@@ -1,27 +1,32 @@
11{ lib, stdenv, fetchurl, fetchpatch }:
22
3−let
3+stdenv.mkDerivation rec {
4+ pname = "cpio";
45 version = "2.13";
5− name = "cpio-${version}";
6−in stdenv.mkDerivation {
7− inherit name;
86
97 src = fetchurl {
10− url = "mirror://gnu/cpio/${name}.tar.bz2";
8+ url = "mirror://gnu/cpio/cpio-${version}.tar.bz2";
119 sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga";
1210 };
1311
14− patches = [
15− (fetchpatch {
16− name = "CVE-2021-38185.patch";
17− url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b";
18− sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32";
19− })
12+ patches = let
13+ fp = suffix: rev: sha256: fetchpatch {
14+ name = "CVE-2021-38185-${suffix}.patch";
15+ url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=${rev}";
16+ inherit sha256;
17+ };
18+ in [
19+ (fp "1" "dd96882877721703e19272fe25034560b794061b"
20+ "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32")
21+ (fp "2" "dfc801c44a93bed7b3951905b188823d6a0432c8"
22+ "1qkrhi3lbxk6hflp6w3h4sgssc0wblv8r0qgxqzbjrm36pqwxiwh")
23+ (fp "3" "236684f6deb3178043fe72a8e2faca538fa2aae1"
24+ "0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6")
2025 ];
2126
22− preConfigure = if stdenv.isCygwin then ''
27+ preConfigure = lib.optionalString stdenv.isCygwin ''
2328 sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
24− '' else null;
29+ '';
2530
2631 enableParallelBuilding = true;
2732