about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs/sources.nix
diff options
context:
space:
mode:
authorLin Jian <me@linj.tech>2024-03-26 00:44:53 +0800
committerLin Jian <me@linj.tech>2024-03-26 03:52:17 +0800
commite8124a9c5db7f96c51ad8dd7587ed4e26ff44fd6 (patch)
treeca908831cc33b3e91c3c63c6108e135206e993a6 /pkgs/applications/editors/emacs/sources.nix
parent0ccce9b3e6c969f2db54e9b28c9ca2c68894af4d (diff)
emacs28: backport security fixes from Emacs 29.3
https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html
Diffstat (limited to 'pkgs/applications/editors/emacs/sources.nix')
-rw-r--r--pkgs/applications/editors/emacs/sources.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 7b0f893a4e43e..02b3aec7e9c80 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -79,6 +79,20 @@ in
         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=";
+      })
     ];
   });