diff options
| author | Mark H Weaver <mhw@netris.org> | 2020-07-27 16:09:16 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2020-07-28 14:12:31 -0400 |
| commit | 6a14917a16d3f629727960a9b620aa5455d963c3 (patch) | |
| tree | b71c88dbf38b84da85d5aca34b1ce202fc5eca01 /gnu/packages | |
| parent | 305b388ca84ea943fc724846e85aff264693988f (diff) | |
| download | guix-6a14917a16d3f629727960a9b620aa5455d963c3.tar guix-6a14917a16d3f629727960a9b620aa5455d963c3.tar.gz | |
gnu: icecat: Update to 68.11.0-guix0-preview1 [security-fixes].
Includes fixes for CVE-2020-6463, CVE-2020-6514, CVE-2020-15652, and
CVE-2020-15659.
* gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update.
(icecat-source): Update gnuzilla commit, base version, and hashes.
* gnu/packages/patches/icecat-makeicecat.patch: Adapt to new version.
Diffstat (limited to 'gnu/packages')
| -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 a525f70618..8923836437 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -556,8 +556,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "68.10.0-guix0-preview1") -(define %icecat-build-id "20200630000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "68.11.0-guix0-preview1") +(define %icecat-build-id "20200728000000") ;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' @@ -579,11 +579,11 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0azdinwqjfv2q37gqpxmfvzsk86pvsi6cjaq1310zs26gric5j1f")))) + "0q11dmfz59a11xgwy5sdc6x89xvb8lkm51lr8yvqb9qvmz5gghci")))) - (upstream-icecat-base-version "68.10.0") ; maybe older than base-version + (upstream-icecat-base-version "68.11.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "76dced64ce0e72fe3030dc2f7b22cda8e36b165e") + (gnuzilla-commit "ac907e0c0f5b8896da34d31594b168e60983bec8") (gnuzilla-source (origin (method git-fetch) @@ -595,7 +595,7 @@ from forcing GEXP-PROMISE." (string-take gnuzilla-commit 8))) (sha256 (base32 - "0xcg6h0da63qyv7h575xjrbkzqqcjhwjd45x9h9qmpxiaibi9g3d")))) + "1n2sdf48s5xwcaf69v7yqvas069ficqnfk6nf0kqvd87vryb7182")))) (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 cff0b7ad45..521166b0fc 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 2ec8c2627e46e80fc208584966a2ded7a0a9ff76b55ffccec0623b89b98ded2b firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +-echo -n 91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160 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 2ec8c2627e46e80fc208584966a2ded7a0a9ff76b55ffccec0623b89b98ded2b firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - ++# echo -n 91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c - +# +# echo Extracting Firefox tarball +# tar -xf firefox-${FFVERSION}esr.source.tar.xz |