diff options
| author | qolii <36613499+qolii@users.noreply.github.com> | 2018-06-03 17:59:43 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-03 17:59:43 +0000 |
| commit | 20d83e286db2301b4801e7655073a9e817f82ae8 (patch) | |
| tree | 93ce7f6fc0cd8be708f948f6a0125a550e5913a1 /pkgs/development/libraries/libarchive | |
| parent | 9d1d27492833c5f22895b7807eeb994c61821c2d (diff) | |
| download | nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.tar nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.tar.gz nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.tar.bz2 nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.tar.lz nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.tar.xz nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.tar.zst nixpkgs-20d83e286db2301b4801e7655073a9e817f82ae8.zip | |
libarchive: pull in patch to support LibresSSL-2.7 (#41395)
Diffstat (limited to 'pkgs/development/libraries/libarchive')
| -rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 9a9c3b1fa64..da1bffb367d 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,5 @@ { - fetchurl, stdenv, pkgconfig, + fetchurl, fetchpatch, stdenv, pkgconfig, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, # Optional but increases closure only negligibly. @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { 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 = "1r5n09dqhs5f8jx4iyqy06f0ryrxnbz60ww9aiww0j4gp5fs77qk"; + }) ]; outputs = [ "out" "lib" "dev" ]; |