diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
| commit | 23800e47361304682914314b99cfd4f3926f28e3 (patch) | |
| tree | e67d984ab5961a81c8b8c6396c79cb218fecda85 /gnu-system.am | |
| parent | 9b1bf33081652210502c6ef34506e27a9bc60f06 (diff) | |
| parent | aebb05b09502be00fb121f9c6cd74a190fb12a1c (diff) | |
| download | guix-23800e47361304682914314b99cfd4f3926f28e3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gnu-system.am b/gnu-system.am index 405c01fb07..fc7f326c4f 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> # Copyright © 2013, 2014 Mark H Weaver <mhw@netris.org> # @@ -339,6 +339,11 @@ dist_patch_DATA = \ gnu/packages/patches/clucene-pkgconfig.patch \ gnu/packages/patches/cmake-fix-tests.patch \ gnu/packages/patches/coreutils-dummy-man.patch \ + gnu/packages/patches/cpio-CVE-2014-9112-pt1.patch \ + gnu/packages/patches/cpio-CVE-2014-9112-pt2.patch \ + gnu/packages/patches/cpio-CVE-2014-9112-pt3.patch \ + gnu/packages/patches/cpio-CVE-2014-9112-pt4.patch \ + gnu/packages/patches/cpio-CVE-2014-9112-pt5.patch \ gnu/packages/patches/cpio-gets-undeclared.patch \ gnu/packages/patches/cssc-gets-undeclared.patch \ gnu/packages/patches/cssc-missing-include.patch \ @@ -402,6 +407,7 @@ dist_patch_DATA = \ gnu/packages/patches/libtheora-config-guess.patch \ gnu/packages/patches/libtool-skip-tests.patch \ gnu/packages/patches/libtool-skip-tests-for-mips.patch \ + gnu/packages/patches/libtool-2.4-skip-tests.patch \ gnu/packages/patches/libssh-CVE-2014-0017.patch \ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \ gnu/packages/patches/luit-posix.patch \ @@ -410,11 +416,11 @@ dist_patch_DATA = \ gnu/packages/patches/mc-fix-ncurses-build.patch \ gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/mhash-keygen-test-segfault.patch \ - gnu/packages/patches/minetest-subgame-env-var.patch \ gnu/packages/patches/mit-krb5-init-fix.patch \ gnu/packages/patches/mpc123-initialize-ao.patch \ gnu/packages/patches/module-init-tools-moduledir.patch \ gnu/packages/patches/mupdf-buildsystem-fix.patch \ + gnu/packages/patches/mutt-CVE-2014-9116.patch \ gnu/packages/patches/net-tools-bitrot.patch \ gnu/packages/patches/nvi-assume-preserve-path.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ @@ -456,6 +462,9 @@ dist_patch_DATA = \ gnu/packages/patches/texi2html-document-encoding.patch \ gnu/packages/patches/texi2html-i18n.patch \ gnu/packages/patches/udev-gir-libtool.patch \ + gnu/packages/patches/unzip-CVE-2014-8139.patch \ + gnu/packages/patches/unzip-CVE-2014-8140.patch \ + gnu/packages/patches/unzip-CVE-2014-8141.patch \ gnu/packages/patches/util-linux-perl.patch \ gnu/packages/patches/vpnc-script.patch \ gnu/packages/patches/vtk-mesa-10.patch \ |