Hi,

Below is a patch that updates Tor Browser to 9.5. Briefly tested on
amd64. Release announcement:
https://blog.torproject.org/new-release-tor-browser-95

Includes a change from Stéphane HUC to the pkg-readme of
meta/tor-browser.

Thanks,
Caspar Schutijser


Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- meta/tor-browser/Makefile   5 May 2020 20:12:20 -0000       1.25
+++ meta/tor-browser/Makefile   3 Jun 2020 16:04:32 -0000
@@ -4,12 +4,12 @@ COMMENT=      Tor Browser meta package
 
 MAINTAINER=    Caspar Schutijser <cas...@schutijser.com>
 
-PKGNAME=       tor-browser-9.0.10
+PKGNAME=       tor-browser-9.5
 ONLY_FOR_ARCHS =       amd64 i386
 
-RUN_DEPENDS=   www/tor-browser/browser>=9.0.10 \
-               www/tor-browser/noscript>=11.0.25 \
-               www/tor-browser/https-everywhere>=2020.3.16 \
-               net/tor>=0.4.2.7
+RUN_DEPENDS=   www/tor-browser/browser>=9.5 \
+               www/tor-browser/noscript>=11.0.26 \
+               www/tor-browser/https-everywhere>=2020.5.20 \
+               net/tor>=0.4.3.5
 
 .include <bsd.port.mk>
Index: meta/tor-browser/pkg/README
===================================================================
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.4
diff -u -p -r1.4 README
--- meta/tor-browser/pkg/README 4 Sep 2018 12:46:16 -0000       1.4
+++ meta/tor-browser/pkg/README 3 Jun 2020 16:04:32 -0000
@@ -41,7 +41,7 @@ Transports (PT).  This means that not al
 such as using obfsproxy to get to Tor.  A future update will include
 ports for PT components.  Pluggable Transports have a web page
 worth reading:
-  https://www.torproject.org/docs/pluggable-transports.html.en
+  https://2019.www.torproject.org/docs/pluggable-transports.html.en
 
 For more information about Tor Browser and the Tor anonymity network
 in general please visit http://www.torproject.org
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile.inc
--- www/tor-browser/Makefile.inc        5 May 2020 20:12:20 -0000       1.25
+++ www/tor-browser/Makefile.inc        3 Jun 2020 16:04:32 -0000
@@ -5,7 +5,7 @@ HOMEPAGE ?=             https://www.torproject.org
 PERMIT_PACKAGE ?=      Yes
 CATEGORIES =           www
 BROWSER_NAME =         tor-browser
-TB_VERSION =           9.0.10
+TB_VERSION =           9.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.45
diff -u -p -r1.45 Makefile
--- www/tor-browser/browser/Makefile    5 May 2020 20:12:20 -0000       1.45
+++ www/tor-browser/browser/Makefile    3 Jun 2020 16:04:32 -0000
@@ -9,13 +9,13 @@ ONLY_FOR_ARCHS =      amd64 i386
 MOZILLA_VERSION =      ${TB_VERSION}
 MOZILLA_PROJECT =      ${BROWSER_NAME}
 MOZILLA_CODENAME =     browser
-TL_VERSION =           0.2.20.5
+TL_VERSION =           0.2.21.8
 
 EXTRACT_SUFX =         .tar.xz
 PATCHORIG =            .pat.orig
 
 PKGNAME =              ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME =             src-firefox-tor-browser-68.8.0esr-9.0-2-build1
+DISTNAME =             src-firefox-tor-browser-68.9.0esr-9.5-1-build2
 
 FIX_EXTRACT_PERMISSIONS        = Yes
 DISTFILES +=           ${DISTNAME}.tar.xz \
@@ -93,7 +93,7 @@ MAKE_ENV +=           BUILD_OPT=1 \
                        XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
 BUILD_DEPENDS +=       devel/py-virtualenv
 
-RUN_DEPENDS +=         net/tor>=0.4.2.5
+RUN_DEPENDS +=         net/tor>=0.4.3.5
 
 CONFIGURE_ARGS +=      --enable-release #1386371
 CONFIGURE_ARGS +=      --enable-sandbox --enable-content-sandbox
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- www/tor-browser/browser/distinfo    5 May 2020 20:12:20 -0000       1.24
+++ www/tor-browser/browser/distinfo    3 Jun 2020 16:04:32 -0000
@@ -1,6 +1,6 @@
-SHA256 (mozilla/src-firefox-tor-browser-68.8.0esr-9.0-2-build1.tar.xz) = 
d37FZv64a1X66+v3GIFQdOdZ5uKV0isduUThNQ0v5as=
-SHA256 (mozilla/src-tor-launcher-0.2.20.5.tar.xz) = 
LVEbHAxcGf49cC8NF4bVYfFD7k2GA8SX+f+VA5p7L4U=
-SHA256 (mozilla/tor-browser-linux64-9.0.10_en-US.tar.xz) = 
cb34CmRIi5WmIasydfot55z35nHfQZgtH0O8HBd0nB0=
-SIZE (mozilla/src-firefox-tor-browser-68.8.0esr-9.0-2-build1.tar.xz) = 
348566404
-SIZE (mozilla/src-tor-launcher-0.2.20.5.tar.xz) = 210916
-SIZE (mozilla/tor-browser-linux64-9.0.10_en-US.tar.xz) = 80175308
+SHA256 (mozilla/src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 
JeNF7a4rgLqpSg53r7b6pmssqkLvsv6xZIrQ7J/9uxw=
+SHA256 (mozilla/src-tor-launcher-0.2.21.8.tar.xz) = 
v1cOZqTcpK1Ygxsw1GN+8Un5+8CMMuocvBE5iaZrVXg=
+SHA256 (mozilla/tor-browser-linux64-9.5_en-US.tar.xz) = 
CPygaVSxEZKRsdKY9ZaD6bRL1CjbEhWjxWLzN7/4jlA=
+SIZE (mozilla/src-firefox-tor-browser-68.9.0esr-9.5-1-build2.tar.xz) = 
348699028
+SIZE (mozilla/src-tor-launcher-0.2.21.8.tar.xz) = 214908
+SIZE (mozilla/tor-browser-linux64-9.5_en-US.tar.xz) = 79022648
Index: www/tor-browser/browser/patches/patch-_mozconfig
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-_mozconfig,v
retrieving revision 1.5
diff -u -p -r1.5 patch-_mozconfig
--- www/tor-browser/browser/patches/patch-_mozconfig    13 Feb 2020 07:41:53 
-0000      1.5
+++ www/tor-browser/browser/patches/patch-_mozconfig    3 Jun 2020 16:04:32 
-0000
@@ -8,20 +8,21 @@ means we can not pass --disable-eme to c
 Index: .mozconfig
 --- .mozconfig.orig
 +++ .mozconfig
-@@ -10,9 +10,9 @@ ac_add_options --enable-official-branding
+@@ -19,10 +19,10 @@ ac_add_options --enable-official-branding
  # Let's support GTK3 for ESR60
  ac_add_options --enable-default-toolkit=cairo-gtk3
  
--ac_add_options --enable-tor-browser-update
+-ac_add_options --disable-tor-launcher
++#ac_add_options --disable-tor-launcher
+ ac_add_options --disable-tor-browser-update
 -ac_add_options --enable-signmar
 -ac_add_options --enable-verify-mar
-+#ac_add_options --enable-tor-browser-update
 +#ac_add_options --enable-signmar
 +#ac_add_options --enable-verify-mar
  
  ac_add_options --disable-strip
  ac_add_options --disable-install-strip
-@@ -21,8 +21,11 @@ ac_add_options --disable-debug
+@@ -31,10 +31,13 @@ ac_add_options --disable-debug
  ac_add_options --disable-crashreporter
  ac_add_options --disable-webrtc
  # Let's make sure no preference is enabling either Adobe's or Google's CDM.
@@ -30,9 +31,10 @@ Index: .mozconfig
  ac_add_options --enable-proxy-bypass-protection
  
  # Disable telemetry
--ac_add_options MOZ_TELEMETRY_REPORTING=
-\ No newline at end of file
-+
+ ac_add_options MOZ_TELEMETRY_REPORTING=
+ 
+-ac_add_options --with-tor-browser-version=dev-build
 +# avoid 1.1GB libxul
 +ac_add_options --disable-debug-symbols
-+ac_add_options MOZ_TELEMETRY_REPORTING=
++
++#ac_add_options --with-tor-browser-version=dev-build
Index: 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js
===================================================================
RCS file: 
/cvs/ports/www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js,v
retrieving revision 1.1
diff -u -p -r1.1 
patch-browser_extensions_tor-launcher_src_components_tl-process_js
--- 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js
  13 Feb 2020 07:41:53 -0000      1.1
+++ 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js
  3 Jun 2020 16:04:32 -0000
@@ -6,7 +6,7 @@ the new getTorFile() deal with it.
 Index: browser/extensions/tor-launcher/src/components/tl-process.js
 --- browser/extensions/tor-launcher/src/components/tl-process.js.orig
 +++ browser/extensions/tor-launcher/src/components/tl-process.js
-@@ -376,6 +376,8 @@ TorProcessService.prototype =
+@@ -377,6 +377,8 @@ TorProcessService.prototype =
        var torrcFile = TorLauncherUtil.getTorFile("torrc", true);
        var torrcDefaultsFile =
                      TorLauncherUtil.getTorFile("torrc-defaults", false);
@@ -15,7 +15,7 @@ Index: browser/extensions/tor-launcher/s
        var hashedPassword = this.mProtocolSvc.TorGetPassword(true);
        var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile();
        var controlPort = this.mProtocolSvc.TorGetControlPort();
-@@ -401,19 +403,14 @@ TorProcessService.prototype =
+@@ -404,19 +406,14 @@ TorProcessService.prototype =
          return;
        }
  
