diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:51:33 +0100 |
| commit | c9171e5a4c3e61f9afa0e3da3755712d1da5d693 (patch) | |
| tree | 89b09dee818b612c9c52fb92d79b7169f1202006 /pkgs/tools/archivers | |
| parent | e851d53ceaf2cd48d0757c385626dd2040db0f12 (diff) | |
| parent | 078fc69425787c9ceebfa003add3c1d80e49560c (diff) | |
| download | nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.gz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.bz2 nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.lz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.xz nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.tar.zst nixlib-c9171e5a4c3e61f9afa0e3da3755712d1da5d693.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1430035
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3550b7d7de36..886ed8179091 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d"; sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; }) + (fetchpatch rec { + name = "CVE-2017-17969.patch"; + url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5"; + sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional |