diff options
Diffstat (limited to 'pkgs/tools/archivers/cpio/default.nix')
-rw-r--r-- | pkgs/tools/archivers/cpio/default.nix | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index f2207b588499..570f1904ee21 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,36 +1,32 @@ { stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation { - name = "cpio-2.11"; +let + version = "2.12"; + name = "cpio-${version}"; +in stdenv.mkDerivation { + inherit name; src = fetchurl { - url = mirror://gnu/cpio/cpio-2.11.tar.bz2; - sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd"; + url = "mirror://gnu/cpio/${name}.tar.bz2"; + sha256 = "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh"; }; patches = [ - ./no-gets.patch (fetchpatch { - name = "CVE-2014-9112.diff"; - url = "http://pkgs.fedoraproject.org/cgit/cpio.git/plain/cpio-2.11" - + "-CVE-2014-9112.patch?h=f21&id=b475b4d6f31c95e073edc95c742a33a39ef4ec95"; - sha256 = "0c9yrysvpwbmiq7ph84dk6mv46hddiyvkgya1zsmj76n9ypb1b4i"; + name = "CVE-2015-1197-cpio-2.12.patch"; + url = "https://gist.github.com/nckx/70b0bfa80ddfb86c2967/" + + "raw/e9b40d4d4b701f584f826775b75beb10751dc884/" + + "CVE-2015-1197-cpio-2.12.patch"; + sha256 = "0ph43m4lavwkc4gnl5h9p3da4kb1pnhwk5l2qsky70dqri8pcr8v"; }) - ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; - - postPatch = let pp = - fetchpatch { - name = "CVE-2015-1197.diff"; - url = "https://marc.info/?l=oss-security&m=142289947619786&w=2"; - sha256 = "0fr95bj416zfljv40fl1sh50059d18wdmfgaq8ad2fqi5cnbk859"; - }; - # one "<" and one "&" sign get mangled in the patch - in "cat ${pp} | sed 's/</</;s/&/\\&/' | patch -p1"; + ]; preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' '' else null; + enableParallelBuilding = true; + meta = { homepage = http://www.gnu.org/software/cpio/; description = "A program to create or extract from cpio archives"; |