CVS commit: pkgsrc/security/tor-browser

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 26 20:55:20 UTC 2020

Modified Files:
        pkgsrc/security/tor-browser: Makefile distinfo
        pkgsrc/security/tor-browser/patches: patch-config_makefiles_rust.mk

Log Message:
tor-browser: update to 9.5.4.

This release updates Firefox to 68.12.0esr.

Also, this release features important security updates to Firefox.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/security/tor-browser/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/tor-browser/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/security/tor-browser/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/security/tor-browser/Makefile
diff -u pkgsrc/security/tor-browser/Makefile:1.73 pkgsrc/security/tor-browser/Makefile:1.74
--- pkgsrc/security/tor-browser/Makefile:1.73   Tue Aug 18 17:58:13 2020
+++ pkgsrc/security/tor-browser/Makefile        Wed Aug 26 20:55:19 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2020/08/18 17:58:13 leot Exp $
+# $NetBSD: Makefile,v 1.74 2020/08/26 20:55:19 wiz Exp $
 
-DISTNAME=      src-firefox-tor-browser-68.11.0esr-9.5-1-build1
-PKGNAME=       tor-browser-9.5.3
-PKGREVISION=   2
+DISTNAME=      src-firefox-tor-browser-68.12.0esr-9.5-1-build1
+PKGNAME=       tor-browser-9.5.4
 CATEGORIES=    security www
 MASTER_SITES=  https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/security/tor-browser/distinfo
diff -u pkgsrc/security/tor-browser/distinfo:1.27 pkgsrc/security/tor-browser/distinfo:1.28
--- pkgsrc/security/tor-browser/distinfo:1.27   Sat Aug 22 23:12:34 2020
+++ pkgsrc/security/tor-browser/distinfo        Wed Aug 26 20:55:19 2020
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.27 2020/08/22 23:12:34 wiz Exp $
+$NetBSD: distinfo,v 1.28 2020/08/26 20:55:19 wiz Exp $
 
-SHA1 (src-firefox-tor-browser-68.11.0esr-9.5-1-build1.tar.xz) = be69e804180d7cc1fb500b1a497f79ab41c4f0db
-RMD160 (src-firefox-tor-browser-68.11.0esr-9.5-1-build1.tar.xz) = 625ab420108a64c3f50f2c482190ece3afcbd974
-SHA512 (src-firefox-tor-browser-68.11.0esr-9.5-1-build1.tar.xz) = 8feb9e165f5b7ef80d944b950ec499c15414fd00b4684bca6d5f5019727d21eba46072d5ee416ab0f86b3cae24aa4ba894933a3efbf7b8818cbd956284c1e9ba
-Size (src-firefox-tor-browser-68.11.0esr-9.5-1-build1.tar.xz) = 348642008 bytes
-SHA1 (tor-browser-linux64-9.5.3_en-US.tar.xz) = 5f32789cb9c648cfdfeba93810d45b11c6f5402e
-RMD160 (tor-browser-linux64-9.5.3_en-US.tar.xz) = 27f63a7d8672db669d58ce66b80116903a0c482c
-SHA512 (tor-browser-linux64-9.5.3_en-US.tar.xz) = 760673a0b40c905ec2866a030f4de9c33240cb9138e8af38a28d8527899d9477a8afbe436eda0ff72cc125cd8a5db75cb88efdc8027a0db4ee91f3be363eed90
-Size (tor-browser-linux64-9.5.3_en-US.tar.xz) = 79021184 bytes
+SHA1 (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 2d6081a8ad82e3095970f1d1a41f130024454e3d
+RMD160 (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 7c262331bfc168604d03f8f59ef7f349055f4f5b
+SHA512 (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 4674308ff40a65859c892a9a4e01e1506daded409e761c4ddb24d4f98ec73b63c86d2d051b05b1b8655dd5df894a59117752ee2e9a0c3e643577a3576c62aab3
+Size (src-firefox-tor-browser-68.12.0esr-9.5-1-build1.tar.xz) = 348639116 bytes
+SHA1 (tor-browser-linux64-9.5.4_en-US.tar.xz) = 8f4665912642c86e1161b788a7398478952107d8
+RMD160 (tor-browser-linux64-9.5.4_en-US.tar.xz) = 53025eff780989ece3f7089d272c1b6623519e6b
+SHA512 (tor-browser-linux64-9.5.4_en-US.tar.xz) = 2b69874c476e78c88eeae795cf530ed67b4319535dfbe092bb1e5cb83b9f1a021ea568ed1efeb61b0b5475d90495b3fd3005c51ec2d75d46c893b225e236dd66
+Size (tor-browser-linux64-9.5.4_en-US.tar.xz) = 79033640 bytes
 SHA1 (patch-.mozconfig) = 66fbb2f113091eee1f022cd656231f845b04b0f8
 SHA1 (patch-aa) = 9f7200c411cd2217a80ec10a276c8877bc6b845c
 SHA1 (patch-browser_app_profile_000-tor-browser.js) = 84a0a15605fff0e22f3150bce901a296fc920280
 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) = 41f88d91b3ebcc55085b3e6c37f9ec2995fc9c7b
 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/security/tor-browser/patches/patch-config_makefiles_rust.mk
diff -u pkgsrc/security/tor-browser/patches/patch-config_makefiles_rust.mk:1.1 pkgsrc/security/tor-browser/patches/patch-config_makefiles_rust.mk:1.2
--- pkgsrc/security/tor-browser/patches/patch-config_makefiles_rust.mk:1.1      Sat Aug 22 23:12:34 2020
+++ pkgsrc/security/tor-browser/patches/patch-config_makefiles_rust.mk  Wed Aug 26 20:55:19 2020
@@ -1,24 +1,11 @@
-$NetBSD: patch-config_makefiles_rust.mk,v 1.1 2020/08/22 23:12:34 wiz Exp $
+$NetBSD: patch-config_makefiles_rust.mk,v 1.2 2020/08/26 20:55:19 wiz 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-18 09:41:09.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
- 
+@@ -59,6 +59,9 @@ endif
  ifdef CARGO_INCREMENTAL
  export CARGO_INCREMENTAL
  endif