diff options
| author | Florian Klink <flokli@flokli.de> | 2020-05-01 14:42:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 14:42:50 +0200 |
| commit | d92d0c382e1b41505f92c226bcde8aac60c9ec87 (patch) | |
| tree | 919ff23304b5cb075de8d4763c46439cc52bbd9c | |
| parent | Merge pull request #86396 from etu/php-upstream-extensions-meta (diff) | |
| parent | p7zip: mark as insecure (diff) | |
| download | nixpkgs-d92d0c382e1b41505f92c226bcde8aac60c9ec87.tar.gz | |
Merge pull request #86417 from tokudan/p7zip-abandoned
p7zip: fix two CVEs and mark as insecure
| -rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3f0c2487c91b..b7a97b3766b5 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, enableUnfree ? false }: +{ stdenv, fetchurl, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { patches = [ ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; + sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; + sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional @@ -49,6 +57,11 @@ stdenv.mkDerivation rec { description = "A port of the 7-zip archiver"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; + knownVulnerabilities = [ + # p7zip is abandoned, according to this thread on its forums: + # https://sourceforge.net/p/p7zip/discussion/383043/thread/fa143cf2/#1817 + "p7zip is abandoned and may not receive important security fixes" + ]; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; |