cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'staging-next' into staging

Browse source 
libarchive: larger security rebuild
This commit is contained in:
Vladimír Čunát 2019-03-10 10:51:24 +01:00
commit 3563f68da5
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/libraries/libarchive/default.nix
View file

@ -17,6 +17,21 @@ stdenv.mkDerivation rec {
sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms"; sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
}; };
patches = [
(fetchpatch {
# details: https://github.com/libarchive/libarchive/pull/1105
name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80
url = "https://github.com/libarchive/libarchive/pull/1105.diff";
sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf";
})
(fetchpatch {
# details: https://github.com/libarchive/libarchive/pull/1120
name = "cve-2019-1000019_cve-2019-1000020.diff";
url = "https://github.com/libarchive/libarchive/pull/1120.diff";
sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4";
})
];
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];