diff options
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 907ac58d15f..292c0be20e5 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { # remaps /etc/passwd to a trivial file, but we can't do that on Darwin so I do this # instead. In this case, I pass in the very imaginative "submitter" as the submitter name - patchPhase = let + patches = [ + # CVE-2018-1000097 + (fetchurl { + url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-2+deb9u1/debian/patches/01-fix-heap-buffer-overflow-cve-2018-1000097.patch"; + sha256 = "19g0sxc8g79aj5gd5idz5409311253jf2q8wqkasf0handdvsbxx"; + }) + ]; + + postPatch = let # This evaluates to a string containing: # # substituteInPlace tests/shar-2 --replace '${SHAR}' '${SHAR} -s submitter' diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9e05043d4b0..20d85405bba 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional enableNLS libnatspec ++ stdenv.lib.optional stdenv.isCygwin libiconv; - meta = { + meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; - platforms = stdenv.lib.platforms.all; + license = licenses.bsdOriginal; + platforms = platforms.all; maintainers = [ ]; }; } |