diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-09-22 04:47:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-09-22 13:48:32 -0400 |
| commit | ae71cd8ac93245360ffe73d6ab260975ec0d742f (patch) | |
| tree | 12a825e14b608919122460c22328461c5439d76e /gnu/local.mk | |
| parent | 91294b53619995712a6f8d497d650bfc02b4c952 (diff) | |
| download | guix-ae71cd8ac93245360ffe73d6ab260975ec0d742f.tar guix-ae71cd8ac93245360ffe73d6ab260975ec0d742f.tar.gz | |
gnu: icecat: Add fixes from upstream mozilla-esr60 [security fixes].
Includes fixes for CVE-2018-12383 and CVE-2018-12385.
* gnu/packages/patches/icecat-CVE-2018-12383.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/patches/icecat-avoid-bundled-libraries.patch: Adapt to apply
cleanly to IceCat 60.
* gnu/packages/gnuzilla.scm (mozilla-patch): Update to fetch from
mozilla-esr60.
(icecat): Add selected changesets from upstream mozilla-esr60.
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index daf96ea4b6..fe2b573dd5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -810,6 +810,7 @@ dist_patch_DATA = \ %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch \ %D%/packages/patches/hydra-disable-darcs-test.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-CVE-2018-12383.patch \ %D%/packages/patches/icecat-use-system-graphite2.patch \ %D%/packages/patches/icecat-use-system-harfbuzz.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ |