From 70b2bcf4e00d24037bcf5482eec489b8616b01bb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Aug 2026 22:09:35 +0800 Subject: [PATCH] emacs30, emacs30-macport: backport ACE mitigation for bug#80574 https://eshelyaron.com/posts/2026-08-06-emacs-arbitrary-code-execution-returns.html (cherry picked from commit 6b7b2ab4f53a17c5c953975f1f63012e438a2cd8) --- pkgs/applications/editors/emacs/sources.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index fb9d9697cd85..58a60c59fe36 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -131,6 +131,11 @@ in url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2"; hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM="; }) + (fetchpatch { + name = "nullify-read-symbol-shorthands-around-risky-intern-calls-80574.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8466eb44991707d128110bdc549fad14c8e1d61e"; + hash = "sha256-SyRCay2MahCJovtzBHA9M1H9hXhtD5IG3ZFSEUwaWlg="; + }) ]; }); @@ -156,6 +161,11 @@ in url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/02_all_ts-query-pred.patch?id=86190bf195b3e17108372d8ad89eb57037180dd2"; hash = "sha256-0GPyfKLSaB09a8hamrSf6lx4Qk8Big4AKMOivkN1wEM="; }) + (fetchpatch { + name = "nullify-read-symbol-shorthands-around-risky-intern-calls-80574.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8466eb44991707d128110bdc549fad14c8e1d61e"; + hash = "sha256-SyRCay2MahCJovtzBHA9M1H9hXhtD5IG3ZFSEUwaWlg="; + }) ]; }); }