Received: by mail.netbsd.org (Postfix, from userid 605) id A8EC984DEA; Thu, 9 Jul 2020 06:27:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3099184DE9 for ; Thu, 9 Jul 2020 06:27:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id pv4KHNfYJCc4 for ; Thu, 9 Jul 2020 06:27:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5CBBD84C8B for ; Thu, 9 Jul 2020 06:27:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 513E5FB28; Thu, 9 Jul 2020 06:27:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1594276067160810" MIME-Version: 1.0 Date: Thu, 9 Jul 2020 06:27:47 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2020Q2] pkgsrc/security/tor-browser To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20200709062747.513E5FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1594276067160810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Thu Jul 9 06:27:47 UTC 2020 Modified Files: pkgsrc/security/tor-browser [pkgsrc-2020Q2]: Makefile distinfo Added Files: pkgsrc/security/tor-browser/patches [pkgsrc-2020Q2]: patch-config_gcc-stl-wrapper.template.h Log Message: Pullup ticket #6260 - requested by wiz security/tor-browser: security fix Revisions pulled up: - security/tor-browser/Makefile 1.69 - security/tor-browser/distinfo 1.24 - security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h 1.1 --- Module Name: pkgsrc Committed By: wiz Date: Sat Jul 4 08:33:58 UTC 2020 Modified Files: pkgsrc/security/tor-browser: Makefile distinfo Added Files: pkgsrc/security/tor-browser/patches: patch-config_gcc-stl-wrapper.template.h Log Message: tor-browser: update to 9.5.1. This release updates Firefox to 68.10.0esr and NoScript to 11.0.32. Also, this release features important security updates to Firefox. The full changelog since Tor Browser 9.5 is: All Platforms Update Firefox to 68.10.0esr Update NoScript to 11.0.32 Translations update Bug 40009: Improve tor's client auth stability Windows + OS X + Linux Bug 34361: "Prioritize .onion sites when known" appears under General Bug 34362: Improve Onion Service Authentication prompt Bug 34369: Fix learn more link in Onion Auth prompt Bug 34379: Fix learn more for Onion-Location Bug 34347: The Tor Network part on the onboarding is not new anymore To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.68.2.1 pkgsrc/security/tor-browser/Makefile cvs rdiff -u -r1.23 -r1.23.2.1 pkgsrc/security/tor-browser/distinfo cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1594276067160810 Content-Disposition: inline Content-Length: 6297 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/tor-browser/Makefile diff -u pkgsrc/security/tor-browser/Makefile:1.68 pkgsrc/security/tor-browser/Makefile:1.68.2.1 --- pkgsrc/security/tor-browser/Makefile:1.68 Thu Jun 18 12:56:40 2020 +++ pkgsrc/security/tor-browser/Makefile Thu Jul 9 06:27:46 2020 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2020/06/18 12:56:40 wiz Exp $ +# $NetBSD: Makefile,v 1.68.2.1 2020/07/09 06:27:46 bsiegert Exp $ -DISTNAME= src-firefox-tor-browser-68.9.0esr-9.5-1-build2 -PKGNAME= tor-browser-9.5 -PKGREVISION= 2 +DISTNAME= src-firefox-tor-browser-68.10.0esr-9.5-1-build2 +PKGNAME= tor-browser-9.5.1 CATEGORIES= security www MASTER_SITES= https://dist.torproject.org/torbrowser/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz @@ -18,16 +17,19 @@ LICENSE= mpl-1.1 WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} DEPENDS+= tor-[0-9]*:../../net/tor -DEPENDS+= tor-browser-https-everywhere-[0-9]*:../../security/tor-browser-https-everywhere -DEPENDS+= tor-browser-noscript-[0-9]*:../../security/tor-browser-noscript +DEPENDS+= tor-browser-https-everywhere>=2020.5.20:../../security/tor-browser-https-everywhere +DEPENDS+= tor-browser-noscript>=11.0.32:../../security/tor-browser-noscript # How to update this package: # # replace all patches with the one from the correspoding www/firefox${ESR_RELEASE} -# BUT keep patch-xpcom_io_TorFileUtils.cpp -# AND keep patch-browser_app_profile_000-tor-browser.js -# AND the second chunk of patch-toolkit_moz.configure -# (AND if necessary patch-.mozconfig) +# compare e.g. the output of +# diff -r -I NetBSD . ../../www/firefox68 +# BUT keep: +# patch-.mozconfig (if still necessary) +# patch-browser_app_profile_000-tor-browser.js +# patch-toolkit_moz.configure (second chunk) +# patch-xpcom_io_TorFileUtils.cpp # make the patches apply # # when packaged up, read MESSAGE and test by visiting https://check.torproject.org Index: pkgsrc/security/tor-browser/distinfo diff -u pkgsrc/security/tor-browser/distinfo:1.23 pkgsrc/security/tor-browser/distinfo:1.23.2.1 --- pkgsrc/security/tor-browser/distinfo:1.23 Thu Jun 18 12:56:40 2020 +++ pkgsrc/security/tor-browser/distinfo Thu Jul 9 06:27:46 2020 @@ -1,18 +1,19 @@ -$NetBSD: distinfo,v 1.23 2020/06/18 12:56:40 wiz Exp $ +$NetBSD: distinfo,v 1.23.2.1 2020/07/09 06:27:46 bsiegert Exp $ -SHA1 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 27b3e18e92341557b9c8b18afd114d458dd2e403 -RMD160 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = db61ef7788f1b6c4111e7a4c6df56c7bd51e6777 -SHA512 (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 5a8db89e2bd60980bd00d779c23433014b2d4e29bd55cc81ec83115fb62d79246e73b36cee765b285cadd9306b57f737264549936431898e78717be01200a435 -Size (src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 348699028 bytes -SHA1 (tor-browser-linux64-9.5_en-US.tar.xz) = 3f84ce557b01fe22157f52d7387f979ee2824da6 -RMD160 (tor-browser-linux64-9.5_en-US.tar.xz) = df45b10a19916d79f65d99f87505d0ecce55a8fe -SHA512 (tor-browser-linux64-9.5_en-US.tar.xz) = 7534711c12192e937c3a71ea5d3f1d3786d0cb5da6c3f9f8db5c5950c9c342a60fbcc9c4bded2fcea1e5342de3c09b41641154c4fa757734afa21c81f223b5b2 -Size (tor-browser-linux64-9.5_en-US.tar.xz) = 79022648 bytes +SHA1 (src-firefox-tor-browser-68.10.0esr-9.5-1-build2.tar.xz) = 4edf759bdf180b32f6432bb4eb3fb5cda7558f2b +RMD160 (src-firefox-tor-browser-68.10.0esr-9.5-1-build2.tar.xz) = 891607eeaf89634aff4beaf7f52b0a5a37a0c9de +SHA512 (src-firefox-tor-browser-68.10.0esr-9.5-1-build2.tar.xz) = cba66ed3951210a7bf408262510cf8e5df37ea7b264c57f06b2907063d864072e9f8eaae8d50f643f1834d7900ee74341dc4b819cd96d737a71733a5ed08cd8c +Size (src-firefox-tor-browser-68.10.0esr-9.5-1-build2.tar.xz) = 348678144 bytes +SHA1 (tor-browser-linux64-9.5.1_en-US.tar.xz) = 33e07e8d322700b24ddb526483c4d43e2ed1e126 +RMD160 (tor-browser-linux64-9.5.1_en-US.tar.xz) = f62056c60b53c9644a484e66d7e4debf961d3f3f +SHA512 (tor-browser-linux64-9.5.1_en-US.tar.xz) = 304706d1836985f89794511f71c4b95e6f72daa363952dcef3bef20c434e507a0fee84bc7be096a8c3afae6e188265faacc7e0db20da9020848b7891620d9e2a +Size (tor-browser-linux64-9.5.1_en-US.tar.xz) = 79002140 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-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 Added files: Index: pkgsrc/security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h diff -u /dev/null pkgsrc/security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h:1.1.2.2 --- /dev/null Thu Jul 9 06:27:47 2020 +++ pkgsrc/security/tor-browser/patches/patch-config_gcc-stl-wrapper.template.h Thu Jul 9 06:27:47 2020 @@ -0,0 +1,29 @@ +$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.1.2.2 2020/07/09 06:27:47 bsiegert Exp $ + +--- config/gcc-stl-wrapper.template.h.orig 2020-03-05 20:56:39.000000000 +0000 ++++ config/gcc-stl-wrapper.template.h +@@ -28,14 +28,14 @@ + #endif + + // Don't include mozalloc for cstdlib. See bug 1245076. +-#ifndef moz_dont_include_mozalloc_for_cstdlib +-# define moz_dont_include_mozalloc_for_cstdlib ++#ifndef moz_dont_include_mozalloc_for_${HEADER} ++# define moz_dont_include_mozalloc_for_${HEADER} + #endif + + // Include mozalloc after the STL header and all other headers it includes + // have been preprocessed. + #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ +- !defined(moz_dont_include_mozalloc_for_${HEADER}) ++ !defined(moz_dont_include_mozalloc_for_cstdlib) + # define MOZ_INCLUDE_MOZALLOC_H + # define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER} + #endif +@@ -64,4 +64,6 @@ + # include "mozilla/throw_gcc.h" + #endif + ++#undef moz_dont_include_mzalloc_for_${HEADER} ++ + #endif // if mozilla_${HEADER}_h --_----------=_1594276067160810--