02/02: gnu: icecat: Update to 68.9.0-guix0-preview1 [security fixes].

[guix-commits]

mhw pushed a commit to branch master
in repository guix.

commit 833252a88bd9a11b7bd431877130dd80f1d548f2
Author: Mark H Weaver <mhw@netris.org>
AuthorDate: Tue Jun 2 00:24:56 2020 -0400

    gnu: icecat: Update to 68.9.0-guix0-preview1 [security fixes].
    
    Includes fixes for CVE-2020-12399 and CVE-2020-12405.
    
    * 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.
---
 gnu/packages/gnuzilla.scm                    | 12 ++++++------
 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 7bf9850..e00a09e 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.8.0-guix0-preview1")
-(define %icecat-build-id "20200505000000") ;must be of the form YYYYMMDDhhmmss
+(define %icecat-version "68.9.0-guix0-preview1")
+(define %icecat-build-id "20200602000000") ;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
-              "0hp8cc7xk6qj4q1s8n97qv9sdrypkzvphik96m5qv1r5s9k24nzs"))))
+              "01s41p985g6v544lf08zch3myssn5c76jwmkzzd68zd9m3hhalck"))))
 
-         (upstream-icecat-base-version "68.8.0") ; maybe older than 
base-version
+         (upstream-icecat-base-version "68.9.0") ; maybe older than 
base-version
          ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
-         (gnuzilla-commit "5358ff2963a6136f8acafdc598cad540231ad23e")
+         (gnuzilla-commit "d7acf32ad905a3382cb2353577a96d29aa58f589")
          (gnuzilla-source
           (origin
             (method git-fetch)
@@ -595,7 +595,7 @@ from forcing GEXP-PROMISE."
                                       (string-take gnuzilla-commit 8)))
             (sha256
              (base32
-              "1bq0qzgkxz9q61g48bc05i0zx1z8k0pklxnmn54ch136aqgsyli4"))))
+              "0m49zm05m3n95diij2zyvpm74q66zxjhv9rp8zvaab0h7v2s09n9"))))
 
          (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 2978a57..d3d95cb 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 fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 
firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+-echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 
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 fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842 
firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
++# echo -n 935105e1a8a97d64daffb372690e2b566b5f07641f01470929dbbc82d20d4407 
firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
 +# 
 +# echo Extracting Firefox tarball
 +# tar -xf firefox-${FFVERSION}esr.source.tar.xz