diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2017-03-22 12:57:37 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2017-03-22 12:57:37 +0200 |
commit | 378de69c59ee0700c67b10b38592c213821b41f2 (patch) | |
tree | ee9b6465430077a79cace3cb8fab1a85a8c1e4c5 /gnu/local.mk | |
parent | 049e02eaa258942515260a58c8d9ddfc4e7caffe (diff) | |
parent | d8be338f16c7da4acfa55f29f58beaf908d3ad60 (diff) | |
download | patches-378de69c59ee0700c67b10b38592c213821b41f2.tar patches-378de69c59ee0700c67b10b38592c213821b41f2.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 256682effa..b8db8712d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -778,7 +778,6 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ - %D%/packages/patches/ngircd-no-dns-in-tests.patch \ %D%/packages/patches/ninja-zero-mtime.patch \ %D%/packages/patches/node-9077.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ @@ -964,7 +963,6 @@ dist_patch_DATA = \ %D%/packages/patches/util-linux-CVE-2017-2616.patch \ %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ - %D%/packages/patches/vim-CVE-2017-5953.patch \ %D%/packages/patches/virglrenderer-CVE-2017-6386.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9638+CVE-2014-9639.patch \ %D%/packages/patches/vorbis-tools-CVE-2014-9640.patch \ |