diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
| commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
| tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/tools/archivers/sharutils/default.nix | |
| parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
| parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) | |
| download | nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.gz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.bz2 nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.lz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.xz nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.tar.zst nixpkgs-d9fa74ba7891cfae4a029ee79dd29e4ab3425385.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/tools/archivers/sharutils/default.nix')
| -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' |