diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile index 3a8fc4e7a8c2..87e126e11e70 100644 --- a/www/tor-browser/Makefile +++ b/www/tor-browser/Makefile @@ -1,183 +1,183 @@ PORTNAME= tor-browser -DISTVERSION= 15.0a2 +DISTVERSION= 15.0a3 CATEGORIES= www net security wayland -TAG_BASE= 948fad2286cb59fe168a949009b67d986fd9c153 -TAG_TOR= ec17987af29cb2614d114789996a3b4a09cbc3e7 +TAG_BASE= 7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937 +TAG_TOR= db5e90248e74338ce72ff118bdb749fea6ea2606 MASTER_SITES= TOR \ LOCAL/vvd \ https://build-sources.tbb.torproject.org/:source1 \ LOCAL/vvd:source1 \ LOCAL/jsm:source2 \ LOCAL/vvd:source2 \ https://secure.informaction.com/download/releases/:source3 \ LOCAL/vvd:source3 \ https://gitlab.torproject.org/tpo/translation/-/archive/${TAG_BASE}.tar.gz?dummy=/:source4 \ LOCAL/vvd:source4 \ https://gitlab.torproject.org/tpo/translation/-/archive/${TAG_TOR}.tar.gz?dummy=/:source5 \ LOCAL/vvd:source5 MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}/:DEFAULT \ download/releases/:source3 -DISTNAME= src-firefox-tor-browser-140.2.0esr-15.0-1-build3 +DISTNAME= src-firefox-tor-browser-140.3.0esr-15.0-1-build3 MANUAL= manual_215922.zip NOSCRIPT= noscript-13.0.9.xpi DISTFILES= ${DISTNAME}.tar.xz \ ${MANUAL}:source1 \ fonts-3--4348e1.tar.zst:source2 \ ${NOSCRIPT}:source3 \ tpo-translation-${TAG_BASE}_GL0.tar.gz:source4 \ tpo-translation-${TAG_TOR}_GL0.tar.gz:source5 MAINTAINER= freebsd@sysctl.cz COMMENT= Tor Browser for FreeBSD WWW= https://www.torproject.org/ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= nspr>=4.32:devel/nspr \ nss>=3.112:security/nss \ icu>=76.1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=10.1.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.45:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ libvpx>=1.14:multimedia/libvpx \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf2.13:devel/autoconf2.13 \ nasm:devel/nasm \ yasm:devel/yasm RUN_DEPENDS= tor:security/tor \ obfs4proxy:security/obfs4proxy-tor \ snowflake-client:security/snowflake-tor USES= compiler:c++11-lib libtool localbase:ldflags perl5 pkgconfig \ python shebangfix tar:xz USE_GECKO= gecko USE_GITHUB= nodefault TAG_L10N= 468bb10 GH_TUPLE= mozilla-l10n:firefox-l10n:${TAG_L10N}:ffl10n USE_MOZILLA= -sqlite LOCALES= af ar az be bg bs ca cs da de el es-ES et fa fi fr ga-IE gu-IN \ he hi-IN hr hu hy-AM id is it ja ka km ko lt lv mk mr ms my \ nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sq sr sv-SE ta \ te th tl tr uk ur vi zh-CN zh-TW CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" CONFIGURE_ENV+= MOZ_CHROME_MULTILOCALE="${LOCALES}" MAKE_ENV+= LOCALES="${LOCALES}" CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 SSP_UNSAFE= yes BUNDLE_LIBS= yes SUB_FILES= fonts.conf tor-browser.desktop torrc-defaults WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} MOZ_EXPORT= MOZ_TELEMETRY_REPORTING="" \ MOZILLA_OFFICIAL="1" \ MOZ_OFFICIAL_BRANDING="1" \ MOZ_APP_DISPLAYNAME="Tor Browser" \ MOZ_APP_NAME="tor-browser" \ MOZ_CHROME_MULTILOCALE="${LOCALES}" MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \ --enable-official-branding \ --enable-optimize \ --enable-bundled-fonts \ --disable-tests \ --disable-debug \ --disable-crashreporter \ --disable-webrtc \ --disable-parental-controls \ --enable-proxy-bypass-protection \ --disable-system-policies \ --disable-backgroundtasks \ --with-distribution-id=org.torproject \ --with-branding=browser/branding/tb-release .include "${.CURDIR}/../../www/firefox/Makefile.options" .include .if ${ARCH} == i386 && ${MACHINE_CPU:Msse2} # is not enabled on i386 by default # Fix for error: always_inline function '_mm_setzero_si64' requires target feature 'sse2' CFLAGS_i386+= -msse2 .endif .if ${ARCH} == amd64 MOZ_OPTIONS+= --enable-rust-simd .endif .if ${ARCH} == powerpc64 MOZ_OPTIONS+= --without-wasm-sandboxed-libraries .else BUILD_DEPENDS+= ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \ ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc@${LLVM_VERSION} \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} MOZILLA_PLIST_DIRS= bin lib share/applications share/pixmaps \ share/tor-browser MOZ_OPTIONS+= --with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot .endif post-patch: @${REINPLACE_CMD} 's|LOCALBASE|${LOCALBASE}|g' \ "${WRKSRC}/browser/app/profile/000-tor-browser.js" @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp ${MKDIR} ${WRKSRC}/tmp-manual ${UNZIP_NATIVE_CMD} -d ${WRKSRC}/tmp-manual ${DISTDIR}/${MANUAL} pre-configure: @${REINPLACE_CMD} 's|export MOZ_GOOGLE_.*||g' ${WRKSRC}/.mozconfig ${PYTHON_CMD} ${FILESDIR}/packagemanual.py ${WRKSRC}/tmp-manual/public \ ${WRKSRC}/browser/base/content/manual post-configure: ${MKDIR} ${WRKDIR}/.mozbuild/l10n-central ${CP} -r ${WRKDIR}/firefox-l10n-${TAG_L10N}/* \ ${WRKDIR}/.mozbuild/l10n-central .for i in ${LOCALES} ${CP} ${WRKDIR}/translation-${TAG_BASE}/${i}/base-browser.ftl \ ${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/ ${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/tor-browser.ftl \ ${WRKDIR}/.mozbuild/l10n-central/${i}/toolkit/toolkit/global/ ${MKDIR} ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/branding/tb-release \ ${WRKSRC}/toolkit/torbutton/chrome/locale/${i} ${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/brand.properties \ ${WRKDIR}/translation-${TAG_TOR}/${i}/branding/brand.ftl \ ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/branding/tb-release . for j in onionLocation.properties settings.properties torConnect.properties \ torlauncher.properties ${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/${j} \ ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/ . endfor ${CP} -r ${WRKDIR}/translation-${TAG_TOR}/${i}/branding \ ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/ .endfor post-build: MOZBUILD_STATE_PATH=${WRKDIR}/.mozbuild AB_CD="multi" MOZ_AUTOMATION="1" \ PATH="`find ${WRKRDIR}/.mozbuild/srcdirs -name build -type d -print`/bin:${PATH}" \ ${WRKSRC}/mach package-multi-locale --locales ${LOCALES} post-install: ${MKDIR} ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig \ ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts \ ${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions ${INSTALL_DATA} ${WRKDIR}/torrc-defaults \ ${STAGEDIR}${DATADIR}/torrc-defaults ${INSTALL_DATA} ${WRKDIR}/tor-browser.desktop ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/fonts.conf \ ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig/fonts.conf (cd ${WRKDIR}/fonts && \ ${COPYTREE_SHARE} "*.otf *.ttf" ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts) ${INSTALL_DATA} ${DISTDIR}/${NOSCRIPT} \ "${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" .include diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo index 83d48d660499..3fcc82235447 100644 --- a/www/tor-browser/distinfo +++ b/www/tor-browser/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1756751668 -SHA256 (src-firefox-tor-browser-140.2.0esr-15.0-1-build3.tar.xz) = 7bfe41e4a0f384069b876e3556ff04f83c93a14cf715df10704987fdbe7a1083 -SIZE (src-firefox-tor-browser-140.2.0esr-15.0-1-build3.tar.xz) = 691093416 +TIMESTAMP = 1758569239 +SHA256 (src-firefox-tor-browser-140.3.0esr-15.0-1-build3.tar.xz) = aec327cd07e161cf0606352a71be1db1f649a33da4519387a93840083d63ab57 +SIZE (src-firefox-tor-browser-140.3.0esr-15.0-1-build3.tar.xz) = 691334928 SHA256 (manual_215922.zip) = b5ed703f54d52e9f197320f3698e936d585a3fed23cc4f9fbf59edce2869f885 SIZE (manual_215922.zip) = 28305786 SHA256 (fonts-3--4348e1.tar.zst) = 7fbbecece6de777f196982f6eb567970a6d8e7ac2bf5b1ad6b90e1ea36374032 SIZE (fonts-3--4348e1.tar.zst) = 27441580 SHA256 (noscript-13.0.9.xpi) = 525ab61aff21f67d10c3e20965a86ed479631549908a658f54692adc47d771f5 SIZE (noscript-13.0.9.xpi) = 994397 -SHA256 (tpo-translation-948fad2286cb59fe168a949009b67d986fd9c153_GL0.tar.gz) = d6ec26c3d942b147d661c43eb3055857e0f65b32a94f80ebf970a665ad7e5b8a -SIZE (tpo-translation-948fad2286cb59fe168a949009b67d986fd9c153_GL0.tar.gz) = 961619 -SHA256 (tpo-translation-ec17987af29cb2614d114789996a3b4a09cbc3e7_GL0.tar.gz) = 98322858c27f9da141bec04a577ab60c4e1f6ca65ce6390a153e01017df720cf -SIZE (tpo-translation-ec17987af29cb2614d114789996a3b4a09cbc3e7_GL0.tar.gz) = 2850321 +SHA256 (tpo-translation-7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937_GL0.tar.gz) = bdf9d2e546cc183331c9c8ca2b4f8b7d3c9399c0454b9fffcfd7282b7a90b6b7 +SIZE (tpo-translation-7a4673ab420d7c52cd3fa7366d0d9cdaa5a37937_GL0.tar.gz) = 962329 +SHA256 (tpo-translation-db5e90248e74338ce72ff118bdb749fea6ea2606_GL0.tar.gz) = da2787fcbb953c1772d193d60b4633afce8bd34321e9209e83760bc58c0df901 +SIZE (tpo-translation-db5e90248e74338ce72ff118bdb749fea6ea2606_GL0.tar.gz) = 2897151 SHA256 (mozilla-l10n-firefox-l10n-468bb10_GH0.tar.gz) = f4fa857e29371568c41c9c8a3298c086ffc4df73085a93ec6a1cc6be8a17a3e3 SIZE (mozilla-l10n-firefox-l10n-468bb10_GH0.tar.gz) = 71046393 diff --git a/www/tor-browser/files/patch-bug1874059 b/www/tor-browser/files/patch-bug1874059 deleted file mode 100644 index 3fa954ef9def..000000000000 --- a/www/tor-browser/files/patch-bug1874059 +++ /dev/null @@ -1,25 +0,0 @@ -commit 56c888446600991803fd92d668349101ad4bf160 -Author: Christoph Moench-Tegeder -Date: Tue Feb 6 22:51:27 2024 +0100 - - switch to -fvisibility flags - - this fixes linkage with llvm18 (which does not like the former - approach via the #pragma in gcc_hidden.h - - PR: 276746 - Submitted by: dim@ - -diff --git build/moz.configure/toolchain.configure build/moz.configure/toolchain.configure -index d08b748db250..4696f69153f6 100644 ---- build/moz.configure/toolchain.configure -+++ build/moz.configure/toolchain.configure -@@ -2186,7 +2186,7 @@ set_define("_LIBCPP_HIDE_FROM_ABI", libcxx_override_visibility.hide_from_abi) - @depends(target, build_environment) - def visibility_flags(target, env): - if target.os != "WINNT": -- if target.kernel == "Darwin": -+ if target.kernel == "Darwin" or target.kernel == "FreeBSD": - return ("-fvisibility=hidden", "-fvisibility-inlines-hidden") - return ( - "-I%s/system_wrappers" % os.path.join(env.dist), diff --git a/www/tor-browser/files/patch-toolkit_xre_nsEmbedFunctions.cpp b/www/tor-browser/files/patch-toolkit_xre_nsEmbedFunctions.cpp deleted file mode 100644 index caac874012c9..000000000000 --- a/www/tor-browser/files/patch-toolkit_xre_nsEmbedFunctions.cpp +++ /dev/null @@ -1,17 +0,0 @@ -diff --git toolkit/xre/nsEmbedFunctions.cpp toolkit/xre/nsEmbedFunctions.cpp -index 9ce6af94637c..44165558f7ec 100644 ---- toolkit/xre/nsEmbedFunctions.cpp -+++ toolkit/xre/nsEmbedFunctions.cpp -@@ -360,10 +360,12 @@ nsresult XRE_InitChildProcess(int aArgc, char* aArgv[], - static_cast(*crashHelperPidArg); - #endif // defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID) - -+#if !defined(XP_FREEBSD) - exceptionHandlerIsSet = CrashReporter::SetRemoteExceptionHandler( - std::move(*crashReporterArg), crashHelperPid); - MOZ_ASSERT(exceptionHandlerIsSet, - "Should have been able to set remote exception handler"); -+#endif - - if (!exceptionHandlerIsSet) { - // Bug 684322 will add better visibility into this condition