diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 12:04:42 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-04 12:04:42 +0100 |
commit | e32aea5472007507e62933b27a4db9a50810e5dc (patch) | |
tree | 55ccbe4ed5baf1fd2689b16d7108da8f7be857a9 /gnu/local.mk | |
parent | fb98351621a6b311d4ff9593d6c22d40a3b3fe8f (diff) | |
parent | d46f9f833b190aac04f7f4683b84a06a291a3f8f (diff) | |
download | guix-e32aea5472007507e62933b27a4db9a50810e5dc.tar guix-e32aea5472007507e62933b27a4db9a50810e5dc.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 cdf1c8b85b..68ed1d4813 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1512,7 +1512,8 @@ dist_patch_DATA = \ %D%/packages/patches/xsane-fix-pdf-floats.patch \ %D%/packages/patches/xsane-fix-snprintf-buffer-length.patch \ %D%/packages/patches/xsane-support-ipv6.patch \ - %D%/packages/patches/xsane-tighten-default-umask.patch + %D%/packages/patches/xsane-tighten-default-umask.patch \ + %D%/packages/patches/zziplib-CVE-2018-16548.patch MISC_DISTRO_FILES = \ %D%/packages/ld-wrapper.in \ |