diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-04 22:34:28 +0200 |
| commit | a76585e5535f433d37c0900cf0b2d3c9d3b3461c (patch) | |
| tree | 007befec20e2a33117256eeee11b7c642179dad4 /gnu/local.mk | |
| parent | 1dc32c2961402c946c25e5a1aabe79a30cce3cff (diff) | |
| parent | c427fda233a7da0c8eb27e244a562c51d3835503 (diff) | |
| download | patches-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.tar patches-a76585e5535f433d37c0900cf0b2d3c9d3b3461c.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 22de2c8cfe..26ecd068e5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -871,7 +871,6 @@ dist_patch_DATA = \ %D%/packages/patches/newsbeuter-CVE-2017-12904.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ninja-zero-mtime.patch \ - %D%/packages/patches/node-9077.patch \ %D%/packages/patches/nss-increase-test-timeout.patch \ %D%/packages/patches/nss-pkgconfig.patch \ %D%/packages/patches/nvi-assume-preserve-path.patch \ @@ -887,6 +886,8 @@ dist_patch_DATA = \ %D%/packages/patches/openscenegraph-ffmpeg3.patch \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openjpeg-CVE-2017-12982.patch \ + %D%/packages/patches/openjpeg-CVE-2017-14040.patch \ + %D%/packages/patches/openjpeg-CVE-2017-14041.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ %D%/packages/patches/openssl-runpath.patch \ |