diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-02 09:40:36 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-02 09:40:36 +0200 |
| commit | 92f3ea646e287535e4978d5875b80e393ea8ea4e (patch) | |
| tree | f6ea0a0cae06dd06327f2ede9dd042c649a2ae03 | |
| parent | 6f723b9bad655a64f1234557b5e08b5ce9556228 (diff) | |
| parent | 002b853782e939c50da3fa7d424b08346f39eb6f (diff) | |
| download | nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.tar nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.tar.gz nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.tar.bz2 nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.tar.lz nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.tar.xz nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.tar.zst nixlib-92f3ea646e287535e4978d5875b80e393ea8ea4e.zip | |
Merge branch 'master' into staging-next
... to avoid the accidental gnupatch rebuild
| -rw-r--r-- | pkgs/tools/text/gnupatch/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index e4595e64c08b..a046c5911157 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { ./CVE-2018-6951.patch (fetchurl { url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1; + name = "Allow_input_files_to_be_missing_for_ed-style_patches.patch"; sha256 = "0iw0lk0yhnhvfjzal48ij6zdr92mgb84jq7fwryy1hdhi47hhq64"; }) (fetchurl { # CVE-2018-1000156 url = https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d; + name = "Fix_arbitrary_command_execution_in_ed-style_patches.patch"; sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg"; }) # https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300 |