mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 06:01:15 +00:00
Revert "bzip2: patch for CVE-2016-3189"
This reverts commit 9c71508c95
.
This commit is contained in:
parent
892a9b1f0f
commit
6393ca650e
|
@ -1,12 +0,0 @@
|
|||
diff --git a/bzip2recover.c b/bzip2recover.c
|
||||
index f9de049..252c1b7 100644
|
||||
--- a/bzip2recover.c
|
||||
+++ b/bzip2recover.c
|
||||
@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
|
||||
bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
|
||||
bsPutUInt32 ( bsWr, blockCRC );
|
||||
bsClose ( bsWr );
|
||||
+ outFile = NULL;
|
||||
}
|
||||
if (wrBlock >= rbCtr) break;
|
||||
wrBlock++;
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch
|
||||
{ stdenv, fetchurl
|
||||
, linkStatic ? (stdenv.system == "i686-cygwin")
|
||||
}:
|
||||
|
||||
|
@ -20,16 +20,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./CVE-2016-3189.patch
|
||||
];
|
||||
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
|
||||
'';
|
||||
|
||||
|
||||
outputs = [ "bin" "dev" "out" "man" ];
|
||||
|
||||
configureFlags =
|
||||
|
|
Loading…
Reference in a new issue