Skip to content

Commit

Permalink
libarchive: 3.3.2 -> 3.3.3
Browse files Browse the repository at this point in the history
Update includes patches for sec issues:
- CVE-2017-14166
- CVE-2017-14501
- CVE-2017-14502
- Upstream includes patch for libressl version check

fixes #49583
  • Loading branch information
periklis authored and Mic92 committed Nov 15, 2018
1 parent cb2a3bc commit 95fa7b6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 77 deletions.
36 changes: 0 additions & 36 deletions pkgs/development/libraries/libarchive/CVE-2017-14166.patch

This file was deleted.

28 changes: 0 additions & 28 deletions pkgs/development/libraries/libarchive/CVE-2017-14502.patch

This file was deleted.

15 changes: 2 additions & 13 deletions pkgs/development/libraries/libarchive/default.nix
Expand Up @@ -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 ];
Expand Down

0 comments on commit 95fa7b6

Please sign in to comment.