Hi ports@,

We skipped 7.0.3 because it was Linux-only, but 7.0.4 is for everyone.
Attached is an update, which also fixes the issue of the bookmarks
toolbar looking like normal Firefox ESR's default instead of Tor
Browser (kudos to Mike Kaply for knowing *everything* about packaging
Mozilla and sharing it on his blog).  It also incorporates changes
suggested by landry@ and sthen@ during the 7.0.2 update discussion.

We (George and I) have also been testing the recently-posted
net/obfs4proxy ports in conjunction with this release, with good
results: you can connect to Tor using obfs4 bridges by adding a line
or two to your ~/TorBrowser-Data/Data/torrc now.  If/when
net/obfs4proxy gets accepted I'll add an r-dep to meta/tor-browser and
we're that much closer to having full TBB functionality.

Feedback most welcome.  Patch attached.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF

Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- meta/tor-browser/Makefile	26 Jul 2017 20:50:39 -0000	1.7
+++ meta/tor-browser/Makefile	11 Aug 2017 20:33:42 -0000
@@ -4,7 +4,7 @@ COMMENT=	Tor Browser meta package
 
 MAINTAINER=	Sean Levy <att...@stalphonsos.com>
 
-PKGNAME=	tor-browser-7.0.2
+PKGNAME=	tor-browser-7.0.4
 
 RUN_DEPENDS=	www/tor-browser/browser \
 		www/tor-browser/torbutton \
Index: meta/tor-browser/pkg/README
===================================================================
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- meta/tor-browser/pkg/README	26 Jul 2017 20:50:39 -0000	1.2
+++ meta/tor-browser/pkg/README	11 Aug 2017 20:33:42 -0000
@@ -11,11 +11,11 @@ To start Tor Browser:
 This will create a ~/TorBrowser-Data directory tree if it does not
 exist.
 
-As of the 7.0.2 release Tor Browser keeps its data in ~/TorBrowser-Data/Data.
-In 6.5.2 it was ~/TorBrowser-Data/Browser.  If you wish to preserve either
-your tor configuration (bridges, etc) or your browser profile across
-the updated to 7.0.2 please do the following BEFORE starting tor-browser
-after you upgrade:
+As of the 7.0.2 release Tor Browser keeps its data in
+~/TorBrowser-Data/Data.  In 6.5.2 it was ~/TorBrowser-Data/Browser.
+If you wish to preserve either your tor configuration (bridges, etc)
+or your browser profile and are updating from a version before 7.0.2
+please do the following BEFORE starting tor-browser after you upgrade:
 
   $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
 
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.inc
--- www/tor-browser/Makefile.inc	26 Jul 2017 20:50:39 -0000	1.8
+++ www/tor-browser/Makefile.inc	11 Aug 2017 20:33:42 -0000
@@ -7,7 +7,7 @@ PERMIT_PACKAGE_CDROM ?= Yes
 CATEGORIES =		www
 BROWSER_NAME =		tor-browser
 # XXX If updating, bump REVISION of any extensions which did not get updated.
-TB_VERSION =		7.0.2
+TB_VERSION =		7.0.4
 TB_PREFIX =		tb
 
 SUBST_VARS +=		BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- www/tor-browser/browser/Makefile	9 Aug 2017 06:24:26 -0000	1.15
