Stuart Henderson <[email protected]> writes: > On 2017/07/26 16:30, George Rosamond wrote: >> Stuart Henderson: >> > On 2017/07/26 15:22, Marc Espie wrote: >> >> Good news, the update builds with clang... so that's a go for me. >> >> >> > >> > It builds and runs for me, I don't see any problems with toolbars >> > (admittedly only light use). >> >> The issue is related to the bookmarks toolbar, which shows the default >> Firefox ones instead of the default TB ones. It's not displayed by default. > > This is what I see if I enable it: https://junkpile.org/tb702.png > I've never used tor-browser before to know if that's what is expected or > not. It's not using bookmarks from my normal Firefox installation but > I'm not sure if that's what you mean.. > > Is this very bad? (The other option will be "no package" as the old version > isn't going to build).
It is disturbing and annoying because I just can't suss out why it started happening. Also, it didn't happen to me in my testing, but my only viable method of testing ATM is to use X11 forwarding over SSH on a crappy net. When I fire up tor-browser this way on the machine in NYC that I work on, I don't get that toolbar, which is how TB normally looks. I cannot explain this yet. It's seriously bugging me. If anyone has any clues I'd love to hear them. That much said it seems clear we should get the update in if possible and worry about these details later. >> > I do see a crash if I try to view certificate information on an HTTPS >> > site, but I think it's probably better to commit the update and then try >> > to track that down afterwards. (I haven't tested the old version to see >> > if it's new, and I'm on a machine with full clang-built packages so it's >> > hard to go back and try it now). Unless there are objections I'll go >> > ahead and do that. >> > >> >> I'm not seeing that after checking a few different certs. > > Ok I'm thinking let's ignore that for now.. In the interests of forward progress I'm attaching an updated update that addresses the following: * PATCHORIG * remove post-extract search-and-destroy * mung WANTLIB/LIB_DEPENDS as per sthen@ (port-lib-depends-check seems happy) * go back to files/configure, ditch the two configure.in patches Thanks for all the feedback. Am always open to more. 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.6 diff -u -p -r1.6 Makefile --- meta/tor-browser/Makefile 11 May 2017 01:26:37 -0000 1.6 +++ meta/tor-browser/Makefile 26 Jul 2017 17:01:44 -0000 @@ -4,7 +4,7 @@ COMMENT= Tor Browser meta package MAINTAINER= Sean Levy <[email protected]> -PKGNAME= tor-browser-6.5.2 +PKGNAME= tor-browser-7.0.2 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.1.1.1 diff -u -p -r1.1.1.1 README --- meta/tor-browser/pkg/README 13 Nov 2016 21:18:48 -0000 1.1.1.1 +++ meta/tor-browser/pkg/README 26 Jul 2017 17:01:44 -0000 @@ -8,7 +8,16 @@ To start Tor Browser: $ tor-browser -This will create a ~/TorBrowser-Data directory if it does not exist. +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: + + $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data Tor Browser uses its own instance of the tor server running on a different port than the net/tor port is configured to use by default. @@ -18,12 +27,14 @@ daemon you have running via the standard tor). The tor instance used by Tor Browser stores its configuration in -~/TorBrowser-Data/Browser/torrc; the tor daemon state lives in -~/TorBrowser-Data/Browser/tor_data. When you use Tor Browser to -change your configuration (e.g. add bridges) the above torrc is -updated. You can also add bridges by editing your torrc yourself. -Make sure Tor Browser is not running before doing so if you use this -method; if Tor Browser is running it might overwrite your torrc. +~/TorBrowser-Data/Data/torrc; the tor daemon state lives in +~/TorBrowser-Data/Data/tor_data. + +When you use Tor Browser to change your configuration (e.g. add +bridges) the above torrc is updated. You can also add bridges by +editing your torrc yourself. Make sure Tor Browser is not running +before doing so if you use this method; if Tor Browser is running it +might overwrite your torrc. NOTE: The OpenBSD Tor Browser ports do not yet include Pluggable Transports (PT). This means that not all features are yet available, Index: www/tor-browser/Makefile.inc =================================================================== RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.7 diff -u -p -r1.7 Makefile.inc --- www/tor-browser/Makefile.inc 11 May 2017 01:26:37 -0000 1.7 +++ www/tor-browser/Makefile.inc 26 Jul 2017 17:01:44 -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 = 6.5.2 +TB_VERSION = 7.0.2 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.11 diff -u -p -r1.11 Makefile --- www/tor-browser/browser/Makefile 14 Jun 2017 05:23:10 -0000 1.11 +++ www/tor-browser/browser/Makefile 26 Jul 2017 17:01:44 -0000 @@ -14,15 +14,16 @@ EXTRACT_SUFX = .tar.gz DIST_SUBDIR = ${BROWSER_NAME} WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//} +PATCHORIG = .pat.orig + GH_PROJECT = torb -GH_TAGNAME = v${TB_VERSION}-esr45.9.0 +GH_TAGNAME = v${TB_VERSION}-esr52.2.0 PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION} DISTNAME = ${GH_TAGNAME} -REVISION = 0 -SO_VERSION = 1.0 -MOZILLA_LIBS = browsercomps xul lgpllibs +SO_VERSION = 2.0 +MOZILLA_LIBS = xul lgpllibs mozavcodec mozavutil MOZILLA_LIBS += freebl3 nss3 nssckbi nssdbm3 MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3 MOZILLA_LIBS += mozsqlite3 @@ -32,62 +33,58 @@ PERMIT_PACKAGE_CDROM= Yes MODULES = www/mozilla lang/python +MODPY_RUNDEP = No + +COMPILER = clang +MODCLANG_ARCHS = amd64 i386 + MOZILLA_USE_BUNDLED_NSS = Yes MOZILLA_USE_BUNDLED_LIBEVENT = Yes MOZILLA_USE_BUNDLED_SQLITE = Yes -MOZILLA_AUTOCONF_DIRS += . js/src -MODPY_RUNDEP = No +WANTLIB += X11-xcb xcb xcb-shm intl iconv ${LIBECXX} -# necessary glue to build with the correct compiler after fx 17 -COMPILER = clang -MODCLANG_ARCHS = amd64 i386 +LIB_DEPENDS += devel/gettext # Regression tests are too hard to adapt to run here NO_TEST = Yes +CONFIGURE_STYLE = simple +CONFIGURE_ARGS += --prefix=${PREFIX} + # for nss build system MAKE_ENV += BUILD_OPT=1 \ LOCALBASE="${LOCALBASE}" \ NSS_ENABLE_ECC=1 \ XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}" - -CONFIGURE_STYLE = autoconf no-autoheader - -LIB_DEPENDS += devel/gettext>=0.10.38 \ - converters/libiconv -WANTLIB += intl>=5 iconv>=6 - BUILD_DEPENDS += devel/py-virtualenv -# to be able to link when building with clang on i386 or gcc on ppc -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" +# 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 \ - --enable-tor-brower-data-in-home-dir + --disable-tor-browser-update # relies on pulseaudio for sound and broken at runtime -CONFIGURE_ARGS += --disable-webrtc - -CONFIGURE_ARGS += --disable-gstreamer +#CONFIGURE_ARGS += --disable-webrtc -RUN_DEPENDS += net/tor>=0.2.9.10 +RUN_DEPENDS += net/tor>=0.3.0.9 # bug 857628 CONFIGURE_ARGS += --enable-pie -# there are sometimes .orig files in the source, messes with update-patches -post-extract: - -find ${WRKSRC} -name '*.orig' -exec rm {} \; - 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 BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}-${TB_VERSION} BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg @@ -105,6 +102,10 @@ post-install: cat ${FILESDIR}/tor-browser-cfg-tail.js) > ${BROWSER_CFG} chown ${SHAREOWN}:${SHAREGRP} ${BROWSER_CFG} chmod ${SHAREMODE} ${BROWSER_CFG} + # install distribution.ini file + ${INSTALL_DATA_DIR} ${BROWSER_DIR}/distribution + echo "[Global]\nid=OpenBSD\nversion=${OSREV}\nabout=Packaged by ${MAINTAINER}\n" > \ + ${BROWSER_DIR}/distribution/distribution.ini # install desktop file ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ${SUBST_DATA} ${FILESDIR}/${BROWSER_NAME}.desktop \ Index: www/tor-browser/browser/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- www/tor-browser/browser/distinfo 11 May 2017 01:26:37 -0000 1.6 +++ www/tor-browser/browser/distinfo 26 Jul 2017 17:01:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (tor-browser/v6.5.2-esr45.9.0.tar.gz) = WZFZ4ullzb1Ox9oEmwC8tvl+gQgkwtobZ5k+hKj5Bd0= -SIZE (tor-browser/v6.5.2-esr45.9.0.tar.gz) = 256788819 +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 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 26 Jul 2017 17:01:44 -0000 @@ -0,0 +1,25 @@ +#!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# Welcome to the new world of configure. We're working on moving to a +# python based configure. In the meanwhile, remains of the old autoconf +# based configure is in old-configure.in. +# If you need to add something, please come talk to the build system +# peers for now. +# +# Because adding a configure file in the tree is going to conflict with +# existing configure files in people's (and automation) work trees, and +# because some automation jobs are still running autoconf and configure +# "manually", this file is actually an m4 file that is processed by +# autoconf, but doesn't call any autoconf macros. The `divert` line +# below ensures the script that follows is output by autoconf. +: "" +#!/bin/sh + +SRCDIR=$(dirname $0) +TOPSRCDIR="$SRCDIR" +export OLD_CONFIGURE="$SRCDIR"/old-configure + +which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/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.5 diff -u -p -r1.5 extension-overrides.js --- www/tor-browser/browser/files/extension-overrides.js 11 May 2017 01:26:37 -0000 1.5 +++ www/tor-browser/browser/files/extension-overrides.js 26 Jul 2017 17:01:44 -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:"); -pref("noscript.default", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); -pref("noscript.mandatory", "about: about:tbupdate chrome: resource: blob: mediasource: moz-safe-about:"); +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("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); @@ -55,6 +55,10 @@ 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"); @@ -92,6 +96,9 @@ pref("extensions.torlauncher.default_bri 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.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.1.1.1 diff -u -p -r1.1.1.1 tor-browser-cfg-tail.js --- www/tor-browser/browser/files/tor-browser-cfg-tail.js 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/files/tor-browser-cfg-tail.js 26 Jul 2017 17:01:44 -0000 @@ -1,10 +1,12 @@ -// OpenBSD: Initialize ~/.tor-browser/torrc to an empty config. +// 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; -var file = Cc["@mozilla.org/file/directory_service;1"]. - getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile); +// 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"]. Index: www/tor-browser/browser/patches/patch-_mozconfig =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-_mozconfig,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-_mozconfig --- www/tor-browser/browser/patches/patch-_mozconfig 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-_mozconfig 26 Jul 2017 17:01:44 -0000 @@ -1,29 +1,19 @@ -$OpenBSD: patch-_mozconfig,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ +$OpenBSD$ -Set MOZ_OBJDIR correctly. Turn off auto-update stuff. Trn on data-in-home-dir ---- .mozconfig.orig Wed Sep 7 02:07:10 2016 -+++ .mozconfig Sat Nov 12 10:39:53 2016 -@@ -1,6 +1,6 @@ - . $topsrcdir/browser/config/mozconfig - --mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build-`arch -s` - mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" - mk_add_options MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 -@@ -9,10 +9,11 @@ ac_add_options --enable-optimize - #ac_add_options --disable-optimize - ac_add_options --enable-official-branding +Disable the updater and related stuff. Does nothing under OpenBSD +Index: .mozconfig +--- .mozconfig.orig ++++ .mozconfig +@@ -12,9 +12,9 @@ ac_add_options --enable-official-branding + # Let's support GTK2 for ESR52 + ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-tor-browser-update --ac_add_options --enable-update-packaging -ac_add_options --enable-signmar -ac_add_options --enable-verify-mar +#ac_add_options --enable-tor-browser-update -+#ac_add_options --enable-update-packaging +#ac_add_options --enable-signmar +#ac_add_options --enable-verify-mar -+ac_add_options --enable-tor-browser-data-in-home-dir ac_add_options --disable-strip ac_add_options --disable-install-strip Index: www/tor-browser/browser/patches/patch-browser_installer_Makefile_in =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-browser_installer_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-browser_installer_Makefile_in --- www/tor-browser/browser/patches/patch-browser_installer_Makefile_in 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-browser_installer_Makefile_in 26 Jul 2017 17:01:44 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-browser_installer_Makefi Don't install the sdk / headers etc Patch taken from www/firefox-esr ---- browser/installer/Makefile.in.orig Tue May 31 07:26:30 2016 -+++ browser/installer/Makefile.in Wed Jun 1 18:33:10 2016 -@@ -95,8 +95,6 @@ MOZ_PKG_MAC_ICON=branding/disk.icns +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 Index: www/tor-browser/browser/patches/patch-configure_in =================================================================== RCS file: www/tor-browser/browser/patches/patch-configure_in diff -N www/tor-browser/browser/patches/patch-configure_in --- www/tor-browser/browser/patches/patch-configure_in 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ - -Add --enable-tor-browser-data-in-home-dir which implies ---enable-tor-browser-data-outside-app-dir, c.f. patch-xpcom_io_TorFileUtils_cpp ---- configure.in.orig Wed Sep 7 02:07:10 2016 -+++ configure.in Wed Sep 21 14:54:53 2016 -@@ -6539,11 +6539,22 @@ if test -n "$TOR_BROWSER_UPDATE"; then - AC_DEFINE(TOR_BROWSER_UPDATE) - fi - -+MOZ_ARG_ENABLE_BOOL(tor-browser-data-in-home-dir, -+[ --enable-tor-browser-data-in-home-dir -+ Enable Tor Browser data in home dir], -+ TOR_BROWSER_DATA_IN_HOME_DIR=1, -+ TOR_BROWSER_DATA_IN_HOME_DIR= ) -+ - MOZ_ARG_ENABLE_BOOL(tor-browser-data-outside-app-dir, - [ --enable-tor-browser-data-outside-app-dir - Enable Tor Browser data outside of app directory], - TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1, - TOR_BROWSER_DATA_OUTSIDE_APP_DIR= ) -+ -+if test -n "$TOR_BROWSER_DATA_IN_HOME_DIR"; then -+ TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1 -+ AC_DEFINE(TOR_BROWSER_DATA_IN_HOME_DIR) -+fi - - if test -n "$TOR_BROWSER_DATA_OUTSIDE_APP_DIR"; then - AC_DEFINE(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) Index: www/tor-browser/browser/patches/patch-gfx_skia_moz_build =================================================================== RCS file: www/tor-browser/browser/patches/patch-gfx_skia_moz_build diff -N www/tor-browser/browser/patches/patch-gfx_skia_moz_build --- www/tor-browser/browser/patches/patch-gfx_skia_moz_build 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-gfx_skia_moz_build,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ - -Brought over from www/firefox-esr 45.1.1 ---- gfx/skia/moz.build.orig Tue May 31 07:26:30 2016 -+++ gfx/skia/moz.build Wed Jun 1 18:33:22 2016 -@@ -573,7 +573,7 @@ if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_AR - 'skia/src/opts/memset32_neon.S', - ] - --if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT': -+if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC'] and CONFIG['OS_ARCH'] != 'WINNT' and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSE4_1']: - if CONFIG['CPU_ARCH'] == 'x86_64': - SOURCES += [ - 'skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S', -@@ -644,11 +644,13 @@ if CONFIG['_MSC_VER']: - if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['GNU_CC']: - SOURCES['skia/src/opts/SkBitmapFilter_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['skia/src/opts/SkBitmapProcState_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] -- SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3'] -+ if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']: -+ SOURCES['skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp'].flags += ['-mssse3'] - SOURCES['skia/src/opts/SkBlitRect_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['skia/src/opts/SkBlitRow_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['skia/src/opts/SkBlurImage_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] -- SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1'] -+ if CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSE4_1']: -+ SOURCES['skia/src/opts/SkBlurImage_opts_SSE4.cpp'].flags += ['-msse4.1'] - SOURCES['skia/src/opts/SkMorphology_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['skia/src/opts/SkUtils_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] - SOURCES['skia/src/opts/SkXfermode_opts_SSE2.cpp'].flags += CONFIG['SSE2_FLAGS'] Index: www/tor-browser/browser/patches/patch-gfx_skia_skia_src_opts_SkBlitRow_opts_SSE4_h =================================================================== RCS file: www/tor-browser/browser/patches/patch-gfx_skia_skia_src_opts_SkBlitRow_opts_SSE4_h diff -N www/tor-browser/browser/patches/patch-gfx_skia_skia_src_opts_SkBlitRow_opts_SSE4_h --- www/tor-browser/browser/patches/patch-gfx_skia_skia_src_opts_SkBlitRow_opts_SSE4_h 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-gfx_skia_skia_src_opts_SkBlitRow_opts_SSE4_h,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ - -Brought over from www/firefox-esr 45.1.1 ---- gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h.orig Tue May 31 07:26:30 2016 -+++ gfx/skia/skia/src/opts/SkBlitRow_opts_SSE4.h Wed Jun 1 18:33:35 2016 -@@ -17,7 +17,8 @@ - */ - #if /* 1)*/ (defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC))) \ - /* 2)*/ && !defined(SK_BUILD_FOR_WIN) \ -- /* 3)*/ && !defined(MEMORY_SANITIZER) -+ /* 3)*/ && !defined(MEMORY_SANITIZER) \ -+ /* 4)*/ && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE41 - extern "C" void S32A_Opaque_BlitRow32_SSE4_asm(SkPMColor* SK_RESTRICT dst, - const SkPMColor* SK_RESTRICT src, - int count, U8CPU alpha); Index: www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-intl_icu_source_Makefile_in --- www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in 26 Jul 2017 17:01:44 -0000 @@ -10,9 +10,10 @@ gmake[6]: Leaving directory '/usr/obj/po Makefile:77: recipe for target 'buildicu' failed Patch taken from www/firefox-esr ---- intl/icu/source/Makefile.in.orig Tue May 31 07:26:30 2016 -+++ intl/icu/source/Makefile.in Wed Jun 1 18:33:48 2016 -@@ -333,7 +333,7 @@ $(top_builddir)/config/pkgdataMakefile: +Index: intl/icu/source/Makefile.in +--- intl/icu/source/Makefile.in.orig ++++ intl/icu/source/Makefile.in +@@ -325,7 +325,7 @@ $(top_builddir)/config/pkgdataMakefile: $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed -$(RMV) $@ 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 26 Jul 2017 17:01:44 -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/browser/patches/patch-security_nss_Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-security_nss_Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-security_nss_Makefile --- www/tor-browser/browser/patches/patch-security_nss_Makefile 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-security_nss_Makefile 26 Jul 2017 17:01:44 -0000 @@ -1,14 +1,15 @@ $OpenBSD: patch-security_nss_Makefile,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ Taken from security/nss ---- security/nss/Makefile.orig Tue May 31 07:26:30 2016 -+++ security/nss/Makefile Wed Jun 1 18:35:53 2016 +Index: security/nss/Makefile +--- security/nss/Makefile.orig ++++ security/nss/Makefile @@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### --nss_build_all: build_nspr all -+nss_build_all: all +-nss_build_all: build_nspr all latest ++nss_build_all: all latest nss_clean_all: clobber_nspr clobber Index: www/tor-browser/browser/patches/patch-security_nss_coreconf_OpenBSD_mk =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-security_nss_coreconf_OpenBSD_mk,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-security_nss_coreconf_OpenBSD_mk --- www/tor-browser/browser/patches/patch-security_nss_coreconf_OpenBSD_mk 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-security_nss_coreconf_OpenBSD_mk 26 Jul 2017 17:01:44 -0000 @@ -1,8 +1,9 @@ $OpenBSD: patch-security_nss_coreconf_OpenBSD_mk,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ Taken from security/nss ---- security/nss/coreconf/OpenBSD.mk.orig Fri Sep 11 16:39:07 2015 -+++ security/nss/coreconf/OpenBSD.mk Fri Sep 11 16:39:45 2015 +Index: security/nss/coreconf/OpenBSD.mk +--- security/nss/coreconf/OpenBSD.mk.orig ++++ security/nss/coreconf/OpenBSD.mk @@ -24,7 +24,7 @@ OS_LIBS += -pthread DSO_LDOPTS += -pthread endif @@ -10,7 +11,7 @@ Taken from security/nss -DLL_SUFFIX = so.1.0 +DLL_SUFFIX = so.${SO_VERSION} - OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DOPENBSD @@ -35,7 +35,7 @@ ARCH = openbsd DSO_CFLAGS = -fPIC -DPIC Index: www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-security_nss_lib_freebl_blapi_h --- www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h 26 Jul 2017 17:01:44 -0000 @@ -1,9 +1,10 @@ $OpenBSD: patch-security_nss_lib_freebl_blapi_h,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ Taken from security/nss ---- security/nss/lib/freebl/blapi.h.orig Fri Sep 11 16:41:51 2015 -+++ security/nss/lib/freebl/blapi.h Fri Sep 11 16:42:26 2015 -@@ -1189,6 +1189,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo +Index: security/nss/lib/freebl/blapi.h +--- security/nss/lib/freebl/blapi.h.orig ++++ security/nss/lib/freebl/blapi.h +@@ -1212,6 +1212,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo */ extern void SHA1_Begin(SHA1Context *cx); @@ -11,4 +12,4 @@ Taken from security/nss + /* ** Update the SHA-1 hash function with more data. - ** "cx" the context + ** "cx" the context Index: www/tor-browser/browser/patches/patch-storage_mozStorageConnection_cpp =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-storage_mozStorageConnection_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-storage_mozStorageConnection_cpp --- www/tor-browser/browser/patches/patch-storage_mozStorageConnection_cpp 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-storage_mozStorageConnection_cpp 26 Jul 2017 17:01:44 -0000 @@ -1,9 +1,10 @@ $OpenBSD: patch-storage_mozStorageConnection_cpp,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ Brought over from www/firefox-esr 45.1.1 ---- storage/mozStorageConnection.cpp.orig Tue May 31 07:26:30 2016 -+++ storage/mozStorageConnection.cpp Wed Jun 1 18:34:14 2016 -@@ -743,6 +743,13 @@ Connection::initializeInternal() +Index: storage/mozStorageConnection.cpp +--- storage/mozStorageConnection.cpp.orig ++++ storage/mozStorageConnection.cpp +@@ -782,6 +782,13 @@ Connection::initializeInternal() return convertResultCode(srv); } Index: www/tor-browser/browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops_h =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops_h diff -N www/tor-browser/browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops_h --- www/tor-browser/browser/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops_h 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops_h,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ - -Brought over from www/firefox-esr 45.1.1 ---- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig Tue May 31 07:26:30 2016 -+++ toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h Wed Jun 1 18:34:31 2016 -@@ -78,7 +78,11 @@ typedef intptr_t Atomic64; - - // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or - // Atomic64 routines below, depending on your architecture. -+#if defined(__OpenBSD__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT) -+typedef Atomic32 AtomicWord; -+#else - typedef intptr_t AtomicWord; -+#endif - - // Atomically execute: - // result = *ptr; Index: www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-xpcom_io_TorFileUtils_cpp --- www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 26 Jul 2017 17:01:44 -0000 @@ -1,10 +1,25 @@ $OpenBSD: patch-xpcom_io_TorFileUtils_cpp,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ -Honor the --enable-tor-data-in-home-dir configure option. Hopefully -this goes away soon c.f. https://trac.torproject.org/projects/tor/ticket/20497 ---- xpcom/io/TorFileUtils.cpp.orig Wed Sep 7 02:07:10 2016 -+++ xpcom/io/TorFileUtils.cpp Thu Sep 22 12:55:26 2016 -@@ -15,7 +15,17 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** +Autoconf is gone now so the old configure patch to add +--enable-tor-browser-data-in-home-dir will never fly. Hard-code it on +for now on OpenBSD and try to get something similar done under the new +Pyton config regime (encouraged by tbb devs on IRC). c.f. +https://trac.torproject.org/projects/tor/ticket/20557 +Index: xpcom/io/TorFileUtils.cpp +--- xpcom/io/TorFileUtils.cpp.orig ++++ xpcom/io/TorFileUtils.cpp +@@ -6,6 +6,10 @@ + + #include "TorFileUtils.h" + ++#ifdef __OpenBSD__ ++# define TOR_BROWSER_DATA_IN_HOME_DIR 1 ++#endif ++ + static nsresult GetAppRootDir(nsIFile *aExeFile, nsIFile** aFile); + + //----------------------------------------------------------------------------- +@@ -15,7 +19,17 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** NS_ENSURE_ARG_POINTER(aFile); nsCOMPtr<nsIFile> tbDataDir; Index: www/tor-browser/browser/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- www/tor-browser/browser/pkg/PLIST 14 Apr 2017 07:05:00 -0000 1.3 +++ www/tor-browser/browser/pkg/PLIST 26 Jul 2017 17:01:44 -0000 @@ -12,9 +12,6 @@ lib/${BROWSER_NAME}-${TB_VERSION}/browse 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/components/ -lib/${BROWSER_NAME}-${TB_VERSION}/browser/components/components.manifest -@lib lib/${BROWSER_NAME}-${TB_VERSION}/browser/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION} 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 @@ -22,9 +19,12 @@ lib/${BROWSER_NAME}-${TB_VERSION}/browse 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/[email protected] 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 @@ -32,9 +32,13 @@ lib/${BROWSER_NAME}-${TB_VERSION}/depend 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} @@ -54,10 +58,6 @@ lib/${BROWSER_NAME}-${TB_VERSION}/run-mo @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}-${TB_VERSION}/webapprt/ -@bin lib/${BROWSER_NAME}-${TB_VERSION}/webapprt-stub -lib/${BROWSER_NAME}-${TB_VERSION}/webapprt/omni.ja -lib/${BROWSER_NAME}-${TB_VERSION}/webapprt/webapprt.ini share/applications/${BROWSER_NAME}.desktop share/pixmaps/ @exec %D/bin/update-desktop-database Index: www/tor-browser/https-everywhere/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- www/tor-browser/https-everywhere/Makefile 11 May 2017 01:26:37 -0000 1.6 +++ www/tor-browser/https-everywhere/Makefile 26 Jul 2017 17:01:44 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2017/05/11 01:26:37 danj Exp $ ADDON_NAME = https-everywhere -V = 5.2.14 +V = 5.2.19 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.6 diff -u -p -r1.6 distinfo --- www/tor-browser/https-everywhere/distinfo 11 May 2017 01:26:37 -0000 1.6 +++ www/tor-browser/https-everywhere/distinfo 26 Jul 2017 17:01:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (https-everywhere-5.2.14-eff.xpi) = o6O9uLKeYLQ41eVD5opvgPvWs7FKd/oMHsnXlzPI5ao= -SIZE (https-everywhere-5.2.14-eff.xpi) = 2897016 +SHA256 (https-everywhere-5.2.19-eff.xpi) = oyT3rEi9N+EoL9lZztdDaY9MFMaQ7euRogh12DbNNe4= +SIZE (https-everywhere-5.2.19-eff.xpi) = 2950107 Index: www/tor-browser/noscript/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- www/tor-browser/noscript/Makefile 11 May 2017 01:26:37 -0000 1.7 +++ www/tor-browser/noscript/Makefile 26 Jul 2017 17:01:44 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.7 2017/05/11 01:26:37 danj Exp $ ADDON_NAME = noscript -V = 5.0.2 +V = 5.0.5 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.4 diff -u -p -r1.4 distinfo --- www/tor-browser/noscript/distinfo 11 May 2017 01:26:37 -0000 1.4 +++ www/tor-browser/noscript/distinfo 26 Jul 2017 17:01:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (noscript-5.0.2.xpi) = Mbp3Q2md7vtga8xJGX0m2Sb2tOPTUmzS+KM5+FegT7E= -SIZE (noscript-5.0.2.xpi) = 557292 +SHA256 (noscript-5.0.5.xpi) = vx3uOfblk23ysDt5TB78kja0QFNqBfr8/2Z+M5A+au0= +SIZE (noscript-5.0.5.xpi) = 557812 Index: www/tor-browser/tor-launcher/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- www/tor-browser/tor-launcher/Makefile 11 May 2017 01:26:37 -0000 1.6 +++ www/tor-browser/tor-launcher/Makefile 26 Jul 2017 17:01:44 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2017/05/11 01:26:37 danj Exp $ ADDON_NAME = tor-launcher -V = 0.2.10.3 -REVISION = 1 +V = 0.2.12.2 COMMENT = Tor Browser add-on to manage tor instance GUID = [email protected] PKGNAME = ${TB_NAME} Index: www/tor-browser/tor-launcher/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- www/tor-browser/tor-launcher/distinfo 31 Jan 2017 13:48:18 -0000 1.3 +++ www/tor-browser/tor-launcher/distinfo 26 Jul 2017 17:01:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (tor-launcher-0.2.10.3.tar.gz) = IWp8XF1GfVUS091YIvDTuA4IVIN5Ec5AmXOZWHtJKIQ= -SIZE (tor-launcher-0.2.10.3.tar.gz) = 268062 +SHA256 (tor-launcher-0.2.12.2.tar.gz) = JikaYVmE767eDgQVKP/zOpPZq1R/h1A3bYRm+i1J4ko= +SIZE (tor-launcher-0.2.12.2.tar.gz) = 280078 Index: www/tor-browser/tor-launcher/files/torrc-defaults =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/files/torrc-defaults,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 torrc-defaults --- www/tor-browser/tor-launcher/files/torrc-defaults 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/tor-launcher/files/torrc-defaults 26 Jul 2017 17:01:44 -0000 @@ -5,8 +5,9 @@ AvoidDiskWrites 1 Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9150 -ControlPort 9151 +## XXX I think these two directives are actually screwing us over: +#SocksPort 9150 +#ControlPort 9151 CookieAuthentication 1 GeoIPFile ${LOCALBASE}/share/tor/geoip GeoIPv6File ${LOCALBASE}/share/tor/geoip6 Index: www/tor-browser/tor-launcher/patches/patch-src_components_tl-process_js =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/patches/patch-src_components_tl-process_js,v retrieving revision 1.2 diff -u -p -r1.2 patch-src_components_tl-process_js --- www/tor-browser/tor-launcher/patches/patch-src_components_tl-process_js 2 Dec 2016 08:18:19 -0000 1.2 +++ www/tor-browser/tor-launcher/patches/patch-src_components_tl-process_js 26 Jul 2017 17:01:44 -0000 @@ -1,35 +1,27 @@ $OpenBSD: patch-src_components_tl-process_js,v 1.2 2016/12/02 08:18:19 landry Exp $ -Let geoip/geoip6 file paths be set by prefs like everything else. Go -back to old way of munging relative paths, their new way is -effectively a no-op for us anyway. ---- src/components/tl-process.js.orig Wed Nov 9 04:55:57 2016 -+++ src/components/tl-process.js Fri Nov 18 17:04:27 2016 -@@ -309,6 +309,7 @@ TorProcessService.prototype = - mIsQuitting: false, - mObsSvc: null, - mProtocolSvc: null, -+ mTorFileBaseDir: null, - mTorProcess: null, // nsIProcess - mTorProcessStartTime: null, // JS Date.now() - // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used. -@@ -341,6 +342,8 @@ TorProcessService.prototype = - var exeFile = this._getTorFile("tor", false); - var torrcFile = this._getTorFile("torrc", true); - var torrcDefaultsFile = this._getTorFile("torrc-defaults", false); -+ var geoipFile = this._getTorFile("geoip", false); -+ var geoip6File = this._getTorFile("geoip6", false); +Let geoip/geoip6 file paths be set by prefs like everything else and let +the new getTorFile() deal with it. +Index: src/components/tl-process.js +--- src/components/tl-process.js.orig ++++ src/components/tl-process.js +@@ -345,6 +345,8 @@ TorProcessService.prototype = + var torrcFile = TorLauncherUtil.getTorFile("torrc", true); + var torrcDefaultsFile = + TorLauncherUtil.getTorFile("torrc-defaults", false); ++ var geoipFile = TorLauncherUtil.getTorFile("geoip", false); ++ var geoip6File = TorLauncherUtil.getTorFile("geoip6", false); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); - - var detailsKey; -@@ -364,18 +367,12 @@ TorProcessService.prototype = + var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile(); + var controlPort = this.mProtocolSvc.TorGetControlPort(); +@@ -370,19 +372,14 @@ TorProcessService.prototype = + return; } - - // The geoip and geoip6 files are in the same directory as torrc-defaults. - var geoipFile = torrcDefaultsFile.clone(); - geoipFile.leafName = "geoip"; -- + - var geoip6File = torrcDefaultsFile.clone(); - geoip6File.leafName = "geoip6"; - @@ -38,51 +30,8 @@ effectively a no-op for us anyway. { args.push("--defaults-torrc"); args.push(torrcDefaultsFile.path); -+ args.push("--ignore-missing-torrc"); } ++ args.push("--ignore-missing-torrc"); args.push("-f"); args.push(torrcFile.path); -@@ -684,10 +681,10 @@ TorProcessService.prototype = - return null; - - let isRelativePath = true; -- let isUserData = (aTorFileType != "tor") && -- (aTorFileType != "torrc-defaults"); - let prefName = "extensions.torlauncher." + aTorFileType + "_path"; - let path = TorLauncherUtil.getCharPref(prefName); -+ // N.B. On OpenBSD, path will always be set via prefs.js -+ TorLauncherLogger.log(4, "_getTorFile("+aTorFileType+ ") "+prefName+" = "+path); - if (path) - { - let re = (TorLauncherUtil.isWindows) ? /^[A-Za-z]:\\/ : /^\//; -@@ -768,16 +765,13 @@ TorProcessService.prototype = - if (isRelativePath) - { - // Turn 'path' into an absolute path. -- if (this._isUserDataOutsideOfAppDir) -+ if (!this.mTorFileBaseDir) - { -- let baseDir = isUserData ? this._dataDir : this._appDir; -- f = baseDir.clone(); -+ this.mTorFileBaseDir = Cc["@mozilla.org/file/directory_service;1"] -+ .getService(Ci.nsIProperties) -+ .get("DefProfRt", Ci.nsIFile); - } -- else -- { -- f = this._appDir.clone(); -- f.append("TorBrowser"); -- } -+ f = this.mTorFileBaseDir.clone(); - f.appendRelativePath(path); - } - else -@@ -805,6 +799,8 @@ TorProcessService.prototype = - if (f.exists()) - { - try { f.normalize(); } catch(e) {} -+ -+ TorLauncherLogger.log(5,"_getTorFile: "+aTorFileType+" => "+f.path); - - return f; - } + args.push("DataDirectory"); Index: www/tor-browser/tor-launcher/patches/patch-src_defaults_preferences_prefs_js =================================================================== RCS file: /cvs/ports/www/tor-browser/tor-launcher/patches/patch-src_defaults_preferences_prefs_js,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_defaults_preferences_prefs_js --- www/tor-browser/tor-launcher/patches/patch-src_defaults_preferences_prefs_js 13 Nov 2016 21:15:43 -0000 1.1.1.1 +++ www/tor-browser/tor-launcher/patches/patch-src_defaults_preferences_prefs_js 26 Jul 2017 17:01:44 -0000 @@ -1,9 +1,10 @@ $OpenBSD: patch-src_defaults_preferences_prefs_js,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $ -Set all path-related prefs to minimize patching of tl-process.js ---- src/defaults/preferences/prefs.js.orig Tue May 24 16:33:24 2016 -+++ src/defaults/preferences/prefs.js Wed Sep 7 16:33:18 2016 -@@ -11,14 +11,17 @@ pref("extensions.torlauncher.prompt_at_startup", true) +Set all path-related prefs to minimize patching of tl-util.jsm/tl-process.js +Index: src/defaults/preferences/prefs.js +--- src/defaults/preferences/prefs.js.orig ++++ src/defaults/preferences/prefs.js +@@ -36,14 +36,17 @@ pref("extensions.torlauncher.socks_port_flags", "IPv6T // The tor_path is relative to the application directory. On Linux and // Windows this is the Browser/ directory that contains the firefox // executables, and on Mac OS it is the TorBrowser.app directory. 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 26 Jul 2017 17:01:44 -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.6 diff -u -p -r1.6 Makefile --- www/tor-browser/torbutton/Makefile 11 May 2017 01:26:37 -0000 1.6 +++ www/tor-browser/torbutton/Makefile 26 Jul 2017 17:01:44 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.6 2017/05/11 01:26:37 danj Exp $ ADDON_NAME = torbutton -V = 1.9.6.14 -REVISION = 0 +V = 1.9.7.4 COMMENT = Tor Browser add-on for configuring Tor Browser settings GUID = [email protected] PKGNAME = ${TB_NAME} Index: www/tor-browser/torbutton/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/torbutton/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- www/tor-browser/torbutton/distinfo 12 Apr 2017 18:46:52 -0000 1.5 +++ www/tor-browser/torbutton/distinfo 26 Jul 2017 17:01:44 -0000 @@ -1,2 +1,2 @@ -SHA256 (torbutton-1.9.6.14.tar.gz) = A1tF2RZr4Lj4CghtD4CGzr2wXPNLrV9uAxNia8yZ7Wc= -SIZE (torbutton-1.9.6.14.tar.gz) = 601034 +SHA256 (torbutton-1.9.7.4.tar.gz) = HKANGqJuzAghxrjTqvdhfzzmvY40CQlOyol927bDE/4= +SIZE (torbutton-1.9.7.4.tar.gz) = 595397
