summaryrefslogtreecommitdiff
path: root/www/tor-browser
diff options
context:
space:
mode:
Diffstat (limited to 'www/tor-browser')
-rw-r--r--www/tor-browser/Makefile41
-rw-r--r--www/tor-browser/distinfo14
-rw-r--r--www/tor-browser/files/patch-bug187663235
3 files changed, 67 insertions, 23 deletions
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index 76548cb2b9cc..4ec256a3e68b 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,9 +1,9 @@
PORTNAME= tor-browser
-DISTVERSION= 14.5.4
+DISTVERSION= 14.5.5
PORTREVISION= 1
CATEGORIES= www net security wayland
-TAG_BASE= 90dbac96420394aa35ce29385814742ac4942b26
-TAG_TOR= 9cbc3b3d25d2c5c77f1b6b3172ba6bcad2563939
+TAG_BASE= 8600afeb12fdae895c37618e1386c1a1ac2f5308
+TAG_TOR= 9fe8a13ee4c69f91cd545dc3c575ca8f4851d58e
MASTER_SITES= TOR \
LOCAL/vvd \
https://build-sources.tbb.torproject.org/:source1 \
@@ -18,7 +18,7 @@ MASTER_SITES= TOR \
LOCAL/vvd:source5
MASTER_SITE_SUBDIR= torbrowser/${DISTVERSION}/:DEFAULT \
download/releases/:source3
-DISTNAME= src-firefox-tor-browser-128.12.0esr-14.5-1-build1
+DISTNAME= src-firefox-tor-browser-128.13.0esr-14.5-1-build2
MANUAL= manual_215922.zip
NOSCRIPT= noscript-13.0.8.xpi
DISTFILES= ${DISTNAME}.tar.xz \
@@ -37,7 +37,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= nspr>=4.32:devel/nspr \
nss>=3.101:security/nss \
- icu>=73.1,1:devel/icu \
+ icu>=76.1:devel/icu \
libevent>=2.1.8:devel/libevent \
harfbuzz>=8.5.0:print/harfbuzz \
graphite2>=1.3.14:graphics/graphite2 \
@@ -66,8 +66,8 @@ LOCALES= af ar az be bg bs ca cs da de el es-ES et fa fi fr ga-IE gu-IN \
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" \
- MOZ_CHROME_MULTILOCALE="${LOCALES}"
+CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV+= MOZ_CHROME_MULTILOCALE="${LOCALES}"
MAKE_ENV+= LOCALES="${LOCALES}"
@@ -79,7 +79,7 @@ SUB_FILES= fonts.conf tor-browser.desktop torrc-defaults
WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//}
-MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \
+MOZ_EXPORT= MOZ_TELEMETRY_REPORTING="" \
MOZILLA_OFFICIAL="1" \
MOZ_OFFICIAL_BRANDING="1" \
MOZ_APP_DISPLAYNAME="Tor Browser" \
@@ -105,6 +105,16 @@ MOZ_OPTIONS= --with-base-browser-version=${DISTVERSION} \
.include <bsd.port.options.mk>
+.if ${ARCH} == i386
+BUILD_DEPENDS+= node${NODEJS_VERSION}>=24:www/node${NODEJS_VERSION}
+USES+= nodejs:24,build,env
+. if ${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
+.endif
+
.if ${ARCH} == amd64
MOZ_OPTIONS+= --enable-rust-simd
.endif
@@ -141,11 +151,11 @@ post-configure:
${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
+ ${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
- ${MKDIR} ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/
. for j in onionLocation.properties settings.properties torConnect.properties \
torlauncher.properties
${CP} ${WRKDIR}/translation-${TAG_TOR}/${i}/${j} \
@@ -161,18 +171,17 @@ post-build:
${WRKSRC}/mach package-multi-locale --locales ${LOCALES}
post-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}
+ ${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}${PREFIX}/share/applications/tor-browser.desktop
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fontconfig
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/fonts
+ ${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)
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions
${INSTALL_DATA} ${DISTDIR}/${NOSCRIPT} \
"${STAGEDIR}${PREFIX}/lib/tor-browser/distribution/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
diff --git a/www/tor-browser/distinfo b/www/tor-browser/distinfo
index 17b1427f4f3d..d2a7b26f4e24 100644
--- a/www/tor-browser/distinfo
+++ b/www/tor-browser/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1750789506
-SHA256 (src-firefox-tor-browser-128.12.0esr-14.5-1-build1.tar.xz) = d79e2760287bb86cddf99da0e73e0dd2fe54eb301958f58404deb475e61a47f8
-SIZE (src-firefox-tor-browser-128.12.0esr-14.5-1-build1.tar.xz) = 611154864
+TIMESTAMP = 1753285003
+SHA256 (src-firefox-tor-browser-128.13.0esr-14.5-1-build2.tar.xz) = 1e6b9a5c8be933fb2f4de8ffd7a9e4b094d1871d50940ff673ea43135074a0de
+SIZE (src-firefox-tor-browser-128.13.0esr-14.5-1-build2.tar.xz) = 611043636
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.8.xpi) = 9d978cfe083cb9cce120b5ee41e8933d752d7ab4680bf517c5ec4b29c4cfd2dc
SIZE (noscript-13.0.8.xpi) = 993143
-SHA256 (tpo-translation-90dbac96420394aa35ce29385814742ac4942b26_GL0.tar.gz) = dd720795ebd4a335e522fc48956e81b1ba62580aae33d99997ecdaf6866a3537
-SIZE (tpo-translation-90dbac96420394aa35ce29385814742ac4942b26_GL0.tar.gz) = 793166
-SHA256 (tpo-translation-9cbc3b3d25d2c5c77f1b6b3172ba6bcad2563939_GL0.tar.gz) = 033bd5bb2e4e2f852d3a711c4e652a389f32974fe0304a969f518680d849a32c
-SIZE (tpo-translation-9cbc3b3d25d2c5c77f1b6b3172ba6bcad2563939_GL0.tar.gz) = 2834090
+SHA256 (tpo-translation-8600afeb12fdae895c37618e1386c1a1ac2f5308_GL0.tar.gz) = c338513db81d38423a2f9e778c8116ba5925200c6d12cbafa1ba792656fbe7fc
+SIZE (tpo-translation-8600afeb12fdae895c37618e1386c1a1ac2f5308_GL0.tar.gz) = 911838
+SHA256 (tpo-translation-9fe8a13ee4c69f91cd545dc3c575ca8f4851d58e_GL0.tar.gz) = f69a2289c1d93bf4f05839986b6942877e0fa62285378d213dd077db097fd64d
+SIZE (tpo-translation-9fe8a13ee4c69f91cd545dc3c575ca8f4851d58e_GL0.tar.gz) = 2837456
SHA256 (mozilla-l10n-firefox-l10n-fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3_GH0.tar.gz) = d07ecc7fe021998b523357849f71d52c9cb5248cb79bba29793e1ba353bae5bb
SIZE (mozilla-l10n-firefox-l10n-fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3_GH0.tar.gz) = 68409826
diff --git a/www/tor-browser/files/patch-bug1876632 b/www/tor-browser/files/patch-bug1876632
new file mode 100644
index 000000000000..3932b1deccc9
--- /dev/null
+++ b/www/tor-browser/files/patch-bug1876632
@@ -0,0 +1,35 @@
+commit 4f531ca86d24be5d4de673f6e652ed899151d20c
+Author: Jesper Schmitz Mouridsen <jesper@schmitz.computer>
+Date: Wed Jul 23 22:01:31 2025 +0000
+
+ Bug 1876632 Fix aslr allocations on FreeBSD r=spidermonkey-reviewers,sfink
+
+ Without the alignment flag the desired address
+ gets randomized by aslr in a way which causes it to not
+ be aligned. Furthermore the TryToAlignChunk almost always
+ fails. With this fix it never gets to TryToAlignChunk
+ because the flag guarantees upfront alignment.
+
+ Differential Revision: https://phabricator.services.mozilla.com/D257824
+
+diff --git js/src/gc/Memory.cpp js/src/gc/Memory.cpp
+index e790f1784ede..13639c9a6eb4 100644
+--- js/src/gc/Memory.cpp
++++ js/src/gc/Memory.cpp
+@@ -608,7 +608,16 @@ static void* MapAlignedPagesRandom(size_t length, size_t alignment) {
+ for (size_t i = 1; i <= 1024; ++i) {
+ if (i & 0xf) {
+ uint64_t desired = alignment * GetNumberInRange(minNum, maxNum);
++# if defined(__FreeBSD__) && defined(__aarch64__)
++ int flags = MAP_PRIVATE | MAP_ANON |
++ MAP_ALIGNED(mozilla::CeilingLog2Size(alignment));
++ region = MozTaggedAnonymousMmap((void*)(uintptr_t)desired, length,
++ int(PageAccess::ReadWrite), flags, -1, 0,
++ "js-gc-heap");
++# else
+ region = MapMemoryAtFuzzy(reinterpret_cast<void*>(desired), length);
++
++# endif
+ if (!region) {
+ continue;
+ }