+++ www/tor-browser/browser/Makefile	11 Aug 2017 20:33:42 -0000
@@ -18,11 +18,10 @@ WRKDIST = 		${WRKDIR}/${GH_PROJECT}-${GH
 PATCHORIG =		.pat.orig
 
 GH_PROJECT =		torb
-GH_TAGNAME =		v${TB_VERSION}-esr52.2.0
+GH_TAGNAME =		v${TB_VERSION}-esr52.3.0
 
 PKGNAME =		${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME =		${GH_TAGNAME}
-REVISION =		1
 
 SO_VERSION =		2.0
 MOZILLA_LIBS =		xul lgpllibs mozavcodec mozavutil
@@ -44,7 +43,7 @@ MOZILLA_USE_BUNDLED_NSS =	Yes
 MOZILLA_USE_BUNDLED_LIBEVENT = 	Yes
 MOZILLA_USE_BUNDLED_SQLITE =	Yes
 
-WANTLIB +=		X11-xcb xcb xcb-shm intl iconv ${LIBECXX}
+WANTLIB +=		X11-xcb xcb xcb-shm intl ${LIBECXX}
 
 LIB_DEPENDS +=		devel/gettext
 
@@ -61,19 +60,11 @@ MAKE_ENV +=		BUILD_OPT=1 \
 			XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 BUILD_DEPENDS +=	devel/py-virtualenv
 
-# to be able to link when building with clang on i386
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS +=	--disable-debug-symbols
-.endif
-
 CONFIGURE_ARGS +=	--with-app-name=${BROWSER_NAME} 		\
 			--with-tor-browser-version=${TB_VERSION}	\
 			--disable-tor-browser-update
 
-# relies on pulseaudio for sound and broken at runtime
-#CONFIGURE_ARGS +=	--disable-webrtc
-
-RUN_DEPENDS +=		net/tor>=0.3.0.9
+RUN_DEPENDS +=		net/tor>=0.3.0.10
 
 # bug 857628
 CONFIGURE_ARGS +=	--enable-pie
@@ -82,11 +73,9 @@ post-patch:
 	# hack config/baseconfig.mk to not use MOZ_APP_VERSION in a few places
 	sed -i.bak -e 's/-$$(MOZ_APP_VERSION)/-${TB_VERSION}/'	\
 		${WRKSRC}/config/baseconfig.mk
-	# drop in the sh front end to python Mozilla now uses
-	cp ${FILESDIR}/configure ${WRKSRC}
-	chmod +x ${WRKSRC}/configure
-	cp ${FILESDIR}/configure ${WRKSRC}/js/src
-	chmod +x ${WRKSRC}/js/src/configure
+	# drop in sh front end to configure.py so CONFIGURE_STYLE=simple works
+	${SUBST_PROGRAM} ${FILESDIR}/configure ${WRKSRC}/configure
+	${SUBST_PROGRAM} ${FILESDIR}/configure ${WRKSRC}/js/src/configure
 
 BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}-${TB_VERSION}
 BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- www/tor-browser/browser/distinfo	26 Jul 2017 20:50:39 -0000	1.7
+++ www/tor-browser/browser/distinfo	11 Aug 2017 20:33:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v7.0.2-esr52.2.0.tar.gz) = gWmPLFj3PmCHwgY/F9Zz+NSQ9nAKPrSAyAGZGJBBAFk=
-SIZE (tor-browser/v7.0.2-esr52.2.0.tar.gz) = 293940661
+SHA256 (tor-browser/v7.0.4-esr52.3.0.tar.gz) = 4reNo+YaVGASEYRXkh8fzh+XKSZzhiF153iH4rA539s=
+SIZE (tor-browser/v7.0.4-esr52.3.0.tar.gz) = 294015740
Index: www/tor-browser/browser/files/all-openbsd.js
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/all-openbsd.js,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 all-openbsd.js
--- www/tor-browser/browser/files/all-openbsd.js	13 Nov 2016 21:15:43 -0000	1.1.1.1
+++ www/tor-browser/browser/files/all-openbsd.js	11 Aug 2017 20:33:42 -0000
@@ -1,7 +1,10 @@
 // OpenBSD-specific defaults overrides and stuff necessary for Tor browser
+
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 pref("spellchecker.dictionary_path", "${LOCALBASE}/share/mozilla-dicts/");
 pref("extensions.enabledScopes", 5);
 pref("general.config.filename", "tor-browser.cfg");
 pref("general.config.obscure_value", 0);
+// c.f. https://mike.kaply.com/2012/03/30/customizing-firefox-default-profiles/#comment-685619
+pref("browser.places.smartBookmarksVersion",-1);
Index: www/tor-browser/browser/files/configure
===================================================================
RCS file: www/tor-browser/browser/files/configure
diff -N www/tor-browser/browser/files/configure
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/files/configure	11 Aug 2017 20:33:42 -0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+# simplified sh wrapper around configure.py that relies on SUBST_VARS
+
+SRCDIR=$(dirname $0)
+export OLD_CONFIGURE="$SRCDIR"/old-configure
+
+${MODPY_BIN} ${SRCDIR}/configure.py "$@"
Index: www/tor-browser/browser/files/extension-overrides.js
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/extension-overrides.js,v
retrieving revision 1.6
diff -u -p -r1.6 extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js	26 Jul 2017 20:50:39 -0000	1.6
+++ www/tor-browser/browser/files/extension-overrides.js	11 Aug 2017 20:33:42 -0000
@@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolba
 
 # NoScript Preferences:
 pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
+pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
+pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
+pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
 pref("noscript.ABE.enabled", false);
 pref("noscript.ABE.notify", false);
 pref("noscript.ABE.wanIpAsLocal", false);
@@ -55,10 +55,6 @@ pref("noscript.restrictSubdocScripting",
 pref("noscript.showVolatilePrivatePermissionsToggle", false);
 pref("noscript.volatilePrivatePermissions", true);
 pref("noscript.clearClick", 0);
-// Workaround for bug 22362: Disable XSS filter for now as it freezes the
-// browser in some circumstances.
-pref("noscript.filterXGet", false);
-pref("noscript.filterXPost", false);
 # Tor Launcher preferences (default bridges):
 pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
 
@@ -75,30 +71,29 @@ pref("extensions.torlauncher.default_bri
 pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
 
 pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2");
-pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.21", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
-/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.22"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1");
-pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2");
+pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0");
+pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1");
+/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.21"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1");
+pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0");
 
 pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com");
 pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");
Index: www/tor-browser/browser/files/tor-browser-cfg-tail.js
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/tor-browser-cfg-tail.js,v
retrieving revision 1.2
diff -u -p -r1.2 tor-browser-cfg-tail.js
--- www/tor-browser/browser/files/tor-browser-cfg-tail.js	26 Jul 2017 20:50:39 -0000	1.2
+++ www/tor-browser/browser/files/tor-browser-cfg-tail.js	11 Aug 2017 20:33:42 -0000
@@ -1,8 +1,51 @@
+// c.f. https://mike.kaply.com/2016/05/24/default-profile-directory-doesnt-work-in-firefox-46/
+
+const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+
+var profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+var certDBFile = profileDir.clone();
+certDBFile.append("cert8.db")
+// If cert8.db isn't there, it's a new profile
+if (!certDBFile.exists()) {
+  var defaultProfileDir = Services.dirsvc.get("GreD", Ci.nsIFile);
+  defaultProfileDir.append("browser");
+  defaultProfileDir.append("defaults");
+  defaultProfileDir.append("profile");
+  try {
+    copyDir(defaultProfileDir, profileDir);
+  } catch (e) {
+    Components.utils.reportError(e);
+  }
+}
+ 
+function copyDir(aOriginal, aDestination) {
+  var enumerator = aOriginal.directoryEntries;
+  while (enumerator.hasMoreElements()) {
+    var file = enumerator.getNext().QueryInterface(Components.interfaces.nsIFile);
+    if (file.isDirectory()) {
+      var subdir = aDestination.clone();
+      subdir.append(file.leafName);
+      try {
+        subdir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY);
+        copyDir(file, subdir);
+      } catch (e) {
+        Components.utils.reportError(e);
+      }
+    } else {
+      try {
+        file.copyTo(aDestination, null);
+      } catch (e) {
+        Components.utils.reportError(e);
+      }
+    }
+  }
+}
 
 // OpenBSD: Initialize <ProfD>/torrc to an empty config.
 // The first SAVECONF to the tor control socket will overwrite it.
