diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-06 12:04:52 +0200 |
| commit | f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44 (patch) | |
| tree | 5a7f8e0f97ec403b9aceb9276c8fb9e53bae9df5 /pkgs/tools/archivers | |
| parent | 85afc926d8dfcbc079322594e803078d72a31f9f (diff) | |
| parent | 6820e2f0dd16104961d6fc7e8e38846807159c4e (diff) | |
| download | nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.gz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.bz2 nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.lz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.xz nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.tar.zst nixpkgs-f7be21f4c98ba84e1b3eb7c77ecaed2fb82cce44.zip | |
Merge branch 'master' into add-missing-licenses
Conflicts:
pkgs/development/libraries/exiv2/default.nix
Set license to gpl2Plus
Diffstat (limited to 'pkgs/tools/archivers')
| -rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 10 |
1 files changed, 9 insertions, 1 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' |