Merge branch 'master' into staging-next

... to avoid the accidental gnupatch rebuild
This commit is contained in:
Vladimír Čunát 2019-08-02 09:40:36 +02:00
commit 92f3ea646e
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -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