-var Cc = Components.classes;
-var Ci = Components.interfaces;
+
 // mimic the code in tl-util.jsm from tor-launcher
 var dir = Cc["@mozilla.org/file/directory_service;1"].
            getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile);
Index: www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_cpp
===================================================================
RCS file: www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_cpp
diff -N www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_cpp	11 Aug 2017 20:33:42 -0000
@@ -0,0 +1,19 @@
+$OpenBSD: patch-js_src_jit_ProcessExecutableMemory_cpp,v 1.1 2017/03/20 19:37:06 landry Exp $
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1347139
+
+--- js/src/jit/ProcessExecutableMemory.cpp.orig	Mon Mar 20 10:53:43 2017
++++ js/src/jit/ProcessExecutableMemory.cpp	Mon Mar 20 10:55:09 2017
+@@ -390,7 +390,12 @@ class PageBitSet
+ #if JS_BITS_PER_WORD == 32
+ static const size_t MaxCodeBytesPerProcess = 128 * 1024 * 1024;
+ #else
++#ifdef __OpenBSD__
++// default datasize is 768Mb on OpenBSD
++static const size_t MaxCodeBytesPerProcess = 128 * 1024 * 1024;
++#else
+ static const size_t MaxCodeBytesPerProcess = 1 * 1024 * 1024 * 1024;
++#endif
+ #endif
+ 
+ // Per-process executable memory allocator. It reserves a block of memory of
Index: www/tor-browser/https-everywhere/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- www/tor-browser/https-everywhere/Makefile	26 Jul 2017 20:50:39 -0000	1.7
+++ www/tor-browser/https-everywhere/Makefile	11 Aug 2017 20:33:42 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.7 2017/07/26 20:50:39 sthen Exp $
 
 ADDON_NAME =		https-everywhere
-V =			5.2.19
+V =			5.2.21
 COMMENT =		Tor Browser add-on: force https where possible
 HOMEPAGE =		https://www.eff.org/https-everywhere
 MASTER_SITES =		https://www.eff.org/files/
Index: www/tor-browser/https-everywhere/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- www/tor-browser/https-everywhere/distinfo	26 Jul 2017 20:50:39 -0000	1.7
+++ www/tor-browser/https-everywhere/distinfo	11 Aug 2017 20:33:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (https-everywhere-5.2.19-eff.xpi) = oyT3rEi9N+EoL9lZztdDaY9MFMaQ7euRogh12DbNNe4=
-SIZE (https-everywhere-5.2.19-eff.xpi) = 2950107
+SHA256 (https-everywhere-5.2.21-eff.xpi) = 4VUQex19pcOBCroKX1sp5cyKhukzmA9IzRuSiHtlRjQ=
+SIZE (https-everywhere-5.2.21-eff.xpi) = 2953307
Index: www/tor-browser/noscript/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- www/tor-browser/noscript/Makefile	26 Jul 2017 20:50:39 -0000	1.8
+++ www/tor-browser/noscript/Makefile	11 Aug 2017 20:33:42 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.8 2017/07/26 20:50:39 sthen Exp $
 
 ADDON_NAME =		noscript
-V =			5.0.5
+V =			5.0.8.1
 COMMENT =		Tor Browser add-on: flexible JS blocker
 HOMEPAGE =		http://noscript.net
 MASTER_SITES =		https://secure.informaction.com/download/releases/
Index: www/tor-browser/noscript/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- www/tor-browser/noscript/distinfo	26 Jul 2017 20:50:39 -0000	1.5
+++ www/tor-browser/noscript/distinfo	11 Aug 2017 20:33:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-5.0.5.xpi) = vx3uOfblk23ysDt5TB78kja0QFNqBfr8/2Z+M5A+au0=
-SIZE (noscript-5.0.5.xpi) = 557812
+SHA256 (noscript-5.0.8.1.xpi) = 72SEVJZSQqV1g9JUEpC8+VJnR7GDNa7M3VXzmiOHO8M=
+SIZE (noscript-5.0.8.1.xpi) = 560348
Index: www/tor-browser/tor-launcher/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- www/tor-browser/tor-launcher/Makefile	26 Jul 2017 20:50:39 -0000	1.7
+++ www/tor-browser/tor-launcher/Makefile	11 Aug 2017 20:33:42 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.7 2017/07/26 20:50:39 sthen Exp $
 
 ADDON_NAME =		tor-launcher
