diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-02-05 13:41:09 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-02-05 13:41:09 +0100 |
commit | 48a997cd76c8f141938cf98f82a867d0cf88fec2 (patch) | |
tree | 78469b48c8ca2451134c411b689902ed4d046414 /pkgs/tools/archivers | |
parent | 15021db2fa441d7fa73538dd0e46e9d74731ace8 (diff) | |
parent | 5ca088f1cc4216fe4a11a769ec5d55343a3f978a (diff) |
Merge #66528: glibc: 2.27 -> 2.30 (into staging)
Includes update of stdenv bootstap tools (for three main platforms) and many package fixes with new glibc.
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 0dfd234bc758c..b4fc2377f0e4f 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { 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"; }) + (fetchurl { + url = "https://sources.debian.org/data/main/s/sharutils/1:4.15.2-4/debian/patches/02-fix-ftbfs-with-glibc-2.28.patch"; + sha256 = "15kpjqnfs98n6irmkh8pw7masr08xala7gx024agv7zv14722vkc"; + }) ]; postPatch = let |