summary refs log tree commit diff
path: root/pkgs/development/libraries/libarchive/default.nix
diff options
context:
space:
mode:
authorPeriklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>2018-11-01 12:45:04 +0100
committerJörg Thalheim <joerg@thalheim.io>2018-11-15 14:00:01 +0000
commit95fa7b6370fa5297c4f439a1cbdc8bae35862e12 (patch)
tree0a48ca038b0097a722230de70e325d1b513a873a /pkgs/development/libraries/libarchive/default.nix
parentcb2a3bc577f50352c87da42ad7bc144ca9884766 (diff)
downloadnixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.tar
nixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.tar.gz
nixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.tar.bz2
nixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.tar.lz
nixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.tar.xz
nixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.tar.zst
nixpkgs-95fa7b6370fa5297c4f439a1cbdc8bae35862e12.zip
libarchive: 3.3.2 -> 3.3.3
Update includes patches for sec issues:
- CVE-2017-14166
- CVE-2017-14501
- CVE-2017-14502
- Upstream includes patch for libressl version check

fixes #49583
Diffstat (limited to 'pkgs/development/libraries/libarchive/default.nix')
-rw-r--r--pkgs/development/libraries/libarchive/default.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 7625abf38fb..029be971ac1 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,24 +10,13 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.3.2";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
+    sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
   };
 
-  patches = [
-    ./CVE-2017-14166.patch
-    ./CVE-2017-14502.patch
-
-    # LibreSSL patch; this is from upstream, and can be removed when the next release is made.
-    (fetchpatch {
-      url = "https://github.com/libarchive/libarchive/commit/5da00ad75b09e262774ec3675bbe4d5a4502a852.patch";
-      sha256 = "0np1i9r6mfxmbksj7mmf5abpnmlmg63704p9z3ihjh2rnq596c1v";
-    })
-  ];
-
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];