diff options
author | Mark H Weaver <mhw@netris.org> | 2017-08-06 00:23:20 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-08-06 00:23:20 -0400 |
commit | f167595ba1a4e0e419adc17de6af275bedf32822 (patch) | |
tree | 6a582fbda8ad9d72962359add99e5ae219dd030d /gnu/local.mk | |
parent | e3df6938acc2ba2d2f7333d911b8bdc3697f0f75 (diff) | |
parent | 01a61d7040b1794f36547b107abce6e967d59f21 (diff) | |
download | patches-f167595ba1a4e0e419adc17de6af275bedf32822.tar patches-f167595ba1a4e0e419adc17de6af275bedf32822.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3f27a5f973..acdadd6294 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -582,7 +582,6 @@ dist_patch_DATA = \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ %D%/packages/patches/exim-CVE-2017-1000369.patch \ - %D%/packages/patches/fabric-tests.patch \ %D%/packages/patches/fastcap-mulGlobal.patch \ %D%/packages/patches/fastcap-mulSetup.patch \ %D%/packages/patches/fasthenry-spAllocate.patch \ @@ -620,6 +619,7 @@ dist_patch_DATA = \ %D%/packages/patches/gcr-disable-failing-tests.patch \ %D%/packages/patches/gcr-fix-collection-tests-to-work-with-gpg-21.patch \ %D%/packages/patches/gdk-pixbuf-list-dir.patch \ + %D%/packages/patches/gd-CVE-2017-7890.patch \ %D%/packages/patches/gd-fix-gd2-read-test.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ @@ -637,6 +637,11 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-runpath.patch \ %D%/packages/patches/glib-networking-ssl-cert-file.patch \ %D%/packages/patches/glib-tests-timer.patch \ + %D%/packages/patches/glibc-CVE-2015-5180.patch \ + %D%/packages/patches/glibc-CVE-2015-7547.patch \ + %D%/packages/patches/glibc-CVE-2016-3075.patch \ + %D%/packages/patches/glibc-CVE-2016-3706.patch \ + %D%/packages/patches/glibc-CVE-2016-4429.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ |