Hi ports@,
The attached patch brings us up to Tor Browser 6.5. It requires the
net/tor patch to run since we have to r-dep on net/tor>=0.2.9.9 to
remain true to upstream:
https://marc.info/?l=openbsd-ports&m=148562136724885&w=2
Tested on amd64.
Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D 09C1 4068 D5D5 62A7 29CF
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.inc
--- www/tor-browser/Makefile.inc 24 Dec 2016 20:15:05 -0000 1.3
+++ www/tor-browser/Makefile.inc 26 Jan 2017 22:40:05 -0000
@@ -6,7 +6,7 @@ GH_ACCOUNT ?= torbsd
PERMIT_PACKAGE_CDROM ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 6.0.8
+TB_VERSION = 6.5
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.4
diff -u -p -r1.4 Makefile
--- www/tor-browser/browser/Makefile 24 Jan 2017 21:27:28 -0000 1.4
+++ www/tor-browser/browser/Makefile 26 Jan 2017 22:40:05 -0000
@@ -15,11 +15,10 @@ DIST_SUBDIR = ${BROWSER_NAME}
WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
GH_PROJECT = torb
-GH_TAGNAME = v${TB_VERSION}-esr45.6.0
+GH_TAGNAME = v${TB_VERSION}-esr45.7.0
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
DISTNAME = ${GH_TAGNAME}
-REVISION = 0
SO_VERSION = 1.0
MOZILLA_LIBS = browsercomps xul lgpllibs
@@ -81,7 +80,7 @@ WANTLIB += icudata icui18n icuuc
CONFIGURE_ARGS += --disable-gstreamer
-RUN_DEPENDS += net/tor>=0.2.8.7
+RUN_DEPENDS += net/tor>=0.2.9.9
# bug 857628
CONFIGURE_ARGS += --enable-pie
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- www/tor-browser/browser/distinfo 24 Dec 2016 20:15:06 -0000 1.3
+++ www/tor-browser/browser/distinfo 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (tor-browser/v6.0.8-esr45.6.0.tar.gz) = btCnk5yi1YoQ1YA+o5VwFRHjpM9yF/mmE8YvuSAVwzY=
-SIZE (tor-browser/v6.0.8-esr45.6.0.tar.gz) = 256614669
+SHA256 (tor-browser/v6.5-esr45.7.0.tar.gz) = RIKh9Ura08i7pYMfz1mjNZn50kAetrnpmOBppzGvXcM=
+SIZE (tor-browser/v6.5-esr45.7.0.tar.gz) = 256763405
Index: www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp
===================================================================
RCS file: www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp
diff -N www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp
--- www/tor-browser/browser/patches/patch-js_src_jit_ExecutableAllocator_cpp 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-js_src_jit_ExecutableAllocator_cpp,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-
-Brought over from www/firefox-esr 45.1.1
---- js/src/jit/ExecutableAllocator.cpp.orig Tue May 31 07:26:30 2016
-+++ js/src/jit/ExecutableAllocator.cpp Wed Jun 1 18:34:00 2016
-@@ -88,7 +88,7 @@ ExecutableAllocator::addSizeOfCode(JS::CodeSizes* size
- }
- }
-
--#if TARGET_OS_IPHONE
-+#if defined(__OpenBSD__) || TARGET_OS_IPHONE
- bool ExecutableAllocator::nonWritableJitCode = true;
- #else
- bool ExecutableAllocator::nonWritableJitCode = false;
Index: www/tor-browser/https-everywhere/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- www/tor-browser/https-everywhere/Makefile 24 Dec 2016 20:15:06 -0000 1.3
+++ www/tor-browser/https-everywhere/Makefile 26 Jan 2017 22:40:05 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2016/12/24 20:15:06 landry Exp $
ADDON_NAME = https-everywhere
-V = 5.2.8
+V = 5.2.9
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.3
diff -u -p -r1.3 distinfo
--- www/tor-browser/https-everywhere/distinfo 24 Dec 2016 20:15:06 -0000 1.3
+++ www/tor-browser/https-everywhere/distinfo 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (https-everywhere-5.2.8-eff.xpi) = rfmyjpeI2lsmQnAmmzZJrfRDfD1wgxGsMpx7pqoMnzo=
-SIZE (https-everywhere-5.2.8-eff.xpi) = 2795089
+SHA256 (https-everywhere-5.2.9-eff.xpi) = xygcUliVA0oSXDTRF6S8h5xPuq9lpjrfVCrRBWjaPJQ=
+SIZE (https-everywhere-5.2.9-eff.xpi) = 2798649
Index: www/tor-browser/https-everywhere/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- www/tor-browser/https-everywhere/pkg/PLIST 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ www/tor-browser/https-everywhere/pkg/PLIST 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
+lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/${GUID}.xpi
Index: www/tor-browser/noscript/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- www/tor-browser/noscript/Makefile 25 Dec 2016 08:44:41 -0000 1.4
+++ www/tor-browser/noscript/Makefile 26 Jan 2017 22:40:05 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2016/12/25 08:44:41 landry Exp $
ADDON_NAME = noscript
-V = 2.9.5.2
-REVISION = 0
+V = 2.9.5.3
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.2
diff -u -p -r1.2 distinfo
--- www/tor-browser/noscript/distinfo 2 Dec 2016 08:18:19 -0000 1.2
+++ www/tor-browser/noscript/distinfo 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-2.9.5.2.xpi) = 7XHKkieQ6BvF6Maoe7gfOUo4Z2rDfR+6UYpqQo0SjdU=
-SIZE (noscript-2.9.5.2.xpi) = 555628
+SHA256 (noscript-2.9.5.3.xpi) = zpd5o6WiV0uVj45NB5qZ1DqPhBk771LFh8cE7YHC+70=
+SIZE (noscript-2.9.5.3.xpi) = 555119
Index: www/tor-browser/noscript/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- www/tor-browser/noscript/pkg/PLIST 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ www/tor-browser/noscript/pkg/PLIST 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
+lib/${BROWSER_NAME}-${TB_VERSION}/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.3
diff -u -p -r1.3 Makefile
--- www/tor-browser/tor-launcher/Makefile 25 Dec 2016 08:44:41 -0000 1.3
+++ www/tor-browser/tor-launcher/Makefile 26 Jan 2017 22:40:05 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2016/12/25 08:44:41 landry Exp $
ADDON_NAME = tor-launcher
-V = 0.2.9.4
-REVISION = 0
+V = 0.2.10.3
COMMENT = Tor Browser add-on to manage tor instance
GUID = tor-launc...@torproject.org
PKGNAME = ${TB_NAME}
Index: www/tor-browser/tor-launcher/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/tor-launcher/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- www/tor-browser/tor-launcher/distinfo 2 Dec 2016 08:18:19 -0000 1.2
+++ www/tor-browser/tor-launcher/distinfo 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (tor-launcher-0.2.9.4.tar.gz) = XhMm07QNwEvqBBgVHdxbQiy8kJc+kpS3jWFI5w+8ryE=
-SIZE (tor-launcher-0.2.9.4.tar.gz) = 253980
+SHA256 (tor-launcher-0.2.10.3.tar.gz) = IWp8XF1GfVUS091YIvDTuA4IVIN5Ec5AmXOZWHtJKIQ=
+SIZE (tor-launcher-0.2.10.3.tar.gz) = 268062
Index: www/tor-browser/tor-launcher/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/tor-launcher/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- www/tor-browser/tor-launcher/pkg/PLIST 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ www/tor-browser/tor-launcher/pkg/PLIST 26 Jan 2017 22:40:05 -0000
@@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
+lib/${BROWSER_NAME}-${TB_VERSION}/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.3
diff -u -p -r1.3 Makefile
--- www/tor-browser/torbutton/Makefile 24 Dec 2016 20:15:06 -0000 1.3
+++ www/tor-browser/torbutton/Makefile 26 Jan 2017 22:40:05 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.3 2016/12/24 20:15:06 landry Exp $
ADDON_NAME = torbutton
-V = 1.9.5.13
+V = 1.9.6.12
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.3
diff -u -p -r1.3 distinfo
--- www/tor-browser/torbutton/distinfo 24 Dec 2016 20:15:06 -0000 1.3
+++ www/tor-browser/torbutton/distinfo 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (torbutton-1.9.5.13.tar.gz) = GYsCDnd3dGIIcxomGWnZQLjimLQ+IcXIuxrQpnQ04XY=
-SIZE (torbutton-1.9.5.13.tar.gz) = 893548
+SHA256 (torbutton-1.9.6.12.tar.gz) = c2xlZ8lyePGIpiufWcL0lAe9D+H2o3eArGgGELyWfpU=
+SIZE (torbutton-1.9.6.12.tar.gz) = 600920
Index: www/tor-browser/torbutton/patches/patch-src_chrome_content_popup_xul
===================================================================
RCS file: /cvs/ports/www/tor-browser/torbutton/patches/patch-src_chrome_content_popup_xul,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_chrome_content_popup_xul
--- www/tor-browser/torbutton/patches/patch-src_chrome_content_popup_xul 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ www/tor-browser/torbutton/patches/patch-src_chrome_content_popup_xul 26 Jan 2017 22:40:05 -0000
@@ -2,13 +2,13 @@ $OpenBSD: patch-src_chrome_content_popup
Get rid of "Check for Tor Browser Updates" button in UI since it can't
do anything useful right now.
---- src/chrome/content/popup.xul.orig Thu Jun 23 13:23:51 2016
-+++ src/chrome/content/popup.xul Thu Jun 23 13:24:12 2016
+--- src/chrome/content/popup.xul.orig Thu Jan 19 16:30:45 2017
++++ src/chrome/content/popup.xul Thu Jan 26 17:27:10 2017
@@ -44,12 +44,6 @@
label="&torbutton.context_menu.networksettings;"
accesskey="&torbutton.context_menu.networksettings.key;"
oncommand="torbutton_open_network_settings()"/>
-- <menuseparator/>
+- <menuseparator id="torbutton-checkForUpdateSeparator"/>
- <menuitem id="torbutton-checkForUpdate"
- label="&torbutton.context_menu.downloadUpdate;"
- accesskey="&torbutton.context_menu.downloadUpdate.key;"
Index: www/tor-browser/torbutton/patches/patch-src_defaults_preferences_preferences_js
===================================================================
RCS file: www/tor-browser/torbutton/patches/patch-src_defaults_preferences_preferences_js
diff -N www/tor-browser/torbutton/patches/patch-src_defaults_preferences_preferences_js
--- www/tor-browser/torbutton/patches/patch-src_defaults_preferences_preferences_js 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_defaults_preferences_preferences_js,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-
-Turn on no_updates.
---- src/defaults/preferences/preferences.js.orig Wed Sep 7 02:13:55 2016
-+++ src/defaults/preferences/preferences.js Thu Sep 22 15:29:01 2016
-@@ -133,7 +133,7 @@ pref("extensions.torbutton.block_thread",true);
- pref("extensions.torbutton.block_thwrite",true);
- pref("extensions.torbutton.block_nthread",false);
- pref("extensions.torbutton.block_nthwrite",false);
--pref("extensions.torbutton.no_updates",false);
-+pref("extensions.torbutton.no_updates",true);
- pref("extensions.torbutton.isolate_content",true);
- pref("extensions.torbutton.no_search",true);
- pref("extensions.torbutton.set_uagent",true);
Index: www/tor-browser/torbutton/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/torbutton/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- www/tor-browser/torbutton/pkg/PLIST 13 Nov 2016 21:15:43 -0000 1.1.1.1
+++ www/tor-browser/torbutton/pkg/PLIST 26 Jan 2017 22:40:05 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
-${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi
+lib/${BROWSER_NAME}-${TB_VERSION}/browser/extensions/${GUID}.xpi
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- meta/tor-browser/Makefile 24 Dec 2016 20:15:06 -0000 1.3
+++ meta/tor-browser/Makefile 26 Jan 2017 22:40:05 -0000
@@ -4,7 +4,7 @@ COMMENT= Tor Browser meta package
MAINTAINER= Sean Levy <att...@stalphonsos.com>
-PKGNAME= tor-browser-6.0.8
+PKGNAME= tor-browser-6.5
RUN_DEPENDS= www/tor-browser/browser \
www/tor-browser/torbutton \
