Hi,
The diff below updates Tor Browser to 10.0.4 (10.0.3 was an
Android-only release so I didn't send a diff for that version). Tested
on amd64. More information:
https://blog.torproject.org/new-release-tor-browser-1004
This diff also includes the removal of tb-https-everywhere
(discussed earlier in this thread). I hope that part of the diff is
correct.
Thanks,
Caspar Schutijser
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- meta/tor-browser/Makefile 23 Oct 2020 07:04:09 -0000 1.30
+++ meta/tor-browser/Makefile 13 Nov 2020 19:16:55 -0000
@@ -4,11 +4,11 @@ COMMENT= Tor Browser meta package
MAINTAINER= Caspar Schutijser <cas...@schutijser.com>
-PKGNAME= tor-browser-10.0.2
+PKGNAME= tor-browser-10.0.4
ONLY_FOR_ARCHS = amd64 i386
-RUN_DEPENDS= www/tor-browser/browser>=10.0.2 \
- www/tor-browser/noscript>=11.1.3 \
+RUN_DEPENDS= www/tor-browser/browser>=10.0.4 \
+ www/tor-browser/noscript>=11.1.5 \
net/tor>=0.4.3.6
.include <bsd.port.mk>
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.inc
--- www/tor-browser/Makefile.inc 23 Oct 2020 07:04:09 -0000 1.30
+++ www/tor-browser/Makefile.inc 13 Nov 2020 19:16:55 -0000
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 10.0.2
+TB_VERSION = 10.0.4
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.50
diff -u -p -r1.50 Makefile
--- www/tor-browser/browser/Makefile 23 Oct 2020 07:04:09 -0000 1.50
+++ www/tor-browser/browser/Makefile 13 Nov 2020 19:16:55 -0000
@@ -16,7 +16,7 @@ EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-78.4.0esr-10.0-2-build2
+DISTNAME = src-firefox-tor-browser-78.4.0esr-10.0-2-build3
FIX_EXTRACT_PERMISSIONS = Yes
EXTRACT_ONLY += ${DISTNAME}.tar.xz \
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- www/tor-browser/browser/distinfo 23 Oct 2020 07:04:09 -0000 1.29
+++ www/tor-browser/browser/distinfo 13 Nov 2020 19:16:55 -0000
@@ -1,8 +1,8 @@
SHA256 (mozilla/https-everywhere-2020.8.13-eff.xpi) =
e1XWrqP5HNCK5Hp5VDDX2SXwHiNsgfsLNyqxu1NrTeU=
-SHA256 (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) =
sVMENAJKRprtDeWWQMb6ljdxGmI3PXBq92DIgmBigoo=
+SHA256 (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build3.tar.xz) =
jipis6L07HhZQwRqpNO7TNU2uABAc3/9e8vR/mz5UXE=
SHA256 (mozilla/src-tor-launcher-0.2.26.tar.xz) =
JNovULiGxs68qC1A5c4zKaZHGGGlpj9ohKT8nQFKmNU=
-SHA256 (mozilla/tor-browser-linux64-10.0.2_en-US.tar.xz) =
JBJDMC44VSh1ekXPxsVvFk5nOB8Ro4UGtD32pG1weP8=
+SHA256 (mozilla/tor-browser-linux64-10.0.4_en-US.tar.xz) =
2Ye1+mhFnkZnAYQXgKZ5YIOiIVaiunTCyCOM+ZExw2I=
SIZE (mozilla/https-everywhere-2020.8.13-eff.xpi) = 1766618
-SIZE (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build2.tar.xz) =
364731008
+SIZE (mozilla/src-firefox-tor-browser-78.4.0esr-10.0-2-build3.tar.xz) =
364750652
SIZE (mozilla/src-tor-launcher-0.2.26.tar.xz) = 217792
-SIZE (mozilla/tor-browser-linux64-10.0.2_en-US.tar.xz) = 85903736
+SIZE (mozilla/tor-browser-linux64-10.0.4_en-US.tar.xz) = 85915308
Index: www/tor-browser/browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- www/tor-browser/browser/pkg/PLIST 23 Oct 2020 07:04:09 -0000 1.9
+++ www/tor-browser/browser/pkg/PLIST 13 Nov 2020 19:16:57 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.9 2020/10/23 07:04:09 landry Exp $
@conflict tor-launcher-*
@conflict torbutton-*
+@pkgpath www/tor-browser/https-everywhere
@pkgpath www/tor-browser/tor-launcher
@pkgpath www/tor-browser/torbutton
bin/${BROWSER_NAME}
Index: www/tor-browser/https-everywhere/Makefile
===================================================================
RCS file: www/tor-browser/https-everywhere/Makefile
diff -N www/tor-browser/https-everywhere/Makefile
--- www/tor-browser/https-everywhere/Makefile 26 Aug 2020 07:37:39 -0000
1.20
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-# $OpenBSD: Makefile,v 1.20 2020/08/26 07:37:39 landry Exp $
-
-ADDON_NAME = https-everywhere
-V = 2020.8.13
-COMMENT = Tor Browser add-on: force https where possible
-HOMEPAGE = https://www.eff.org/https-everywhere
-MASTER_SITES = https://www.eff.org/files/
-GUID = https-everywhere-...@eff.org
-ADDON_XPI_FILE = ${ADDON_NAME}-${V}-eff.xpi
-DISTFILES = ${ADDON_XPI_FILE}
-DISTFILE_IS_XPI = Yes
-
-.include <bsd.port.mk>
Index: www/tor-browser/https-everywhere/distinfo
===================================================================
RCS file: www/tor-browser/https-everywhere/distinfo
diff -N www/tor-browser/https-everywhere/distinfo
--- www/tor-browser/https-everywhere/distinfo 26 Aug 2020 07:37:39 -0000
1.18
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-SHA256 (https-everywhere-2020.8.13-eff.xpi) =
e1XWrqP5HNCK5Hp5VDDX2SXwHiNsgfsLNyqxu1NrTeU=
-SIZE (https-everywhere-2020.8.13-eff.xpi) = 1766618
Index: www/tor-browser/https-everywhere/pkg/DESCR
===================================================================
RCS file: www/tor-browser/https-everywhere/pkg/DESCR
diff -N www/tor-browser/https-everywhere/pkg/DESCR
--- www/tor-browser/https-everywhere/pkg/DESCR 13 Nov 2016 21:15:43 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-HTTPS Everywhere is a Firefox extension from the EFF that forces HTTPS
-use wherever possible when browsing. It does this by means of an
-extensive set of rules maintained and updated by the EFF.
-
-This package provides the HTTPS Everywhere add-on for use with Tor
-Browser. It will not work with any other Mozilla-based browser
-package.
Index: www/tor-browser/https-everywhere/pkg/PLIST
===================================================================
RCS file: www/tor-browser/https-everywhere/pkg/PLIST
diff -N www/tor-browser/https-everywhere/pkg/PLIST
--- www/tor-browser/https-everywhere/pkg/PLIST 5 Apr 2020 16:58:27 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/04/05 16:58:27 landry Exp $
-${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.27
diff -u -p -r1.27 Makefile
--- www/tor-browser/noscript/Makefile 23 Oct 2020 07:04:09 -0000 1.27
+++ www/tor-browser/noscript/Makefile 13 Nov 2020 19:16:57 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.27 2020/10/23 07:04:09 landry Exp $
ADDON_NAME = noscript
-V = 11.1.3
+V = 11.1.5
COMMENT = Tor Browser add-on: flexible JS blocker
HOMEPAGE = https://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.24
diff -u -p -r1.24 distinfo
--- www/tor-browser/noscript/distinfo 23 Oct 2020 07:04:09 -0000 1.24
+++ www/tor-browser/noscript/distinfo 13 Nov 2020 19:16:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-11.1.3.xpi) = CFQ+SgPgvsrNEMPNv16qsf81oWSLq+bxUirjNeId59Q=
-SIZE (noscript-11.1.3.xpi) = 601205
+SHA256 (noscript-11.1.5.xpi) = BMppyQUC87Zs0YpPgyy5FbeJsUf/2Ua0jx37EhXrU5g=
+SIZE (noscript-11.1.5.xpi) = 601882
