public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26503 from vdemeester/update-runc

Browse Source 
Update runc to 1.0.0-rc3
This commit is contained in:
Jörg Thalheim 2017-06-10 22:48:03 +01:00 committed by GitHub
commit f2e1e7f3cd
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/virtualization/runc/default.nix
View File

@ -5,30 +5,15 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "runc-${version}"; name = "runc-${version}";
version = "1.0.0-rc2"; version = "1.0.0-rc3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencontainers"; owner = "opencontainers";
repo = "runc"; repo = "runc";
rev = "v${version}"; rev = "v${version}";
sha256 = "06bxc4g3frh4i1lkzvwdcwmzmr0i52rz4a4pij39s15zaigm79wk"; sha256 = "14hdhnni0rz3g0bhcaq95zn2zrhyds0mq2pm2padbamg4bgq4r1c";
}; };
patches = [
# Two patches to fix CVE-2016-9962
# From https://bugzilla.suse.com/show_bug.cgi?id=1012568
(fetchpatch {
name = "0001-libcontainer-nsenter-set-init-processes-as-non-dumpa.patch";
url = "https://bugzilla.suse.com/attachment.cgi?id=709048&action=diff&context=patch&collapsed=&headers=1&format=raw";
sha256 = "1cfsmsyhc45a2929825mdaql0mrhhbrgdm54ly0957j2f46072ck";
})
(fetchpatch {
name = "0002-libcontainer-init-only-pass-stateDirFd-when-creating.patch";
url = "https://bugzilla.suse.com/attachment.cgi?id=709049&action=diff&context=patch&collapsed=&headers=1&format=raw";
sha256 = "1ykwg1mbvsxsnsrk9a8i4iadma1g0rgdmaj19dvif457hsnn31wl";
})
];
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
hardeningDisable = ["fortify"]; hardeningDisable = ["fortify"];
@ -37,7 +22,16 @@ stdenv.mkDerivation rec {
makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
preConfigure = ''
# Extract the source
cd "$NIX_BUILD_TOP"
mkdir -p "go/src/github.com/opencontainers"
mv "$sourceRoot" "go/src/github.com/opencontainers/runc"
export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
'';
preBuild = '' preBuild = ''
cd go/src/github.com/opencontainers/runc
patchShebangs . patchShebangs .
substituteInPlace libcontainer/apparmor/apparmor.go \ substituteInPlace libcontainer/apparmor/apparmor.go \
--replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser