diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-03-12 15:07:41 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-03-12 15:07:41 -0500 |
| commit | 2c9f0b077018d2cac599bd2f466769cd5ffd3adc (patch) | |
| tree | 57471e07a36c096bc9223b2fc76cced32eafa04b /gnu-system.am | |
| parent | f5a9103991531d17bd1d5a944dcec1c49fb9f395 (diff) | |
| parent | 9591e11a4c87982943c9eb527b3b1d72aab8cc08 (diff) | |
| download | guix-2c9f0b077018d2cac599bd2f466769cd5ffd3adc.tar guix-2c9f0b077018d2cac599bd2f466769cd5ffd3adc.tar.gz | |
Merge branch 'master' into security-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am index dc1d038b96..ce8417eecb 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -528,6 +528,23 @@ dist_patch_DATA = \ gnu/packages/patches/icecat-update-graphite2.patch \ gnu/packages/patches/icecat-update-graphite2-pt2.patch \ gnu/packages/patches/icecat-re-enable-DHE-cipher-suites.patch \ + gnu/packages/patches/icecat-CVE-2015-4477.patch \ + gnu/packages/patches/icecat-CVE-2015-7207.patch \ + gnu/packages/patches/icecat-CVE-2016-1952-pt01.patch \ + gnu/packages/patches/icecat-CVE-2016-1952-pt02.patch \ + gnu/packages/patches/icecat-CVE-2016-1952-pt03.patch \ + gnu/packages/patches/icecat-CVE-2016-1952-pt04.patch \ + gnu/packages/patches/icecat-CVE-2016-1952-pt05.patch \ + gnu/packages/patches/icecat-CVE-2016-1952-pt06.patch \ + gnu/packages/patches/icecat-CVE-2016-1954.patch \ + gnu/packages/patches/icecat-CVE-2016-1960.patch \ + gnu/packages/patches/icecat-CVE-2016-1961.patch \ + gnu/packages/patches/icecat-CVE-2016-1962.patch \ + gnu/packages/patches/icecat-CVE-2016-1964.patch \ + gnu/packages/patches/icecat-CVE-2016-1965.patch \ + gnu/packages/patches/icecat-CVE-2016-1966.patch \ + gnu/packages/patches/icecat-CVE-2016-1974.patch \ + gnu/packages/patches/icecat-bug-1248851.patch \ gnu/packages/patches/icu4c-CVE-2014-6585.patch \ gnu/packages/patches/icu4c-CVE-2015-1270.patch \ gnu/packages/patches/icu4c-CVE-2015-4760.patch \ @@ -619,7 +636,6 @@ dist_patch_DATA = \ gnu/packages/patches/module-init-tools-moduledir.patch \ gnu/packages/patches/mumps-build-parallelism.patch \ gnu/packages/patches/mupen64plus-ui-console-notice.patch \ - gnu/packages/patches/mupdf-buildsystem-fix.patch \ gnu/packages/patches/mutt-store-references.patch \ gnu/packages/patches/net-tools-bitrot.patch \ gnu/packages/patches/ngircd-handle-zombies.patch \ @@ -752,6 +768,7 @@ dist_patch_DATA = \ gnu/packages/patches/util-linux-tests.patch \ gnu/packages/patches/upower-builddir.patch \ gnu/packages/patches/valgrind-enable-arm.patch \ + gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch \ gnu/packages/patches/vpnc-script.patch \ gnu/packages/patches/vtk-mesa-10.patch \ gnu/packages/patches/w3m-libgc.patch \ |