summary refs log tree commit diff
path: root/pkgs/tools/compression/bzip2/default.nix
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2016-11-30 19:30:52 -0500
committerGraham Christensen <graham@grahamc.com>2016-11-30 19:30:52 -0500
commit390f6a985bea5183e9e15d9dfe17e61aac86dd00 (patch)
treec9438b7c86c11194999285ab75fdfb18875433c5 /pkgs/tools/compression/bzip2/default.nix
parentea07ad6bd9e3144248864a21b4999f32b78c2857 (diff)
downloadnixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.tar
nixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.tar.gz
nixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.tar.bz2
nixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.tar.lz
nixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.tar.xz
nixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.tar.zst
nixpkgs-390f6a985bea5183e9e15d9dfe17e61aac86dd00.zip
Revert "Revert "bzip2: patch for CVE-2016-3189""
This reverts commit 6393ca650eb9ef5f045905600c4256a0d0bf20b7.
Diffstat (limited to 'pkgs/tools/compression/bzip2/default.nix')
-rw-r--r--pkgs/tools/compression/bzip2/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index cabd412fe65..51f47811065 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , linkStatic ? (stdenv.system == "i686-cygwin")
 }:
 
@@ -20,10 +20,16 @@ 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 =