mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 08:36:41 +01:00
Merge branch 'staging-next'
This reverts the *incomplete* unzip CVE fix that caused many false positives.
This commit is contained in:
commit
7a85636644
1 changed files with 0 additions and 5 deletions
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue