mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #321871 from linj-fork/pr/emacs-org-security

Browse Source 
emacs and org: backport a security fix
This commit is contained in:
Lin Jian 2024-06-24 07:45:41 +08:00 committed by GitHub
commit 218d138dc3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
View File

@ -4453,10 +4453,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.7pre0.20240521.135840";
version = "9.7pre0.20240530.133120";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-9.7pre0.20240521.135840.tar";
sha256 = "06j7kjbpd390i0kqvvnlkpdzqkwiicbdgjymif338l0qx2kl4sg5";
url = "https://elpa.gnu.org/devel/org-9.7pre0.20240530.133120.tar";
sha256 = "sha256-DuuLDBJKI2LwC0PH9PtujcPvaqaKLWYij+KzP1U7o9M=";
};
packageRequires = [ emacs ];
meta = {

20
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
View File

@ -64,6 +64,26 @@ self: let
'';
});
org = super.org.overrideAttrs (old: {
dontUnpack = false;
patches = old.patches or [ ] ++ [
# security fix backported from 9.7.5
(pkgs.fetchpatch {
url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
stripLen = 1;
})
];
postPatch = old.postPatch or "" + "\n" + ''
pushd ..
local content_directory=${old.ename}-${old.version}
src=$PWD/$content_directory.tar
tar --create --verbose --file=$src $content_directory
popd
'';
dontBuild = true;
});
pq = super.pq.overrideAttrs (old: {
buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
});

20
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View File

@ -141,6 +141,26 @@ self: let
};
});
org = super.org.overrideAttrs (old: {
dontUnpack = false;
patches = old.patches or [ ] ++ [
# security fix backported from 9.7.5
(pkgs.fetchpatch {
url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
stripLen = 1;
})
];
postPatch = old.postPatch or "" + "\n" + ''
pushd ..
local content_directory=${old.ename}-${old.version}
src=$PWD/$content_directory.tar
tar --create --verbose --file=$src $content_directory
popd
'';
dontBuild = true;
});
plz = super.plz.overrideAttrs (
old: {
dontUnpack = false;

6
pkgs/applications/editors/emacs/sources.nix
View File

@ -93,6 +93,12 @@ in
url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6";
hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek=";
})
# security fix from Emacs 29.4
(fetchpatch {
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=c645e1d8205f0f0663ec4a2d27575b238c646c7c";
hash = "sha256-G+gGQx5w3KuWMotR1n/sYYL8WyAABYW3fUPeffMMs38=";
})
];
});