diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-24 22:00:23 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-24 22:00:23 +0200 |
| commit | ca4fd41de892c7055ce140863382c332441b15d3 (patch) | |
| tree | 39872899c5bc649e11172dccb2f262a56f234661 /gnu/local.mk | |
| parent | 7276eca4dcbe513922d5a778ee5fc8f2b2649642 (diff) | |
| parent | 648c896ad3b198a1742c1ee8f66a1922aa98c1d8 (diff) | |
| download | guix-ca4fd41de892c7055ce140863382c332441b15d3.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 5639db1f75..060357ea8f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -662,6 +662,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-CVE-2017-1000366-pt1.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt2.patch \ %D%/packages/patches/glibc-CVE-2017-1000366-pt3.patch \ + %D%/packages/patches/glibc-CVE-2017-15670-15671.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ @@ -729,6 +730,7 @@ dist_patch_DATA = \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \ + %D%/packages/patches/icu4c-CVE-2017-14952.patch \ %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ @@ -866,6 +868,9 @@ dist_patch_DATA = \ %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \ + %D%/packages/patches/mupdf-CVE-2017-14685.patch \ + %D%/packages/patches/mupdf-CVE-2017-14686.patch \ + %D%/packages/patches/mupdf-CVE-2017-14687.patch \ %D%/packages/patches/mupdf-CVE-2017-15587.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mutt-store-references.patch \ |