diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-27 03:55:24 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-27 03:55:24 +0200 |
| commit | 9df24909e252980c2393d2baaa617c30db8c9dd8 (patch) | |
| tree | a32bd0d0b993f05a51bd8f49993be99c0770262d /gnu/local.mk | |
| parent | ae40e02cd68d4e0ab10690bd4e59c698df472857 (diff) | |
| parent | fdabfdbf8d5e179b2726ae69ff8aec48b0504788 (diff) | |
| download | patches-9df24909e252980c2393d2baaa617c30db8c9dd8.tar patches-9df24909e252980c2393d2baaa617c30db8c9dd8.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 26ce266e4b..6847b6190f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -743,7 +743,8 @@ dist_patch_DATA = \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch \ - %D%/packages/patches/libtar-CVE-2013-4420.patch \ + %D%/packages/patches/libtar-CVE-2013-4420.patch \ + %D%/packages/patches/libtasn1-CVE-2017-6891.patch \ %D%/packages/patches/libtheora-config-guess.patch \ %D%/packages/patches/libtiff-CVE-2016-10092.patch \ %D%/packages/patches/libtiff-CVE-2016-10093.patch \ |