Hi ports@,
Attached is a patch to bring -current ports up to Tor Browser 8.0.1.
Lightly tested on amd64. Full release announcement here:
https://blog.torproject.org/new-release-tor-browser-801
The release announcement for 8.0 is also relevant:
https://blog.torproject.org/new-release-tor-browser-80
Pax, -A
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- meta/tor-browser/Makefile 4 Sep 2018 12:46:16 -0000 1.13
+++ meta/tor-browser/Makefile 27 Sep 2018 21:24:54 -0000
@@ -4,13 +4,12 @@ COMMENT= Tor Browser meta package
MAINTAINER= Sean Levy <att...@stalphonsos.com>
-PKGNAME= tor-browser-7.5.3
-REVISION= 0
+PKGNAME= tor-browser-8.0.1
-RUN_DEPENDS= www/tor-browser/browser>=7.5.3 \
- www/tor-browser/torbutton>=1.9.8.6 \
- www/tor-browser/tor-launcher>=0.2.14.4 \
- www/tor-browser/noscript>=5.1.8.4 \
- www/tor-browser/https-everywhere>=2018.3.13
+RUN_DEPENDS= www/tor-browser/browser>=8.0.1 \
+ www/tor-browser/torbutton>=2.0.7 \
+ www/tor-browser/tor-launcher>=0.2.16.6 \
+ www/tor-browser/noscript>=10.1.9.6 \
+ www/tor-browser/https-everywhere>=2018.8.22
.include <bsd.port.mk>
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.inc
--- www/tor-browser/Makefile.inc 24 Apr 2018 18:06:30 -0000 1.13
+++ www/tor-browser/Makefile.inc 27 Sep 2018 21:24:54 -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.5.3
+TB_VERSION = 8.0.1
TB_PREFIX = tb
SUBST_VARS += BROWSER_NAME TB_VERSION
@@ -37,7 +37,7 @@ CONFIGURE_STYLE ?= none
BUILD_DEPENDS += archivers/zip archivers/unzip
RUN_DEPENDS += www/tor-browser/browser
-EXTDIR_ROOT ?= lib/${BROWSER_NAME}-${TB_VERSION}
+EXTDIR_ROOT ?= lib/${BROWSER_NAME}
REAL_EXTDIR ?= ${PREFIX}/${EXTDIR_ROOT}/browser/extensions
SUBST_VARS += EXTDIR_ROOT GUID
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- www/tor-browser/browser/Makefile 27 Jun 2018 21:04:06 -0000 1.26
+++ www/tor-browser/browser/Makefile 27 Sep 2018 21:24:54 -0000
@@ -15,13 +15,12 @@ PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
DISTNAME = ${BROWSER_NAME}-${TB_VERSION}
-REVISION = 1
-SO_VERSION = 2.0
-MOZILLA_LIBS = xul lgpllibs mozavcodec mozavutil
+SO_VERSION = 3.0
+MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
MOZILLA_LIBS += freebl3 nss3 nssckbi nssdbm3
MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3
-MOZILLA_LIBS += mozsqlite3
+MOZILLA_LIBS += nspr4 mozsqlite3 plc4 plds4
# mozilla public license
PERMIT_PACKAGE_CDROM= Yes
@@ -33,13 +32,27 @@ MODPY_RUNDEP = No
COMPILER = base-clang ports-clang
MODCLANG_ARCHS = amd64 i386
-MOZILLA_USE_BUNDLED_NSS = Yes
+# firefox >= 44 doesnt build with base libevent
MOZILLA_USE_BUNDLED_LIBEVENT = Yes
+# firefox >= 46 defaults to gtk+3
+MOZILLA_USE_GTK3 = Yes
+# 56 requires 59.1
+MOZILLA_USE_BUNDLED_ICU = Yes
+# 59 is broken with system cairo and the option is being dropped
+MOZILLA_USE_BUNDLED_CAIRO = Yes
+# #1460600
+MOZILLA_USE_BUNDLED_HUNSPELL = Yes
+# tor-browser needs built-in nss, sqlite
+MOZILLA_USE_BUNDLED_NSPR = Yes
+MOZILLA_USE_BUNDLED_NSS = Yes
MOZILLA_USE_BUNDLED_SQLITE = Yes
-WANTLIB += X11-xcb intl pixman-1 xcb xcb-shm ${COMPILER_LIBCXX}
+# firefox >= 53 needs rust
+BUILD_DEPENDS += lang/rust
+# stylo build needs LLVM
+BUILD_DEPENDS += devel/llvm
-LIB_DEPENDS += devel/gettext
+WANTLIB += X11-xcb Xcursor Xi fribidi intl xcb xcb-shm ${COMPILER_LIBCXX}
# Regression tests are too hard to adapt to run here
NO_TEST = Yes
@@ -47,6 +60,11 @@ NO_TEST = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --prefix=${PREFIX}
+# app-name etc. for tor-browser
+CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \
+ --with-tor-browser-version=${TB_VERSION} \
+ --disable-tor-browser-update
+
# for nss build system
MAKE_ENV += BUILD_OPT=1 \
LOCALBASE="${LOCALBASE}" \
@@ -54,14 +72,17 @@ MAKE_ENV += BUILD_OPT=1 \
XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
BUILD_DEPENDS += devel/py-virtualenv
-CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \
- --with-tor-browser-version=${TB_VERSION} \
- --disable-tor-browser-update
-
-RUN_DEPENDS += net/tor>=0.3.2.10
+RUN_DEPENDS += net/tor>=0.3.4.8
# bug 857628
CONFIGURE_ARGS += --enable-pie
+CONFIGURE_ARGS += --enable-release #1386371
+CONFIGURE_ARGS += --enable-rust-simd #1261841
+.if ${MACHINE_ARCH} == "i386"
+CONFIGURE_ARGS += --disable-debug-symbols
+MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg target_feature=\"sse2\""
+DPB_PROPERTIES = lonesome
+.endif
post-patch:
# hack config/baseconfig.mk to not use MOZ_APP_VERSION in a few places
@@ -71,7 +92,7 @@ post-patch:
${SUBST_PROGRAM} ${FILESDIR}/configure ${WRKSRC}/configure
${SUBST_PROGRAM} ${FILESDIR}/configure ${WRKSRC}/js/src/configure
-BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}-${TB_VERSION}
+BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}
BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg
BROWSER_INI = ${BROWSER_DIR}/distribution/distribution.ini
@@ -83,9 +104,8 @@ post-install:
${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/defaults/profile
${INSTALL_DATA} ${FILESDIR}/bookmarks.html \
${BROWSER_DIR}/browser/defaults/profile
- # put tor-browser.cfg together
- (sed -e 's/^#/\/\/#/' < ${FILESDIR}/extension-overrides.js; \
- cat ${FILESDIR}/tor-browser-cfg-tail.js) > ${BROWSER_CFG}
+ # tor-browser JS config file
+ ${INSTALL_DATA} ${FILESDIR}/${BROWSER_NAME}.cfg ${BROWSER_CFG}
chown ${SHAREOWN}:${SHAREGRP} ${BROWSER_CFG}
chmod ${SHAREMODE} ${BROWSER_CFG}
# install distribution.ini file
@@ -98,7 +118,8 @@ post-install:
${PREFIX}/share/applications/${BROWSER_NAME}.desktop
# install icon for desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
- ${INSTALL_DATA} ${BROWSER_DIR}/browser/icons/mozicon128.png \
+ ${INSTALL_DATA} \
+ ${BROWSER_DIR}/browser/chrome/icons/default/default128.png \
${PREFIX}/share/pixmaps/${BROWSER_NAME}.png
# link default48.png to default.png to be used by default
# by non-icccm compliant wm
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- www/tor-browser/browser/distinfo 24 Apr 2018 18:06:30 -0000 1.12
+++ www/tor-browser/browser/distinfo 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/tor-browser-7.5.3.tar.gz) = MA9Oo5DeWcFq+voe8G4buEA1wlRLXypiJDqvtlQ4Ar0=
-SIZE (mozilla/tor-browser-7.5.3.tar.gz) = 296661624
+SHA256 (mozilla/tor-browser-8.0.1.tar.gz) = 2hOMhEREUF/1QmUWW4KPzCQLQAR+H6H15KpwLjMWG2U=
+SIZE (mozilla/tor-browser-8.0.1.tar.gz) = 385419887
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.2
diff -u -p -r1.2 all-openbsd.js
--- www/tor-browser/browser/files/all-openbsd.js 27 Aug 2017 08:54:08 -0000 1.2
+++ www/tor-browser/browser/files/all-openbsd.js 27 Sep 2018 21:24:54 -0000
@@ -1,10 +1,5 @@
// 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/extension-overrides.js
===================================================================
RCS file: www/tor-browser/browser/files/extension-overrides.js
diff -N www/tor-browser/browser/files/extension-overrides.js
--- www/tor-browser/browser/files/extension-overrides.js 24 Apr 2018 18:06:30 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,106 +0,0 @@
-# Overrides for Extension Preferences
-# Tor Browser Bundle
-# Do not edit this file.
-
-# HTTPS Everywhere Preferences:
-pref("extensions.https_everywhere._observatory.popup_shown", true);
-pref("extensions.https_everywhere.toolbar_hint_shown", true);
-
-# NoScript Preferences:
-pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: 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);
-pref("noscript.confirmUnblock", false);
-pref("noscript.contentBlocker", true);
-pref("noscript.firstRunRedirection", false);
-pref("noscript.global", true);
-pref("noscript.gtemp", "");
-pref("noscript.opacizeObject", 3);
-pref("noscript.forbidWebGL", true);
-pref("noscript.forbidFonts", false);
-pref("noscript.options.tabSelectedIndexes", "5,0,0");
-pref("noscript.policynames", "");
-pref("noscript.secureCookies", true);
-pref("noscript.showAllowPage", false);
-pref("noscript.showBaseDomain", false);
-pref("noscript.showDistrust", false);
-pref("noscript.showRecentlyBlocked", false);
-pref("noscript.showTemp", false);
-pref("noscript.showTempToPerm", false);
-pref("noscript.showUntrusted", false);
-pref("noscript.STS.enabled", false);
-pref("noscript.subscription.lastCheck", -142148139);
-pref("noscript.temp", "");
-pref("noscript.untrusted", "");
-pref("noscript.forbidMedia", false);
-pref("noscript.allowWhitelistUpdates", false);
-pref("noscript.fixLinks", false);
-// Now handled by plugins.click_to_play
-pref("noscript.forbidFlash", false);
-pref("noscript.forbidSilverlight", false);
-pref("noscript.forbidJava", false);
-pref("noscript.forbidPlugins", false);
-// Usability tweaks
-pref("noscript.showPermanent", false);
-pref("noscript.showTempAllowPage", true);
-pref("noscript.showRevokeTemp", true);
-pref("noscript.notify", false);
-pref("noscript.autoReload", true);
-pref("noscript.autoReload.allTabs", false);
-pref("noscript.cascadePermissions", true);
-pref("noscript.restrictSubdocScripting", true);
-pref("noscript.showVolatilePrivatePermissionsToggle", false);
-pref("noscript.volatilePrivatePermissions", true);
-pref("noscript.clearClick", 0);
-# Tor Launcher preferences (default bridges):
-pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4");
-
-// Default bridges.
-pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239");
-pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
-pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9");
-pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED");
-pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A");
-
-pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
-pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B");
-pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D");
-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 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.obfs4.25", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0");
-pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ 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");
-
-pref("extensions.torlauncher.prompt_for_locale", false);
-pref("intl.locale.matchOS", false);
Index: www/tor-browser/browser/files/tor-browser-cfg-tail.js
===================================================================
RCS file: www/tor-browser/browser/files/tor-browser-cfg-tail.js
diff -N www/tor-browser/browser/files/tor-browser-cfg-tail.js
--- www/tor-browser/browser/files/tor-browser-cfg-tail.js 27 Aug 2017 08:54:08 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-// 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.
-
-// 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);
-var file = dir.parent.parent;
-file.append("torrc");
-if (!file.exists()) {
- var stream = Cc["@mozilla.org/network/file-output-stream;1"].
- createInstance(Ci.nsIFileOutputStream);
- stream.init(file, 0x04 | 0x08 | 0x20, 0600, 0);
- stream.write("#\n", 2);
- stream.close();
-}
Index: www/tor-browser/browser/files/tor-browser.cfg
===================================================================
RCS file: www/tor-browser/browser/files/tor-browser.cfg
diff -N www/tor-browser/browser/files/tor-browser.cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/files/tor-browser.cfg 27 Sep 2018 21:24:54 -0000
@@ -0,0 +1,60 @@
+// 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.
+
+// 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);
+var file = dir.parent.parent;
+file.append("torrc");
+if (!file.exists()) {
+ var stream = Cc["@mozilla.org/network/file-output-stream;1"].
+ createInstance(Ci.nsIFileOutputStream);
+ stream.init(file, 0x04 | 0x08 | 0x20, 0600, 0);
+ stream.write("#\n", 2);
+ stream.close();
+}
Index: www/tor-browser/browser/patches/patch-browser_installer_Makefile_in
===================================================================
RCS file: www/tor-browser/browser/patches/patch-browser_installer_Makefile_in
diff -N www/tor-browser/browser/patches/patch-browser_installer_Makefile_in
--- www/tor-browser/browser/patches/patch-browser_installer_Makefile_in 26 Jul 2017 20:50:39 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-browser_installer_Makefile_in,v 1.2 2017/07/26 20:50:39 sthen Exp $
-Don't install the sdk / headers etc
-
-Patch taken from www/firefox-esr
-Index: browser/installer/Makefile.in
---- browser/installer/Makefile.in.orig
-+++ browser/installer/Makefile.in
-@@ -103,8 +103,6 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
- MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
- endif
-
--INSTALL_SDK = 1
--
- include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
- include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
-
Index: www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
===================================================================
RCS file: www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
diff -N www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-build_moz_configure_init_configure 27 Sep 2018 21:24:54 -0000
@@ -0,0 +1,24 @@
+$OpenBSD: patch-build_moz_configure_init_configure,v 1.2 2018/09/25 14:26:36 landry Exp $
+
+Fix build with rust 1.29.
+https://hg.mozilla.org/mozilla-central/rev/36f4ba2fb6f5
+https://hg.mozilla.org/releases/mozilla-esr60/rev/381ae910e9b2712699fdc6a9bb9702c04bccb8f5
+
+Index: build/moz.configure/init.configure
+--- build/moz.configure/init.configure.orig
++++ build/moz.configure/init.configure
+@@ -591,7 +591,13 @@ def split_triplet(triplet, allow_unknown=False):
+ # There is also a quartet form:
+ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # But we can consider the "KERNEL-OPERATING_SYSTEM" as one.
+- cpu, manufacturer, os = triplet.split('-', 2)
++ parts = triplet.split('-', 2)
++ if len(parts) == 3:
++ cpu, _, os = parts
++ elif len(parts) == 2:
++ cpu, os = parts
++ else:
++ die("Unexpected triplet string: %s" % triplet)
+
+ # Autoconf uses config.sub to validate and canonicalize those triplets,
+ # but the granularity of its results has never been satisfying to our
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
--- www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_cpp 27 Aug 2017 08:54:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-js_src_jit_ProcessExecutableMemory_cpp,v 1.2 2017/08/27 08:54:08 sthen 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/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h
===================================================================
RCS file: www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h
diff -N www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h 27 Sep 2018 21:24:54 -0000
@@ -0,0 +1,14 @@
+$OpenBSD: patch-js_src_jit_ProcessExecutableMemory_h,v 1.2 2018/06/27 05:11:34 landry Exp $
+
+Index: js/src/jit/ProcessExecutableMemory.h
+--- js/src/jit/ProcessExecutableMemory.h.orig
++++ js/src/jit/ProcessExecutableMemory.h
+@@ -14,7 +14,7 @@ namespace jit {
+
+ // Limit on the number of bytes of executable memory to prevent JIT spraying
+ // attacks.
+-#if JS_BITS_PER_WORD == 32
++#if JS_BITS_PER_WORD == 32 || defined(__OpenBSD__)
+ static const size_t MaxCodeBytesPerProcess = 140 * 1024 * 1024;
+ #else
+ static const size_t MaxCodeBytesPerProcess = 1 * 1024 * 1024 * 1024;
Index: www/tor-browser/browser/patches/patch-netwerk_cache_nsDiskCacheDeviceSQL_cpp
===================================================================
RCS file: www/tor-browser/browser/patches/patch-netwerk_cache_nsDiskCacheDeviceSQL_cpp
diff -N www/tor-browser/browser/patches/patch-netwerk_cache_nsDiskCacheDeviceSQL_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-netwerk_cache_nsDiskCacheDeviceSQL_cpp 27 Sep 2018 21:24:54 -0000
@@ -0,0 +1,23 @@
+$OpenBSD: patch-netwerk_cache_nsDiskCacheDeviceSQL_cpp,v 1.1 2018/06/27 05:11:34 landry Exp $
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1470961
+
+Index: netwerk/cache/nsDiskCacheDeviceSQL.cpp
+--- netwerk/cache/nsDiskCacheDeviceSQL.cpp.orig
++++ netwerk/cache/nsDiskCacheDeviceSQL.cpp
+@@ -48,7 +48,6 @@
+
+ #include "mozilla/Telemetry.h"
+
+-#include "sqlite3.h"
+ #include "mozilla/storage.h"
+ #include "nsVariant.h"
+ #include "mozilla/BasePrincipal.h"
+@@ -218,7 +217,6 @@ nsOfflineCacheEvictionFunction::OnFunctionCall(mozISto
+
+ // If the key is currently locked, refuse to delete this row.
+ if (mDevice->IsLocked(fullKey)) {
+- NS_ADDREF(*_retval = new IntegerVariant(SQLITE_IGNORE));
+ return NS_OK;
+ }
+
Index: www/tor-browser/browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- www/tor-browser/browser/pkg/PLIST 27 Jun 2018 21:04:06 -0000 1.5
+++ www/tor-browser/browser/pkg/PLIST 27 Sep 2018 21:24:54 -0000
@@ -1,63 +1,69 @@
@comment $OpenBSD: PLIST,v 1.5 2018/06/27 21:04:06 espie Exp $
bin/${BROWSER_NAME}
-lib/${BROWSER_NAME}-${TB_VERSION}/
-lib/${BROWSER_NAME}-${TB_VERSION}/application.ini
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/blocklist.xml
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome.manifest
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/icons/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/icons/default/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/icons/default/default.png
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/icons/default/default16.png
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/icons/default/default32.png
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/chrome/icons/default/default48.png
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/defaults/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/defaults/preferences/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/defaults/preferences/all-openbsd.js
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/defaults/profile/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/defaults/profile/bookmarks.html
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/features/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/features/e10sroll...@mozilla.org.xpi
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/icons/
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/icons/mozicon128.png
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/omni.ja
-lib/${BROWSER_NAME}-${TB_VERSION}/chrome.manifest
-lib/${BROWSER_NAME}-${TB_VERSION}/defaults/
-lib/${BROWSER_NAME}-${TB_VERSION}/defaults/pref/
-lib/${BROWSER_NAME}-${TB_VERSION}/defaults/pref/channel-prefs.js
-lib/${BROWSER_NAME}-${TB_VERSION}/dependentlibs.list
-lib/${BROWSER_NAME}-${TB_VERSION}/dictionaries/
-lib/${BROWSER_NAME}-${TB_VERSION}/dictionaries/en-US.aff
-lib/${BROWSER_NAME}-${TB_VERSION}/dictionaries/en-US.dic
-lib/${BROWSER_NAME}-${TB_VERSION}/distribution/
-lib/${BROWSER_NAME}-${TB_VERSION}/distribution/distribution.ini
-lib/${BROWSER_NAME}-${TB_VERSION}/libfreebl3.chk
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libfreebl3.so.${LIBfreebl3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/liblgpllibs.so.${LIBlgpllibs_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libmozavcodec.so.${LIBmozavcodec_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libmozavutil.so.${LIBmozavutil_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libmozsqlite3.so.${LIBmozsqlite3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libnss3.so.${LIBnss3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libnssckbi.so.${LIBnssckbi_VERSION}
-lib/${BROWSER_NAME}-${TB_VERSION}/libnssdbm3.chk
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libnssdbm3.so.${LIBnssdbm3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libnssutil3.so.${LIBnssutil3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libsmime3.so.${LIBsmime3_VERSION}
-lib/${BROWSER_NAME}-${TB_VERSION}/libsoftokn3.chk
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libsoftokn3.so.${LIBsoftokn3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libssl3.so.${LIBssl3_VERSION}
-@lib lib/${BROWSER_NAME}-${TB_VERSION}/libxul.so.${LIBxul_VERSION}
-lib/${BROWSER_NAME}-${TB_VERSION}/omni.ja
-lib/${BROWSER_NAME}-${TB_VERSION}/platform.ini
-@bin lib/${BROWSER_NAME}-${TB_VERSION}/plugin-container
-lib/${BROWSER_NAME}-${TB_VERSION}/removed-files
-lib/${BROWSER_NAME}-${TB_VERSION}/run-mozilla.sh
-@bin lib/${BROWSER_NAME}-${TB_VERSION}/${BROWSER_NAME}
-@bin lib/${BROWSER_NAME}-${TB_VERSION}/${BROWSER_NAME}-bin
-lib/${BROWSER_NAME}-${TB_VERSION}/${BROWSER_NAME}.cfg
+lib/${BROWSER_NAME}/
+lib/${BROWSER_NAME}/application.ini
+lib/${BROWSER_NAME}/browser/
+lib/${BROWSER_NAME}/browser/blocklist.xml
+lib/${BROWSER_NAME}/browser/chrome/
+lib/${BROWSER_NAME}/browser/chrome.manifest
+lib/${BROWSER_NAME}/browser/chrome/icons/
+lib/${BROWSER_NAME}/browser/chrome/icons/default/
+lib/${BROWSER_NAME}/browser/chrome/icons/default/default.png
+lib/${BROWSER_NAME}/browser/chrome/icons/default/default128.png
+lib/${BROWSER_NAME}/browser/chrome/icons/default/default16.png
+lib/${BROWSER_NAME}/browser/chrome/icons/default/default32.png
+lib/${BROWSER_NAME}/browser/chrome/icons/default/default48.png
+lib/${BROWSER_NAME}/browser/chrome/icons/default/default64.png
+lib/${BROWSER_NAME}/browser/defaults/
+lib/${BROWSER_NAME}/browser/defaults/preferences/
+lib/${BROWSER_NAME}/browser/defaults/preferences/all-openbsd.js
+lib/${BROWSER_NAME}/browser/defaults/profile/
+lib/${BROWSER_NAME}/browser/defaults/profile/bookmarks.html
+lib/${BROWSER_NAME}/browser/extensions/
+lib/${BROWSER_NAME}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+lib/${BROWSER_NAME}/browser/features/
+lib/${BROWSER_NAME}/browser/features/onboard...@mozilla.org.xpi
+lib/${BROWSER_NAME}/browser/omni.ja
+lib/${BROWSER_NAME}/chrome.manifest
+lib/${BROWSER_NAME}/defaults/
+lib/${BROWSER_NAME}/defaults/pref/
+lib/${BROWSER_NAME}/defaults/pref/channel-prefs.js
+lib/${BROWSER_NAME}/dependentlibs.list
+lib/${BROWSER_NAME}/dictionaries/
+lib/${BROWSER_NAME}/dictionaries/en-US.aff
+lib/${BROWSER_NAME}/dictionaries/en-US.dic
+lib/${BROWSER_NAME}/distribution/
+lib/${BROWSER_NAME}/distribution/distribution.ini
+lib/${BROWSER_NAME}/gtk2/
+@lib lib/${BROWSER_NAME}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION}
+lib/${BROWSER_NAME}/libfreebl3.chk
+@lib lib/${BROWSER_NAME}/libfreebl3.so.${LIBfreebl3_VERSION}
+@lib lib/${BROWSER_NAME}/liblgpllibs.so.${LIBlgpllibs_VERSION}
+@lib lib/${BROWSER_NAME}/libmozavcodec.so.${LIBmozavcodec_VERSION}
+@lib lib/${BROWSER_NAME}/libmozavutil.so.${LIBmozavutil_VERSION}
+@lib lib/${BROWSER_NAME}/libmozgtk.so.${LIBmozgtk_VERSION}
+@lib lib/${BROWSER_NAME}/libmozsqlite3.so.${LIBmozsqlite3_VERSION}
+@lib lib/${BROWSER_NAME}/libnspr4.so.${LIBnspr4_VERSION}
+@lib lib/${BROWSER_NAME}/libnss3.so.${LIBnss3_VERSION}
+@lib lib/${BROWSER_NAME}/libnssckbi.so.${LIBnssckbi_VERSION}
+lib/${BROWSER_NAME}/libnssdbm3.chk
+@lib lib/${BROWSER_NAME}/libnssdbm3.so.${LIBnssdbm3_VERSION}
+@lib lib/${BROWSER_NAME}/libnssutil3.so.${LIBnssutil3_VERSION}
+@lib lib/${BROWSER_NAME}/libplc4.so.${LIBplc4_VERSION}
+@lib lib/${BROWSER_NAME}/libplds4.so.${LIBplds4_VERSION}
+@lib lib/${BROWSER_NAME}/libsmime3.so.${LIBsmime3_VERSION}
+lib/${BROWSER_NAME}/libsoftokn3.chk
+@lib lib/${BROWSER_NAME}/libsoftokn3.so.${LIBsoftokn3_VERSION}
+@lib lib/${BROWSER_NAME}/libssl3.so.${LIBssl3_VERSION}
+@lib lib/${BROWSER_NAME}/libxul.so.${LIBxul_VERSION}
+lib/${BROWSER_NAME}/omni.ja
+@bin lib/${BROWSER_NAME}/pingsender
+lib/${BROWSER_NAME}/platform.ini
+@bin lib/${BROWSER_NAME}/plugin-container
+lib/${BROWSER_NAME}/removed-files
+@bin lib/${BROWSER_NAME}/${BROWSER_NAME}
+@bin lib/${BROWSER_NAME}/${BROWSER_NAME}-bin
+lib/${BROWSER_NAME}/${BROWSER_NAME}.cfg
share/applications/${BROWSER_NAME}.desktop
share/pixmaps/
@tag update-desktop-database
Index: www/tor-browser/https-everywhere/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- www/tor-browser/https-everywhere/Makefile 24 Apr 2018 18:06:30 -0000 1.12
+++ www/tor-browser/https-everywhere/Makefile 27 Sep 2018 21:24:54 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2018/04/24 18:06:30 sthen Exp $
ADDON_NAME = https-everywhere
-V = 2018.3.13
+V = 2018.8.22
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.12
diff -u -p -r1.12 distinfo
--- www/tor-browser/https-everywhere/distinfo 24 Apr 2018 18:06:30 -0000 1.12
+++ www/tor-browser/https-everywhere/distinfo 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (https-everywhere-2018.3.13-eff.xpi) = g+qcOqHBVaEfu+Fid/DfwGHddjE3lRJkBaptbaJKHGc=
-SIZE (https-everywhere-2018.3.13-eff.xpi) = 1599795
+SHA256 (https-everywhere-2018.8.22-eff.xpi) = s3uN3IceU56XB1t66VVcB2ADpRs4l3a8Kkcp4/E2kM4=
+SIZE (https-everywhere-2018.8.22-eff.xpi) = 1714626
Index: www/tor-browser/https-everywhere/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- www/tor-browser/https-everywhere/pkg/PLIST 31 Jan 2017 13:48:18 -0000 1.2
+++ www/tor-browser/https-everywhere/pkg/PLIST 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2017/01/31 13:48:18 landry Exp $
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/${GUID}.xpi
+${EXTDIR_ROOT}/
+${EXTDIR_ROOT}/browser/
+${EXTDIR_ROOT}/browser/extensions/
+${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
Index: www/tor-browser/noscript/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- www/tor-browser/noscript/Makefile 24 Apr 2018 18:06:30 -0000 1.13
+++ www/tor-browser/noscript/Makefile 27 Sep 2018 21:24:54 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.13 2018/04/24 18:06:30 sthen Exp $
ADDON_NAME = noscript
-V = 5.1.8.4
+V = 10.1.9.6
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.10
diff -u -p -r1.10 distinfo
--- www/tor-browser/noscript/distinfo 24 Apr 2018 18:06:30 -0000 1.10
+++ www/tor-browser/noscript/distinfo 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-5.1.8.4.xpi) = HIWnLNDX0hD43UY/lwAhRwOl8oMZwrFnnbAPhhpSifc=
-SIZE (noscript-5.1.8.4.xpi) = 777343
+SHA256 (noscript-10.1.9.6.xpi) = M2ribQpwaI5sKzwUJnyegPUvbzbDHyO4JC4O2uNmbUI=
+SIZE (noscript-10.1.9.6.xpi) = 457297
Index: www/tor-browser/noscript/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- www/tor-browser/noscript/pkg/PLIST 31 Jan 2017 13:48:18 -0000 1.2
+++ www/tor-browser/noscript/pkg/PLIST 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2017/01/31 13:48:18 landry Exp $
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/${GUID}.xpi
+${EXTDIR_ROOT}/
+${EXTDIR_ROOT}/browser/
+${EXTDIR_ROOT}/browser/extensions/
+${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
Index: www/tor-browser/tor-launcher/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- www/tor-browser/tor-launcher/Makefile 24 Apr 2018 18:06:30 -0000 1.12
+++ www/tor-browser/tor-launcher/Makefile 27 Sep 2018 21:24:54 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2018/04/24 18:06:30 sthen Exp $
ADDON_NAME = tor-launcher
-V = 0.2.14.4
+V = 0.2.16.6
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.7
diff -u -p -r1.7 distinfo
--- www/tor-browser/tor-launcher/distinfo 24 Apr 2018 18:06:30 -0000 1.7
+++ www/tor-browser/tor-launcher/distinfo 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (tor-launcher-0.2.14.4.tar.gz) = T/eQHR63zUPcwQYt+WRjxMqoOthNnlzoRQZfuYN9y8k=
-SIZE (tor-launcher-0.2.14.4.tar.gz) = 216868
+SHA256 (tor-launcher-0.2.16.6.tar.gz) = 3FEPYcSdYRdsKa8DDHVE0IVrQlrcWTwdLvGTTBOFUpQ=
+SIZE (tor-launcher-0.2.16.6.tar.gz) = 257904
Index: www/tor-browser/tor-launcher/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/tor-launcher/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- www/tor-browser/tor-launcher/pkg/PLIST 31 Jan 2017 13:48:18 -0000 1.2
+++ www/tor-browser/tor-launcher/pkg/PLIST 27 Sep 2018 21:24:54 -0000
@@ -1,4 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2017/01/31 13:48:18 landry Exp $
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/${GUID}.xpi
+${EXTDIR_ROOT}/
+${EXTDIR_ROOT}/browser/
+${EXTDIR_ROOT}/browser/extensions/
+${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
share/${BROWSER_NAME}/
share/${BROWSER_NAME}/torrc-defaults
Index: www/tor-browser/torbutton/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/torbutton/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- www/tor-browser/torbutton/Makefile 24 Apr 2018 18:06:30 -0000 1.12
+++ www/tor-browser/torbutton/Makefile 27 Sep 2018 21:24:54 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2018/04/24 18:06:30 sthen Exp $
ADDON_NAME = torbutton
-V = 1.9.8.6
+V = 2.0.7
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.11
diff -u -p -r1.11 distinfo
--- www/tor-browser/torbutton/distinfo 24 Apr 2018 18:06:30 -0000 1.11
+++ www/tor-browser/torbutton/distinfo 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (torbutton-1.9.8.6.tar.gz) = W0V5jqmnzaNBZB/FmBO1vNEfJ/0m1rAnZyFcEpRhhAw=
-SIZE (torbutton-1.9.8.6.tar.gz) = 601334
+SHA256 (torbutton-2.0.7.tar.gz) = 40cmYCfVPmE4ZKPFCgmqS3hoP5EyrrPT7AbUYFlb40w=
+SIZE (torbutton-2.0.7.tar.gz) = 645298
Index: www/tor-browser/torbutton/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/torbutton/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- www/tor-browser/torbutton/pkg/PLIST 31 Jan 2017 13:48:18 -0000 1.2
+++ www/tor-browser/torbutton/pkg/PLIST 27 Sep 2018 21:24:54 -0000
@@ -1,2 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2017/01/31 13:48:18 landry Exp $
-lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/${GUID}.xpi
+${EXTDIR_ROOT}/
+${EXTDIR_ROOT}/browser/
+${EXTDIR_ROOT}/browser/extensions/
+${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
