On Tue, Sep 05, 2023 at 11:57:04AM +0200, Caspar Schutijser wrote:
> Hi,
>
> Below is a diff that updates Tor Browser to 12.5.3. I finally fixed
> all problems related to upstream's changes involving the configuration
> directory.
>
> Change of note (quoting from the updated pkg-readme):
> > As of the 12.5 release, torrc has been moved from
> > ~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
> > If you wish to preserve your tor configuration (e.g., bridges),
> > please do the following BEFORE starting tor-browser after you upgrade:
> >
> > $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor
>
> Feedback and test reports are welcome.
>
> Release announcement of the 12.5 series can be found here:
> https://blog.torproject.org/new-release-tor-browser-125/
>
> Comments or OKs? Diff for -stable to follow later.
And here is the diff for 7.3-stable.
Comments or OKs?
Caspar
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.68.2.4
diff -u -p -r1.68.2.4 Makefile
--- meta/tor-browser/Makefile 9 Jun 2023 08:57:55 -0000 1.68.2.4
+++ meta/tor-browser/Makefile 6 Sep 2023 10:06:17 -0000
@@ -2,11 +2,11 @@ COMMENT= Tor Browser meta package
MAINTAINER= Caspar Schutijser <cas...@schutijser.com>
-PKGNAME= tor-browser-12.0.7
+PKGNAME= tor-browser-12.5.3
ONLY_FOR_ARCHS = amd64
-RUN_DEPENDS= www/tor-browser/browser>=12.0.7 \
- www/tor-browser/noscript>=11.4.22 \
+RUN_DEPENDS= www/tor-browser/browser>=12.5.3 \
+ www/tor-browser/noscript>=11.4.26 \
net/tor>=0.4.7.13
.include <bsd.port.mk>
Index: meta/tor-browser/pkg/README
===================================================================
RCS file: /cvs/ports/meta/tor-browser/pkg/README,v
retrieving revision 1.10
diff -u -p -r1.10 README
--- meta/tor-browser/pkg/README 16 Jan 2023 18:19:19 -0000 1.10
+++ meta/tor-browser/pkg/README 6 Sep 2023 10:06:17 -0000
@@ -9,14 +9,6 @@ To start Tor Browser:
This will create a ~/TorBrowser-Data directory tree if it does not
exist.
-As of the 7.0.2 release Tor Browser keeps its data in
-~/TorBrowser-Data/Data. In 6.5.2 it was ~/TorBrowser-Data/Browser.
-If you wish to preserve either your tor configuration (bridges, etc)
-or your browser profile and are updating from a version before 7.0.2
-please do the following BEFORE starting tor-browser after you upgrade:
-
- $ mv ~/TorBrowser-Data/Browser ~/TorBrowser-Data/Data
-
Tor Browser uses its own instance of the tor server running on a
different port than the net/tor port is configured to use by default.
It starts and stops this tor daemon using the integrated tor-launcher.
@@ -24,8 +16,15 @@ It should not interfere with any tor dae
standard mechanism (e.g. rcctl start tor).
The tor instance used by Tor Browser stores its configuration in
-~/TorBrowser-Data/Data/torrc; the tor daemon state lives in
-~/TorBrowser-Data/Data/tor_data.
+~/TorBrowser-Data/Tor/torrc; the tor daemon stores state files in
+~/TorBrowser-Data/Tor.
+
+As of the 12.5 release, torrc has been moved from
+~/TorBrowser-Data/torrc to ~/TorBrowser-Data/Tor/torrc.
+If you wish to preserve your tor configuration (e.g., bridges),
+please do the following BEFORE starting tor-browser after you upgrade:
+
+ $ mv ~/TorBrowser-Data/torrc ~/TorBrowser-Data/Tor
When you use Tor Browser to change your configuration (e.g. add
bridges) the above torrc is updated. You can also add bridges by
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.65.2.4
diff -u -p -r1.65.2.4 Makefile.inc
--- www/tor-browser/Makefile.inc 9 Jun 2023 08:57:55 -0000 1.65.2.4
+++ www/tor-browser/Makefile.inc 6 Sep 2023 10:06:17 -0000
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 12.0.7
+TB_VERSION = 12.5.3
TB_PREFIX = tb
# keep meta/tor-browser in sync
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.104.2.4
diff -u -p -r1.104.2.4 Makefile
--- www/tor-browser/browser/Makefile 9 Jun 2023 08:57:55 -0000
1.104.2.4
+++ www/tor-browser/browser/Makefile 6 Sep 2023 10:06:17 -0000
@@ -12,7 +12,7 @@ EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
-DISTNAME = src-firefox-tor-browser-102.12.0esr-12.0-1-build2
+DISTNAME = src-firefox-tor-browser-102.15.0esr-12.5-1-build2
FIX_EXTRACT_PERMISSIONS = Yes
DISTFILES += ${DISTNAME}.tar.xz \
@@ -66,8 +66,7 @@ MAKE_ENV += BUILD_VERBOSE_LOG="1" CARGO
# app-name etc. for tor-browser
CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \
- --with-tor-browser-version=${TB_VERSION} \
- --enable-tor-browser-data-outside-app-dir
+ --with-base-browser-version=${TB_VERSION}
# for nss build system
MAKE_ENV += BUILD_OPT=1 \
@@ -146,10 +145,15 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/
${SUBST_DATA} ${FILESDIR}/${BROWSER_NAME}.desktop \
${PREFIX}/share/applications/${BROWSER_NAME}.desktop
- # install icon for desktop file
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
- ${INSTALL_DATA}
${BROWSER_DIR}/browser/chrome/icons/default/default128.png \
- ${PREFIX}/share/pixmaps/${BROWSER_NAME}.png
+ # install icons for desktop file
+.for s in 16 22 24 32 48 64 128 256
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/${s}x${s}/apps
+ ${INSTALL_DATA} ${WRKSRC}/browser/branding/tb-release/default${s}.png \
+ ${PREFIX}/share/icons/hicolor/${s}x${s}/apps/${BROWSER_NAME}.png
+.endfor
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/scalable/apps
+ ${INSTALL_DATA} ${WRKSRC}/browser/branding/tb-release/firefox.svg
${PREFIX}/share/icons/hicolor/scalable/apps/${BROWSER_NAME}.svg
+
# link default48.png to default.png to be used by default
# by non-icccm compliant wm
ln -f ${BROWSER_DIR}/browser/chrome/icons/default/default{48,}.png
@@ -162,7 +166,7 @@ post-install:
# install fonts.conf and fonts
${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/fontconfig
${SUBST_DATA} \
-
${WRKSRC}/tor-browser-linux64/Browser/TorBrowser/Data/fontconfig/fonts.conf \
+ ${WRKSRC}/tor-browser-linux64/Browser/fontconfig/fonts.conf \
${BROWSER_DIR}/browser/fontconfig/fonts.conf
${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/fonts
cp ${WRKSRC}/tor-browser-linux64/Browser/fonts/* \
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.63.2.4
diff -u -p -r1.63.2.4 distinfo
--- www/tor-browser/browser/distinfo 9 Jun 2023 08:57:55 -0000 1.63.2.4
+++ www/tor-browser/browser/distinfo 6 Sep 2023 10:06:17 -0000
@@ -1,6 +1,6 @@
-SHA256 (mozilla/src-firefox-tor-browser-102.12.0esr-12.0-1-build2.tar.xz) =
iZz/n1VwQTSz+2GSofhMXh+C6OHASInY8aPdiP8gYL4=
-SHA256 (mozilla/tor-browser-linux64-12.0.7_ALL.tar.xz) =
lo+Iy6I7S1NV1E9CBPqJjRFzuEXGC80NRUUlpZfG5wU=
-SHA256 (mozilla/tor-expert-bundle-12.0.7-linux-x86_64.tar.gz) =
XhxTIN5b5RnLNhBpzpfx9/p2RUGfbkVz1K9L+D1CfSg=
-SIZE (mozilla/src-firefox-tor-browser-102.12.0esr-12.0-1-build2.tar.xz) =
511208480
-SIZE (mozilla/tor-browser-linux64-12.0.7_ALL.tar.xz) = 105478904
-SIZE (mozilla/tor-expert-bundle-12.0.7-linux-x86_64.tar.gz) = 17709454
+SHA256 (mozilla/src-firefox-tor-browser-102.15.0esr-12.5-1-build2.tar.xz) =
liVzCmbwt4t40Mxl50YovXr95/g2shaR39Je5jckVkQ=
+SHA256 (mozilla/tor-browser-linux64-12.5.3_ALL.tar.xz) =
QF71UXZXwLjr1XugKeFWZH9RXb4xeKWZScds+xtNekI=
+SHA256 (mozilla/tor-expert-bundle-12.5.3-linux-x86_64.tar.gz) =
bnHde9zt2t/1ykCk8lccTu+UjlsTOmADXNyUnEVxZ/o=
+SIZE (mozilla/src-firefox-tor-browser-102.15.0esr-12.5-1-build2.tar.xz) =
513660772
+SIZE (mozilla/tor-browser-linux64-12.5.3_ALL.tar.xz) = 113345744
+SIZE (mozilla/tor-expert-bundle-12.5.3-linux-x86_64.tar.gz) = 18068376
Index: www/tor-browser/browser/files/tor-browser.cfg
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/tor-browser.cfg,v
retrieving revision 1.1
diff -u -p -r1.1 tor-browser.cfg
--- www/tor-browser/browser/files/tor-browser.cfg 28 Sep 2018 14:54:26
-0000 1.1
+++ www/tor-browser/browser/files/tor-browser.cfg 6 Sep 2023 10:06:17
-0000
@@ -1,4 +1,4 @@
-// c.f.
https://mike.kaply.com/2016/05/24/default-profile-directory-doesnt-work-in-firefox-46/
+// c.f.
https://web.archive.org/web/20210530175830/https://mike.kaply.com/2016/05/24/default-profile-directory-doesnt-work-in-firefox-46/
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Services.jsm");
Index:
www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js
===================================================================
RCS file:
/cvs/ports/www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js,v
retrieving revision 1.2.4.1
diff -u -p -r1.2.4.1 patch-browser_app_profile_000-tor-browser_js
---
www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js
11 Apr 2023 19:37:29 -0000 1.2.4.1
+++
www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js
6 Sep 2023 10:06:17 -0000
@@ -3,7 +3,7 @@ Set all path-related prefs to minimize p
Index: browser/app/profile/000-tor-browser.js
--- browser/app/profile/000-tor-browser.js.orig
+++ browser/app/profile/000-tor-browser.js
-@@ -120,14 +120,17 @@ pref("extensions.torlauncher.socks_port_flags", "Exten
+@@ -114,7 +114,10 @@ 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.
@@ -15,12 +15,3 @@ Index: browser/app/profile/000-tor-brows
// The torrc_path and tordatadir_path are relative to the data directory,
// which is TorBrowser-Data/ if it exists as a sibling of the application
- // directory. If TorBrowser-Data/ does not exist, these paths are relative
- // to the TorBrowser/ directory within the application directory.
--pref("extensions.torlauncher.torrc_path", "");
--pref("extensions.torlauncher.tordatadir_path", "");
-+pref("extensions.torlauncher.torrc_path", "torrc");
-+pref("extensions.torlauncher.tordatadir_path", "tor_data");
-
- // BridgeDB-related preferences (used for Moat).
- pref("extensions.torlauncher.bridgedb_front", "cdn.sstatic.net");
Index:
www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser
===================================================================
RCS file:
/cvs/ports/www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser,v
retrieving revision 1.2
diff -u -p -r1.2 patch-browser_config_mozconfigs_base-browser
---
www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser
14 Nov 2022 22:13:59 -0000 1.2
+++
www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser
6 Sep 2023 10:06:17 -0000
@@ -10,13 +10,15 @@ https://gitlab.torproject.org/tpo/applic
Index: browser/config/mozconfigs/base-browser
--- browser/config/mozconfigs/base-browser.orig
+++ browser/config/mozconfigs/base-browser
-@@ -12,19 +12,19 @@ ac_add_options --enable-official-branding
+@@ -12,7 +12,6 @@ ac_add_options --enable-official-branding
export MOZILLA_OFFICIAL=1
ac_add_options --enable-optimize
-ac_add_options --enable-rust-simd
- ac_add_options --enable-bundled-fonts
+ # Bug 13379: Sign our MAR files.
+ ac_add_options --enable-verify-mar
+@@ -23,13 +22,14 @@ ac_add_options --enable-bundled-fonts
ac_add_options --disable-tests
ac_add_options --disable-debug
@@ -32,7 +34,7 @@ Index: browser/config/mozconfigs/base-br
ac_add_options --enable-proxy-bypass-protection
# See bugs #30575 and #32418: system policies are harmful either because they
# could allow proxy bypass, and override a number of other preferences we set
-@@ -37,7 +37,3 @@ ac_add_options --enable-base-browser
+@@ -40,7 +40,3 @@ ac_add_options --disable-backgroundtasks
# Disable telemetry
ac_add_options MOZ_TELEMETRY_REPORTING=
Index:
www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser
===================================================================
RCS file:
/cvs/ports/www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser,v
retrieving revision 1.1
diff -u -p -r1.1 patch-browser_config_mozconfigs_tor-browser
--- www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser
29 Jul 2022 20:20:10 -0000 1.1
+++ www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser
6 Sep 2023 10:06:17 -0000
@@ -1,13 +1,15 @@
-Disable the updater and related stuff. Does nothing under OpenBSD.
+Code behind --with-relative-data-dir does not do what we want
+(which is to use a directory in the home directory), let's not use it.
Index: browser/config/mozconfigs/tor-browser
--- browser/config/mozconfigs/tor-browser.orig
+++ browser/config/mozconfigs/tor-browser
-@@ -4,7 +4,4 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
+@@ -2,7 +2,7 @@
- ac_add_options --with-relative-profile=TorBrowser/Data/Browser
+ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
--ac_add_options --enable-tor-browser-update
--ac_add_options --enable-verify-mar
--
- ac_add_options --with-distribution-id=org.torproject
+-ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser
++#ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser
+ # This is not needed with the relative data directory, but it is when you
+ # disable it, otherwise it is "Mozilla" (on Windows and macOS) or ".mozilla"
on
+ # Unix systems.
Index:
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm
===================================================================
RCS file:
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm
diff -N
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm
---
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm
14 Nov 2022 22:13:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Force DataOutsideOfAppDir on OpenBSD since it will always be true
-(turned on in patch-xpcom_io_TorFileUtils_cpp).
-
-Index: toolkit/components/tor-launcher/TorLauncherUtil.jsm
---- toolkit/components/tor-launcher/TorLauncherUtil.jsm.orig
-+++ toolkit/components/tor-launcher/TorLauncherUtil.jsm
-@@ -31,7 +31,7 @@ class TorFile {
- checkIPCPathLen = true;
-
- static _isFirstIPCPathRequest = true;
-- static _isUserDataOutsideOfAppDir = undefined;
-+ static _isUserDataOutsideOfAppDir = true;
- static _dataDir = null;
- static _appDir = null;
-
Index:
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm
===================================================================
RCS file:
/cvs/ports/www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm,v
retrieving revision 1.2
diff -u -p -r1.2 patch-toolkit_components_tor-launcher_TorProcess_jsm
---
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm
29 Jan 2023 08:56:47 -0000 1.2
+++
www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm
6 Sep 2023 10:06:17 -0000
@@ -4,7 +4,7 @@ the new getTorFile() deal with it.
Index: toolkit/components/tor-launcher/TorProcess.jsm
--- toolkit/components/tor-launcher/TorProcess.jsm.orig
+++ toolkit/components/tor-launcher/TorProcess.jsm
-@@ -264,6 +264,8 @@ class TorProcess {
+@@ -242,6 +242,8 @@ class TorProcess {
const torrcFile = TorLauncherUtil.getTorFile("torrc", true);
this._dataDir = TorLauncherUtil.getTorFile("tordatadir", true);
const onionAuthDir = TorLauncherUtil.getTorFile("toronionauthdir", true);
@@ -13,7 +13,7 @@ Index: toolkit/components/tor-launcher/T
const hashedPassword = TorProtocolService.torGetPassword(true);
let detailsKey;
if (!this._exeFile) {
-@@ -292,17 +294,13 @@ class TorProcess {
+@@ -270,17 +272,13 @@ class TorProcess {
"torrc-defaults",
false
);
Index: www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp
===================================================================
RCS file: www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp
diff -N www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp
6 Sep 2023 10:06:17 -0000
@@ -0,0 +1,44 @@
+Use ~/TorBrowser-Data/Browser as the browser data directory.
+
+Index: toolkit/xre/nsXREDirProvider.cpp
+--- toolkit/xre/nsXREDirProvider.cpp.orig
++++ toolkit/xre/nsXREDirProvider.cpp
+@@ -1557,6 +1557,19 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns
+ const char* homeDir = getenv("HOME");
+ if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
+
++# if defined(__OpenBSD__)
++ rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
++ getter_AddRefs(localDir));
++ NS_ENSURE_SUCCESS(rv, rv);
++ rv = localDir->AppendNative("TorBrowser-Data"_ns);
++ NS_ENSURE_SUCCESS(rv, rv);
++ rv = localDir->AppendNative("Browser"_ns);
++ NS_ENSURE_SUCCESS(rv, rv);
++ if (aLocal) {
++ rv = localDir->AppendNative("Caches"_ns);
++ NS_ENSURE_SUCCESS(rv, rv);
++ }
++# else
+ # ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */
+ aLocal = false;
+ # endif
+@@ -1576,6 +1589,7 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns
+ rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+ getter_AddRefs(localDir));
+ }
++# endif
+ #else
+ # error "Don't know how to get product dir on your platform"
+ #endif
+@@ -1636,8 +1650,10 @@ nsresult nsXREDirProvider::GetUserDataDirectory(nsIFil
+ nsresult rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), aLocal);
+ NS_ENSURE_SUCCESS(rv, rv);
+
++#if !defined(__OpenBSD__)
+ rv = AppendProfilePath(localDir, aLocal);
+ NS_ENSURE_SUCCESS(rv, rv);
++#endif
+
+ rv = EnsureDirectoryExists(localDir);
+ NS_ENSURE_SUCCESS(rv, rv);
Index:
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf
===================================================================
RCS file:
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf
diff -N
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf
---
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf
14 Nov 2022 22:13:59 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Set path to bundled fonts.
-
-Index: tor-browser-linux64/Browser/TorBrowser/Data/fontconfig/fonts.conf
---- tor-browser-linux64/Browser/TorBrowser/Data/fontconfig/fonts.conf.orig
-+++ tor-browser-linux64/Browser/TorBrowser/Data/fontconfig/fonts.conf
-@@ -39,7 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.
-
- <!-- Font directory list -->
-
-- <dir>fonts</dir>
-+ <dir>${TRUEBROWSER_DIR}/browser/fonts</dir>
-
- <!--
- Accept deprecated 'mono' alias, replacing it with 'monospace'
Index:
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf
===================================================================
RCS file:
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf
diff -N
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
www/tor-browser/browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf
6 Sep 2023 10:06:17 -0000
@@ -0,0 +1,14 @@
+Set path to bundled fonts.
+
+Index: tor-browser-linux64/Browser/fontconfig/fonts.conf
+--- tor-browser-linux64/Browser/fontconfig/fonts.conf.orig
++++ tor-browser-linux64/Browser/fontconfig/fonts.conf
+@@ -39,7 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.
+
+ <!-- Font directory list -->
+
+- <dir>fonts</dir>
++ <dir>${TRUEBROWSER_DIR}/browser/fonts</dir>
+
+ <!--
+ Accept deprecated 'mono' alias, replacing it with 'monospace'
Index: www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp
===================================================================
RCS file: www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp
diff -N www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp
--- www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 29 Jul
2022 20:20:10 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-Autoconf is gone now so the old configure patch to add
---enable-tor-browser-data-in-home-dir will never fly. Hard-code it on
-for now on OpenBSD and try to get something similar done under the new
-Pyton config regime (encouraged by tbb devs on IRC). c.f.
-https://trac.torproject.org/projects/tor/ticket/20557
-
-Index: xpcom/io/TorFileUtils.cpp
---- xpcom/io/TorFileUtils.cpp.orig
-+++ xpcom/io/TorFileUtils.cpp
-@@ -11,6 +11,10 @@
- # include "nsILocalFileMac.h"
- #endif
-
-+#ifdef __OpenBSD__
-+# define TOR_BROWSER_DATA_IN_HOME_DIR 1
-+#endif
-+
- nsresult TorBrowser_GetUserDataDir(nsIFile* aAppDir, nsIFile** aFile) {
- NS_ENSURE_ARG_POINTER(aFile);
- nsCOMPtr<nsIFile> tbDataDir;
-@@ -20,6 +24,16 @@ nsresult TorBrowser_GetUserDataDir(nsIFile* aAppDir, n
- if (!homeDir || !*homeDir) return NS_ERROR_FAILURE;
- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
- getter_AddRefs(tbDataDir));
-+ NS_ENSURE_SUCCESS(rv, rv);
-+#elif defined(TOR_BROWSER_DATA_IN_HOME_DIR)
-+ const char *homeDir = getenv("HOME");
-+ if (!homeDir || !*homeDir)
-+ return NS_ERROR_FAILURE;
-+ nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
-+ getter_AddRefs(tbDataDir));
-+ NS_ENSURE_SUCCESS(rv, rv);
-+ nsAutoCString leafSubdir("TorBrowser-Data"_ns);
-+ rv = tbDataDir->AppendNative(leafSubdir);
- NS_ENSURE_SUCCESS(rv, rv);
- #elif defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
- nsAutoCString tbDataLeafName("TorBrowser-Data"_ns);
Index:
www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
===================================================================
RCS file:
www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
diff -N
www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp
6 Sep 2023 10:06:17 -0000
@@ -0,0 +1,18 @@
+Use ~/TorBrowser-Data/Browser as the browser data directory.
+
+Index: xpcom/io/nsAppFileLocationProvider.cpp
+--- xpcom/io/nsAppFileLocationProvider.cpp.orig
++++ xpcom/io/nsAppFileLocationProvider.cpp
+@@ -402,6 +402,12 @@ nsresult nsAppFileLocationProvider::GetProductDirector
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
++# if defined(__OpenBSD__)
++ rv = localDir->AppendNative("TorBrowser-Data"_ns);
++ NS_ENSURE_SUCCESS(rv, rv);
++ rv = localDir->AppendNative("Browser"_ns);
++ NS_ENSURE_SUCCESS(rv, rv);
++# endif
+ #else
+ # error dont_know_how_to_get_product_dir_on_your_platform
+ #endif
Index: www/tor-browser/browser/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- www/tor-browser/browser/pkg/PLIST 27 Oct 2022 17:37:14 -0000 1.17
+++ www/tor-browser/browser/pkg/PLIST 6 Sep 2023 10:06:18 -0000
@@ -221,8 +221,16 @@ lib/${BROWSER_NAME}/removed-files
@bin lib/${BROWSER_NAME}/${BROWSER_NAME}-bin
lib/${BROWSER_NAME}/${BROWSER_NAME}.cfg
share/applications/${BROWSER_NAME}.desktop
-@tag update-desktop-database
-share/pixmaps/
-share/pixmaps/tor-browser.png
+share/icons/hicolor/128x128/apps/${BROWSER_NAME}.png
+share/icons/hicolor/16x16/apps/${BROWSER_NAME}.png
+share/icons/hicolor/22x22/apps/${BROWSER_NAME}.png
+share/icons/hicolor/24x24/apps/${BROWSER_NAME}.png
+share/icons/hicolor/256x256/apps/${BROWSER_NAME}.png
+share/icons/hicolor/32x32/apps/${BROWSER_NAME}.png
+share/icons/hicolor/48x48/apps/${BROWSER_NAME}.png
+share/icons/hicolor/64x64/apps/${BROWSER_NAME}.png
+share/icons/hicolor/scalable/apps/${BROWSER_NAME}.svg
share/tor-browser/
share/tor-browser/torrc-defaults
+@tag gtk-update-icon-cache %D/share/icons/hicolor
+@tag update-desktop-database
Index: www/tor-browser/noscript/Makefile
===================================================================
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.50.2.3
diff -u -p -r1.50.2.3 Makefile
--- www/tor-browser/noscript/Makefile 9 Jun 2023 08:57:55 -0000 1.50.2.3
+++ www/tor-browser/noscript/Makefile 6 Sep 2023 10:06:18 -0000
@@ -1,5 +1,5 @@
ADDON_NAME = noscript
-V = 11.4.22
+V = 11.4.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.44.2.3
diff -u -p -r1.44.2.3 distinfo
--- www/tor-browser/noscript/distinfo 9 Jun 2023 08:57:55 -0000 1.44.2.3
+++ www/tor-browser/noscript/distinfo 6 Sep 2023 10:06:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (noscript-11.4.22.xpi) = RqhMhd9Ma+EZBTiK0rZq61oBDtYVSEESyMFxCtE7w24=
-SIZE (noscript-11.4.22.xpi) = 948900
+SHA256 (noscript-11.4.26.xpi) = KD2w6uu9KIjBqFL1rKuqjgIl/x6xqXolvOrt/RTZ9Ew=
+SIZE (noscript-11.4.26.xpi) = 952442
