From 5f3f3a755c9936782a4b24313ce4f8c8fe4b51d2 Mon Sep 17 00:00:00 2001 From: archer-65 Date: Sun, 6 Apr 2025 21:09:55 +0200 Subject: [PATCH 1/2] emacs28-macport: remove --- pkgs/applications/editors/emacs/default.nix | 2 -- pkgs/applications/editors/emacs/sources.nix | 29 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 8640d64786b37..90189ee8b779a 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -46,8 +46,6 @@ lib.makeScope pkgs.newScope ( withPgtk = true; }; - emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; - emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; } ) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 952d8e5aeab7e..76785b7bbea8d 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -121,35 +121,6 @@ in ]; }); - emacs28-macport = import ./make-emacs.nix (mkArgs { - pname = "emacs-mac"; - version = "28.2"; - 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 { pname = "emacs-mac"; version = "29.1"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3c2334ce3ddf8..adea31864fb6f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -545,6 +545,7 @@ mapAliases { emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06 emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df389f32233d6..2e581c210e2ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14182,7 +14182,6 @@ with pkgs; emacs30-nox emacs30-pgtk - emacs28-macport emacs29-macport ; From 2472eda1188fd235935d543c6c6158ea5c13f5da Mon Sep 17 00:00:00 2001 From: archer-65 Date: Sun, 6 Apr 2025 22:16:39 +0200 Subject: [PATCH 2/2] doc/rl-2505: mention Emacs 29 Macport patches and Emacs 28 Macport removal --- doc/release-notes/rl-2505.section.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 6a6a797269c66..a44349118a34c 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -273,6 +273,7 @@ - `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024. - Emacs 28 and 29 have been removed. +- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched. - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more