Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / gnu / local.mk

diff --git a/gnu/local.mk b/gnu/local.mk
index 490f07b..bc30cba 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -574,7 +574,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/bash-completion-directories.patch       \
   %D%/packages/patches/bazaar-CVE-2017-14176.patch             \
   %D%/packages/patches/bcftools-regidx-unsigned-char.patch     \
-  %D%/packages/patches/binutils-ld-new-dtags.patch             \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blast+-fix-makefile.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
@@ -706,7 +705,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gimp-CVE-2017-17787.patch               \
   %D%/packages/patches/gimp-CVE-2017-17789.patch               \
   %D%/packages/patches/glib-networking-ssl-cert-file.patch     \
-  %D%/packages/patches/glib-respect-datadir.patch              \
   %D%/packages/patches/glib-tests-timer.patch                  \
   %D%/packages/patches/glibc-CVE-2015-5180.patch               \
   %D%/packages/patches/glibc-CVE-2015-7547.patch               \
@@ -738,7 +736,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gpm-glibc-2.26.patch                    \
   %D%/packages/patches/gpsbabel-minizip.patch                  \
   %D%/packages/patches/gpsbabel-qstring.patch                  \
-  %D%/packages/patches/graphite2-ffloat-store.patch            \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
   %D%/packages/patches/groff-source-date-epoch.patch           \
   %D%/packages/patches/gsl-test-i686.patch                     \
@@ -746,6 +743,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/guile-1.8-cpp-4.5.patch                 \
   %D%/packages/patches/guile-2.2-default-utf8.patch            \
   %D%/packages/patches/guile-default-utf8.patch                        \
+  %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch  \
   %D%/packages/patches/guile-linux-syscalls.patch              \
   %D%/packages/patches/guile-present-coding.patch              \
   %D%/packages/patches/guile-relocatable.patch                 \
@@ -811,7 +809,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/kobodeluxe-midicon-segmentation-fault.patch     \
   %D%/packages/patches/kobodeluxe-graphics-window-signed-char.patch    \
   %D%/packages/patches/laby-make-install.patch                 \
-  %D%/packages/patches/lcms-CVE-2016-10165.patch               \
   %D%/packages/patches/ldc-bootstrap-disable-tests.patch       \
   %D%/packages/patches/ldc-1.7.0-disable-phobos-tests.patch    \
   %D%/packages/patches/ledger-fix-uninitialized.patch          \
@@ -862,8 +859,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/libssh-hostname-parser-bug.patch                \
   %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch     \
   %D%/packages/patches/libtar-CVE-2013-4420.patch              \
-  %D%/packages/patches/libtasn1-CVE-2017-10790.patch           \
-  %D%/packages/patches/libtasn1-CVE-2018-6003.patch            \
   %D%/packages/patches/libtheora-config-guess.patch            \
   %D%/packages/patches/libtiff-CVE-2017-9935.patch             \
   %D%/packages/patches/libtiff-CVE-2017-18013.patch            \
@@ -871,10 +866,7 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libusb-for-axoloti.patch                        \
   %D%/packages/patches/libvdpau-va-gl-unbundle.patch           \
-  %D%/packages/patches/libvorbis-CVE-2017-14632.patch          \
-  %D%/packages/patches/libvorbis-CVE-2017-14633.patch          \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
-  %D%/packages/patches/libxcb-python-3.5-compat.patch          \
   %D%/packages/patches/libxslt-generated-ids.patch             \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
   %D%/packages/patches/lierolibre-check-unaligned-access.patch \
@@ -971,8 +963,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   %D%/packages/patches/patch-hurd-path-max.patch               \
   %D%/packages/patches/pcmanfm-CVE-2017-8934.patch             \
-  %D%/packages/patches/pcre2-CVE-2017-7186.patch               \
-  %D%/packages/patches/pcre2-CVE-2017-8786.patch               \
   %D%/packages/patches/perl-file-path-CVE-2017-6512.patch      \
   %D%/packages/patches/perl-autosplit-default-time.patch       \
   %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch     \
@@ -1101,7 +1091,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/t1lib-CVE-2010-2642.patch               \
   %D%/packages/patches/t1lib-CVE-2011-0764.patch               \
   %D%/packages/patches/t1lib-CVE-2011-1552+.patch              \
-  %D%/packages/patches/tar-CVE-2016-6321.patch                 \
+  %D%/packages/patches/tar-remove-wholesparse-check.patch      \
   %D%/packages/patches/tar-skip-unreliable-tests.patch         \
   %D%/packages/patches/tclxml-3.2-install.patch                        \
   %D%/packages/patches/tcsh-fix-autotest.patch                 \
@@ -1171,8 +1161,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/wpa-supplicant-krack-followups.patch    \
   %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch        \
   %D%/packages/patches/xboing-CVE-2004-0149.patch              \
-  %D%/packages/patches/xcb-proto-python3-print.patch           \
-  %D%/packages/patches/xcb-proto-python3-whitespace.patch      \
   %D%/packages/patches/xdotool-fix-makefile.patch               \
   %D%/packages/patches/xf86-video-ark-remove-mibstore.patch    \
   %D%/packages/patches/xf86-video-ast-remove-mibstore.patch    \