diff options
author | Mark H Weaver <mhw@netris.org> | 2016-12-10 23:03:57 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-12-10 23:03:57 -0500 |
commit | d94691e0c21440657ad198b03145743d4a876829 (patch) | |
tree | 20dd105c352c117244eed15f6ffcc3ea3ba43b00 /gnu/local.mk | |
parent | 72c0b687800a617b891565f5a85bb06c1e1ba015 (diff) | |
parent | edd1652e0a66c7d0713c810c1e3711840d5ab8bc (diff) | |
download | gnu-guix-d94691e0c21440657ad198b03145743d4a876829.tar gnu-guix-d94691e0c21440657ad198b03145743d4a876829.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f8202e2e72..c6cb55b06f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -747,9 +747,9 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/onionshare-fix-install-paths.patch \ %D%/packages/patches/openexr-missing-samples.patch \ - %D%/packages/patches/openjpeg-CVE-2015-6581.patch \ %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-use-after-free-fix.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssh-memory-exhaustion.patch \ |