me
/
guix
Archived
1
0
Fork 0
Code

gnu: icecat: Update to 68.12.0-guix0-preview1 [security fixes]. 

Includes fixes for CVE-2020-15663, CVE-2020-15664, and CVE-2020-15669.

* 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.
master
Mark H Weaver 2020-08-25 06:59:07 -04:00
parent fdaba559d0
commit e45d7f3198
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gnuzilla.scm
View File

@ -556,8 +556,8 @@ from forcing GEXP-PROMISE."
#:system system
#:guile-for-build guile)))
(define %icecat-version "68.11.0-guix0-preview1")
(define %icecat-build-id "20200728000000") ;must be of the form YYYYMMDDhhmmss
(define %icecat-version "68.12.0-guix0-preview1")
(define %icecat-build-id "20200825000000") ;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
"0q11dmfz59a11xgwy5sdc6x89xvb8lkm51lr8yvqb9qvmz5gghci"))))
"1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf"))))
(upstream-icecat-base-version "68.11.0") ; maybe older than base-version
(upstream-icecat-base-version "68.12.0") ; maybe older than base-version
;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version))
(gnuzilla-commit "ac907e0c0f5b8896da34d31594b168e60983bec8")
(gnuzilla-commit "15a7c3d991a670b6489d4f432b52a188358f4ca5")
(gnuzilla-source
(origin
(method git-fetch)
@ -595,7 +595,7 @@ from forcing GEXP-PROMISE."
(string-take gnuzilla-commit 8)))
(sha256
(base32
"1n2sdf48s5xwcaf69v7yqvas069ficqnfk6nf0kqvd87vryb7182"))))
"0n7p067yay413iy0gzprz0xrdkcxj5f8ywhkcghhhzw1nwajckba"))))
(makeicecat-patch
(local-file (search-patch "icecat-makeicecat.patch")))

4
gnu/packages/patches/icecat-makeicecat.patch
View File

@ -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 91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
-echo -n ae692bf2a15908cacbb9d4c7ccf78525a87410ff3f13befedc1926f849bc27cc 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 91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160 firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+# echo -n ae692bf2a15908cacbb9d4c7ccf78525a87410ff3f13befedc1926f849bc27cc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
+#
+# echo Extracting Firefox tarball
+# tar -xf firefox-${FFVERSION}esr.source.tar.xz