summary refs log tree commit diff
path: root/pkgs/tools/archivers
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2019-07-25 22:05:13 +0100
committeradisbladis <adisbladis@gmail.com>2019-07-25 22:07:06 +0100
commiteaafd840bf45c239143701a0e6bff0e294d84350 (patch)
treeb7df83bd3987334db71103059f7983cc0315db38 /pkgs/tools/archivers
parentfd2b2b5cd56a5be788fa88dcd9605a3a5bb5ecc7 (diff)
downloadnixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.tar
nixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.tar.gz
nixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.tar.bz2
nixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.tar.lz
nixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.tar.xz
nixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.tar.zst
nixpkgs-eaafd840bf45c239143701a0e6bff0e294d84350.zip
Revert "unzip: CVE-2019-13232"
This reverts commit 0238946872c1c63709790f6285bf9cc5585a6704.

This patch broke a number of legitimate zips in the wild, including but
not limited to most luarocks and a number of gradle-produced JARs.
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r--pkgs/tools/archivers/unzip/default.nix5
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index 749f481d890..cdf189e82df 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -26,11 +26,6 @@ stdenv.mkDerivation {
     ./CVE-2016-9844.patch
     ./CVE-2018-18384.patch
     ./dont-hardcode-cc.patch
-    (fetchurl {
-      url = "https://github.com/madler/unzip/commit/47b3ceae397d21bf822bc2ac73052a4b1daf8e1c.patch";
-      name = "CVE-2019-13232.patch";
-      sha256 = "0iy2wcjyvzwrjk02iszwcpg85fkjxs1bvb9isvdiywszav4yjs32";
-    })
   ] ++ stdenv.lib.optional enableNLS
     (fetchurl {
       url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";