-V =			0.2.12.2
+V =			0.2.12.3
 COMMENT =		Tor Browser add-on to manage tor instance
 GUID =			tor-launc...@torproject.org
 PKGNAME =		${TB_NAME}
Index: www/tor-browser/tor-launcher/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/tor-launcher/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- www/tor-browser/tor-launcher/distinfo	26 Jul 2017 20:50:39 -0000	1.4
+++ www/tor-browser/tor-launcher/distinfo	11 Aug 2017 20:33:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (tor-launcher-0.2.12.2.tar.gz) = JikaYVmE767eDgQVKP/zOpPZq1R/h1A3bYRm+i1J4ko=
-SIZE (tor-launcher-0.2.12.2.tar.gz) = 280078
+SHA256 (tor-launcher-0.2.12.3.tar.gz) = r4b8Y+762pb0L5IrtDadsR11vVLdh1IezrRvEHbHbN0=
+SIZE (tor-launcher-0.2.12.3.tar.gz) = 281085
Index: www/tor-browser/tor-launcher/patches/patch-src_modules_tl-util_jsm
===================================================================
RCS file: www/tor-browser/tor-launcher/patches/patch-src_modules_tl-util_jsm
diff -N www/tor-browser/tor-launcher/patches/patch-src_modules_tl-util_jsm
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/tor-launcher/patches/patch-src_modules_tl-util_jsm	11 Aug 2017 20:33:42 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Force DataOutsideOfAppDir on OpenBSD since it will always be true
+(turned on in ../browser/patches/patch-patch-xpcom_io_TorFileUtils_cpp)
+Index: src/modules/tl-util.jsm
+--- src/modules/tl-util.jsm.orig
++++ src/modules/tl-util.jsm
+@@ -697,7 +697,7 @@ let TLUtilInternal =  // Private
+   mStringBundle : null,
+   mOS : "",
+   // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used.
+-  mIsUserDataOutsideOfAppDir: undefined, // Boolean (cached; access via
++  mIsUserDataOutsideOfAppDir: true,      // Boolean (cached; access via
+                                          //   this._isUserDataOutsideOfAppDir)
+   mAppDir: null,        // nsIFile (cached; access via this._appDir)
+   mDataDir: null,       // nsIFile (cached; access via this._dataDir)
Index: www/tor-browser/torbutton/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/torbutton/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- www/tor-browser/torbutton/Makefile	26 Jul 2017 20:50:39 -0000	1.7
+++ www/tor-browser/torbutton/Makefile	11 Aug 2017 20:33:42 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.7 2017/07/26 20:50:39 sthen Exp $
 
 ADDON_NAME =		torbutton
-V =			1.9.7.4
+V =			1.9.7.5
 COMMENT =		Tor Browser add-on for configuring Tor Browser settings
 GUID =			torbut...@torproject.org
 PKGNAME =		${TB_NAME}
Index: www/tor-browser/torbutton/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/torbutton/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- www/tor-browser/torbutton/distinfo	26 Jul 2017 20:50:39 -0000	1.6
+++ www/tor-browser/torbutton/distinfo	11 Aug 2017 20:33:42 -0000
@@ -1,2 +1,2 @@
-SHA256 (torbutton-1.9.7.4.tar.gz) = HKANGqJuzAghxrjTqvdhfzzmvY40CQlOyol927bDE/4=
-SIZE (torbutton-1.9.7.4.tar.gz) = 595397
+SHA256 (torbutton-1.9.7.5.tar.gz) = Y/mIj4DhbBDuUDU008AR8qczYYHuWq29oKVQXvBE+1w=
+SIZE (torbutton-1.9.7.5.tar.gz) = 598765

Reply via email to