diff options
| author | Mark H Weaver <mhw@netris.org> | 2020-01-07 00:40:48 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2020-01-07 12:06:34 -0500 |
| commit | 9020252114fba444556152a36b98b2015bb1d362 (patch) | |
| tree | 6725525846a19f8d63a04b5f84c6907bbf446554 | |
| parent | 6d15516dc6ffca3622ff49179c5c7c360c11b54b (diff) | |
| download | guix-9020252114fba444556152a36b98b2015bb1d362.tar guix-9020252114fba444556152a36b98b2015bb1d362.tar.gz | |
gnu: icecat: Update to 68.4.0-guix0-preview1 [security fixes].
Includes fixes for CVE-2019-17015, CVE-2019-17016, CVE-2019-17017,
CVE-2019-17021, CVE-2019-17022, and CVE-2019-17024.
* gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update.
(icecat-source): Update hash of upstream firefox source tarball,
'upstream-icecat-base-version', and commit and hash of gnuzilla checkout.
* gnu/packages/patches/icecat-makeicecat.patch: Adapt to upstream changes.
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/patches/icecat-makeicecat.patch | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a642f6a95f..df93c2e509 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -550,8 +550,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.3.0-guix0-preview1") -(define %icecat-build-id "20191204000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.4.0-guix0-preview1") +(define %icecat-build-id "20200107000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -573,11 +573,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0sfwp9vyjizj1lkvj6z51r85dl41q3l8380fkdyqdbp7f2d18cg1")))) + "077r2v7q94g8pszkl537lry0dcg9086287m9bmc0g0b98b9nzasq")))) - (upstream-icecat-base-version "68.3.0") ; maybe older than base-version + (upstream-icecat-base-version "68.4.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "85e99badac11983f6d50b0d9942f66a30f55b8e5") + (gnuzilla-commit "235b4d1181a32b71c61f6464504de8d0dae9f566") (gnuzilla-source (origin (method git-fetch) @@ -589,7 +589,7 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "00mb734yvm0r7i64mbg7hvrvhbwkcii9f9hjgwi37aizd9k0n78a")))) + "0fy9my1p8d60ibya7mc0310bglk2lrgl4bzy943k6jn9xxh8877f")))) (makeicecat-patch (local-file (search-patch "icecat-makeicecat.patch")))) diff --git a/gnu/packages/patches/icecat-makeicecat.patch b/gnu/packages/patches/icecat-makeicecat.patch index daa67f6a7a..fde209e8e3 100644 --- a/gnu/packages/patches/icecat-makeicecat.patch +++ b/gnu/packages/patches/icecat-makeicecat.patch @@ -25,7 +25,7 @@ index 8be2362..48716f2 100755 -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc --echo -n e131149a70e7ae867d9b0ea081e8c081d056500ee51bb9270df247e977badc69 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - - -echo Extracting Firefox tarball -tar -xf firefox-${FFVERSION}esr.source.tar.xz @@ -37,7 +37,7 @@ index 8be2362..48716f2 100755 +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353 +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc -+# echo -n e131149a70e7ae867d9b0ea081e8c081d056500ee51bb9270df247e977badc69 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 58ab6fd342698107585da91e240c02e9b1067ca667143abfbee89184cf16f91c firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz |