about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLin Jian <me@linj.tech>2024-06-23 08:03:26 +0800
committerLin Jian <me@linj.tech>2024-06-24 06:11:01 +0800
commit18cbc36a603f486ef5473257ea1a56c7125cc377 (patch)
treee793a1a1d72c71d8b240c471b542578e84be682e
parentaa45c7e67ddb4fc1a8f033cbfe30bb8f1b5adfee (diff)
emacs28: backport a security fix from Emacs 29.4
https://mail.gnu.org/archive/html/emacs-devel/2024-06/msg00695.html
-rw-r--r--pkgs/applications/editors/emacs/sources.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index aecd0b1fd66dc..487d8a3680a6d 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -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=";
+      })
     ];
   });