Hi,
Below is a diff that updates Tor Browser to 12.0a3. See below for an
explanation of why I'm sending this diff.
Since this version is based on a new Firefox ESR series, most of the
changes consist of syncing changes from www/firefox-esr to here.
Other than that, it's not very special.
Just double checking: is having 12.0a3 as the version number problematic
given that 12.0 will be released later which is supposed to be newer
than 12.0a3? Or does our infrastructure consider 12.0 newer than 12.0a3?
Comments or OKs?
Caspar
--
Tor Browser: update to 12.0a3
Yes, that's an alpha release, which is not ideal. Unfortunately however,
Tor Browser's last stable release is based on an unsupported version of
Firefox ESR which does not build with the newest version of Rust (which
we already have).
If you don't want to use an alpha release of Tor Browser, it's probably
best to run OpenBSD 7.2 for another month until Tor Browser 12.0
is released.
Encouraged by landry@ tb@ george@
--
Index: meta/tor-browser/Makefile
===================================================================
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- meta/tor-browser/Makefile 12 Oct 2022 16:15:03 -0000 1.60
+++ meta/tor-browser/Makefile 25 Oct 2022 18:31:40 -0000
@@ -2,12 +2,11 @@ COMMENT= Tor Browser meta package
MAINTAINER= Caspar Schutijser <caspar@schutijser.com>
-PKGNAME= tor-browser-11.5.2
+PKGNAME= tor-browser-12.0a3
ONLY_FOR_ARCHS = amd64
-REVISION= 0
-RUN_DEPENDS= www/tor-browser/browser>=11.5.2 \
- www/tor-browser/noscript>=11.4.6 \
+RUN_DEPENDS= www/tor-browser/browser>=12.0a3 \
+ www/tor-browser/noscript>=11.4.11 \
net/tor>=0.4.7.10
.include <bsd.port.mk>
Index: www/tor-browser/Makefile.inc
===================================================================
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile.inc
--- www/tor-browser/Makefile.inc 30 Aug 2022 14:24:56 -0000 1.57
+++ www/tor-browser/Makefile.inc 25 Oct 2022 18:31:40 -0000
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 11.5.2
+TB_VERSION = 12.0a3
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.91
diff -u -p -r1.91 Makefile
--- www/tor-browser/browser/Makefile 18 Oct 2022 14:41:25 -0000 1.91
+++ www/tor-browser/browser/Makefile 25 Oct 2022 18:31:40 -0000
@@ -5,30 +5,27 @@
COMMENT = modified version of Firefox ESR for browsing over Tor
ONLY_FOR_ARCHS = amd64
-BROKEN= fail to build with lang/rust 1.64.0
-
MOZILLA_VERSION = ${TB_VERSION}
MOZILLA_PROJECT = ${BROWSER_NAME}
MOZILLA_CODENAME = browser
-TL_VERSION = 0.2.37
-REVISION = 1
+TL_VERSION = 0.2.39
EXTRACT_SUFX = .tar.xz
PATCHORIG = .pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-91.13.0esr-11.5-1-build2
+DISTNAME = src-firefox-tor-browser-102.3.0esr-12.0-1-build2
FIX_EXTRACT_PERMISSIONS = Yes
DISTFILES += ${DISTNAME}.tar.xz \
src-tor-launcher-${TL_VERSION}.tar.xz \
tor-browser-linux64-${TB_VERSION}_en-US.tar.xz
-SO_VERSION = 7.0
+SO_VERSION = 8.0
MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
MOZILLA_LIBS += freebl3 nss3 nssckbi
MOZILLA_LIBS += nssutil3 smime3 softokn3 ssl3
-MOZILLA_LIBS += nspr4 mozsqlite3 plc4 plds4
+MOZILLA_LIBS += nspr4 mozsqlite3 plc4 plds4 ipcclientcerts
# mozilla public license for the browser
PERMIT_PACKAGE= Yes
@@ -41,7 +38,6 @@ MODULES = www/mozilla lang/python
MODPY_RUNDEP = No
COMPILER = ports-clang
-MODCLANG_ARCHS = amd64 i386
# tor-browser needs built-in nss, sqlite
MOZILLA_USE_BUNDLED_NSPR = Yes
@@ -49,7 +45,12 @@ 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.19.0
+BUILD_DEPENDS += devel/cbindgen>=0.23.0
+# wasi
+BUILD_DEPENDS += lang/wasi-sdk/compiler-rt \
+ lang/wasi-sdk/libcxxabi \
+ lang/wasi-sdk/libcxx \
+ lang/wasi-libc
# uses pledge()
# Extra: Xcomposite.4 Xdamage.4 Xfixes.6 gdk-x11-2.0.2400 gtk-x11-2.0.2400
@@ -81,12 +82,11 @@ RUN_DEPENDS += net/tor>=0.4.7.10
CONFIGURE_ARGS += --enable-release #1386371
CONFIGURE_ARGS += --enable-sandbox
CONFIGURE_ARGS += --enable-forkserver
+CONFIGURE_ARGS += --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
CONFIGURE_ARGS += --enable-lto=thin
CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
-# remove post 96
-CONFIGURE_ARGS += --disable-necko-wifi
-# XXX badly formed debug in libxul ?
+# XXX badly formed debug
DWZ = :
#DEBUG_PACKAGES = ${BUILD_PACKAGES}
DEBUG_CONFIGURE_ARGS += --enable-debug-symbols \
@@ -110,6 +110,8 @@ post-patch:
${WRKSRC}/browser/app/profile/000-tor-browser.js
ln -s ${WRKSRC}/mozconfig-linux-x86_64 ${WRKSRC}/.mozconfig
+ ${SUBST_CMD} ${WRKSRC}/xpcom/build/BinaryPath.h
+
BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}
TRUEBROWSER_DIR = ${TRUEPREFIX}/lib/${BROWSER_NAME}
BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg
@@ -164,8 +166,10 @@ post-install:
${SUBST_PROGRAM} ${FILESDIR}/${BROWSER_NAME} \
${PREFIX}/bin/${BROWSER_NAME}
-.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/
+.for f in unveil pledge
+.for t in content gpu main rdd socket utility utility-audioDecoder
+ ${INSTALL_DATA} ${FILESDIR}/${f}.${t} ${BROWSER_DIR}/browser/defaults/preferences/
+.endfor
.endfor
.include <bsd.port.mk>
Index: www/tor-browser/browser/distinfo
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- www/tor-browser/browser/distinfo 30 Aug 2022 14:24:56 -0000 1.55
+++ www/tor-browser/browser/distinfo 25 Oct 2022 18:31:40 -0000
@@ -1,6 +1,6 @@
-SHA256 (mozilla/src-firefox-tor-browser-91.13.0esr-11.5-1-build2.tar.xz) = fDppZPkr7ZYd+PpLWvOaTInCajbdnwbAM410NRfeuOQ=
-SHA256 (mozilla/src-tor-launcher-0.2.37.tar.xz) = 91AWkxTFbRS5HFXz2pon3l0hHAYusYX559AIr1i2MTw=
-SHA256 (mozilla/tor-browser-linux64-11.5.2_en-US.tar.xz) = kM3OOFTpEU7nIyqqdGcqLZ86QLb6isM5cfWG7jo891o=
-SIZE (mozilla/src-firefox-tor-browser-91.13.0esr-11.5-1-build2.tar.xz) = 413531784
-SIZE (mozilla/src-tor-launcher-0.2.37.tar.xz) = 261128
-SIZE (mozilla/tor-browser-linux64-11.5.2_en-US.tar.xz) = 112222220
+SHA256 (mozilla/src-firefox-tor-browser-102.3.0esr-12.0-1-build2.tar.xz) = DKDsS/d5QHBPrM35Pofmpr2A5rK0KYV2XgNBObB3Qcg=
+SHA256 (mozilla/src-tor-launcher-0.2.39.tar.xz) = w9zcO9aM433DWvGQeHuR3ea9yEqsxG3ttzjqIcxME68=
+SHA256 (mozilla/tor-browser-linux64-12.0a3_en-US.tar.xz) = qEHwPxZouA6Of6c0zWUWHKbNLHpibI+TuOZe9wijwa0=
+SIZE (mozilla/src-firefox-tor-browser-102.3.0esr-12.0-1-build2.tar.xz) = 511983476
+SIZE (mozilla/src-tor-launcher-0.2.39.tar.xz) = 262744
+SIZE (mozilla/tor-browser-linux64-12.0a3_en-US.tar.xz) = 113342676
Index: www/tor-browser/browser/files/pledge.content
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/pledge.content,v
retrieving revision 1.2
diff -u -p -r1.2 pledge.content
--- www/tor-browser/browser/files/pledge.content 9 Mar 2022 20:48:32 -0000 1.2
+++ www/tor-browser/browser/files/pledge.content 25 Oct 2022 18:31:40 -0000
@@ -9,5 +9,6 @@ unix
drm
ps
inet #dns.google does socket()
+dns #allows sndio forwarding on a fqdn
# only needed if using NIS of the profile is located on a NFS share
getpw
Index: www/tor-browser/browser/files/pledge.utility
===================================================================
RCS file: www/tor-browser/browser/files/pledge.utility
diff -N www/tor-browser/browser/files/pledge.utility
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/files/pledge.utility 25 Oct 2022 18:31:40 -0000
@@ -0,0 +1,4 @@
+stdio
+recvfd
+sendfd
+unix
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/files/pledge.utility-audioDecoder 25 Oct 2022 18:31:40 -0000
@@ -0,0 +1,7 @@
+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.content
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.content,v
retrieving revision 1.6
diff -u -p -r1.6 unveil.content
--- www/tor-browser/browser/files/unveil.content 9 Jun 2022 04:23:28 -0000 1.6
+++ www/tor-browser/browser/files/unveil.content 25 Oct 2022 18:31:40 -0000
@@ -1,4 +1,4 @@
-/dev/dri rw
+/dev/dri/card0 rw
/etc/fonts r
/etc/machine-id r
Index: www/tor-browser/browser/files/unveil.main
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.main,v
retrieving revision 1.5
diff -u -p -r1.5 unveil.main
--- www/tor-browser/browser/files/unveil.main 9 Mar 2022 20:48:32 -0000 1.5
+++ www/tor-browser/browser/files/unveil.main 25 Oct 2022 18:31:40 -0000
@@ -54,6 +54,7 @@
$XDG_RUNTIME_DIR/dconf rwc
$XDG_CACHE_HOME/thumbnails rwc
$XDG_CONFIG_HOME/dconf rw
+$XDG_CONFIG_HOME/fcitx r
$XDG_CONFIG_HOME/fontconfig r
$XDG_CONFIG_HOME/gtk-3.0 r
$XDG_CONFIG_HOME/mimeapps.list r
Index: www/tor-browser/browser/files/unveil.utility
===================================================================
RCS file: www/tor-browser/browser/files/unveil.utility
diff -N www/tor-browser/browser/files/unveil.utility
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/files/unveil.utility 25 Oct 2022 18:31:40 -0000
@@ -0,0 +1 @@
+# nothing
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/files/unveil.utility-audioDecoder 25 Oct 2022 18:31:40 -0000
@@ -0,0 +1,3 @@
+/usr/lib r
+/usr/local/lib r
+/tmp rwc
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.8
diff -u -p -r1.8 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 29 Jul 2022 20:20:10 -0000 1.8
+++ www/tor-browser/browser/patches/patch-browser_extensions_tor-launcher_src_components_tl-process_js 25 Oct 2022 18:31:40 -0000
@@ -4,7 +4,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
-@@ -386,6 +386,8 @@ TorProcessService.prototype =
+@@ -388,6 +388,8 @@ TorProcessService.prototype =
var torrcFile = TorLauncherUtil.getTorFile("torrc", true);
var torrcDefaultsFile =
TorLauncherUtil.getTorFile("torrc-defaults", false);
@@ -13,7 +13,7 @@ Index: browser/extensions/tor-launcher/s
var hashedPassword = this.mProtocolSvc.TorGetPassword(true);
var controlIPCFile = this.mProtocolSvc.TorGetControlIPCFile();
var controlPort = this.mProtocolSvc.TorGetControlPort();
-@@ -413,19 +415,14 @@ TorProcessService.prototype =
+@@ -415,19 +417,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.6
diff -u -p -r1.6 patch-config_makefiles_rust_mk
--- www/tor-browser/browser/patches/patch-config_makefiles_rust_mk 9 Mar 2022 20:48:33 -0000 1.6
+++ www/tor-browser/browser/patches/patch-config_makefiles_rust_mk 25 Oct 2022 18:31:40 -0000
@@ -1,15 +1,17 @@
use lto=thin to reduce memory pressure when building gkrust
https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
Index: config/makefiles/rust.mk
--- config/makefiles/rust.mk.orig
+++ config/makefiles/rust.mk
-@@ -70,7 +70,7 @@ ifndef MOZ_DEBUG_RUST
- # gkrust_gtest. And not when doing cross-language LTO.
- ifndef MOZ_LTO_RUST_CROSS
+@@ -90,7 +90,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=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
endif
# We need -Cembed-bitcode=yes for all crates when using -Clto.
RUSTFLAGS += -Cembed-bitcode=yes
Index: www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gfx_webrender_bindings_webrender_ffi_h
--- www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h 12 Jun 2022 20:21:41 -0000 1.1
+++ www/tor-browser/browser/patches/patch-gfx_webrender_bindings_webrender_ffi_h 25 Oct 2022 18:31:40 -0000
@@ -7,7 +7,7 @@ https://github.com/eqrion/cbindgen/issue
Index: gfx/webrender_bindings/webrender_ffi.h
--- gfx/webrender_bindings/webrender_ffi.h.orig
+++ gfx/webrender_bindings/webrender_ffi.h
-@@ -77,8 +77,6 @@ struct WrPipelineInfo;
+@@ -73,8 +73,6 @@ struct WrPipelineInfo;
struct WrPipelineIdAndEpoch;
using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
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.5
diff -u -p -r1.5 patch-js_src_jit_ProcessExecutableMemory_h
--- www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h 9 Mar 2022 20:48:33 -0000 1.5
+++ www/tor-browser/browser/patches/patch-js_src_jit_ProcessExecutableMemory_h 25 Oct 2022 18:31:40 -0000
@@ -1,11 +1,16 @@
+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
-@@ -14,7 +14,7 @@ namespace jit {
+@@ -13,8 +13,9 @@ namespace js {
+ namespace jit {
// Limit on the number of bytes of executable memory to prevent JIT spraying
- // attacks.
+-// 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
Index: www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm
===================================================================
RCS file: /cvs/ports/www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm,v
retrieving revision 1.2
diff -u -p -r1.2 patch-toolkit_components_downloads_DownloadIntegration_jsm
--- www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm 9 Mar 2022 20:48:33 -0000 1.2
+++ www/tor-browser/browser/patches/patch-toolkit_components_downloads_DownloadIntegration_jsm 25 Oct 2022 18:31:40 -0000
@@ -4,15 +4,15 @@ revert parts of https://hg.mozilla.org/m
Index: toolkit/components/downloads/DownloadIntegration.jsm
--- toolkit/components/downloads/DownloadIntegration.jsm.orig
+++ toolkit/components/downloads/DownloadIntegration.jsm
-@@ -68,6 +68,7 @@ ChromeUtils.defineModuleGetter(
+@@ -58,6 +58,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 = {
+ "Services",
+@@ -367,9 +368,7 @@ var DownloadIntegration = {
Ci.nsIFile
);
directoryPath = directory.path;
@@ -21,9 +21,9 @@ Index: toolkit/components/downloads/Down
- });
+ await OS.File.makeDir(directoryPath, { ignoreExisting: true });
} catch (ex) {
+ Cu.reportError(ex);
// Either the preference isn't set or the directory cannot be created.
- directoryPath = await this.getSystemDownloadsDirectory();
-@@ -943,8 +942,8 @@ var DownloadIntegration = {
+@@ -958,8 +957,8 @@ var DownloadIntegration = {
);
// Create the Downloads folder and ignore if it already exists.
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
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/tor-browser/browser/patches/patch-toolkit_components_processtools_ProcInfo_linux_cpp 25 Oct 2022 18:31:40 -0000
@@ -0,0 +1,122 @@
+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>
++
No comments:
Post a Comment