Hi all, Below is a diff that updates Tor Browser to 11.0. It's based on the new Firefox ESR 91 (instead of 78) so in that regard there are quite some changes syncing with www/firefox-esr. Tested on amd64.
More information: https://blog.torproject.org/new-release-tor-browser-11-0 Caspar Schutijser Index: meta/tor-browser/Makefile =================================================================== RCS file: /cvs/ports/meta/tor-browser/Makefile,v retrieving revision 1.45 diff -u -p -r1.45 Makefile --- meta/tor-browser/Makefile 29 Oct 2021 18:09:53 -0000 1.45 +++ meta/tor-browser/Makefile 10 Nov 2021 18:58:02 -0000 @@ -4,11 +4,11 @@ COMMENT= Tor Browser meta package MAINTAINER= Caspar Schutijser <cas...@schutijser.com> -PKGNAME= tor-browser-10.5.10 +PKGNAME= tor-browser-11.0 ONLY_FOR_ARCHS = amd64 -RUN_DEPENDS= www/tor-browser/browser>=10.5.10 \ +RUN_DEPENDS= www/tor-browser/browser>=11.0 \ www/tor-browser/noscript>=11.2.11 \ - net/tor>=0.4.6.7 + net/tor>=0.4.6.8 .include <bsd.port.mk> Index: www/tor-browser/Makefile.inc =================================================================== RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v retrieving revision 1.44 diff -u -p -r1.44 Makefile.inc --- www/tor-browser/Makefile.inc 29 Oct 2021 18:09:53 -0000 1.44 +++ www/tor-browser/Makefile.inc 10 Nov 2021 18:58:02 -0000 @@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org PERMIT_PACKAGE ?= Yes CATEGORIES = www BROWSER_NAME = tor-browser -TB_VERSION = 10.5.10 +TB_VERSION = 11.0 TB_PREFIX = tb SUBST_VARS += BROWSER_NAME TB_VERSION Index: www/tor-browser/browser/Makefile =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v retrieving revision 1.69 diff -u -p -r1.69 Makefile --- www/tor-browser/browser/Makefile 4 Nov 2021 13:13:36 -0000 1.69 +++ www/tor-browser/browser/Makefile 10 Nov 2021 18:58:02 -0000 @@ -9,15 +9,14 @@ ONLY_FOR_ARCHS = amd64 MOZILLA_VERSION = ${TB_VERSION} MOZILLA_PROJECT = ${BROWSER_NAME} MOZILLA_CODENAME = browser -TL_VERSION = 0.2.30 +TL_VERSION = 0.2.31 HE_VERSION = 2021.4.15 -REVISION = 0 EXTRACT_SUFX = .tar.xz PATCHORIG = .pat.orig PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION} -DISTNAME = src-firefox-tor-browser-78.15.0esr-10.5-1-build3 +DISTNAME = src-firefox-tor-browser-91.3.0esr-11.0-1-build2 FIX_EXTRACT_PERMISSIONS = Yes EXTRACT_ONLY += ${DISTNAME}.tar.xz \ @@ -26,7 +25,7 @@ EXTRACT_ONLY += ${DISTNAME}.tar.xz \ DISTFILES = ${EXTRACT_ONLY} \ https-everywhere-${HE_VERSION}-eff.xpi:0 -SO_VERSION = 6.0 +SO_VERSION = 7.0 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk MOZILLA_LIBS += freebl3 nss3 nssckbi MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3 @@ -43,7 +42,7 @@ MODULES = www/mozilla lang/python MODPY_RUNDEP = No -COMPILER = base-clang ports-clang +COMPILER = ports-clang MODCLANG_ARCHS = amd64 i386 # tor-browser needs built-in nss, sqlite @@ -52,10 +51,13 @@ MOZILLA_USE_BUNDLED_NSS = Yes # 63 requires node because why not #1483595 BUILD_DEPENDS += lang/node # 63 requires cbindgen #1478813 -BUILD_DEPENDS += devel/cbindgen>=0.14.3 +BUILD_DEPENDS += devel/cbindgen>=0.19.0 +#1670807 +BUILD_DEPENDS += devel/m4 # uses pledge() WANTLIB += X11-xcb Xcursor Xi intl xcb xcb-shm harfbuzz ${COMPILER_LIBCXX} +WANTLIB += Xcomposite Xdamage Xfixes # Regression tests are too hard to adapt to run here NO_TEST = Yes @@ -63,8 +65,10 @@ NO_TEST = Yes WRKDIST = ${WRKDIR}/${DISTNAME:S/src-//} CONFIGURE_STYLE = simple +CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/configure.py CONFIGURE_ARGS += --prefix=${PREFIX} MAKE_ENV += BUILD_VERBOSE_LOG="1" CARGOFLAGS="-j${MAKE_JOBS}" +CONFIGURE_ENV += M4=/usr/local/bin/gm4 # app-name etc. for tor-browser CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \ @@ -80,10 +84,11 @@ BUILD_DEPENDS += devel/py-virtualenv BUILD_DEPENDS += archivers/unzip archivers/zip -RUN_DEPENDS += net/tor>=0.4.6.7 +RUN_DEPENDS += net/tor>=0.4.6.8 CONFIGURE_ARGS += --enable-release #1386371 CONFIGURE_ARGS += --enable-sandbox +CONFIGURE_ARGS += --enable-forkserver CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib # XXX badly formed debug in libxul ? @@ -169,7 +174,7 @@ post-install: ${SUBST_PROGRAM} ${FILESDIR}/${BROWSER_NAME} \ ${PREFIX}/bin/${BROWSER_NAME} -.for f in unveil.content unveil.gpu unveil.main pledge.content pledge.gpu pledge.main +.for f in unveil.content unveil.gpu unveil.main unveil.rdd unveil.socket pledge.content pledge.gpu pledge.main pledge.rdd pledge.socket ${INSTALL_DATA} ${FILESDIR}/${f} ${BROWSER_DIR}/browser/defaults/preferences/ .endfor Index: www/tor-browser/browser/distinfo =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v retrieving revision 1.43 diff -u -p -r1.43 distinfo --- www/tor-browser/browser/distinfo 29 Oct 2021 18:09:53 -0000 1.43 +++ www/tor-browser/browser/distinfo 10 Nov 2021 18:58:02 -0000 @@ -1,8 +1,8 @@ SHA256 (mozilla/https-everywhere-2021.4.15-eff.xpi) = fl9ygI6hSL7M1BbsvfM+oevEOkMuTnhbXl4TObeitwg= -SHA256 (mozilla/src-firefox-tor-browser-78.15.0esr-10.5-1-build3.tar.xz) = KNy48z+SDUEhzvet6FkrBMKzolvLeb8oicPpXqUwR0I= -SHA256 (mozilla/src-tor-launcher-0.2.30.tar.xz) = gPoCbTUDHk6WYhG0PM59jy1ybE4rhH1EiR2gFFPW/C0= -SHA256 (mozilla/tor-browser-linux64-10.5.10_en-US.tar.xz) = gnllLeIsmEJ1UZbNhhaHunOj1GodXJTcLBJT4QSkbFc= +SHA256 (mozilla/src-firefox-tor-browser-91.3.0esr-11.0-1-build2.tar.xz) = AJ2q8f1YKpUJrshYawAqRNpCe05zss2IKgEmidtozbI= +SHA256 (mozilla/src-tor-launcher-0.2.31.tar.xz) = vNbO+EBXZP6gZMjJk4mpXjafhCRSTsQ2ZcfEjOZZChk= +SHA256 (mozilla/tor-browser-linux64-11.0_en-US.tar.xz) = QmozM0vityyJsYHuCyRiNQSM36qZqbJzUjg9J31SaCQ= SIZE (mozilla/https-everywhere-2021.4.15-eff.xpi) = 1746434 -SIZE (mozilla/src-firefox-tor-browser-78.15.0esr-10.5-1-build3.tar.xz) = 364899456 -SIZE (mozilla/src-tor-launcher-0.2.30.tar.xz) = 229888 -SIZE (mozilla/tor-browser-linux64-10.5.10_en-US.tar.xz) = 83826292 +SIZE (mozilla/src-firefox-tor-browser-91.3.0esr-11.0-1-build2.tar.xz) = 413481960 +SIZE (mozilla/src-tor-launcher-0.2.31.tar.xz) = 228888 +SIZE (mozilla/tor-browser-linux64-11.0_en-US.tar.xz) = 86363560 Index: www/tor-browser/browser/files/pledge.main =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/pledge.main,v retrieving revision 1.1 diff -u -p -r1.1 pledge.main --- www/tor-browser/browser/files/pledge.main 23 Oct 2020 07:04:09 -0000 1.1 +++ www/tor-browser/browser/files/pledge.main 10 Nov 2021 18:58:02 -0000 @@ -21,3 +21,5 @@ getpw mcast # only needed for WebRTC video +#1183145 +route Index: www/tor-browser/browser/files/pledge.rdd =================================================================== RCS file: www/tor-browser/browser/files/pledge.rdd diff -N www/tor-browser/browser/files/pledge.rdd --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/files/pledge.rdd 10 Nov 2021 18:58:02 -0000 @@ -0,0 +1,7 @@ +# $OpenBSD: pledge.rdd,v 1.1 2021/09/07 13:43:04 landry Exp $ +stdio +rpath # gtk tries to access /usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache +tmppath +recvfd +sendfd +unix # getsockopt Index: www/tor-browser/browser/files/pledge.socket =================================================================== RCS file: www/tor-browser/browser/files/pledge.socket diff -N www/tor-browser/browser/files/pledge.socket --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/files/pledge.socket 10 Nov 2021 18:58:02 -0000 @@ -0,0 +1,8 @@ +# $OpenBSD: pledge.socket,v 1.1 2021/09/07 13:43:04 landry Exp $ +# wait until network.process.enabled and network.http.network_access_on_socket_process.enabled +stdio +rpath # at least for /etc/resolv.conf & /etc/localtime +recvfd +sendfd +inet +dns Index: www/tor-browser/browser/files/unveil.content =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.content,v retrieving revision 1.2 diff -u -p -r1.2 unveil.content --- www/tor-browser/browser/files/unveil.content 13 Feb 2021 05:08:28 -0000 1.2 +++ www/tor-browser/browser/files/unveil.content 10 Nov 2021 18:58:02 -0000 @@ -1,5 +1,4 @@ # $OpenBSD: unveil.content,v 1.2 2021/02/13 05:08:28 jsg Exp $ -/dev/drm0 rw /dev/dri/card0 rw /etc/fonts r @@ -9,6 +8,7 @@ /usr/share/locale r /var/cache/fontconfig r /usr/X11R6/lib r +/usr/lib r /usr/X11R6/share r /var/run r Index: www/tor-browser/browser/files/unveil.gpu =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.gpu,v retrieving revision 1.3 diff -u -p -r1.3 unveil.gpu --- www/tor-browser/browser/files/unveil.gpu 13 Feb 2021 05:08:28 -0000 1.3 +++ www/tor-browser/browser/files/unveil.gpu 10 Nov 2021 18:58:02 -0000 @@ -1,5 +1,4 @@ # $OpenBSD: unveil.gpu,v 1.3 2021/02/13 05:08:28 jsg Exp $ -/dev/drm0 rw /dev/dri/card0 rw /usr/local/lib/tor-browser r @@ -7,6 +6,7 @@ /usr/X11R6/lib r /usr/share/locale r /usr/local/share r +/usr/lib r # normally "pledge dns" exempts this from unveil, but pledge might be disabled /etc/resolv.conf r Index: www/tor-browser/browser/files/unveil.main =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.main,v retrieving revision 1.2 diff -u -p -r1.2 unveil.main --- www/tor-browser/browser/files/unveil.main 15 Jan 2021 11:00:50 -0000 1.2 +++ www/tor-browser/browser/files/unveil.main 10 Nov 2021 18:58:02 -0000 @@ -4,6 +4,9 @@ /dev/video rw /dev/video0 rw /dev/fido rw +# for webgl info in about:support +/dev/dri/card0 rw +/usr/lib r /etc/fonts r /etc/machine-id r @@ -24,7 +27,6 @@ # printing /usr/bin/lpr rx -# for launching registered 3rd party applications like pdf readers /etc/mailcap r ~/.mailcap r ~/.mime.types r @@ -50,7 +52,7 @@ # $XDG_CACHE_HOME, $XDG_CONFIG_HOME, and $XDG_DATA_HOME will expand to the # given variable if it exists in the environment, otherwise defaulting to # ~/.cache, ~/.config, and ~/.local/share -$XDG_CACHE_HOME/dconf rwc +$XDG_RUNTIME_DIR/dconf rwc $XDG_CACHE_HOME/thumbnails rwc $XDG_CONFIG_HOME/dconf rw $XDG_CONFIG_HOME/fontconfig r Index: www/tor-browser/browser/files/unveil.rdd =================================================================== RCS file: www/tor-browser/browser/files/unveil.rdd diff -N www/tor-browser/browser/files/unveil.rdd --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/files/unveil.rdd 10 Nov 2021 18:58:02 -0000 @@ -0,0 +1,3 @@ +# $OpenBSD: unveil.rdd,v 1.1 2021/09/07 13:43:04 landry Exp $ +# shm files +/tmp rwc Index: www/tor-browser/browser/files/unveil.socket =================================================================== RCS file: www/tor-browser/browser/files/unveil.socket diff -N www/tor-browser/browser/files/unveil.socket --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/files/unveil.socket 10 Nov 2021 18:58:02 -0000 @@ -0,0 +1,2 @@ +# disable +# $OpenBSD: unveil.socket,v 1.1 2021/09/07 13:43:04 landry Exp $ Index: www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js,v retrieving revision 1.3 diff -u -p -r1.3 patch-browser_extensions_tor-launcher_src_components_tl-process_js --- www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js 23 Oct 2020 07:04:09 -0000 1.3 +++ www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js 10 Nov 2021 18:58:03 -0000 @@ -6,7 +6,7 @@ the new getTorFile() deal with it. Index: browser/extensions/tor-launcher/src/components/tl-process.js --- browser/extensions/tor-launcher/src/components/tl-process.js.orig +++ browser/extensions/tor-launcher/src/components/tl-process.js -@@ -393,6 +393,8 @@ TorProcessService.prototype = +@@ -377,6 +377,8 @@ TorProcessService.prototype = var torrcFile = TorLauncherUtil.getTorFile("torrc", true); var torrcDefaultsFile = TorLauncherUtil.getTorFile("torrc-defaults", false); @@ -15,7 +15,7 @@ Index: browser/extensions/tor-launcher/s var hashedPassword = this.mProtocolSvc.TorGetPassword(true); var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile(); var controlPort = this.mProtocolSvc.TorGetControlPort(); -@@ -420,19 +422,14 @@ TorProcessService.prototype = +@@ -404,19 +406,14 @@ TorProcessService.prototype = return; } 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.3 diff -u -p -r1.3 patch-config_makefiles_rust_mk --- www/tor-browser/browser/patches/patch-config_makefiles_rust_mk 23 Oct 2020 07:04:09 -0000 1.3 +++ www/tor-browser/browser/patches/patch-config_makefiles_rust_mk 10 Nov 2021 18:58:03 -0000 @@ -6,12 +6,12 @@ https://bugzilla.mozilla.org/show_bug.cg Index: config/makefiles/rust.mk --- config/makefiles/rust.mk.orig +++ config/makefiles/rust.mk -@@ -61,7 +61,7 @@ ifndef MOZ_DEBUG_RUST - # Enable link-time optimization for release builds, but not when linking - # gkrust_gtest. +@@ -70,7 +70,7 @@ ifndef MOZ_DEBUG_RUST + # gkrust_gtest. And not when doing cross-language LTO. + ifndef MOZ_LTO_RUST_CROSS ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) -cargo_rustc_flags += -Clto +cargo_rustc_flags += -Clto=thin endif - # Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when - # using -Clto. + # We need -Cembed-bitcode=yes for all crates when using -Clto. + RUSTFLAGS += -Cembed-bitcode=yes Index: www/tor-browser/browser/patches/patch-dom_ipc_ContentChild_cpp =================================================================== RCS file: www/tor-browser/browser/patches/patch-dom_ipc_ContentChild_cpp diff -N www/tor-browser/browser/patches/patch-dom_ipc_ContentChild_cpp --- www/tor-browser/browser/patches/patch-dom_ipc_ContentChild_cpp 23 Oct 2020 07:04:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$OpenBSD: patch-dom_ipc_ContentChild_cpp,v 1.1 2020/10/23 07:04:09 landry Exp $ - -Do not unveil an already visible pledge file since that interferes with -other unveils. - -cf https://bugzilla.mozilla.org/show_bug.cgi?id=1623086 -Index: dom/ipc/ContentChild.cpp ---- dom/ipc/ContentChild.cpp.orig -+++ dom/ipc/ContentChild.cpp -@@ -4414,8 +4414,18 @@ OpenBSDUnveilPaths(const nsACString& uPath, const nsAC - if (disabled) { - warnx("%s: disabled", PromiseFlatCString(uPath).get()); - } else { -- if (unveil(PromiseFlatCString(pledgePath).get(), "r") == -1) { -- err(1, "unveil(%s, r) failed", PromiseFlatCString(pledgePath).get()); -+ struct stat st; -+ -+ // Only unveil the pledgePath file if it's not already unveiled, otherwise -+ // some containing directory will lose visibility. -+ if (stat(PromiseFlatCString(pledgePath).get(), &st) == -1) { -+ if (errno == ENOENT) { -+ if (unveil(PromiseFlatCString(pledgePath).get(), "r") == -1) { -+ err(1, "unveil(%s, r) failed", PromiseFlatCString(pledgePath).get()); -+ } -+ } else { -+ err(1, "stat(%s)", PromiseFlatCString(pledgePath).get()); -+ } - } - } - Index: www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in =================================================================== RCS file: www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in diff -N www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in --- www/tor-browser/browser/patches/patch-intl_icu_source_Makefile_in 13 Feb 2020 07:41:53 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-intl_icu_source_Makefile_in,v 1.4 2020/02/13 07:41:53 landry Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=990196 - -install -c -o root -g bin -m 555 /usr/obj/ports/firefox-29.0beta3/mozilla-beta/intl/icu/source/config/icu-config-top config/icu-config -install: config/icu-config: chown/chgrp: Operation not permitted -Makefile:313: recipe for target 'config/icu-config' failed -gmake[6]: *** [config/icu-config] Error 71 -gmake[6]: Leaving directory '/usr/obj/ports/firefox-29.0beta3/build-amd64/js/src/intl/icu/target' -Makefile:77: recipe for target 'buildicu' failed - -Patch taken from www/firefox-esr - -Index: intl/icu/source/Makefile.in ---- intl/icu/source/Makefile.in.orig -+++ intl/icu/source/Makefile.in -@@ -337,7 +337,7 @@ $(top_builddir)/config/pkgdataMakefile: - - $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed - -$(RMV) $@ -- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@ -+ install -m 555 $(top_srcdir)/config/icu-config-top $@ - chmod u+w $@ - @echo "# Following from icu/icu4c/source/config/Makefile.inc" >> $@ - LC_ALL=C $(SED) -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@ Index: www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h,v retrieving revision 1.2 diff -u -p -r1.2 patch-js_src_jit_ProcessExecutableMemory_h --- www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h 13 Feb 2020 07:41:53 -0000 1.2 +++ www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h 10 Nov 2021 18:58:03 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-js_src_jit_ProcessExecut Index: js/src/jit/ProcessExecutableMemory.h --- js/src/jit/ProcessExecutableMemory.h.orig +++ js/src/jit/ProcessExecutableMemory.h -@@ -16,7 +16,7 @@ namespace jit { +@@ -14,7 +14,7 @@ namespace jit { // Limit on the number of bytes of executable memory to prevent JIT spraying // attacks. Index: www/tor-browser/browser/patches/patch-media_libcubeb_src_cubeb_sndio_c =================================================================== RCS file: www/tor-browser/browser/patches/patch-media_libcubeb_src_cubeb_sndio_c diff -N www/tor-browser/browser/patches/patch-media_libcubeb_src_cubeb_sndio_c --- www/tor-browser/browser/patches/patch-media_libcubeb_src_cubeb_sndio_c 23 Oct 2020 07:04:09 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-media_libcubeb_src_cubeb_sndio_c,v 1.1 2020/10/23 07:04:09 landry Exp $ - -https://bugzilla.mozilla.org/show_bug.cgi?id=1633769 - -Index: media/libcubeb/src/cubeb_sndio.c ---- media/libcubeb/src/cubeb_sndio.c.orig -+++ media/libcubeb/src/cubeb_sndio.c -@@ -626,7 +626,7 @@ sndio_enumerate_devices(cubeb *context, cubeb_device_t - device->preferred = CUBEB_DEVICE_PREF_ALL; - device->format = CUBEB_DEVICE_FMT_S16NE; - device->default_format = CUBEB_DEVICE_FMT_S16NE; -- device->max_channels = 16; -+ device->max_channels = (type == CUBEB_DEVICE_TYPE_INPUT) ? 2 : 8; - device->default_rate = 48000; - device->min_rate = 4000; - device->max_rate = 192000; Index: www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h,v retrieving revision 1.5 diff -u -p -r1.5 patch-security_nss_lib_freebl_blapi_h --- www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h 23 Oct 2020 07:04:09 -0000 1.5 +++ www/tor-browser/browser/patches/patch-security_nss_lib_freebl_blapi_h 10 Nov 2021 18:58:03 -0000 @@ -5,7 +5,7 @@ Taken from security/nss Index: security/nss/lib/freebl/blapi.h --- security/nss/lib/freebl/blapi.h.orig +++ security/nss/lib/freebl/blapi.h -@@ -1284,6 +1284,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo +@@ -1307,6 +1307,8 @@ extern void SHA1_DestroyContext(SHA1Context *cx, PRBoo */ extern void SHA1_Begin(SHA1Context *cx); 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm 10 Nov 2021 18:58:03 -0000 @@ -0,0 +1,38 @@ +$OpenBSD: patch-toolkit_components_downloads_DownloadIntegration_jsm,v 1.1 2021/09/07 13:43:04 landry Exp $ + +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 +@@ -68,6 +68,7 @@ ChromeUtils.defineModuleGetter( + "NetUtil", + "resource://gre/modules/NetUtil.jsm" + ); ++ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm"); + ChromeUtils.defineModuleGetter( + this, + "CloudStorage", +@@ -365,9 +366,7 @@ var DownloadIntegration = { + Ci.nsIFile + ); + directoryPath = directory.path; +- await IOUtils.makeDirectory(directoryPath, { +- createAncestors: false, +- }); ++ await OS.File.makeDir(directoryPath, { ignoreExisting: true }); + } catch (ex) { + // Either the preference isn't set or the directory cannot be created. + directoryPath = await this.getSystemDownloadsDirectory(); +@@ -943,8 +942,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_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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadUIHelper_jsm 10 Nov 2021 18:58:03 -0000 @@ -0,0 +1,15 @@ +$OpenBSD: patch-toolkit_components_downloads_DownloadUIHelper_jsm,v 1.1 2021/09/07 13:43:04 landry Exp $ + +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_moz_configure =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-toolkit_moz_configure,v retrieving revision 1.2 diff -u -p -r1.2 patch-toolkit_moz_configure --- www/tor-browser/browser/patches/patch-toolkit_moz_configure 23 Oct 2020 07:04:09 -0000 1.2 +++ www/tor-browser/browser/patches/patch-toolkit_moz_configure 10 Nov 2021 18:58:03 -0000 @@ -5,12 +5,12 @@ Required to make font fingerprinting def Index: toolkit/moz.configure --- toolkit/moz.configure.orig +++ toolkit/moz.configure -@@ -1352,7 +1352,7 @@ set_config('MOZ_BITS_DOWNLOAD', +@@ -1581,7 +1581,7 @@ set_config( @depends(target) def bundled_fonts_default(target): -- return target.os == 'WINNT' or target.kernel == 'Linux' -+ return target.os == 'WINNT' or target.kernel == 'Linux' or target.os == 'OpenBSD' +- return target.os == "WINNT" or target.kernel == "Linux" ++ return target.os == "WINNT" or target.kernel == "Linux" or target.os == "OpenBSD" + @depends(build_project) - def allow_bundled_fonts(project): Index: www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp,v retrieving revision 1.1 diff -u -p -r1.1 patch-toolkit_system_gnome_nsGIOService_cpp --- www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp 23 Oct 2020 07:04:09 -0000 1.1 +++ www/tor-browser/browser/patches/patch-toolkit_system_gnome_nsGIOService_cpp 10 Nov 2021 18:58:03 -0000 @@ -10,7 +10,7 @@ unveiled. Index: toolkit/system/gnome/nsGIOService.cpp --- toolkit/system/gnome/nsGIOService.cpp.orig +++ toolkit/system/gnome/nsGIOService.cpp -@@ -243,10 +243,21 @@ nsGIOMimeApp::LaunchWithURI(nsIURI* aUri, +@@ -240,10 +240,21 @@ nsGIOMimeApp::LaunchWithURI(nsIURI* aUri, uris.data = const_cast<char*>(spec.get()); GError* error = nullptr; @@ -34,7 +34,7 @@ Index: toolkit/system/gnome/nsGIOService g_error_free(error); return NS_ERROR_FAILURE; } -@@ -501,20 +512,15 @@ nsGIOService::GetAppForMimeType(const nsACString& aMim +@@ -497,20 +508,15 @@ nsGIOService::GetAppForMimeType(const nsACString& aMim return NS_ERROR_NOT_AVAILABLE; } @@ -60,9 +60,9 @@ Index: toolkit/system/gnome/nsGIOService + 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); + } nsGIOMimeApp* mozApp = new nsGIOMimeApp(app_info); - NS_ENSURE_TRUE(mozApp, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(*aApp = mozApp); -@@ -551,7 +557,24 @@ nsGIOService::ShowURI(nsIURI* aURI) { + } else { +@@ -546,7 +552,24 @@ nsGIOService::ShowURI(nsIURI* aURI) { nsresult rv = aURI->GetSpec(spec); NS_ENSURE_SUCCESS(rv, rv); GError* error = nullptr; @@ -88,7 +88,7 @@ Index: toolkit/system/gnome/nsGIOService g_warning("Could not launch default application for URI: %s", error->message); g_error_free(error); -@@ -567,7 +590,22 @@ nsGIOService::ShowURIForInput(const nsACString& aUri) +@@ -562,7 +585,22 @@ nsGIOService::ShowURIForInput(const nsACString& aUri) nsresult rv = NS_ERROR_FAILURE; GError* error = nullptr; @@ -112,7 +112,7 @@ Index: toolkit/system/gnome/nsGIOService if (error) { g_warning("Cannot launch default application: %s", error->message); g_error_free(error); -@@ -576,6 +614,7 @@ nsGIOService::ShowURIForInput(const nsACString& aUri) +@@ -571,6 +609,7 @@ nsGIOService::ShowURIForInput(const nsACString& aUri) } g_object_unref(file); g_free(spec); Index: www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp,v retrieving revision 1.4 diff -u -p -r1.4 patch-xpcom_io_TorFileUtils_cpp --- www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 13 Feb 2020 07:41:53 -0000 1.4 +++ www/tor-browser/browser/patches/patch-xpcom_io_TorFileUtils_cpp 10 Nov 2021 18:58:03 -0000 @@ -10,17 +10,17 @@ Index: xpcom/io/TorFileUtils.cpp --- xpcom/io/TorFileUtils.cpp.orig +++ xpcom/io/TorFileUtils.cpp @@ -11,6 +11,10 @@ - #include "nsILocalFileMac.h" + # include "nsILocalFileMac.h" #endif +#ifdef __OpenBSD__ +# define TOR_BROWSER_DATA_IN_HOME_DIR 1 +#endif + - static nsresult GetAppRootDir(nsIFile *aExeFile, nsIFile** aFile); + static nsresult GetAppRootDir(nsIFile* aExeFile, nsIFile** aFile); //----------------------------------------------------------------------------- -@@ -20,7 +24,17 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** +@@ -18,7 +22,17 @@ nsresult TorBrowser_GetUserDataDir(nsIFile* aExeFile, NS_ENSURE_ARG_POINTER(aFile); nsCOMPtr<nsIFile> tbDataDir; @@ -32,10 +32,10 @@ Index: xpcom/io/TorFileUtils.cpp + nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true, + getter_AddRefs(tbDataDir)); + NS_ENSURE_SUCCESS(rv, rv); -+ nsAutoCString leafSubdir(NS_LITERAL_CSTRING("TorBrowser-Data")); ++ nsAutoCString leafSubdir("TorBrowser-Data"_ns); + rv = tbDataDir->AppendNative(leafSubdir); + NS_ENSURE_SUCCESS(rv, rv); +#elif defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) - nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data")); + nsAutoCString tbDataLeafName("TorBrowser-Data"_ns); nsCOMPtr<nsIFile> appRootDir; nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); Index: www/tor-browser/browser/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/tor-browser/browser/pkg/PLIST,v retrieving revision 1.11 diff -u -p -r1.11 PLIST --- www/tor-browser/browser/pkg/PLIST 23 Aug 2021 21:25:55 -0000 1.11 +++ www/tor-browser/browser/pkg/PLIST 10 Nov 2021 18:58:03 -0000 @@ -27,12 +27,16 @@ lib/${BROWSER_NAME}/browser/defaults/pre @sample ${SYSCONFDIR}/${MOZILLA_PROJECT}/pledge.gpu lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.main @sample ${SYSCONFDIR}/${MOZILLA_PROJECT}/pledge.main +lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.rdd +lib/${BROWSER_NAME}/browser/defaults/preferences/pledge.socket lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.content @sample ${SYSCONFDIR}/${MOZILLA_PROJECT}/unveil.content lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.gpu @sample ${SYSCONFDIR}/${MOZILLA_PROJECT}/unveil.gpu lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.main @sample ${SYSCONFDIR}/${MOZILLA_PROJECT}/unveil.main +lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.rdd +lib/${BROWSER_NAME}/browser/defaults/preferences/unveil.socket lib/${BROWSER_NAME}/browser/defaults/profile/ lib/${BROWSER_NAME}/browser/defaults/profile/bookmarks.html lib/${BROWSER_NAME}/browser/features/ @@ -95,8 +99,6 @@ lib/${BROWSER_NAME}/distribution/ lib/${BROWSER_NAME}/distribution/distribution.ini lib/${BROWSER_NAME}/fonts/ lib/${BROWSER_NAME}/fonts/TwemojiMozilla.ttf -lib/${BROWSER_NAME}/gtk2/ -@lib lib/${BROWSER_NAME}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION} @lib lib/${BROWSER_NAME}/libfreebl3.so.${LIBfreebl3_VERSION} @lib lib/${BROWSER_NAME}/liblgpllibs.so.${LIBlgpllibs_VERSION} @lib lib/${BROWSER_NAME}/libmozavcodec.so.${LIBmozavcodec_VERSION}
