UPDATE: Tor Browser 9.0.8

Hi,

Below is a patch that updates Tor Browser to 9.0.8. Briefly tested on
amd64. It follows the new release of Firefox ESR. Release announcement:
https://blog.torproject.org/new-release-tor-browser-908

I thought the name of the distfile is a bit odd
(src-firefox-tor-browser-68.6.0esr-9.0-1-build3, it says "68.6.0"
instead of "68.6.1") but I verified that the two patches from Mozilla
are present.

The update of HTTPS Everywhere was supposed to be part of 9.0.7 but I
missed that part because they added it to the changelog after I sent
the diff to ports@. So that is included now as well.

Thanks,
Caspar Schutijser


Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- meta/tor-browser/Makefile 25 Mar 2020 07:32:47 -0000 1.22
+++ meta/tor-browser/Makefile 5 Apr 2020 15:23:35 -0000
@@ -4,12 +4,12 @@ COMMENT= Tor Browser meta package

MAINTAINER= Caspar Schutijser <caspar@schutijser.com>

-PKGNAME= tor-browser-9.0.7
+PKGNAME= tor-browser-9.0.8
ONLY_FOR_ARCHS = amd64 i386

-RUN_DEPENDS= www/tor-browser/browser>=9.0.7 \
+RUN_DEPENDS= www/tor-browser/browser>=9.0.8 \
www/tor-browser/noscript>=11.0.19 \
- www/tor-browser/https-everywhere>=2019.11.7 \
+ www/tor-browser/https-everywhere>=2020.3.16 \
net/tor>=0.4.2.7

.include <bsd.port.mk>
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.inc
--- www/tor-browser/Makefile.inc 25 Mar 2020 07:32:47 -0000 1.22
+++ www/tor-browser/Makefile.inc 5 Apr 2020 15:23:35 -0000
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 9.0.7
+TB_VERSION = 9.0.8
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.41
diff -u -p -r1.41 Makefile
--- www/tor-browser/browser/Makefile 25 Mar 2020 07:32:47 -0000 1.41
+++ www/tor-browser/browser/Makefile 5 Apr 2020 15:23:35 -0000
@@ -15,7 +15,7 @@ EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig

PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-68.6.0esr-9.0-1-build2
+DISTNAME = src-firefox-tor-browser-68.6.0esr-9.0-1-build3

DISTFILES += ${DISTNAME}.tar.xz \
src-tor-launcher-${TL_VERSION}.tar.xz
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- www/tor-browser/browser/distinfo 25 Mar 2020 07:32:47 -0000 1.20
+++ www/tor-browser/browser/distinfo 5 Apr 2020 15:23:35 -0000
@@ -1,4 +1,4 @@
-SHA256 (mozilla/src-firefox-tor-browser-68.6.0esr-9.0-1-build2.tar.xz) = ZDgE2wnV1yte5ElCFrtk9Y4eS560X43mV28N3OFLWwU=
+SHA256 (mozilla/src-firefox-tor-browser-68.6.0esr-9.0-1-build3.tar.xz) = b8Ey9NSGKN9nMnsafelro0piBwSa1aPkJOk3Ut2HLgA=
SHA256 (mozilla/src-tor-launcher-0.2.20.5.tar.xz) = LVEbHAxcGf49cC8NF4bVYfFD7k2GA8SX+f+VA5p7L4U=
-SIZE (mozilla/src-firefox-tor-browser-68.6.0esr-9.0-1-build2.tar.xz) = 348541924
+SIZE (mozilla/src-firefox-tor-browser-68.6.0esr-9.0-1-build3.tar.xz) = 347824884
SIZE (mozilla/src-tor-launcher-0.2.20.5.tar.xz) = 210916
Index: www/tor-browser/https-everywhere/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- www/tor-browser/https-everywhere/Makefile 16 Feb 2020 22:33:50 -0000 1.17
+++ www/tor-browser/https-everywhere/Makefile 5 Apr 2020 15:23:35 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2020/02/16 22:33:50 naddy Exp $

ADDON_NAME = https-everywhere
-V = 2019.11.7
+V = 2020.3.16
COMMENT = Tor Browser add-on: force https where possible
HOMEPAGE = https://www.eff.org/https-everywhere
MASTER_SITES = https://www.eff.org/files/
@@ -9,6 +9,5 @@ GUID = https-everywhere-eff@eff.org
ADDON_XPI_FILE = ${ADDON_NAME}-${V}-eff.xpi
DISTFILES = ${ADDON_XPI_FILE}
DISTFILE_IS_XPI = Yes
-REVISION = 0

.include <bsd.port.mk>
Index: www/tor-browser/https-everywhere/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- www/tor-browser/https-everywhere/distinfo 13 Feb 2020 07:41:54 -0000 1.15
+++ www/tor-browser/https-everywhere/distinfo 5 Apr 2020 15:23:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (https-everywhere-2019.11.7-eff.xpi) = SM2utlaeNqo/ooFMKjk1CzOnyEI1+TVOkPIt8zPrp04=
-SIZE (https-everywhere-2019.11.7-eff.xpi) = 1746491
+SHA256 (https-everywhere-2020.3.16-eff.xpi) = uz2O6WxMWaXVLUI7IP4+e8dBql/dFfL5wLzZgB2mfek=
+SIZE (https-everywhere-2020.3.16-eff.xpi) = 3076882
Index: www/tor-browser/https-everywhere/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- www/tor-browser/https-everywhere/pkg/PLIST 28 Sep 2018 14:54:26 -0000 1.3
+++ www/tor-browser/https-everywhere/pkg/PLIST 5 Apr 2020 15:23:35 -0000
@@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2018/09/28 14:54:26 sthen Exp $
+${EXTDIR_ROOT}/browser/extensions/
${EXTDIR_ROOT}/browser/extensions/${GUID}.xpi