diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-19 17:02:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-19 17:02:16 +0200 |
| commit | 0106d6b40dc0b8f1c81326e633bfa5134a446a9c (patch) | |
| tree | 978cc8408f2d52a024f692a31e98cb555da95462 /gnu/local.mk | |
| parent | 7e66e0b3e7f69e045362f9452f9b745aa850d354 (diff) | |
| parent | 793a66e5fef3f562080000280c022af517aad612 (diff) | |
| download | patches-0106d6b40dc0b8f1c81326e633bfa5134a446a9c.tar patches-0106d6b40dc0b8f1c81326e633bfa5134a446a9c.tar.gz | |
Merge branch 'master' into staging
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 dc63c72eb8..4fc54e61c1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -974,6 +974,10 @@ dist_patch_DATA = \ %D%/packages/patches/openscenegraph-ffmpeg3.patch \ %D%/packages/patches/opensmtpd-fix-crash.patch \ %D%/packages/patches/openssl-runpath.patch \ + %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch \ + %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch \ + %D%/packages/patches/openssl-1.1.0-CVE-2018-0495.patch \ + %D%/packages/patches/openssl-1.1.0-CVE-2018-0732.patch \ %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch \ %D%/packages/patches/openssl-c-rehash-in.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ @@ -1068,6 +1072,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qemu-CVE-2018-11806.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ |