Commit 86733544 authored by archer-65's avatar archer-65
Browse files

emacs-macport: 29.1 -> 29.4 

Additional:
* Do not mark as vulnerable as CVE patches are applied
parent 994274e7

pkgs/applications/editors/emacs/sources.nix

+18 −3
Original line number Diff line number Diff line
@@ -152,9 +152,24 @@ in 


  emacs29-macport = import ./make-emacs.nix (mkArgs {

    pname = "emacs-mac";

    version = "29.1";

    version = "29.4";

    variant = "macport";

    rev = "emacs-29.1-mac-10.0";

    hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";

    rev = "emacs-29.4-mac-10.1";

    hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic=";

    patches = fetchpatch: [

      # CVE-2024-53920

      (fetchpatch {

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";

        hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4=";

      })



      # CVE-2025-1244

      (fetchpatch {

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";

        hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w=";

      })

    ];



    meta.knownVulnerabilities = [ ];

  });

}