diff options
author | Mark H Weaver <mhw@netris.org> | 2018-01-23 17:01:07 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-01-23 17:01:07 -0500 |
commit | a102d359a68ce7219a1880e47dd6f9332cbbce3a (patch) | |
tree | d879e718f08d776ad84c456c91a349e59941d1f2 /gnu/local.mk | |
parent | 07b8ea841e1e2eda5b367f35cf68d23d0520cc4d (diff) | |
parent | f3a13a21e50fa3751fc39e5768ea6843bfc19df2 (diff) | |
download | guix-a102d359a68ce7219a1880e47dd6f9332cbbce3a.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 865d1eae88..9c44b2cc42 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -836,6 +836,7 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ + %D%/packages/patches/libsndfile-CVE-2017-12562.patch \ %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 \ @@ -1037,6 +1038,7 @@ dist_patch_DATA = \ %D%/packages/patches/raptor2-heap-overflow.patch \ %D%/packages/patches/ratpoison-shell.patch \ %D%/packages/patches/rcs-5.9.4-noreturn.patch \ + %D%/packages/patches/rct-add-missing-headers.patch \ %D%/packages/patches/readline-link-ncurses.patch \ %D%/packages/patches/readline-6.2-CVE-2014-2524.patch \ %D%/packages/patches/readline-7.0-mingw.patch \ @@ -1049,6 +1051,7 @@ dist_patch_DATA = \ %D%/packages/patches/rsync-CVE-2017-17433-fix-tests.patch \ %D%/packages/patches/rsync-CVE-2017-17434-pt1.patch \ %D%/packages/patches/rsync-CVE-2017-17434-pt2.patch \ + %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \ %D%/packages/patches/ruby-concurrent-test-arm.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ |