public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libarchive: pull in patch to support LibresSSL-2.7 (#41395)

Browse Source
This commit is contained in:
qolii 2018-06-03 17:59:43 +00:00 committed by Orivej Desh
parent 9d1d274928
commit 20d83e286d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libarchive/default.nix
View File

@ -1,5 +1,5 @@
{ {
fetchurl, stdenv, pkgconfig, fetchurl, fetchpatch, stdenv, pkgconfig,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
# Optional but increases closure only negligibly. # Optional but increases closure only negligibly.
@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./CVE-2017-14166.patch ./CVE-2017-14166.patch
./CVE-2017-14502.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 = "1r5n09dqhs5f8jx4iyqy06f0ryrxnbz60ww9aiww0j4gp5fs77qk";
})
]; ];
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];