summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbsiegert <bsiegert@pkgsrc.org>2020-06-04 11:36:28 +0000
committerbsiegert <bsiegert@pkgsrc.org>2020-06-04 11:36:28 +0000
commitcf477be6fb6e3b64240de66805a1998930b7cb53 (patch)
tree3e1da07da3c5695693caf319c9a7b9241e411480
parent33196916a8a9247fdfe2d637a8652656a342a1f7 (diff)
downloadpkgsrc-cf477be6fb6e3b64240de66805a1998930b7cb53.tar.gz
Pullup ticket #6220 - requested by nia
www/firefox68: security fix Revisions pulled up: - www/firefox68/Makefile 1.22 - www/firefox68/distinfo 1.16 - www/firefox68/patches/patch-build_moz.configure_rust.configure 1.1 --- Module Name: pkgsrc Committed By: nia Date: Wed Jun 3 13:00:24 UTC 2020 Modified Files: pkgsrc/www/firefox68: Makefile distinfo Added Files: pkgsrc/www/firefox68/patches: patch-build_moz.configure_rust.configure Log Message: firefox68: Update to 68.9.0 Security Vulnerabilities fixed in Firefox ESR 68.9 #CVE-2020-12399: Timing attack on DSA signatures in NSS library #CVE-2020-12405: Use-after-free in SharedWorkerService #CVE-2020-12406: JavaScript Type confusion with NativeTypes #CVE-2020-12410: Memory safety bugs fixed in Firefox 77 and Firefox ESR 68.9
-rw-r--r--www/firefox68/Makefile4
-rw-r--r--www/firefox68/distinfo12
-rw-r--r--www/firefox68/patches/patch-build_moz.configure_rust.configure17
3 files changed, 26 insertions, 7 deletions
diff --git a/www/firefox68/Makefile b/www/firefox68/Makefile
index e9a8f3a8901..2fb99cea8ac 100644
--- a/www/firefox68/Makefile
+++ b/www/firefox68/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15.2.3 2020/05/13 13:40:16 bsiegert Exp $
+# $NetBSD: Makefile,v 1.15.2.4 2020/06/04 11:36:28 bsiegert Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH= 68.8
+MOZ_BRANCH= 68.9
MOZ_BRANCH_MINOR= .0esr
DISTNAME= firefox-${FIREFOX_VER}.source
diff --git a/www/firefox68/distinfo b/www/firefox68/distinfo
index 841c04cecca..6ca95f66b30 100644
--- a/www/firefox68/distinfo
+++ b/www/firefox68/distinfo
@@ -1,11 +1,13 @@
-$NetBSD: distinfo,v 1.11.2.3 2020/05/13 13:40:16 bsiegert Exp $
+$NetBSD: distinfo,v 1.11.2.4 2020/06/04 11:36:28 bsiegert Exp $
-SHA1 (firefox-68.8.0esr.source.tar.xz) = 291cb48dcbf50030a38a66eca40d9cfcaff9784d
-RMD160 (firefox-68.8.0esr.source.tar.xz) = d275572b5a35dff01b271285880dff2222f24038
-SHA512 (firefox-68.8.0esr.source.tar.xz) = 139a63dc85ae76a50da6be9a31425f97144e6c7e4a65b0f3009a84eb5c8c9566f6bb331e26590f8aecd5045c4d730ab4e848cf7220f3444a31147b5533c742b3
-Size (firefox-68.8.0esr.source.tar.xz) = 312602308 bytes
+SHA1 (firefox-68.9.0esr.source.tar.xz) = ee6406ec1280afc24d4a90c392ff09ff5060686e
+RMD160 (firefox-68.9.0esr.source.tar.xz) = 6bb287d394768b137d46f4abac9111ba662b9942
+SHA512 (firefox-68.9.0esr.source.tar.xz) = 98431800d80f7c680aef9eede29df8217810912a319a7f7f8c2e637c43ecd4f4e29223a417afb2a6315e825f979453ff6e6b5a575649aba5cc63ce5956375bb8
+Size (firefox-68.9.0esr.source.tar.xz) = 317469120 bytes
SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
+SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
+SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89
SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
diff --git a/www/firefox68/patches/patch-build_moz.configure_rust.configure b/www/firefox68/patches/patch-build_moz.configure_rust.configure
new file mode 100644
index 00000000000..350b36f2931
--- /dev/null
+++ b/www/firefox68/patches/patch-build_moz.configure_rust.configure
@@ -0,0 +1,17 @@
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.1.2.2 2020/06/04 11:36:28 bsiegert Exp $
+
+* Do not match rumprun toolchain for NetBSD,
+ narrowed should be one not two.
+
+--- build/moz.configure/rust.configure.orig 2020-05-28 00:01:39.000000000 +0000
++++ build/moz.configure/rust.configure
+@@ -330,7 +330,8 @@ def rust_triple_alias(host_or_target):
+ narrowed = [
+ c for c in candidates
+ if c.target.raw_os == host_or_target.raw_os and
+- c.target.raw_cpu == host_or_target.raw_cpu
++ c.target.raw_cpu == host_or_target.raw_cpu and
++ not c.rust_target.endswith("-rumprun-netbsd")
+ ]
+ if len(narrowed) == 1:
+ return narrowed[0].rust_target