diff options
| author | Lin Jian <me@linj.tech> | 2024-03-27 19:27:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 19:27:23 +0800 |
| commit | 098e283b46ba62c9c5ba70f2513ddc59c599f800 (patch) | |
| tree | 7efdd07c3699e1101b26cc86741a19c6c82845f6 /pkgs | |
| parent | 285d456c6d97742a4fae58280776502f4e652699 (diff) | |
| parent | d3635821355bd04098e8139145eecdcaa30c1d4e (diff) | |
Merge pull request #299316 from Atemu/emacs28-macport-CVE
emacs28-macport: incorporate security patches
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/editors/emacs/sources.nix | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 02b3aec7e9c80..a5797ae6f3056 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -110,6 +110,27 @@ in variant = "macport"; rev = "emacs-28.2-mac-9.1"; hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; + patches = fetchpatch: [ + # CVE-2022-45939 + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; + hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; + }) + + # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; + }) + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; + hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; + }) + (fetchpatch { + 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="; + }) + ]; }); emacs29-macport = import ./make-emacs.nix (mkArgs { |