summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2024-04-10 07:30:37 +0200
committerWeijia Wang <9713184+wegank@users.noreply.github.com>2024-04-10 07:30:37 +0200
commitb0816236849483d6c2493fd876ac362580be52b3 (patch)
tree3351d382d14ec39d0a4bdd456b478d65d8ed3848
parentMerge pull request #302939 from christoph-heiss/sourcehut-update (diff)
downloadnixpkgs-b0816236849483d6c2493fd876ac362580be52b3.tar.gz
guix: add patch for CVE-2024-27297
-rw-r--r--pkgs/by-name/gu/guix/package.nix14
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/by-name/gu/guix/package.nix b/pkgs/by-name/gu/guix/package.nix
index 6549a9b8e276..8f9e4e4836b9 100644
--- a/pkgs/by-name/gu/guix/package.nix
+++ b/pkgs/by-name/gu/guix/package.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
+, fetchpatch
, autoreconfHook
, disarchive
, git
@@ -43,6 +44,19 @@ stdenv.mkDerivation rec {
hash = "sha256-Q8dpy/Yy7wVEmsH6SMG6FSwzSUxqvH5HE3u6eyFJ+KQ=";
};
+ patches = [
+ (fetchpatch {
+ name = "CVE-2024-27297_1.patch";
+ url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=8f4ffb3fae133bb21d7991e97c2f19a7108b1143";
+ hash = "sha256-xKo1h2uckC2pYHt+memekagfL6dWcF8gOnTOOW/wJUU=";
+ })
+ (fetchpatch {
+ name = "CVE-2024-27297_2.patch";
+ url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=ff1251de0bc327ec478fc66a562430fbf35aef42";
+ hash = "sha256-f4KWDVrvO/oI+4SCUHU5GandkGtHrlaM1BWygM/Qlao=";
+ })
+ ];
+
postPatch = ''
sed nix/local.mk -i -E \
-e "s|^sysvinitservicedir = .*$|sysvinitservicedir = $out/etc/init.d|" \