diff options
author | Leo Famulari <leo@famulari.name> | 2017-06-04 14:56:31 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-06-04 14:56:31 -0400 |
commit | 9f825cec1beb0174a218ee3af603a692e5aea81d (patch) | |
tree | 16dd2359f73965bb015a89daa76af4ca1ba2e500 /gnu/local.mk | |
parent | 8b4186e116434860a93fd1c8163fdeb86c1d63a8 (diff) | |
parent | cc24bf98bd9b57e7f5653858c1a54283a490cbd0 (diff) | |
download | guix-9f825cec1beb0174a218ee3af603a692e5aea81d.tar guix-9f825cec1beb0174a218ee3af603a692e5aea81d.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8b73f7e64c..015267f09d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -723,6 +723,7 @@ dist_patch_DATA = \ %D%/packages/patches/libevent-2.1-dns-tests.patch \ %D%/packages/patches/libevent-2.1-skip-failing-test.patch \ %D%/packages/patches/libextractor-ffmpeg-3.patch \ + %D%/packages/patches/libgit2-0.25.1-mtime-0.patch \ %D%/packages/patches/libgit2-use-after-free.patch \ %D%/packages/patches/libffi-3.2.1-complex-alpha.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ @@ -931,6 +932,10 @@ dist_patch_DATA = \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/qemu-CVE-2017-7493.patch \ + %D%/packages/patches/qemu-CVE-2017-8112.patch \ + %D%/packages/patches/qemu-CVE-2017-8309.patch \ + %D%/packages/patches/qemu-CVE-2017-8379.patch \ + %D%/packages/patches/qemu-CVE-2017-8380.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ |