diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-10-07 23:55:17 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-10-07 23:55:17 -0400 |
| commit | 319fe79dd01e03c4ef61311c336bcd77e1133f02 (patch) | |
| tree | c169d85b429a801fdc22ce27c25b7e4230eb320a /gnu-system.am | |
| parent | 9511de1ef8c59788f2c93ae6b0cb1e87e30824ab (diff) | |
| parent | a606ed89d4e3737beec2f3392bedba61904778f4 (diff) | |
| download | guix-319fe79dd01e03c4ef61311c336bcd77e1133f02.tar guix-319fe79dd01e03c4ef61311c336bcd77e1133f02.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu-system.am b/gnu-system.am index b219d73cb7..bf5eeaaf2f 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -451,6 +451,7 @@ dist_patch_DATA = \ gnu/packages/patches/flex-bison-tests.patch \ gnu/packages/patches/flint-ldconfig.patch \ gnu/packages/patches/fltk-shared-lib-defines.patch \ + gnu/packages/patches/freeimage-CVE-2015-0852.patch \ gnu/packages/patches/fuse-CVE-2015-3202.patch \ gnu/packages/patches/gawk-shell.patch \ gnu/packages/patches/gcc-arm-link-spec-fix.patch \ @@ -573,6 +574,8 @@ dist_patch_DATA = \ gnu/packages/patches/nvi-dbpagesize-binpower.patch \ gnu/packages/patches/nvi-db4.patch \ gnu/packages/patches/openexr-missing-samples.patch \ + gnu/packages/patches/openjpeg-CVE-2015-6581.patch \ + gnu/packages/patches/openjpeg-use-after-free-fix.patch \ gnu/packages/patches/openssl-runpath.patch \ gnu/packages/patches/openssl-c-rehash.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ @@ -612,8 +615,6 @@ dist_patch_DATA = \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ gnu/packages/patches/qemu-CVE-2015-6855.patch \ gnu/packages/patches/qt4-ldflags.patch \ - gnu/packages/patches/qt4-tests.patch \ - gnu/packages/patches/qt5-runpath.patch \ gnu/packages/patches/ratpoison-shell.patch \ gnu/packages/patches/readline-link-ncurses.patch \ gnu/packages/patches/ripperx-missing-file.patch \ @@ -648,11 +649,11 @@ dist_patch_DATA = \ 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.22.patch \ - gnu/packages/patches/valgrind-linux-libre-4.x.patch \ + gnu/packages/patches/valgrind-enable-arm.patch \ gnu/packages/patches/vpnc-script.patch \ gnu/packages/patches/vtk-mesa-10.patch \ gnu/packages/patches/w3m-fix-compile.patch \ + gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch \ gnu/packages/patches/weex-vacopy.patch \ gnu/packages/patches/wicd-bitrate-none-fix.patch \ gnu/packages/patches/wicd-get-selected-profile-fix.patch \ |