Solene Rapenne:
> I propose applying the following www/tor-browser update on 6.5-stable
> (it's the exact same patch than on current)
>
> tor-browser on 6.5 has the same bug that hit firefox last month,
> extensions are disabled.
Yes, but Tor Browser 8.0.9 is now deprecated, and 8.5.1 is the current one.
https://blog.torproject.org/new-release-tor-browser-851
g
>
> Tested, works well.
>
>
> Index: ports/www/tor-browser/Makefile.inc
> diff -u ports/www/tor-browser/Makefile.inc:1.15
> ports/www/tor-browser/Makefile.inc:1.17
> --- ports/www/tor-browser/Makefile.inc:1.15 Sat Oct 6 00:02:12 2018
> +++ ports/www/tor-browser/Makefile.inc Thu May 9 08:31:17 2019
> @@ -1,4 +1,4 @@
> -# $OpenBSD: Makefile.inc,v 1.15 2018/10/05 22:02:12 sthen Exp $
> +# $OpenBSD: Makefile.inc,v 1.17 2019/05/09 06:31:17 landry Exp $
>
> MAINTAINER ?= Sean Levy <att...@stalphonsos.com>
> HOMEPAGE ?= https://www.torproject.org
> @@ -6,7 +6,7 @@
> PERMIT_PACKAGE_CDROM ?= Yes
> CATEGORIES = www
> BROWSER_NAME = tor-browser
> -TB_VERSION = 8.0.2
> +TB_VERSION = 8.0.9
> TB_PREFIX = tb
>
> SUBST_VARS += BROWSER_NAME TB_VERSION
> Index: ports/www/tor-browser/browser/Makefile
> diff -u ports/www/tor-browser/browser/Makefile:1.31
> ports/www/tor-browser/browser/Makefile:1.32
> --- ports/www/tor-browser/browser/Makefile:1.31 Mon Mar 11 20:04:38 2019
> +++ ports/www/tor-browser/browser/Makefile Wed May 1 19:36:30 2019
> @@ -1,4 +1,4 @@
> -# $OpenBSD: Makefile,v 1.31 2019/03/11 19:04:38 semarie Exp $
> +# $OpenBSD: Makefile,v 1.32 2019/05/01 17:36:30 landry Exp $
> # Some of this comes from www/firefox-esr as apropos, since Tor
> # browser is a fork of ESR. It is a good idea to look at that
> # Makefile when editing this one (ESR versions not always the same).
> @@ -9,7 +9,6 @@
> MOZILLA_VERSION = ${TB_VERSION}
> MOZILLA_PROJECT = ${BROWSER_NAME}
> MOZILLA_CODENAME = browser
> -REVISION = 0
>
> EXTRACT_SUFX = .tar.gz
> PATCHORIG = .pat.orig
> @@ -17,7 +16,7 @@
> PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
> DISTNAME = ${BROWSER_NAME}-${TB_VERSION}
>
> -SO_VERSION = 3.0
> +SO_VERSION = 4.0
> MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil
> mozgtk
> MOZILLA_LIBS += freebl3 nss3 nssckbi nssdbm3
> MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3
> Index: ports/www/tor-browser/browser/distinfo
> diff -u ports/www/tor-browser/browser/distinfo:1.14
> ports/www/tor-browser/browser/distinfo:1.16
> --- ports/www/tor-browser/browser/distinfo:1.14 Sat Oct 6 00:02:12 2018
> +++ ports/www/tor-browser/browser/distinfo Thu May 9 08:31:17 2019
> @@ -1,2 +1,2 @@
> -SHA256 (mozilla/tor-browser-8.0.2.tar.gz) =
> 0jsZDX8VhqhTF4ZHPaCXgqnZWzDS1QHIY0LncLuuYks=
> -SIZE (mozilla/tor-browser-8.0.2.tar.gz) = 385480115
> +SHA256 (mozilla/tor-browser-8.0.9.tar.gz) =
> B2YOSrwnXSihuHRczush6oYeo9LPFSJGNqoTlE3cmAI=
> +SIZE (mozilla/tor-browser-8.0.9.tar.gz) = 387604509
> Index:
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
> diff -u
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure:1.2
>
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure:removed
> ---
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure:1.2
> Wed Oct 3 16:55:36 2018
> +++
> ports/www/tor-browser/browser/patches/patch-build_moz_configure_init_configure
> Fri Jun 14 22:56:32 2019
> @@ -1,24 +0,0 @@
> -$OpenBSD: patch-build_moz_configure_init_configure,v 1.2 2018/10/03 14:55:36
> sthen 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
> -@@ -577,7 +577,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: ports/www/tor-browser/https-everywhere/Makefile
> diff -u ports/www/tor-browser/https-everywhere/Makefile:1.13
> ports/www/tor-browser/https-everywhere/Makefile:1.15
> --- ports/www/tor-browser/https-everywhere/Makefile:1.13 Fri Sep 28
> 16:54:26 2018
> +++ ports/www/tor-browser/https-everywhere/Makefile Thu May 9 08:31:17 2019
> @@ -1,7 +1,8 @@
> -# $OpenBSD: Makefile,v 1.13 2018/09/28 14:54:26 sthen Exp $
> +# $OpenBSD: Makefile,v 1.15 2019/05/09 06:31:17 landry Exp $
>
> ADDON_NAME = https-everywhere
> -V = 2018.8.22
> +V = 2019.1.31
> +REVISION = 0
> COMMENT = Tor Browser add-on: force https where possible
> HOMEPAGE = https://www.eff.org/https-everywhere
> MASTER_SITES = https://www.eff.org/files/
> Index: ports/www/tor-browser/https-everywhere/distinfo
> diff -u ports/www/tor-browser/https-everywhere/distinfo:1.13
> ports/www/tor-browser/https-everywhere/distinfo:1.14
> --- ports/www/tor-browser/https-everywhere/distinfo:1.13 Fri Sep 28
> 16:54:26 2018
> +++ ports/www/tor-browser/https-everywhere/distinfo Wed May 1 19:36:30 2019
> @@ -1,2 +1,2 @@
> -SHA256 (https-everywhere-2018.8.22-eff.xpi) =
> s3uN3IceU56XB1t66VVcB2ADpRs4l3a8Kkcp4/E2kM4=
> -SIZE (https-everywhere-2018.8.22-eff.xpi) = 1714626
> +SHA256 (https-everywhere-2019.1.31-eff.xpi) =
> UCLTSyny0DAvHSWJPwK8yiGxykJHlM/GROJvfGXERiA=
> +SIZE (https-everywhere-2019.1.31-eff.xpi) = 1765652
> Index: ports/www/tor-browser/noscript/Makefile
> diff -u ports/www/tor-browser/noscript/Makefile:1.14
> ports/www/tor-browser/noscript/Makefile:1.16
> --- ports/www/tor-browser/noscript/Makefile:1.14 Fri Sep 28 16:54:26 2018
> +++ ports/www/tor-browser/noscript/Makefile Thu May 9 08:31:17 2019
> @@ -1,7 +1,7 @@
> -# $OpenBSD: Makefile,v 1.14 2018/09/28 14:54:26 sthen Exp $
> +# $OpenBSD: Makefile,v 1.16 2019/05/09 06:31:17 landry Exp $
>
> ADDON_NAME = noscript
> -V = 10.1.9.6
> +V = 10.6.1
> COMMENT = Tor Browser add-on: flexible JS blocker
> HOMEPAGE = http://noscript.net
> MASTER_SITES =
> https://secure.informaction.com/download/releases/
> Index: ports/www/tor-browser/noscript/distinfo
> diff -u ports/www/tor-browser/noscript/distinfo:1.11
> ports/www/tor-browser/noscript/distinfo:1.13
> --- ports/www/tor-browser/noscript/distinfo:1.11 Fri Sep 28 16:54:26 2018
> +++ ports/www/tor-browser/noscript/distinfo Thu May 9 08:31:17 2019
> @@ -1,2 +1,2 @@
> -SHA256 (noscript-10.1.9.6.xpi) = M2ribQpwaI5sKzwUJnyegPUvbzbDHyO4JC4O2uNmbUI=
> -SIZE (noscript-10.1.9.6.xpi) = 457297
> +SHA256 (noscript-10.6.1.xpi) = sVBH0ARdEvKLLh5ES9uGgAJXtcpsyPTIAisgxVDNlyc=
> +SIZE (noscript-10.6.1.xpi) = 519725
> Index: ports/www/tor-browser/tor-launcher/Makefile
> diff -u ports/www/tor-browser/tor-launcher/Makefile:1.13
> ports/www/tor-browser/tor-launcher/Makefile:1.15
> --- ports/www/tor-browser/tor-launcher/Makefile:1.13 Fri Sep 28 16:54:26 2018
> +++ ports/www/tor-browser/tor-launcher/Makefile Thu May 9 08:31:17 2019
> @@ -1,7 +1,8 @@
> -# $OpenBSD: Makefile,v 1.13 2018/09/28 14:54:26 sthen Exp $
> +# $OpenBSD: Makefile,v 1.15 2019/05/09 06:31:17 landry Exp $
>
> ADDON_NAME = tor-launcher
> V = 0.2.16.6
> +REVISION = 1
> COMMENT = Tor Browser add-on to manage tor instance
> GUID = tor-launc...@torproject.org
> PKGNAME = ${TB_NAME}
> Index: ports/www/tor-browser/tor-launcher/patches/patch-Makefile
> diff -u ports/www/tor-browser/tor-launcher/patches/patch-Makefile:1.1.1.1
> ports/www/tor-browser/tor-launcher/patches/patch-Makefile:removed
> --- ports/www/tor-browser/tor-launcher/patches/patch-Makefile:1.1.1.1 Sun Nov
> 13 22:15:43 2016
> +++ ports/www/tor-browser/tor-launcher/patches/patch-Makefile Fri Jun 14
> 22:56:32 2019
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2016/11/13 21:15:43 landry Exp $
> ---- Makefile.orig Wed Mar 18 15:08:01 2015
> -+++ Makefile Wed Mar 18 15:06:38 2015
> -@@ -27,7 +27,7 @@ help:
> - pkg-prepare: clean
> - @mkdir -p pkg
> - $(eval TMP="$(shell mktemp -d "/tmp/$(EXT_NAME).XXXXXX")")
> -- @cp -a "src" "$(TMP)/$(EXT_NAME)"
> -+ @cp -R "src" "$(TMP)/$(EXT_NAME)"
> - @if [ -n "$(TL_LOGO)" ]; then \
> - if [ "$(TL_LOGO)" = "-" ]; then \
> - rm "$(TMP)/$(EXT_NAME)/chrome/skin/tbb-logo.png"; \
> -@@ -35,7 +35,7 @@ pkg-prepare: clean
> - cp -p "$(TL_LOGO)"
> "$(TMP)/$(EXT_NAME)/chrome/skin/tbb-logo.png"; \
> - fi \
> - fi
> -- @cp -a chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest
> -+ @cp chrome.manifest.in "$(TMP)/$(EXT_NAME)"/chrome.manifest
> - @mv "$(TMP)/$(EXT_NAME)"/chrome/locale/en \
> - "$(TMP)/$(EXT_NAME)"/chrome/locale/en-US
> - @for d in "$(TMP)/$(EXT_NAME)"/chrome/locale/*; do \
> Index: ports/www/tor-browser/torbutton/Makefile
> diff -u ports/www/tor-browser/torbutton/Makefile:1.13
> ports/www/tor-browser/torbutton/Makefile:1.15
> --- ports/www/tor-browser/torbutton/Makefile:1.13 Fri Sep 28 16:54:26 2018
> +++ ports/www/tor-browser/torbutton/Makefile Thu May 9 08:31:18 2019
> @@ -1,7 +1,7 @@
> -# $OpenBSD: Makefile,v 1.13 2018/09/28 14:54:26 sthen Exp $
> +# $OpenBSD: Makefile,v 1.15 2019/05/09 06:31:18 landry Exp $
>
> ADDON_NAME = torbutton
> -V = 2.0.7
> +V = 2.0.13
> COMMENT = Tor Browser add-on for configuring Tor Browser settings
> GUID = torbut...@torproject.org
> PKGNAME = ${TB_NAME}
> Index: ports/www/tor-browser/torbutton/distinfo
> diff -u ports/www/tor-browser/torbutton/distinfo:1.12
> ports/www/tor-browser/torbutton/distinfo:1.14
> --- ports/www/tor-browser/torbutton/distinfo:1.12 Fri Sep 28 16:54:26 2018
> +++ ports/www/tor-browser/torbutton/distinfo Thu May 9 08:31:18 2019
> @@ -1,2 +1,2 @@
> -SHA256 (torbutton-2.0.7.tar.gz) =
> 40cmYCfVPmE4ZKPFCgmqS3hoP5EyrrPT7AbUYFlb40w=
> -SIZE (torbutton-2.0.7.tar.gz) = 645298
> +SHA256 (torbutton-2.0.13.tar.gz) =
> g5tTfy3LpE7MekZeCVZ8/4a6DDZs/nb4aIJzQMq8DR0=
> +SIZE (torbutton-2.0.13.tar.gz) = 669174
>
