Merge branch 'staging-next'

This reverts the *incomplete* unzip CVE fix that caused many
false positives.
This commit is contained in:
Vladimír Čunát 2019-07-26 10:52:45 +02:00
commit 7a85636644
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -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";