diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-08 10:59:39 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-08 10:59:39 -0400 |
| commit | b81378251c629615aff0d62ca686bb53a10367de (patch) | |
| tree | 4c15f2be58d665cf0eed1e00c84f70764890c3b8 /gnu-system.am | |
| parent | 319fe79dd01e03c4ef61311c336bcd77e1133f02 (diff) | |
| parent | b5881775ac2db345bf5826d6351366346ff03275 (diff) | |
| download | guix-b81378251c629615aff0d62ca686bb53a10367de.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/gnu-system.am b/gnu-system.am index bf5eeaaf2f..2912305c92 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -538,9 +538,19 @@ dist_patch_DATA = \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests2.patch \ gnu/packages/patches/libssh-CVE-2014-0017.patch \ + gnu/packages/patches/libunwind-CVE-2015-3239.patch \ + gnu/packages/patches/libwmf-CAN-2004-0941.patch \ gnu/packages/patches/libwmf-CVE-2006-3376.patch \ + gnu/packages/patches/libwmf-CVE-2007-0455.patch \ + gnu/packages/patches/libwmf-CVE-2007-2756.patch \ + gnu/packages/patches/libwmf-CVE-2007-3472.patch \ + gnu/packages/patches/libwmf-CVE-2007-3473.patch \ + gnu/packages/patches/libwmf-CVE-2007-3477.patch \ gnu/packages/patches/libwmf-CVE-2009-1364.patch \ - gnu/packages/patches/libwmf-CVE-2015-0848+4588+4695+4696.patch \ + gnu/packages/patches/libwmf-CVE-2009-3546.patch \ + gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \ + gnu/packages/patches/libwmf-CVE-2015-4695.patch \ + gnu/packages/patches/libwmf-CVE-2015-4696.patch \ gnu/packages/patches/lirc-localstatedir.patch \ gnu/packages/patches/libpthread-glibc-preparation.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ @@ -644,8 +654,11 @@ dist_patch_DATA = \ gnu/packages/patches/unzip-CVE-2014-8141.patch \ gnu/packages/patches/unzip-CVE-2014-9636.patch \ gnu/packages/patches/unzip-allow-greater-hostver-values.patch \ - gnu/packages/patches/unzip-increase-size-of-cfactorstr.patch \ + gnu/packages/patches/unzip-attribs-overflow.patch \ + gnu/packages/patches/unzip-fix-overflows-and-infloop.patch \ + gnu/packages/patches/unzip-format-secure.patch \ gnu/packages/patches/unzip-initialize-symlink-flag.patch \ + gnu/packages/patches/unzip-overflow-long-fsize.patch \ gnu/packages/patches/unzip-remove-build-date.patch \ gnu/packages/patches/util-linux-tests.patch \ gnu/packages/patches/upower-builddir.patch \ @@ -660,15 +673,6 @@ dist_patch_DATA = \ gnu/packages/patches/wicd-template-instantiation.patch \ gnu/packages/patches/wicd-urwid-1.3.patch \ gnu/packages/patches/wmctrl-64-fix.patch \ - gnu/packages/patches/wpa-supplicant-CVE-2015-1863.patch \ - gnu/packages/patches/wpa-supplicant-2015-2-fix.patch \ - gnu/packages/patches/wpa-supplicant-2015-3-fix.patch \ - gnu/packages/patches/wpa-supplicant-2015-4-fix-pt1.patch \ - gnu/packages/patches/wpa-supplicant-2015-4-fix-pt2.patch \ - gnu/packages/patches/wpa-supplicant-2015-4-fix-pt3.patch \ - gnu/packages/patches/wpa-supplicant-2015-4-fix-pt4.patch \ - gnu/packages/patches/wpa-supplicant-2015-4-fix-pt5.patch \ - gnu/packages/patches/wpa-supplicant-2015-5-fix.patch \ gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \ gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \ gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \ |