diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
| commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
| tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/development/libraries/libarchive | |
| parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
| parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
| download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip | |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libarchive')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libarchive/default.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index 029be971ac17..f2a1c500a8be 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -17,6 +17,21 @@ stdenv.mkDerivation rec { 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" ]; nativeBuildInputs = [ pkgconfig ]; |