CVS commit: pkgsrc/www/firefox68

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug 29 18:39:34 UTC 2020

Modified Files:
        pkgsrc/www/firefox68: Makefile distinfo
        pkgsrc/www/firefox68/patches: patch-config_makefiles_rust.mk

Log Message:
firefox68: Update to 68.12.0

Security Vulnerabilities fixed in Firefox ESR 68.12

    #CVE-2020-15663: Downgrade attack on the Mozilla Maintenance Service could
    have resulted in escalation of privilege

    #CVE-2020-15664: Attacker-induced prompt for extension installation

    #CVE-2020-15669: Use-After-Free when aborting an operation


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/firefox68/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/firefox68/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox68/Makefile
diff -u pkgsrc/www/firefox68/Makefile:1.33 pkgsrc/www/firefox68/Makefile:1.34
--- pkgsrc/www/firefox68/Makefile:1.33  Tue Aug 18 17:58:16 2020
+++ pkgsrc/www/firefox68/Makefile       Sat Aug 29 18:39:34 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.33 2020/08/18 17:58:16 leot Exp $
+# $NetBSD: Makefile,v 1.34 2020/08/29 18:39:34 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            68.11
+MOZ_BRANCH=            68.12
 MOZ_BRANCH_MINOR=      .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
-PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/firefox68/distinfo
diff -u pkgsrc/www/firefox68/distinfo:1.22 pkgsrc/www/firefox68/distinfo:1.23
--- pkgsrc/www/firefox68/distinfo:1.22  Fri Aug  7 09:09:48 2020
+++ pkgsrc/www/firefox68/distinfo       Sat Aug 29 18:39:34 2020
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.22 2020/08/07 09:09:48 maya Exp $
+$NetBSD: distinfo,v 1.23 2020/08/29 18:39:34 nia Exp $
 
-SHA1 (firefox-68.11.0esr.source.tar.xz) = 445acbf7b7b8f75374ee6347bb6f45748511bcf9
-RMD160 (firefox-68.11.0esr.source.tar.xz) = 82edab46fe312a47889047fe431784c511684ade
-SHA512 (firefox-68.11.0esr.source.tar.xz) = 7dcfa4944945bce184b96643a7afbd0cc97c93e4f727695bd5ee1e1745cff89784e68baf109588ef56791211b4b8f5c7c056ae6ac77f54fd00a5af5d5606f23e
-Size (firefox-68.11.0esr.source.tar.xz) = 321294384 bytes
+SHA1 (firefox-68.12.0esr.source.tar.xz) = 976fae5c3cdee8b7929e4f17eca6cf44513d08b4
+RMD160 (firefox-68.12.0esr.source.tar.xz) = c7871e1d9f8eaff2c0eaff7c70f49c2488e616f8
+SHA512 (firefox-68.12.0esr.source.tar.xz) = 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
+Size (firefox-68.12.0esr.source.tar.xz) = 313856956 bytes
 SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
 SHA1 (patch-browser_app_profile_firefox.js) = cf93582b68b8d4e72c3c25682ab9138e185418c8
 SHA1 (patch-build_moz.configure_rust.configure) = b57a9b1451dc426d75774f73d7c05fc98fe6e317
 SHA1 (patch-config_gcc-stl-wrapper.template.h) = 11b45e0c7a9399c5b74b170648280a388dd67d89
-SHA1 (patch-config_makefiles_rust.mk) = 25502bfbe32877b35c244c2c19d6ee1dd63cb771
+SHA1 (patch-config_makefiles_rust.mk) = 564169b2a1ef7f378caa8ba8962b9cf3baf01735
 SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3cd2c65ab281d802c56216565970450767a3fb24
 SHA1 (patch-dom_webauthn_u2f-hid-rs_src_lib.rs) = c0dfe8b1e7ebbc7c1d6066c204030f13b063b8d7

Index: pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk
diff -u pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk:1.1 pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk:1.2
--- pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk:1.1     Fri Aug  7 09:09:48 2020
+++ pkgsrc/www/firefox68/patches/patch-config_makefiles_rust.mk Sat Aug 29 18:39:34 2020
@@ -1,30 +1,18 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/08/07 09:09:48 maya Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.2 2020/08/29 18:39:34 nia Exp $
 
 NetBSD<10 doesn't get along with parallel rust builds (it causes issues
 with ld.so) which are the default. Force -j1.
 
-Set -Cembed-bitcode=yes when using LTO to fix build with rust >= 1.45.
-Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
-
---- config/makefiles/rust.mk.orig      2020-07-20 21:02:39.000000000 +0000
+--- config/makefiles/rust.mk.orig      2020-08-17 18:26:21.000000000 +0000
 +++ config/makefiles/rust.mk
-@@ -49,11 +49,19 @@ ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds.
- cargo_rustc_flags += -C lto
- endif
-+# Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when
-+# using -Clto.
-+ifeq (,$(filter 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION)))
-+RUSTFLAGS += -Cembed-bitcode=yes
-+endif
- endif
- 
- ifdef CARGO_INCREMENTAL
+@@ -60,6 +60,10 @@ ifdef CARGO_INCREMENTAL
  export CARGO_INCREMENTAL
  endif
+ 
 +ifeq ($(OS_ARCH),NetBSD)
 +cargo_build_flags += -j1
 +endif
- 
++
  rustflags_neon =
  ifeq (neon,$(MOZ_FPU))
+ # Enable neon and disable restriction to 16 FPU registers