diff options
| author | Leo Famulari <leo@famulari.name> | 2016-10-05 19:15:25 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-10-05 19:15:25 -0400 |
| commit | b19c7989b770f47011cd531a13c89002374dc3e0 (patch) | |
| tree | ca0dccd3a677d4ac5237de87c9f78c31dbdaf148 /gnu/local.mk | |
| parent | 6524c1cfcf6088c5574e6ff21f540dfb22f944bf (diff) | |
| parent | 145947608905d36f31227e87bebd7ed3a922e910 (diff) | |
| download | guix-b19c7989b770f47011cd531a13c89002374dc3e0.tar guix-b19c7989b770f47011cd531a13c89002374dc3e0.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d74081b673..db3762278c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -478,7 +478,6 @@ dist_patch_DATA = \ %D%/packages/patches/clang-3.8-libc-search-path.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-fix-tests.patch \ - %D%/packages/patches/cpio-gets-undeclared.patch \ %D%/packages/patches/cpio-CVE-2016-2037.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cracklib-CVE-2016-6318.patch \ @@ -556,6 +555,7 @@ dist_patch_DATA = \ %D%/packages/patches/grub-CVE-2015-8370.patch \ %D%/packages/patches/grub-gets-undeclared.patch \ %D%/packages/patches/grub-freetype.patch \ + %D%/packages/patches/gsl-test-i686.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-arm-fixes.patch \ %D%/packages/patches/guile-default-utf8.patch \ @@ -668,6 +668,16 @@ dist_patch_DATA = \ %D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \ %D%/packages/patches/libwmf-CVE-2015-4695.patch \ %D%/packages/patches/libwmf-CVE-2015-4696.patch \ + %D%/packages/patches/libx11-CVE-2016-7942.patch \ + %D%/packages/patches/libx11-CVE-2016-7943.patch \ + %D%/packages/patches/libxfixes-CVE-2016-7944.patch \ + %D%/packages/patches/libxi-CVE-2016-7945-CVE-2016-7946.patch \ + %D%/packages/patches/libxrandr-CVE-2016-7947-CVE-2016-7948.patch \ + %D%/packages/patches/libxrender-CVE-2016-7949.patch \ + %D%/packages/patches/libxrender-CVE-2016-7950.patch \ + %D%/packages/patches/libxtst-CVE-2016-7951-CVE-2016-7952.patch \ + %D%/packages/patches/libxv-CVE-2016-5407.patch \ + %D%/packages/patches/libxvmc-CVE-2016-7953.patch \ %D%/packages/patches/libxslt-generated-ids.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ @@ -691,6 +701,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ + %D%/packages/patches/metabat-remove-compilation-date.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mplayer2-theora-fix.patch \ @@ -800,7 +811,6 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-symlinkfix.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ - %D%/packages/patches/rush-CVE-2013-6889.patch \ %D%/packages/patches/sed-hurd-path-max.patch \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-test-threading.patch \ |