pyrox.dev
Merge pull request #26503 from vdemeester/update-runc
Update runc to 1.0.0-rc3
authored by Jörg Thalheim and committed by GitHub f2e1e7f3 86de1559
+11
-17
pkgs/applications/virtualization/runc/default.nix
+11
-17
pkgs/applications/virtualization/runc/default.nix
···
5
5
6
6
stdenv.mkDerivation rec {
7
7
name = "runc-${version}";
8
-
version = "1.0.0-rc2";
8
+
version = "1.0.0-rc3";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "opencontainers";
12
12
repo = "runc";
13
13
rev = "v${version}";
14
-
sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk";
14
+
sha256 = "14hdhnni0rz3g0bhcaq95zn2zrhyds0mq2pm2padbamg4bgq4r1c";
15
15
};
16
16
17
-
patches = [
18
-
# Two patches to fix CVE-2016-9962
19
-
# From https://bugzilla.suse.com/show_bug.cgi?id=1012568
20
-
(fetchpatch {
21
-
name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch";
22
-
url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw";
23
-
sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck";
24
-
})
25
-
(fetchpatch {
26
-
name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch";
27
-
url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw";
28
-
sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl";
29
-
})
30
-
];
31
-
32
17
outputs = [ "out" "man" ];
33
18
34
19
hardeningDisable = ["fortify"];
···
37
22
38
23
makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
39
24
25
+
preConfigure = ''
26
+
# Extract the source
27
+
cd "$NIX_BUILD_TOP"
28
+
mkdir -p "go/src/github.com/opencontainers"
29
+
mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
30
+
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
31
+
'';
32
+
40
33
preBuild = ''
34
+
cd go/src/github.com/opencontainers/runc
41
35
patchShebangs .
42
36
substituteInPlace libcontainer/apparmor/apparmor.go \
43
37
--replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser