ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Revert "bzip2: patch for CVE-2016-3189"

Browse Source 
This reverts commit 9c71508c95.
This commit is contained in:
Graham Christensen 2016-11-30 19:06:43 -05:00
parent 892a9b1f0f
commit 6393ca650e
No known key found for this signature in database
GPG Key ID: ACA1C1D120C83D5C
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/compression/bzip2/CVE-2016-3189.patch
View File

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

8
pkgs/tools/compression/bzip2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch { stdenv, fetchurl
, linkStatic ? (stdenv.system == "i686-cygwin") , linkStatic ? (stdenv.system == "i686-cygwin")
}: }:
@ -20,16 +20,10 @@ stdenv.mkDerivation rec {
sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c"; sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
}; };
patches = [
./CVE-2016-3189.patch
];
postPatch = '' postPatch = ''
sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
''; '';
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
configureFlags = configureFlags =