Bug 286420 - www/tor-browser: Update to 14.5
Summary: www/tor-browser: Update to 14.5
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Vladimir Druzenko
URL: https://blog.torproject.org/new-relea...
Keywords:
Depends on:
Blocks:
 
Reported: 2025-04-28 17:42 UTC by Martin Filla
Modified: 2025-05-03 13:12 UTC (History)
1 user (show)

See Also:
vvd: merge-quarterly+

Attachments
0001-tor-browser-update-to-14.5.patch (2.36 KB, patch)
2025-04-28 17:42 UTC, Martin Filla 		no flags Details | Diff
0001-tor-browser-update-to-14.5.patch (4.82 KB, patch)
2025-04-28 19:11 UTC, Martin Filla 		freebsd: maintainer-approval+
Details | Diff
0001-tor-browser-update-to-14.5.patch (5.46 KB, patch)
2025-04-28 20:52 UTC, Martin Filla 		freebsd: maintainer-approval+
Details | Diff
v1 (6.39 KB, text/plain)
2025-05-02 21:50 UTC, Vladimir Druzenko 		vvd: maintainer-approval?
Details
0001-tor-browser-update-to-14.5_v2.patch (7.82 KB, patch)
2025-05-03 12:05 UTC, Martin Filla 		freebsd: maintainer-approval+
Details | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Filla 2025-04-28 17:42:20 UTC 
Created attachment 259959 [details]
0001-tor-browser-update-to-14.5.patch

