diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
| commit | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (patch) | |
| tree | bd839f1f635dc114c84d67c1db09b74f613ec315 /gnu/local.mk | |
| parent | 369d15674c8bb251c45a45466031a2da1640df9f (diff) | |
| parent | 256d5c6e339d59287284bb83f35c594f13bd08f9 (diff) | |
| download | guix-7b38f045c04fe69001ff5c2f04486cc51a69ae82.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index adae0f3d23..99a5ec72f6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -924,6 +924,7 @@ dist_patch_DATA = \ %D%/packages/patches/luit-posix.patch \ %D%/packages/patches/luminance-hdr-qt-printer.patch \ %D%/packages/patches/lvm2-static-link.patch \ + %D%/packages/patches/lxc-CVE-2018-6556.patch \ %D%/packages/patches/lxsession-use-gapplication.patch \ %D%/packages/patches/lyx-2.2.3-fix-test.patch \ %D%/packages/patches/mailutils-uninitialized-memory.patch \ @@ -1038,7 +1039,6 @@ dist_patch_DATA = \ %D%/packages/patches/plink-1.07-unclobber-i.patch \ %D%/packages/patches/plink-endian-detection.patch \ %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ - %D%/packages/patches/polkit-drop-test.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ %D%/packages/patches/potrace-tests.patch \ @@ -1212,6 +1212,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-CVE-2017-13082.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2018-14526.patch \ %D%/packages/patches/wpa-supplicant-fix-key-reuse.patch \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ @@ -1236,7 +1237,6 @@ dist_patch_DATA = \ %D%/packages/patches/xinetd-fix-fd-leak.patch \ %D%/packages/patches/xinetd-CVE-2013-4342.patch \ %D%/packages/patches/xmodmap-asprintf.patch \ - %D%/packages/patches/xorg-server-rotate-fb.patch \ %D%/packages/patches/zathura-pdf-mupdf-link-to-jpeg-libraries.patch \ %D%/packages/patches/zathura-plugindir-environment-variable.patch \ %D%/packages/patches/zstd-fix-stdin-list-without-tty.patch \ |