Unverified Commit 098e283b authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #299316 from Atemu/emacs28-macport-CVE 

emacs28-macport: incorporate security patches
parents 285d456c d3635821

pkgs/applications/editors/emacs/sources.nix

+21 −0
Original line number Diff line number Diff line
@@ -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 {