Hi,
this is an update to tor-browser 14.5. I tested in poudriere.
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2025-04-28 18:43:12 UTC 
Maybe time to update manual_215922.zip to https://build-sources.tbb.torproject.org/manual_268702.zip ?
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2025-04-28 18:48:06 UTC 
Where is distinfo update?
Comment 3 Martin Filla 2025-04-28 19:03:00 UTC 
(In reply to Vladimir Druzenko from comment #2)
I am sorry. I will send new patch.
Comment 4 Martin Filla 2025-04-28 19:11:58 UTC 
Created attachment 259961 [details]
0001-tor-browser-update-to-14.5.patch

This is an updated tor-browser patch.
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2025-04-28 19:26:41 UTC 
henry suggested more changes:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/43697#note_3193615
Comment 6 Martin Filla 2025-04-28 20:52:19 UTC 
Created attachment 259969 [details]
0001-tor-browser-update-to-14.5.patch

this is an update from the tor-browser GitLab.
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2025-05-02 21:50:18 UTC 
Created attachment 260102 [details]
v1

@@ -1,23 +1,31 @@
 PORTNAME=      tor-browser
-DISTVERSION=   14.0.9
-PORTREVISION=  2
+DISTVERSION=   14.5
 CATEGORIES=    www net security wayland
+TAG_BASE=      86442427facf038d5706644221de7e2fb733550b
+TAG_TOR=       2c0b448503d52c3b512d1e7a55ccc78ac19db146
 MASTER_SITES=  TOR \
                LOCAL/vvd \
-               LOCAL/vvd:source1 \
                https://build-sources.tbb.torproject.org/:source1 \
+               LOCAL/vvd:source1 \
                LOCAL/jsm:source2 \
                LOCAL/vvd:source2 \
+               https://secure.informaction.com/:source3 \
                LOCAL/vvd:source3 \
-               https://secure.informaction.com/%SUBDIR%/: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-128.9.0esr-14.0-2-build2
+DISTNAME=      src-firefox-tor-browser-128.9.0esr-14.5-1-build4
+MANUAL=                manual_215922.zip
 NOSCRIPT=      noscript-12.1.1.xpi
 DISTFILES=     ${DISTNAME}.tar.xz \
-               manual_215922.zip:source1 \
+               ${MANUAL}:source1 \
                fonts-3--4348e1.tar.zst:source2 \
-               ${NOSCRIPT}:source3
+               ${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
@@ -28,7 +36,7 @@

 BUILD_DEPENDS= nspr>=4.32:devel/nspr \
                nss>=3.101:security/nss \
-               icu>=73.1:devel/icu \
+               icu>=73.1,1:devel/icu \
                libevent>=2.1.8:devel/libevent \
                harfbuzz>=8.5.0:print/harfbuzz \
                graphite2>=1.3.14:graphics/graphite2 \
@@ -50,18 +58,13 @@
 USE_GITHUB=    nodefault
 TAG_L10N=      fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3
 GH_TUPLE=      mozilla-l10n:firefox-l10n:${TAG_L10N}:ffl10n
-USE_GITLAB=    nodefault
-GL_SITE=       https://gitlab.torproject.org/
-GL_ACCOUNT=    tpo
-GL_PROJECT=    translation:basebrowser translation:torbrowser
-TAG_BASE=      d687be19490caa48a46a3e2193bda95d57cbb96d
-TAG_TOR=       95b60f2679611d39b035f2e45555c2c3d64d991f
-GL_TAGNAME=    ${TAG_BASE}:basebrowser ${TAG_TOR}:torbrowser
 USE_MOZILLA=   -sqlite

-LOCALES=       ar ca cs da de el es-ES fa fi fr ga-IE he hu id is it ja ka ko \
-               lt mk ms my nb-NO nl pl pt-BR ro ru sq sv-SE th tr uk vi zh-CN \
-               zh-TW
+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" \
                MOZ_CHROME_MULTILOCALE="${LOCALES}"

@@ -114,40 +117,41 @@
                        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_215922.zip
+       ${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_BASE}/${i}/newIdentity.properties \
-               ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/chrome/browser/
-       ${CP} ${WRKDIR}/translation-${TAG_BASE}/${i}/securityLevel.properties \
-               ${WRKDIR}/.mozbuild/l10n-central/${i}/browser/chrome/browser/
        ${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
+       ${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 aboutTBUpdate.dtd brand.dtd brand.properties onionLocation.properties \
-       settings.properties torConnect.properties torbutton.dtd \
-       torbutton.properties torlauncher.properties
+. 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
+. endfor
        ${CP} -r ${WRKDIR}/translation-${TAG_TOR}/${i}/branding \
-               ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}
+               ${WRKSRC}/toolkit/torbutton/chrome/locale/${i}/
 .endfor

 post-build:
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2025-05-02 21:53:37 UTC 
Update list of LOCALES.
Move tpo-translation-* to MASTER_SITES with alternative mirrors - tor sites blocked and not all users can download files from https://gitlab.torproject.org/
Several white-space fixes.
Comment 9 Martin Filla 2025-05-03 11:06:16 UTC 
(In reply to Vladimir Druzenko from comment #8)
there is problem: Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/python/mozbuild/mozbuild/action/jar_maker.py", line 15, in <module>
    sys.exit(main(sys.argv[1:]))
             ^^^^^^^^^^^^^^^^^^
  File "/wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/python/mozbuild/mozbuild/action/jar_maker.py", line 11, in main
    return mozbuild.jar.main(args)
           ^^^^^^^^^^^^^^^^^^^^^^^
  File "/wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/python/mozbuild/mozbuild/jar.py", line 645, in main
    jm.makeJar(infile, options.d)
  File "/wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/python/mozbuild/mozbuild/jar.py", line 368, in makeJar
    self.processJarSection(info, jardir)
  File "/wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/python/mozbuild/mozbuild/jar.py", line 419, in processJarSection
    self._processEntryLine(e, outHelper, jf)
  File "/wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/python/mozbuild/mozbuild/jar.py", line 497, in _processEntryLine
    raise RuntimeError(
RuntimeError: File "content/manual/static/images/security-settings-anim.gif" not found in /wrkdirs/usr/ports/www/tor-browser/work/firefox-tor-browser-128.9.0esr-14.5-1-build4/browser/base, /wrkdirs/usr/ports/www/tor-browser/work/.build/browser/base
gmake[3]: Entering directory '/wrkdirs/usr/ports/www/tor-browser/work/.build/dom/push'
/wrkdirs/usr/ports/www/tor-browser/work/.mozbuild/srcdirs/firefox-tor-browser-128.9.0esr-14.5-1-build4-7f98c99b7459/_virtualenvs/build/bin/python -m mozbuild.action.buildlist ../../dist/bin/chrome.manifest 'manifest components/Push.manifest'
Comment 10 Vladimir Druzenko freebsd_committer freebsd_triage 2025-05-03 11:33:29 UTC 
(In reply to Martin Filla from comment #9)
Are you sure you got my Makefile with "MANUAL=manual_215922.zip"?
Error look like you uses incompatible more recent manual_*.zip.
Comment 11 Martin Filla 2025-05-03 12:05:06 UTC 
Created attachment 260116 [details]
0001-tor-browser-update-to-14.5_v2.patch
Comment 12 commit-hook freebsd_committer freebsd_triage 2025-05-03 13:05:25 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d4af697822432c486174d1371f7d5f4aedfdb768

commit d4af697822432c486174d1371f7d5f4aedfdb768
Author:     Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2025-05-03 12:56:39 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-03 13:04:31 +0000

    www/tor-browser: Update 14.0.9 => 14.5

    Changelog:
    https://blog.torproject.org/new-release-tor-browser-145/

    Improve port:
    - update list of LOCALES;
    - move tpo-translation-* to MASTER_SITES with alternative mirrors - tor
      sites are blocked in several countries and not all users can download
      files from https://gitlab.torproject.org/;
    - several white-space fixes.

    PR:             286420
    Co-authored-by: vvd
    MFH:            2025Q2

 www/tor-browser/Makefile | 62 ++++++++++++++++++++++++++----------------------
 www/tor-browser/distinfo | 14 +++++------
 2 files changed, 40 insertions(+), 36 deletions(-)
Comment 13 commit-hook freebsd_committer freebsd_triage 2025-05-03 13:12:28 UTC 
A commit in branch 2025Q2 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=45349b1b35218f1d4f38944b6cc3cf2ee4391dc4

commit 45349b1b35218f1d4f38944b6cc3cf2ee4391dc4
Author:     Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2025-05-03 12:56:39 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-03 13:11:27 +0000

    www/tor-browser: Update 14.0.9 => 14.5

    Changelog:
    https://blog.torproject.org/new-release-tor-browser-145/

    Improve port:
    - update list of LOCALES;
    - move tpo-translation-* to MASTER_SITES with alternative mirrors - tor
      sites are blocked in several countries and not all users can download
      files from https://gitlab.torproject.org/;
    - several white-space fixes.

    PR:             286420
    Co-authored-by: vvd
    MFH:            2025Q2
    (cherry picked from commit d4af697822432c486174d1371f7d5f4aedfdb768)

 www/tor-browser/Makefile | 61 ++++++++++++++++++++++++++----------------------
 www/tor-browser/distinfo | 14 +++++------
 2 files changed, 40 insertions(+), 35 deletions(-)
Comment 14 Vladimir Druzenko freebsd_committer freebsd_triage 2025-05-03 13:12:57 UTC 
Thanks.