From 6393ca650eb9ef5f045905600c4256a0d0bf20b7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 30 Nov 2016 19:06:43 -0500
Subject: [PATCH] Revert "bzip2: patch for CVE-2016-3189"

This reverts commit 9c71508c95482139f3fb1fef2cc5f3cb20600ad5.
---
 pkgs/tools/compression/bzip2/CVE-2016-3189.patch | 12 ------------
 pkgs/tools/compression/bzip2/default.nix         |  8 +-------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/compression/bzip2/CVE-2016-3189.patch

diff --git a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
deleted file mode 100644
index eff324b32503..000000000000
--- a/pkgs/tools/compression/bzip2/CVE-2016-3189.patch
+++ /dev/null
@@ -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++;
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 51f478110659..cabd412fe65d 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -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 =