Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / gnu-system.am

diff --git a/gnu-system.am b/gnu-system.am
index fb661d4..f67e077 100644 (file)
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -403,7 +403,6 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/clang-libc-search-path.patch            \
   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            \
@@ -441,7 +440,6 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/gcc-libvtv-runpath.patch                        \
   gnu/packages/patches/gcc-5.0-libvtv-runpath.patch            \
   gnu/packages/patches/geoclue-config.patch                    \
-  gnu/packages/patches/gettext-msgunfmt.patch                  \
   gnu/packages/patches/ghostscript-runpath.patch               \
   gnu/packages/patches/gitolite-openssh-6.8-compat.patch       \
   gnu/packages/patches/glib-tests-desktop.patch                        \
@@ -473,6 +471,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/hydra-automake-1.15.patch               \
   gnu/packages/patches/hydra-disable-darcs-test.patch          \
   gnu/packages/patches/icecat-enable-acceleration-and-webgl.patch \
+  gnu/packages/patches/icecat-freetype-2.6.patch               \
   gnu/packages/patches/icecat-libvpx-1.4.patch                 \
   gnu/packages/patches/irrlicht-mesa-10.patch                  \
   gnu/packages/patches/jbig2dec-ignore-testtest.patch          \
@@ -540,6 +539,7 @@ dist_patch_DATA =                                           \
   gnu/packages/patches/ngircd-handle-zombies.patch             \
   gnu/packages/patches/ngircd-no-dns-in-tests.patch            \
   gnu/packages/patches/ninja-tests.patch                       \
+  gnu/packages/patches/ninja-zero-mtime.patch                  \
   gnu/packages/patches/nss-pkgconfig.patch                     \
   gnu/packages/patches/nvi-assume-preserve-path.patch          \
   gnu/packages/patches/nvi-dbpagesize-binpower.patch           \
@@ -625,6 +625,11 @@ dist_patch_DATA =                                          \
   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/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-initialize-symlink-flag.patch     \
+  gnu/packages/patches/unzip-remove-build-date.patch           \
   gnu/packages/patches/util-linux-tests.patch                  \
   gnu/packages/patches/upower-builddir.patch                   \
   gnu/packages/patches/valgrind-glibc-2.21.patch               \