Hi, Below is a WIP diff for Tor Browser 12.5.2. Upstream removed some code that we rely on for setting the data directory for the browser (~/TorBrowser-Data/Browser) and the new default doesn't work very well for us. This is why I haven't been able to update Tor Browser to the 12.5 series in a timely manner.
It took me a long time to figure out how to make Tor Browser look in the desired location for the Firefox profile; with two new patches I finally was able to do so. The result (which I still need to clean up a bit) can be found below. Unfortunately, after fixing that, a new problem appeared. Clicking "Connect" to connect to the Tor network doesn't do much. So probably there's some problem related to the Tor Launcher. I'm about to be offline for 1.5 weeks so I'm sending this to the mailing list on the off chance someone wants to have a look at this before I can continue to work on it again. Help or feedback is welcome. Caspar Index: Makefile.inc =================================================================== RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.69 diff -u -p -r1.69 Makefile.inc --- Makefile.inc 9 Jun 2023 08:57:20 -0000 1.69 +++ Makefile.inc 16 Aug 2023 18:32:25 -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.2 TB_PREFIX = tb # keep meta/tor-browser in sync Index: browser/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v retrieving revision 1.114 diff -u -p -r1.114 Makefile --- browser/Makefile 1 Aug 2023 14:00:33 -0000 1.114 +++ browser/Makefile 16 Aug 2023 18:32:25 -0000 @@ -5,14 +5,13 @@ COMMENT = modified version of Firefox ESR for browsing over Tor MOZILLA_VERSION = ${TB_VERSION} -REVISION = 1 MOZILLA_PROJECT = ${BROWSER_NAME} MOZILLA_CODENAME = browser EXTRACT_SUFX = .tar.xz 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.14.0esr-12.5-1-build2 FIX_EXTRACT_PERMISSIONS = Yes DISTFILES += ${DISTNAME}.tar.xz \ @@ -67,8 +66,7 @@ CONFIGURE_ENV += LDFLAGS=-Wl,--threads=$ # 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 \ @@ -149,10 +147,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 @@ -165,7 +168,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: browser/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.67 diff -u -p -r1.67 distinfo --- browser/distinfo 9 Jun 2023 08:57:20 -0000 1.67 +++ browser/distinfo 16 Aug 2023 18:32:25 -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.14.0esr-12.5-1-build2.tar.xz) = NPRusV17cZY9SLZ5pWHtQ4EpYKGUQrS55/rAkc4oZKQ= +SHA256 (mozilla/tor-browser-linux64-12.5.2_ALL.tar.xz) = Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es= +SHA256 (mozilla/tor-expert-bundle-12.5.2-linux-x86_64.tar.gz) = Po57SU+ePStXWbe4pEh0rNS1w6yFjp+8p5RWVH61S1k= +SIZE (mozilla/src-firefox-tor-browser-102.14.0esr-12.5-1-build2.tar.xz) = 514481116 +SIZE (mozilla/tor-browser-linux64-12.5.2_ALL.tar.xz) = 113335896 +SIZE (mozilla/tor-expert-bundle-12.5.2-linux-x86_64.tar.gz) = 18067414 Index: 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.3 diff -u -p -r1.3 patch-browser_app_profile_000-tor-browser_js --- browser/patches/patch-browser_app_profile_000-tor-browser_js 3 Apr 2023 17:26:50 -0000 1.3 +++ browser/patches/patch-browser_app_profile_000-tor-browser_js 16 Aug 2023 18:32:25 -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,14 +114,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: 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 --- browser/patches/patch-browser_config_mozconfigs_base-browser 14 Nov 2022 22:13:59 -0000 1.2 +++ browser/patches/patch-browser_config_mozconfigs_base-browser 16 Aug 2023 18:32:25 -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: browser/patches/patch-browser_config_mozconfigs_tor-browser =================================================================== RCS file: browser/patches/patch-browser_config_mozconfigs_tor-browser diff -N browser/patches/patch-browser_config_mozconfigs_tor-browser --- browser/patches/patch-browser_config_mozconfigs_tor-browser 29 Jul 2022 20:20:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -Disable the updater and related stuff. Does nothing under OpenBSD. - -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" - - ac_add_options --with-relative-profile=TorBrowser/Data/Browser - --ac_add_options --enable-tor-browser-update --ac_add_options --enable-verify-mar -- - ac_add_options --with-distribution-id=org.torproject Index: browser/patches/patch-third_party_rust_mp4parse_src_lib_rs =================================================================== RCS file: browser/patches/patch-third_party_rust_mp4parse_src_lib_rs diff -N browser/patches/patch-third_party_rust_mp4parse_src_lib_rs --- browser/patches/patch-third_party_rust_mp4parse_src_lib_rs 7 Jun 2023 15:47:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -Unbreak build with rustc 1.70.0 - -https://github.com/mozilla/mp4parse-rust/commit/605d601ea8a20e4b26d2f2b55416c3005a8f9a4a - -Index: third_party/rust/mp4parse/src/lib.rs ---- third_party/rust/mp4parse/src/lib.rs.orig -+++ third_party/rust/mp4parse/src/lib.rs -@@ -3184,8 +3184,13 @@ macro_rules! impl_mul { - type Output = $output; - - fn mul(self, rhs: $rhs) -> Self::Output { -- static_assertions::const_assert!(<$output>::MAX <= <$inner>::MAX as u64); -- static_assertions::const_assert!(<$lhs>::MAX * <$rhs>::MAX <= <$output>::MAX); -+ static_assertions::const_assert!( -+ <$output as UpperBounded>::MAX <= <$inner>::MAX as u64 -+ ); -+ static_assertions::const_assert!( -+ <$lhs as UpperBounded>::MAX * <$rhs as UpperBounded>::MAX -+ <= <$output as UpperBounded>::MAX -+ ); - - let lhs: $inner = self.get().into(); - let rhs: $inner = rhs.get().into(); Index: browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm =================================================================== RCS file: browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm diff -N browser/patches/patch-toolkit_components_tor-launcher_TorLauncherUtil_jsm --- 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: 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 --- browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm 29 Jan 2023 08:56:47 -0000 1.2 +++ browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm 16 Aug 2023 18:32:26 -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: browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp =================================================================== RCS file: browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp diff -N browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp 16 Aug 2023 18:32:26 -0000 @@ -0,0 +1,51 @@ +Use ~/TorBrowser-Data/Browser as the browser data directory. + +Index: toolkit/xre/nsXREDirProvider.cpp +--- toolkit/xre/nsXREDirProvider.cpp.orig ++++ toolkit/xre/nsXREDirProvider.cpp +@@ -1472,6 +1472,25 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns + return gDataDirHome->Clone(aFile); + } + ++#if 1 ++ const char *homeDir = getenv("HOME"); ++ if (!homeDir || !*homeDir) { ++ return NS_ERROR_FAILURE; ++ } ++ 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); ++ } ++ NS_IF_ADDREF(*aFile = localDir); ++ return rv; ++#endif + #if defined(RELATIVE_DATA_DIR) + RefPtr<nsXREDirProvider> singleton = GetSingleton(); + if (!singleton) { +@@ -1554,7 +1573,7 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns + + rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir)); + #elif defined(XP_UNIX) +- const char* homeDir = getenv("HOME"); ++// const char* homeDir = getenv("HOME"); + if (!homeDir || !*homeDir) return NS_ERROR_FAILURE; + + # ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ +@@ -1636,8 +1655,10 @@ nsresult nsXREDirProvider::GetUserDataDirectory(nsIFil + nsresult rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), aLocal); + NS_ENSURE_SUCCESS(rv, rv); + ++#if 0 + rv = AppendProfilePath(localDir, aLocal); + NS_ENSURE_SUCCESS(rv, rv); ++#endif + + rv = EnsureDirectoryExists(localDir); + NS_ENSURE_SUCCESS(rv, rv); Index: browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf =================================================================== RCS file: browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf diff -N browser/patches/patch-tor-browser-linux64_Browser_TorBrowser_Data_fontconfig_fonts_conf --- 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: browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf =================================================================== RCS file: browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf diff -N browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ browser/patches/patch-tor-browser-linux64_Browser_fontconfig_fonts_conf 16 Aug 2023 18:32:26 -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: browser/patches/patch-xpcom_io_TorFileUtils_cpp =================================================================== RCS file: browser/patches/patch-xpcom_io_TorFileUtils_cpp diff -N browser/patches/patch-xpcom_io_TorFileUtils_cpp --- 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: browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp =================================================================== RCS file: browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp diff -N browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp 16 Aug 2023 18:32:26 -0000 @@ -0,0 +1,33 @@ +Use ~/TorBrowser-Data/Browser as the browser data directory. + +Index: xpcom/io/nsAppFileLocationProvider.cpp +--- xpcom/io/nsAppFileLocationProvider.cpp.orig ++++ xpcom/io/nsAppFileLocationProvider.cpp +@@ -352,6 +352,27 @@ nsresult nsAppFileLocationProvider::GetProductDirector + } + #endif + ++#if 1 ++ rv = NS_NewNativeLocalFile(nsDependentCString(PR_GetEnv("HOME")), true, ++ getter_AddRefs(localDir)); ++ if (NS_FAILED(rv)) { ++ return rv; ++ } ++ rv = localDir->AppendNative("TorBrowser-Data"_ns); ++ NS_ENSURE_SUCCESS(rv, rv); ++ rv = localDir->AppendNative("Browser"_ns); ++ NS_ENSURE_SUCCESS(rv, rv); ++ rv = localDir->Exists(&exists); ++ if (NS_SUCCEEDED(rv) && !exists) { ++ rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0700); ++ } ++ if (NS_FAILED(rv)) { ++ return rv; ++ } ++ localDir.forget(aLocalFile); ++ return rv; ++#endif ++ + #if defined(MOZ_WIDGET_COCOA) + FSRef fsRef; + # if defined(TOR_BROWSER) Index: browser/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- browser/pkg/PLIST 27 Oct 2022 17:37:14 -0000 1.17 +++ browser/pkg/PLIST 16 Aug 2023 18:32:26 -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: noscript/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v retrieving revision 1.53 diff -u -p -r1.53 Makefile --- noscript/Makefile 9 Jun 2023 08:57:20 -0000 1.53 +++ noscript/Makefile 16 Aug 2023 18:32:26 -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: noscript/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/noscript/distinfo,v retrieving revision 1.47 diff -u -p -r1.47 distinfo --- noscript/distinfo 9 Jun 2023 08:57:20 -0000 1.47 +++ noscript/distinfo 16 Aug 2023 18:32:26 -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
