Skip to content

Commit 5e33351

Browse files
authored
guix: fix build user takeover patch (#353533)
2 parents 7d0e50b + e3c99d6 commit 5e33351

File tree

2 files changed

+13
-44
lines changed

2 files changed

+13
-44
lines changed

pkgs/by-name/gu/guix/guix-build-user-takeover-fix.patch

Lines changed: 0 additions & 42 deletions
This file was deleted.

pkgs/by-name/gu/guix/package.nix

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
stdenv,
44
fetchurl,
55
fetchpatch,
6+
fetchDebianPatch,
67
autoreconfHook,
78
disarchive,
89
git,
@@ -57,9 +58,19 @@ stdenv.mkDerivation rec {
5758
url = "https://git.savannah.gnu.org/cgit/guix.git/patch/?id=ff1251de0bc327ec478fc66a562430fbf35aef42";
5859
hash = "sha256-f4KWDVrvO/oI+4SCUHU5GandkGtHrlaM1BWygM/Qlao=";
5960
})
60-
# manual port of build user takeover remediation commit
6161
# see https://guix.gnu.org/en/blog/2024/build-user-takeover-vulnerability
62-
./guix-build-user-takeover-fix.patch
62+
(fetchDebianPatch {
63+
inherit pname version;
64+
debianRevision = "8";
65+
patch = "security/0101-daemon-Sanitize-failed-build-outputs-prior-to-exposi.patch";
66+
hash = "sha256-cbra/+K8+xHUJrCKRgzJCuhMBpzCSjgjosKAkJx7QIo=";
67+
})
68+
(fetchDebianPatch {
69+
inherit pname version;
70+
debianRevision = "8";
71+
patch = "security/0102-daemon-Sanitize-successful-build-outputs-prior-to-ex.patch";
72+
hash = "sha256-mOnlYtpIuYL+kDvSNuXuoDLJP03AA9aI2ALhap+0NOM=";
73+
})
6374
];
6475

6576
postPatch = ''

0 commit comments

Comments
 (0)