Index: 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js
===================================================================
RCS file: 
/cvs/ports/www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js,v
retrieving revision 1.2
diff -u -p -r1.2 
patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js
--- 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js
 16 Feb 2020 10:45:59 -0000      1.2
+++ 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_defaults_preferences_torlauncher-prefs_js
 3 Jun 2020 16:04:32 -0000
@@ -5,7 +5,7 @@ Set all path-related prefs to minimize p
 Index: 
browser/extensions/tor-launcher/src/defaults/preferences/torlauncher-prefs.js
 --- 
browser/extensions/tor-launcher/src/defaults/preferences/torlauncher-prefs.js.orig
 +++ 
browser/extensions/tor-launcher/src/defaults/preferences/torlauncher-prefs.js
-@@ -43,14 +43,17 @@ pref("extensions.torlauncher.socks_port_flags", "IPv6T
+@@ -43,14 +43,17 @@ pref("extensions.torlauncher.socks_port_flags", "Exten
  // 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/browser/patches/patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm
===================================================================
RCS file: 
/cvs/ports/www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm,v
retrieving revision 1.1
diff -u -p -r1.1 patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm
--- 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm
       13 Feb 2020 07:41:53 -0000      1.1
+++ 
www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_modules_tl-util_jsm
       3 Jun 2020 16:04:32 -0000
@@ -6,7 +6,7 @@ Force DataOutsideOfAppDir on OpenBSD sin
 Index: browser/extensions/tor-launcher/src/modules/tl-util.jsm
 --- browser/extensions/tor-launcher/src/modules/tl-util.jsm.orig
 +++ browser/extensions/tor-launcher/src/modules/tl-util.jsm
-@@ -810,7 +810,7 @@ let TLUtilInternal =  // Private
+@@ -821,7 +821,7 @@ let TLUtilInternal =  // Private
    mStringBundle : null,
    mOS : "",
    // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used.
Index: www/tor-browser/https-everywhere/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/https-everywhere/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- www/tor-browser/https-everywhere/Makefile   5 Apr 2020 16:58:27 -0000       
1.18
+++ www/tor-browser/https-everywhere/Makefile   3 Jun 2020 16:04:32 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.18 2020/04/05 16:58:27 landry Exp $
 
 ADDON_NAME =           https-everywhere
-V =                    2020.3.16
+V =                    2020.5.20
 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.16
diff -u -p -r1.16 distinfo
--- www/tor-browser/https-everywhere/distinfo   5 Apr 2020 16:58:27 -0000       
1.16
+++ www/tor-browser/https-everywhere/distinfo   3 Jun 2020 16:04:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (https-everywhere-2020.3.16-eff.xpi) = 
uz2O6WxMWaXVLUI7IP4+e8dBql/dFfL5wLzZgB2mfek=
-SIZE (https-everywhere-2020.3.16-eff.xpi) = 3076882
+SHA256 (https-everywhere-2020.5.20-eff.xpi) = 
hrM6HnbONpZW96GeyTCg+4xtiChyHNh5jE1PB5MftKY=
+SIZE (https-everywhere-2020.5.20-eff.xpi) = 1761982
Index: www/tor-browser/noscript/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- www/tor-browser/noscript/Makefile   5 May 2020 20:12:20 -0000       1.22
+++ www/tor-browser/noscript/Makefile   3 Jun 2020 16:04:32 -0000
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.22 2020/05/05 20:12:20 sthen Exp $
 
 ADDON_NAME =           noscript
-V =                    11.0.25
+V =                    11.0.26
 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.19
diff -u -p -r1.19 distinfo
--- www/tor-browser/noscript/distinfo   5 May 2020 20:12:20 -0000       1.19
+++ www/tor-browser/noscript/distinfo   3 Jun 2020 16:04:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-11.0.25.xpi) = LlXPbcbQ9gEuLwMo7P7BgqTwLJTi/ECBivQfYQ69Zmg=
-SIZE (noscript-11.0.25.xpi) = 582664
+SHA256 (noscript-11.0.26.xpi) = macKeHM/5+IYUvZ73gkPale1vb007Lvfz0gdyGGWX9g=
+SIZE (noscript-11.0.26.xpi) = 582948

Reply via email to