diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-25 12:42:39 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-25 12:42:39 -0500 |
| commit | d123f2f991e0bf6f51e5f207d291fb4c1ceb1245 (patch) | |
| tree | 8ca3cbeff8a08ab9e11a0324fd9ec0bae7614f4c /gnu/local.mk | |
| parent | a282d7ff174ccc13b3645359449af6052451c2a1 (diff) | |
| parent | 864042c5c5f845fd3c1ae37c64dc1a672fedef28 (diff) | |
| download | guix-d123f2f991e0bf6f51e5f207d291fb4c1ceb1245.tar.gz guix-d123f2f991e0bf6f51e5f207d291fb4c1ceb1245.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 532ea51dd2..9d835a8250 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -595,7 +595,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ - %D%/packages/patches/gnupg-test-segfault-on-32bit-arch.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ @@ -647,7 +646,6 @@ dist_patch_DATA = \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ - %D%/packages/patches/khal-disable-failing-tests.patch \ %D%/packages/patches/khmer-use-libraries.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ @@ -701,8 +699,6 @@ dist_patch_DATA = \ %D%/packages/patches/libtiff-tiffcp-underflow.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libunwind-CVE-2015-3239.patch \ - %D%/packages/patches/libupnp-CVE-2016-6255.patch \ - %D%/packages/patches/libupnp-CVE-2016-8863.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libwebp-CVE-2016-9085.patch \ %D%/packages/patches/libwmf-CAN-2004-0941.patch \ @@ -782,6 +778,7 @@ dist_patch_DATA = \ %D%/packages/patches/openjpeg-CVE-2016-5157.patch \ %D%/packages/patches/openjpeg-CVE-2016-7163.patch \ %D%/packages/patches/openjpeg-CVE-2016-9850-CVE-2016-9851.patch \ + %D%/packages/patches/openjpeg-CVE-2016-9572-CVE-2016-9573.patch \ %D%/packages/patches/openjpeg-use-after-free-fix.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ |