Hi, Below is a diff that updates Tor Browser to 13.0. The 13.0 series is based on the new Firefox ESR (version 115).
Release notes: https://blog.torproject.org/new-release-tor-browser-130/ Test reports or feedback is welcome! Comments or OKs? Diff for -stable is almost identical (except for the BUILD_DEPENDS commit to -current a couple of days ago) so I won't send a separate diff for that. Right now a build is still running with the --with-branding=browser/branding/tb-release flag added to CONFIGURE_ARGS to hopefully fix the branding of the UI (and possibly also of the icons that are installed, as reported by george@) but that's a minor change and I wanted to send this out already. Caspar Index: meta/tor-browser/Makefile =================================================================== RCS file: /cvs/ports/meta/tor-browser/Makefile,v retrieving revision 1.77 diff -u -p -r1.77 Makefile --- meta/tor-browser/Makefile 29 Sep 2023 18:01:17 -0000 1.77 +++ meta/tor-browser/Makefile 17 Oct 2023 16:15:45 -0000 @@ -2,11 +2,11 @@ COMMENT= Tor Browser meta package MAINTAINER= Caspar Schutijser <cas...@schutijser.com> -PKGNAME= tor-browser-12.5.6 +PKGNAME= tor-browser-13.0 ONLY_FOR_ARCHS = aarch64 amd64 -RUN_DEPENDS= www/tor-browser/browser>=12.5.6 \ +RUN_DEPENDS= www/tor-browser/browser>=13.0 \ www/tor-browser/noscript>=11.4.27 \ - net/tor>=0.4.7.13 + net/tor>=0.4.8.7 .include <bsd.port.mk> Index: www/tor-browser/Makefile.inc =================================================================== RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.74 diff -u -p -r1.74 Makefile.inc --- www/tor-browser/Makefile.inc 29 Sep 2023 18:01:18 -0000 1.74 +++ www/tor-browser/Makefile.inc 17 Oct 2023 16:15:45 -0000 @@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org PERMIT_PACKAGE ?= Yes CATEGORIES = www BROWSER_NAME = tor-browser -TB_VERSION = 12.5.6 +TB_VERSION = 13.0 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.123 diff -u -p -r1.123 Makefile --- www/tor-browser/browser/Makefile 16 Oct 2023 14:07:51 -0000 1.123 +++ www/tor-browser/browser/Makefile 17 Oct 2023 16:15:45 -0000 @@ -11,14 +11,14 @@ MOZILLA_CODENAME = browser EXTRACT_SUFX = .tar.xz PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/} -DISTNAME = src-firefox-tor-browser-102.15.1esr-12.5-1-build3 +DISTNAME = src-firefox-tor-browser-115.3.1esr-13.0-1-build2 FIX_EXTRACT_PERMISSIONS = Yes DISTFILES += ${DISTNAME}.tar.xz \ - tor-browser-linux64-${TB_VERSION}_ALL.tar.xz \ - tor-expert-bundle-${TB_VERSION}-linux-x86_64.tar.gz + tor-browser-linux-x86_64-${TB_VERSION}.tar.xz \ + tor-expert-bundle-linux-x86_64-${TB_VERSION}.tar.gz -SO_VERSION = 8.0 +SO_VERSION = 9.0 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk MOZILLA_LIBS += freebl3 nss3 nssckbi MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3 @@ -49,6 +49,7 @@ BUILD_DEPENDS += lang/wasi-sdk/compiler- lang/wasi-libc # mach uses pkg_resources BUILD_DEPENDS += devel/py-setuptools${MODPY_FLAVOR} +BUILD_DEPENDS += textproc/jq # uses pledge() # Extra: Xcomposite.4 Xcursor.5 Xdamage.4 Xfixes.6 Xi.12 Xrender.6 @@ -67,7 +68,8 @@ CONFIGURE_ENV += LDFLAGS=-Wl,--threads=$ # app-name etc. for tor-browser CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \ - --with-base-browser-version=${TB_VERSION} + --with-base-browser-version=${TB_VERSION} \ + --enable-update-channel=release # for nss build system MAKE_ENV += BUILD_OPT=1 \ @@ -77,7 +79,7 @@ MAKE_ENV += BUILD_OPT=1 \ RUN_DEPENDS += net/obfs4proxy>=0.0.14 \ net/snowflake_proxy>=2.4.1 \ - net/tor>=0.4.7.13 + net/tor>=0.4.8.7 CONFIGURE_ARGS += --enable-release #1386371 CONFIGURE_ARGS += --enable-sandbox @@ -111,16 +113,12 @@ post-patch: # add default bridges for Pluggable Transports that we support .for pt in meek-azure obfs4 snowflake I=1; \ - cat ${WRKDIR}/tor/pluggable_transports/bridges_list.${pt}.txt | while read -r line ; do \ - echo "pref(\"extensions.torlauncher.default_bridge.${pt}.$$I\", \"$$line\");" >>${WRKSRC}/browser/app/profile/000-tor-browser.js; \ + jq ".[\"bridges\"][\"${pt}\"].[]" ${WRKDIR}/tor/pluggable_transports/pt_config.json | while read -r line ; do \ + echo "pref(\"extensions.torlauncher.default_bridge.${pt}.$$I\", $$line);" >>${WRKSRC}/browser/app/profile/000-tor-browser.js; \ I=$$((I + 1)); \ done .endfor - ${SUBST_CMD} ${WRKSRC}/xpcom/build/BinaryPath.h - sed -i 's/"files":{[^}]*}/"files":{}/' \ - ${WRKSRC}/third_party/rust/mp4parse/.cargo-checksum.json - BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME} TRUEBROWSER_DIR = ${TRUEPREFIX}/lib/${BROWSER_NAME} BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg @@ -155,7 +153,8 @@ post-install: ${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 + ${INSTALL_DATA} ${WRKSRC}/browser/branding/tb-release/content/tor-browser-logo.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 @@ -181,7 +180,7 @@ post-install: ${PREFIX}/bin/${BROWSER_NAME} .for f in unveil pledge -.for t in content gpu main rdd socket utility utility-audioDecoder +.for t in content gpu main rdd socket utility ${INSTALL_DATA} ${FILESDIR}/${f}.${t} ${BROWSER_DIR}/browser/defaults/preferences/ .endfor .endfor Index: www/tor-browser/browser/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.71 diff -u -p -r1.71 distinfo --- www/tor-browser/browser/distinfo 29 Sep 2023 18:01:18 -0000 1.71 +++ www/tor-browser/browser/distinfo 17 Oct 2023 16:15:45 -0000 @@ -1,6 +1,6 @@ -SHA256 (mozilla/src-firefox-tor-browser-102.15.1esr-12.5-1-build3.tar.xz) = KnkywrL4Cj7GA34/pHXhhnx0o1KIFrhwtagS3RWnQpY= -SHA256 (mozilla/tor-browser-linux64-12.5.6_ALL.tar.xz) = lZlGhyGDT9Vxox3ghfFSIZd3sazNyL23k0UtipaIGR8= -SHA256 (mozilla/tor-expert-bundle-12.5.6-linux-x86_64.tar.gz) = b+u3qiQDA9OG1ouhYTZ6xW+uPA62zf3GT7XOi48Sels= -SIZE (mozilla/src-firefox-tor-browser-102.15.1esr-12.5-1-build3.tar.xz) = 514543008 -SIZE (mozilla/tor-browser-linux64-12.5.6_ALL.tar.xz) = 113277580 -SIZE (mozilla/tor-expert-bundle-12.5.6-linux-x86_64.tar.gz) = 17945499 +SHA256 (mozilla/src-firefox-tor-browser-115.3.1esr-13.0-1-build2.tar.xz) = hBoJvEkbL7Efl/E7j/FlPtWHPzyhT/lADBP+8RBjJHg= +SHA256 (mozilla/tor-browser-linux-x86_64-13.0.tar.xz) = zdmPbmJo5FDoOjob+9TDCvCgKgLHvLi3bOMhcZg8DVM= +SHA256 (mozilla/tor-expert-bundle-linux-x86_64-13.0.tar.gz) = tvvh0uBZljheqVBK1Q81gq76O83YdW3iHINagAxYObo= +SIZE (mozilla/src-firefox-tor-browser-115.3.1esr-13.0-1-build2.tar.xz) = 544764832 +SIZE (mozilla/tor-browser-linux-x86_64-13.0.tar.xz) = 119425820 +SIZE (mozilla/tor-expert-bundle-linux-x86_64-13.0.tar.gz) = 29903840 Index: www/tor-browser/browser/files/pledge.utility =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/pledge.utility,v retrieving revision 1.1 diff -u -p -r1.1 pledge.utility --- www/tor-browser/browser/files/pledge.utility 27 Oct 2022 17:37:13 -0000 1.1 +++ www/tor-browser/browser/files/pledge.utility 17 Oct 2023 16:15:45 -0000 @@ -1,4 +1,7 @@ stdio +tmppath +rpath # gtk tries to access /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache recvfd sendfd -unix +prot_exec +unix # getsockopt Index: www/tor-browser/browser/files/pledge.utility-audioDecoder =================================================================== RCS file: www/tor-browser/browser/files/pledge.utility-audioDecoder diff -N www/tor-browser/browser/files/pledge.utility-audioDecoder --- www/tor-browser/browser/files/pledge.utility-audioDecoder 27 Oct 2022 17:37:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ -stdio -tmppath -rpath # gtk tries to access /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache -recvfd -sendfd -prot_exec -unix # getsockopt Index: www/tor-browser/browser/files/unveil.utility =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.utility,v retrieving revision 1.1 diff -u -p -r1.1 unveil.utility --- www/tor-browser/browser/files/unveil.utility 27 Oct 2022 17:37:13 -0000 1.1 +++ www/tor-browser/browser/files/unveil.utility 17 Oct 2023 16:15:45 -0000 @@ -1 +1,3 @@ -# nothing +/usr/lib r +/usr/local/lib r +/tmp rwc Index: www/tor-browser/browser/files/unveil.utility-audioDecoder =================================================================== RCS file: www/tor-browser/browser/files/unveil.utility-audioDecoder diff -N www/tor-browser/browser/files/unveil.utility-audioDecoder --- www/tor-browser/browser/files/unveil.utility-audioDecoder 27 Oct 2022 17:37:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,3 +0,0 @@ -/usr/lib r -/usr/local/lib r -/tmp rwc 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.4 diff -u -p -r1.4 patch-browser_app_profile_000-tor-browser_js --- www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js 6 Sep 2023 09:42:29 -0000 1.4 +++ www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js 17 Oct 2023 16:15:45 -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 -@@ -114,7 +114,10 @@ pref("extensions.torlauncher.socks_port_flags", "Exten +@@ -100,7 +100,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. 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.3 diff -u -p -r1.3 patch-browser_config_mozconfigs_base-browser --- www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser 6 Sep 2023 09:42:29 -0000 1.3 +++ www/tor-browser/browser/patches/patch-browser_config_mozconfigs_base-browser 17 Oct 2023 16:15:45 -0000 @@ -16,9 +16,9 @@ Index: browser/config/mozconfigs/base-br ac_add_options --enable-optimize -ac_add_options --enable-rust-simd - # 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-unverified-updates + ac_add_options --enable-base-browser-update +@@ -21,13 +20,14 @@ ac_add_options --enable-bundled-fonts ac_add_options --disable-tests ac_add_options --disable-debug @@ -34,10 +34,10 @@ 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 -@@ -40,7 +40,3 @@ ac_add_options --disable-backgroundtasks - - # Disable telemetry - ac_add_options MOZ_TELEMETRY_REPORTING= +@@ -42,7 +42,3 @@ ac_add_options MOZ_TELEMETRY_REPORTING= + # Disable the creation of a <something>.default that Firefox by default creates + # for old version that could not use dedicated profiles. See tor-browser#41542. + ac_add_options --disable-legacy-profile-creation - -if test -z "$WASI_SYSROOT"; then - ac_add_options --without-wasm-sandboxed-libraries 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.2 diff -u -p -r1.2 patch-browser_config_mozconfigs_tor-browser --- www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser 6 Sep 2023 09:42:29 -0000 1.2 +++ www/tor-browser/browser/patches/patch-browser_config_mozconfigs_tor-browser 17 Oct 2023 16:15:45 -0000 @@ -4,9 +4,9 @@ Code behind --with-relative-data-dir doe Index: browser/config/mozconfigs/tor-browser --- browser/config/mozconfigs/tor-browser.orig +++ browser/config/mozconfigs/tor-browser -@@ -2,7 +2,7 @@ - - mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +@@ -8,7 +8,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" + # like Firefox does. + # export MOZ_APP_REMOTINGNAME="Tor Browser" -ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser +#ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser Index: www/tor-browser/browser/patches/patch-config_makefiles_rust_mk =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-config_makefiles_rust_mk,v retrieving revision 1.7 diff -u -p -r1.7 patch-config_makefiles_rust_mk --- www/tor-browser/browser/patches/patch-config_makefiles_rust_mk 27 Oct 2022 17:37:13 -0000 1.7 +++ www/tor-browser/browser/patches/patch-config_makefiles_rust_mk 17 Oct 2023 16:15:45 -0000 @@ -5,11 +5,11 @@ https://bugzilla.mozilla.org/show_bug.cg Index: config/makefiles/rust.mk --- config/makefiles/rust.mk.orig +++ config/makefiles/rust.mk -@@ -90,7 +90,8 @@ ifndef rustflags_sancov +@@ -92,7 +92,8 @@ ifndef rustflags_sancov # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. ifndef MOZ_CODE_COVERAGE ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) --cargo_rustc_flags += -Clto +-cargo_rustc_flags += -Clto$(if $(filter full,$(MOZ_LTO_RUST_CROSS)),=fat) +cargo_rustc_flags += -Clto=thin +export CARGO_PROFILE_RELEASE_LTO=thin endif Index: www/tor-browser/browser/patches/patch-js_src_ctypes_libffi_src_dlmalloc_c =================================================================== RCS file: www/tor-browser/browser/patches/patch-js_src_ctypes_libffi_src_dlmalloc_c diff -N www/tor-browser/browser/patches/patch-js_src_ctypes_libffi_src_dlmalloc_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/patches/patch-js_src_ctypes_libffi_src_dlmalloc_c 17 Oct 2023 16:15:45 -0000 @@ -0,0 +1,20 @@ +use /dev/random to init memory within libffi ? +Index: js/src/ctypes/libffi/src/dlmalloc.c +--- js/src/ctypes/libffi/src/dlmalloc.c.orig ++++ js/src/ctypes/libffi/src/dlmalloc.c +@@ -2525,7 +2525,6 @@ static int init_mparams(void) { + + #if (FOOTERS && !INSECURE) + { +-#if USE_DEV_RANDOM + int fd; + unsigned char buf[sizeof(size_t)]; + /* Try to use /dev/urandom, else fall back on using time */ +@@ -2535,7 +2534,6 @@ static int init_mparams(void) { + close(fd); + } + else +-#endif /* USE_DEV_RANDOM */ + s = (size_t)(time(0) ^ (size_t)0x55555555U); + + s |= (size_t)8U; /* ensure nonzero */ Index: www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h =================================================================== RCS file: www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h diff -N www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h --- www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h 27 Oct 2022 17:37:13 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1347139 - -Index: js/src/jit/ProcessExecutableMemory.h ---- js/src/jit/ProcessExecutableMemory.h.orig -+++ js/src/jit/ProcessExecutableMemory.h -@@ -13,8 +13,9 @@ namespace js { - namespace jit { - - // Limit on the number of bytes of executable memory to prevent JIT spraying --// attacks. --#if JS_BITS_PER_WORD == 32 -+// attacks. Default datasize is 768Mb on OpenBSD, keep MaxCodeBytesPerProcess -+// low there otherwise the js engine hits ulimit quickly. -+#if JS_BITS_PER_WORD == 32 || defined(__OpenBSD__) - static const size_t MaxCodeBytesPerProcess = 140 * 1024 * 1024; - #else - // This is the largest number which satisfies various alignment static Index: www/tor-browser/browser/patches/patch-media_ffvpx_libavcodec_x86_fft_asm =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-media_ffvpx_libavcodec_x86_fft_asm,v retrieving revision 1.2 diff -u -p -r1.2 patch-media_ffvpx_libavcodec_x86_fft_asm --- www/tor-browser/browser/patches/patch-media_ffvpx_libavcodec_x86_fft_asm 15 Feb 2023 10:15:10 -0000 1.2 +++ www/tor-browser/browser/patches/patch-media_ffvpx_libavcodec_x86_fft_asm 17 Oct 2023 16:15:45 -0000 @@ -6,7 +6,7 @@ read-only by ld.so after relocations hav Index: media/ffvpx/libavcodec/x86/fft.asm --- media/ffvpx/libavcodec/x86/fft.asm.orig +++ media/ffvpx/libavcodec/x86/fft.asm -@@ -548,10 +548,6 @@ DEFINE_ARGS zc, w, n, o1, o3 +@@ -457,10 +457,6 @@ DEFINE_ARGS zc, w, n, o1, o3 %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs lea r2, [dispatch_tab%1] mov r2, [r2 + (%2q-2)*gprsize] @@ -17,9 +17,9 @@ Index: media/ffvpx/libavcodec/x86/fft.as call r2 %endmacro ; FFT_DISPATCH -@@ -731,11 +727,7 @@ DECL_PASS pass_interleave_3dnow, PASS_BIG 0 - %define pass_interleave_3dnowext pass_interleave_3dnow - %endif +@@ -585,11 +581,7 @@ cglobal imdct_calc, 3,5,3 + jl .loop + RET -%ifdef PIC -%define SECTION_REL - $$ @@ -29,7 +29,7 @@ Index: media/ffvpx/libavcodec/x86/fft.as %macro DECL_FFT 1-2 ; nbits, suffix %ifidn %0, 1 -@@ -773,8 +765,10 @@ fft %+ n %+ fullsuffix: +@@ -627,8 +619,10 @@ fft %+ n %+ fullsuffix: %endrep %undef n Index: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm diff -N www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm --- www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm 27 Oct 2022 17:37:13 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1696958 -revert parts of https://hg.mozilla.org/mozilla-central/rev/aadba76932ea - -Index: toolkit/components/downloads/DownloadIntegration.jsm ---- toolkit/components/downloads/DownloadIntegration.jsm.orig -+++ toolkit/components/downloads/DownloadIntegration.jsm -@@ -58,6 +58,7 @@ ChromeUtils.defineModuleGetter( - "NetUtil", - "resource://gre/modules/NetUtil.jsm" - ); -+ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); - ChromeUtils.defineModuleGetter( - this, - "Services", -@@ -367,9 +368,7 @@ var DownloadIntegration = { - Ci.nsIFile - ); - directoryPath = directory.path; -- await IOUtils.makeDirectory(directoryPath, { -- createAncestors: false, -- }); -+ await OS.File.makeDir(directoryPath, { ignoreExisting: true }); - } catch (ex) { - Cu.reportError(ex); - // Either the preference isn't set or the directory cannot be created. -@@ -958,8 +957,8 @@ var DownloadIntegration = { - ); - - // Create the Downloads folder and ignore if it already exists. -- return IOUtils.makeDirectory(directoryPath, { -- createAncestors: false, -+ return OS.File.makeDir(directoryPath, { -+ ignoreExisting: true - }).then(() => directoryPath); - }, - Index: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_sys_mjs =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_sys_mjs diff -N www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_sys_mjs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_sys_mjs 17 Oct 2023 16:15:45 -0000 @@ -0,0 +1,15 @@ +Make sure downloadsFolder isnt translated + +was previously in patch-toolkit_components_downloads_DownloadUIHelper_jsm +Index: toolkit/components/downloads/DownloadIntegration.sys.mjs +--- toolkit/components/downloads/DownloadIntegration.sys.mjs.orig ++++ toolkit/components/downloads/DownloadIntegration.sys.mjs +@@ -870,7 +870,7 @@ export var DownloadIntegration = { + // displayed in the user interface. + let directoryPath = PathUtils.join( + this._getDirectory(aName), +- lazy.stringBundle.GetStringFromName("downloadsFolder") ++ "Downloads" + ); + + // Create the Downloads folder and ignore if it already exists. Index: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadUIHelper_jsm =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadUIHelper_jsm diff -N www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadUIHelper_jsm --- www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadUIHelper_jsm 9 Mar 2022 20:48:33 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -Make sure DownloadUIHelper.strings.downloadsFolder isnt translated - -Index: toolkit/components/downloads/DownloadUIHelper.jsm ---- toolkit/components/downloads/DownloadUIHelper.jsm.orig -+++ toolkit/components/downloads/DownloadUIHelper.jsm -@@ -154,6 +154,7 @@ XPCOMUtils.defineLazyGetter(DownloadUIHelper, "strings - strings[stringName] = string.value; - } - } -+ strings["downloadsFolder"] = "Downloads"; - return strings; - }); - Index: www/tor-browser/browser/patches/patch-toolkit_components_processtools_ProcInfo_linux_cpp =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_processtools_ProcInfo_linux_cpp diff -N www/tor-browser/browser/patches/patch-toolkit_components_processtools_ProcInfo_linux_cpp --- www/tor-browser/browser/patches/patch-toolkit_components_processtools_ProcInfo_linux_cpp 27 Oct 2022 17:37:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,122 +0,0 @@ -about:processes for OpenBSD - -https://bugzilla.mozilla.org/show_bug.cgi?id=1772090 - -Index: toolkit/components/processtools/ProcInfo_linux.cpp ---- toolkit/components/processtools/ProcInfo_linux.cpp.orig -+++ toolkit/components/processtools/ProcInfo_linux.cpp -@@ -13,6 +13,11 @@ - #include "nsMemoryReporterManager.h" - #include "nsWhitespaceTokenizer.h" - -+#ifdef __OpenBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#include <cerrno> -+#endif - #include <cstdio> - #include <cstring> - #include <unistd.h> -@@ -24,6 +29,95 @@ namespace mozilla { - - int GetCycleTimeFrequencyMHz() { return 0; } - -+#ifdef __OpenBSD__ -+nsresult GetCpuTimeSinceProcessStartInMs(uint64_t* aResult) { -+ timespec t; -+ if (clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t) == 0) { -+ uint64_t cpuTime = -+ uint64_t(t.tv_sec) * 1'000'000'000u + uint64_t(t.tv_nsec); -+ *aResult = cpuTime / PR_NSEC_PER_MSEC; -+ return NS_OK; -+ } -+ -+ return NS_ERROR_FAILURE; -+} -+ -+nsresult GetGpuTimeSinceProcessStartInMs(uint64_t* aResult) { -+ return NS_ERROR_NOT_IMPLEMENTED; -+} -+ -+ProcInfoPromise::ResolveOrRejectValue GetProcInfoSync( -+ nsTArray<ProcInfoRequest>&& aRequests) { -+ ProcInfoPromise::ResolveOrRejectValue result; -+ -+ HashMap<base::ProcessId, ProcInfo> gathered; -+ if (!gathered.reserve(aRequests.Length())) { -+ result.SetReject(NS_ERROR_OUT_OF_MEMORY); -+ return result; -+ } -+ for (const auto& request : aRequests) { -+ size_t size; -+ int mib[6]; -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC; -+ mib[2] = KERN_PROC_PID | KERN_PROC_SHOW_THREADS; -+ mib[3] = request.pid; -+ mib[4] = sizeof(kinfo_proc); -+ mib[5] = 0; -+ if (sysctl(mib, 6, nullptr, &size, nullptr, 0) == -1) { -+ // Can't get info for this process. Skip it. -+ continue; -+ } -+ -+ mib[5] = size / sizeof(kinfo_proc); -+ auto procs = MakeUniqueFallible<kinfo_proc[]>(mib[5]); -+ if (!procs) { -+ result.SetReject(NS_ERROR_OUT_OF_MEMORY); -+ return result; -+ } -+ if (sysctl(mib, 6, procs.get(), &size, nullptr, 0) == -1 && -+ errno != ENOMEM) { -+ continue; -+ } -+ -+ ProcInfo info; -+ info.pid = request.pid; -+ info.childId = request.childId; -+ info.type = request.processType; -+ info.origin = request.origin; -+ info.windows = std::move(request.windowInfo); -+ -+ bool found = false; -+ for (size_t i = 0; i < size / sizeof(kinfo_proc); i++) { -+ const auto& p = procs[i]; -+ if (p.p_tid == -1) { -+ // This is the process. -+ found = true; -+ info.cpuTime = p.p_rtime_sec * 1'000'000'000u + -+ p.p_uutime_usec * 1'000u; -+ info.memory = (p.p_vm_tsize + p.p_vm_dsize + p.p_vm_ssize) * -+ getpagesize(); -+ } else { -+ // This is one of its threads. -+ ThreadInfo threadInfo; -+ threadInfo.tid = p.p_tid; -+ threadInfo.cpuTime = p.p_rtime_sec * 1'000'000'000u + -+ p.p_uutime_usec * 1'000u; -+ info.threads.AppendElement(threadInfo); -+ } -+ } -+ -+ if (found && !gathered.put(request.pid, std::move(info))) { -+ result.SetReject(NS_ERROR_OUT_OF_MEMORY); -+ return result; -+ } -+ } -+ -+ // ... and we're done! -+ result.SetResolve(std::move(gathered)); -+ return result; -+} -+#else - // StatReader can parse and tokenize a POSIX stat file. - // see http://man7.org/linux/man-pages/man5/proc.5.html - // -@@ -340,5 +434,6 @@ ProcInfoPromise::ResolveOrRejectValue GetProcInfoSync( - result.SetResolve(std::move(gathered)); - return result; - } -+#endif - - } // namespace mozilla Index: www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm diff -N www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm --- www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_jsm 6 Sep 2023 09:42:29 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -Let geoip/geoip6 file paths be set by prefs like everything else and let -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 -@@ -242,6 +242,8 @@ class TorProcess { - const torrcFile = TorLauncherUtil.getTorFile("torrc", true); - this._dataDir = TorLauncherUtil.getTorFile("tordatadir", true); - const onionAuthDir = TorLauncherUtil.getTorFile("toronionauthdir", true); -+ const geoipFile = TorLauncherUtil.getTorFile("geoip", false); -+ const geoip6File = TorLauncherUtil.getTorFile("geoip6", false); - const hashedPassword = TorProtocolService.torGetPassword(true); - let detailsKey; - if (!this._exeFile) { -@@ -270,17 +272,13 @@ class TorProcess { - "torrc-defaults", - false - ); -- // The geoip and geoip6 files are in the same directory as torrc-defaults. -- const geoipFile = torrcDefaultsFile.clone(); -- geoipFile.leafName = "geoip"; -- const geoip6File = torrcDefaultsFile.clone(); -- geoip6File.leafName = "geoip6"; - - this._args = []; - if (torrcDefaultsFile) { - this._args.push("--defaults-torrc"); - this._args.push(torrcDefaultsFile.path); - } -+ this._args.push("--ignore-missing-torrc"); - this._args.push("-f"); - this._args.push(torrcFile.path); - this._args.push("DataDirectory"); Index: www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs diff -N www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/patches/patch-toolkit_components_tor-launcher_TorProcess_sys_mjs 17 Oct 2023 16:15:45 -0000 @@ -0,0 +1,26 @@ +Let geoip/geoip6 file paths be set by prefs like everything else and let +the new getTorFile() deal with it. + +Index: toolkit/components/tor-launcher/TorProcess.sys.mjs +--- toolkit/components/tor-launcher/TorProcess.sys.mjs.orig ++++ toolkit/components/tor-launcher/TorProcess.sys.mjs +@@ -254,16 +254,14 @@ export class TorProcess { + "torrc-defaults", + false + ); +- // The geoip and geoip6 files are in the same directory as torrc-defaults. +- const geoipFile = torrcDefaultsFile.clone(); +- geoipFile.leafName = "geoip"; +- const geoip6File = torrcDefaultsFile.clone(); +- geoip6File.leafName = "geoip6"; ++ const geoipFile = lazy.TorLauncherUtil.getTorFile("geoip", false); ++ const geoip6File = lazy.TorLauncherUtil.getTorFile("geoip6", false); + + this.#args = []; + if (torrcDefaultsFile) { + this.#args.push("--defaults-torrc", torrcDefaultsFile.path); + } ++ this.#args.push("--ignore-missing-torrc"); + this.#args.push("-f", torrcFile.path); + this.#args.push("DataDirectory", this.#dataDir.path); + this.#args.push("ClientOnionAuthDir", onionAuthDir.path); Index: www/tor-browser/browser/patches/patch-toolkit_moz_configure =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-toolkit_moz_configure,v retrieving revision 1.6 diff -u -p -r1.6 patch-toolkit_moz_configure --- www/tor-browser/browser/patches/patch-toolkit_moz_configure 27 Oct 2022 17:37:13 -0000 1.6 +++ www/tor-browser/browser/patches/patch-toolkit_moz_configure 17 Oct 2023 16:15:45 -0000 @@ -3,7 +3,7 @@ Required to make font fingerprinting def Index: toolkit/moz.configure --- toolkit/moz.configure.orig +++ toolkit/moz.configure -@@ -1770,7 +1770,7 @@ set_config( +@@ -1837,7 +1837,7 @@ set_config( @depends(target) def bundled_fonts_default(target): Index: www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp diff -N www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp --- www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp 27 Oct 2022 17:37:13 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,125 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1714919 - -Try to fix opening downloaded files with registered external mimetype handlers -after gio-launch-desktop removal in glib 2.64. - -more or less replaces g_app_info_launch_uris() (which relies on /bin/sh in -2.64) calls by g_spawn_async() using a handler that should be previously -unveiled. - -Index: toolkit/system/gnome/nsGIOService.cpp ---- toolkit/system/gnome/nsGIOService.cpp.orig -+++ toolkit/system/gnome/nsGIOService.cpp -@@ -234,13 +234,24 @@ nsGIOMimeApp::LaunchWithURI(nsIURI* aUri, - uris.data = const_cast<char*>(spec.get()); - - GUniquePtr<GError> error; -- gboolean result = g_app_info_launch_uris( -- mApp, &uris, GetLaunchContext().get(), getter_Transfers(error)); -- if (!result) { -- g_warning("Cannot launch application: %s", error->message); -+ gchar *path = g_filename_from_uri(spec.get(), NULL, NULL); -+ const gchar *bin = g_app_info_get_executable(mApp); -+ if (!bin) { -+ g_warning("no executable found for %s, maybe not unveiled ?", g_app_info_get_name(mApp)); - return NS_ERROR_FAILURE; - } -+ g_message("LaunchWithURI: spawning %s %s for %s", bin, path, spec.get()); -+ const gchar * const argv[] = { bin, path, NULL }; - -+ GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH | -+ G_SPAWN_DO_NOT_REAP_CHILD); -+ gboolean result = g_spawn_async( NULL, (char**) argv, NULL, flags, NULL, NULL, NULL, getter_Transfers(error)); -+ -+ if (!result) { -+ g_warning("Cannot launch application %s with arg %s: %s", bin, path, error->message); -+ return NS_ERROR_FAILURE; -+ } -+ - return NS_OK; - } - -@@ -491,23 +502,18 @@ nsGIOService::GetAppForMimeType(const nsACString& aMim - return NS_ERROR_NOT_AVAILABLE; - } - --#if defined(__OpenBSD__) && defined(MOZ_SANDBOX) -- // g_app_info_get_default_for_type will fail on OpenBSD's veiled filesystem -- // since we most likely don't have direct access to the binaries that are -- // registered as defaults for this type. Fake it up by just executing -- // xdg-open via gio-launch-desktop (which we do have access to) and letting -- // it figure out which program to execute for this MIME type -- RefPtr<GAppInfo> app_info = dont_AddRef(g_app_info_create_from_commandline( -- "/usr/local/bin/xdg-open", -- nsPrintfCString("System default for %s", content_type.get()).get(), -- G_APP_INFO_CREATE_NONE, NULL)); --#else - RefPtr<GAppInfo> app_info = - dont_AddRef(g_app_info_get_default_for_type(content_type.get(), false)); --#endif - if (!app_info) { - return NS_ERROR_FAILURE; - } -+ char *t; -+ t = g_find_program_in_path(g_app_info_get_executable(app_info)); -+ if (t != NULL) { -+ g_debug("%s is registered as handler for %s, binary available as %s", g_app_info_get_executable(app_info), content_type.get(), t); -+ } else { -+ g_warning("%s is registered as handler for %s but not available in PATH (missing unveil ?)", g_app_info_get_executable(app_info), content_type.get()); -+ } - RefPtr<nsGIOMimeApp> mozApp = new nsGIOMimeApp(app_info.forget()); - mozApp.forget(aApp); - return NS_OK; -@@ -535,8 +541,24 @@ nsresult nsGIOService::ShowURI(nsIURI* aURI) { - nsAutoCString spec; - MOZ_TRY(aURI->GetSpec(spec)); - GUniquePtr<GError> error; -- if (!g_app_info_launch_default_for_uri(spec.get(), GetLaunchContext().get(), -- getter_Transfers(error))) { -+ gboolean result_uncertain; -+ gchar *path = g_filename_from_uri(spec.get(), NULL, NULL); -+ gchar *content_type = g_content_type_guess(path, NULL, 0, &result_uncertain); -+ if (content_type != NULL && !result_uncertain) { -+ GAppInfo* app_info = g_app_info_get_default_for_type(content_type, false); -+ const gchar *bin = g_app_info_get_executable(app_info); -+ if (!bin) { -+ g_warning("no executable found for %s, maybe not unveiled ?", g_app_info_get_name(app_info)); -+ return NS_ERROR_FAILURE; -+ } -+ g_message("ShowURI: spawning %s %s for %s (content type %s)", bin, path, spec.get(), content_type); -+ const gchar * const argv[] = { bin, path, NULL }; -+ GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH | -+ G_SPAWN_DO_NOT_REAP_CHILD); -+ g_spawn_async( NULL, (char**) argv, NULL, flags, NULL, NULL, NULL, getter_Transfers(error)); -+ } -+ g_free(content_type); -+ if (error) { - g_warning("Could not launch default application for URI: %s", - error->message); - return NS_ERROR_FAILURE; -@@ -549,8 +571,23 @@ static nsresult LaunchPath(const nsACString& aPath) { - g_file_new_for_commandline_arg(PromiseFlatCString(aPath).get())); - GUniquePtr<char> spec(g_file_get_uri(file)); - GUniquePtr<GError> error; -- g_app_info_launch_default_for_uri(spec.get(), GetLaunchContext().get(), -- getter_Transfers(error)); -+ gboolean result_uncertain; -+ gchar *path = g_filename_from_uri(spec.get(), NULL, NULL); -+ gchar *content_type = g_content_type_guess(path, NULL, 0, &result_uncertain); -+ if (content_type != NULL && !result_uncertain) { -+ GAppInfo* app_info = g_app_info_get_default_for_type(content_type, false); -+ const gchar *bin = g_app_info_get_executable(app_info); -+ if (!bin) { -+ g_warning("no executable found for %s, maybe not unveiled ?", g_app_info_get_name(app_info)); -+ return NS_ERROR_FAILURE; -+ } -+ g_message("ShowURIForInput: spawning %s %s for %s (content type %s)", bin, path, spec.get(), content_type); -+ const gchar * const argv[] = { bin, path, NULL }; -+ GSpawnFlags flags = static_cast<GSpawnFlags>(G_SPAWN_SEARCH_PATH | -+ G_SPAWN_DO_NOT_REAP_CHILD); -+ g_spawn_async( NULL, (char**) argv, NULL, flags, NULL, NULL, NULL, getter_Transfers(error)); -+ } -+ g_free(content_type); - if (error) { - g_warning("Cannot launch default application: %s", error->message); - return NS_ERROR_FAILURE; Index: www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_cpp =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_cpp diff -N www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_cpp --- www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_cpp 27 Oct 2022 17:37:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=1776713 - -Index: toolkit/xre/glxtest.cpp ---- toolkit/xre/glxtest.cpp.orig -+++ toolkit/xre/glxtest.cpp -@@ -258,6 +258,9 @@ static void close_logging() { - #define PCI_BASE_CLASS_DISPLAY 0x03 - - static int get_pci_status() { -+#ifdef __OpenBSD__ -+ return 1; -+#endif - void* libpci = dlopen("libpci.so.3", RTLD_LAZY); - if (!libpci) { - libpci = dlopen("libpci.so", RTLD_LAZY); Index: www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_glxtest_cpp =================================================================== RCS file: www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_glxtest_cpp diff -N www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_glxtest_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/patches/patch-toolkit_xre_glxtest_glxtest_cpp 17 Oct 2023 16:15:45 -0000 @@ -0,0 +1,13 @@ +Index: toolkit/xre/glxtest/glxtest.cpp +--- toolkit/xre/glxtest/glxtest.cpp.orig ++++ toolkit/xre/glxtest/glxtest.cpp +@@ -193,6 +193,9 @@ extern "C" { + #define PCI_BASE_CLASS_DISPLAY 0x03 + + static void get_pci_status() { ++#ifdef __OpenBSD__ ++ return; ++#endif + log("GLX_TEST: get_pci_status start\n"); + + if (access("/sys/bus/pci/", F_OK) != 0 && Index: www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-toolkit_xre_nsXREDirProvider_cpp --- www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp 6 Sep 2023 09:42:29 -0000 1.1 +++ www/tor-browser/browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp 17 Oct 2023 16:15:45 -0000 @@ -3,7 +3,7 @@ Use ~/TorBrowser-Data/Browser as the bro Index: toolkit/xre/nsXREDirProvider.cpp --- toolkit/xre/nsXREDirProvider.cpp.orig +++ toolkit/xre/nsXREDirProvider.cpp -@@ -1557,6 +1557,19 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns +@@ -1433,6 +1433,19 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns const char* homeDir = getenv("HOME"); if (!homeDir || !*homeDir) return NS_ERROR_FAILURE; @@ -23,7 +23,7 @@ Index: toolkit/xre/nsXREDirProvider.cpp # ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */ aLocal = false; # endif -@@ -1576,6 +1589,7 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns +@@ -1452,6 +1465,7 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(ns rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, getter_AddRefs(localDir)); } @@ -31,7 +31,7 @@ Index: toolkit/xre/nsXREDirProvider.cpp #else # error "Don't know how to get product dir on your platform" #endif -@@ -1636,8 +1650,10 @@ nsresult nsXREDirProvider::GetUserDataDirectory(nsIFil +@@ -1512,8 +1526,10 @@ nsresult nsXREDirProvider::GetUserDataDirectory(nsIFil nsresult rv = GetUserDataDirectoryHome(getter_AddRefs(localDir), aLocal); NS_ENSURE_SUCCESS(rv, rv); Index: www/tor-browser/browser/patches/patch-xpcom_build_BinaryPath_h =================================================================== RCS file: www/tor-browser/browser/patches/patch-xpcom_build_BinaryPath_h diff -N www/tor-browser/browser/patches/patch-xpcom_build_BinaryPath_h --- www/tor-browser/browser/patches/patch-xpcom_build_BinaryPath_h 27 Oct 2022 17:37:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -avoid pledge sysctl 4: 1 55 29028 1 ? - -Index: xpcom/build/BinaryPath.h ---- xpcom/build/BinaryPath.h.orig -+++ xpcom/build/BinaryPath.h -@@ -204,6 +204,7 @@ class BinaryPath { - mib[1] = KERN_PROC_ARGS; - mib[2] = getpid(); - mib[3] = KERN_PROC_ARGV; -+ return GetFromArgv0("${TRUEPREFIX}/lib/${MOZILLA_PROJECT}/${MOZILLA_PROJECT}", aResult); - - size_t len = 0; - if (sysctl(mib, 4, nullptr, &len, nullptr, 0) < 0) { Index: www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-xpcom_io_nsAppFileLocationProvider_cpp --- www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp 6 Sep 2023 09:42:29 -0000 1.1 +++ www/tor-browser/browser/patches/patch-xpcom_io_nsAppFileLocationProvider_cpp 17 Oct 2023 16:15:45 -0000 @@ -3,7 +3,7 @@ Use ~/TorBrowser-Data/Browser as the bro Index: xpcom/io/nsAppFileLocationProvider.cpp --- xpcom/io/nsAppFileLocationProvider.cpp.orig +++ xpcom/io/nsAppFileLocationProvider.cpp -@@ -402,6 +402,12 @@ nsresult nsAppFileLocationProvider::GetProductDirector +@@ -328,6 +328,12 @@ nsresult nsAppFileLocationProvider::GetProductDirector if (NS_FAILED(rv)) { return rv; } Index: www/tor-browser/browser/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v retrieving revision 1.19 diff -u -p -r1.19 PLIST --- www/tor-browser/browser/pkg/PLIST 14 Sep 2023 06:03:49 -0000 1.19 +++ www/tor-browser/browser/pkg/PLIST 17 Oct 2023 16:15:45 -0000 @@ -29,7 +29,6 @@ lib/${BROWSER_NAME}/browser/defaults/pre lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.rdd lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.socket lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.utility -lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.utility-audioDecoder lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.content @sample ${SYSCONFDIR}/${MOZILLA_PROJECT}/unveil.content lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.gpu @@ -39,18 +38,19 @@ lib/${BROWSER_NAME}/browser/defaults/pre lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.rdd lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.socket lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.utility -lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.utility-audioDecoder lib/${BROWSER_NAME}/browser/defaults/profile/ lib/${BROWSER_NAME}/browser/defaults/profile/bookmarks.html -lib/${BROWSER_NAME}/browser/features/ -lib/${BROWSER_NAME}/browser/features/onboard...@mozilla.org.xpi lib/${BROWSER_NAME}/browser/fontconfig/ lib/${BROWSER_NAME}/browser/fontconfig/fonts.conf lib/${BROWSER_NAME}/browser/fonts/ +lib/${BROWSER_NAME}/browser/fonts/000_README.txt lib/${BROWSER_NAME}/browser/fonts/Arimo-Bold.ttf lib/${BROWSER_NAME}/browser/fonts/Arimo-BoldItalic.ttf lib/${BROWSER_NAME}/browser/fonts/Arimo-Italic.ttf lib/${BROWSER_NAME}/browser/fonts/Arimo-Regular.ttf +lib/${BROWSER_NAME}/browser/fonts/Cousine-Bold.ttf +lib/${BROWSER_NAME}/browser/fonts/Cousine-BoldItalic.ttf +lib/${BROWSER_NAME}/browser/fonts/Cousine-Italic.ttf lib/${BROWSER_NAME}/browser/fonts/Cousine-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoNaskhArabic-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSansAdlam-Regular.ttf @@ -174,14 +174,14 @@ lib/${BROWSER_NAME}/browser/fonts/NotoSe lib/${BROWSER_NAME}/browser/fonts/NotoSerifLao-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifMalayalam-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifMyanmar-Regular.ttf -lib/${BROWSER_NAME}/browser/fonts/NotoSerifNyiakengPuachueHmong-Regular.ttf +lib/${BROWSER_NAME}/browser/fonts/NotoSerifNPHmong-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifSinhala-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifTamil-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifTelugu-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifThai-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifTibetan-Regular.ttf lib/${BROWSER_NAME}/browser/fonts/NotoSerifYezidi-Regular.ttf -lib/${BROWSER_NAME}/browser/fonts/STIXMath-Regular.otf +lib/${BROWSER_NAME}/browser/fonts/STIXTwoMath-Regular.otf lib/${BROWSER_NAME}/browser/fonts/Tinos-Bold.ttf lib/${BROWSER_NAME}/browser/fonts/Tinos-BoldItalic.ttf lib/${BROWSER_NAME}/browser/fonts/Tinos-Italic.ttf @@ -196,6 +196,7 @@ lib/${BROWSER_NAME}/distribution/ lib/${BROWSER_NAME}/distribution/distribution.ini lib/${BROWSER_NAME}/fonts/ lib/${BROWSER_NAME}/fonts/TwemojiMozilla.ttf +@bin lib/${BROWSER_NAME}/glxtest @lib lib/${BROWSER_NAME}/libfreebl3.so.${LIBfreebl3_VERSION} @lib lib/${BROWSER_NAME}/libipcclientcerts.so.${LIBipcclientcerts_VERSION} @lib lib/${BROWSER_NAME}/liblgpllibs.so.${LIBlgpllibs_VERSION}
