- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Update STUN servers in Snowflake builtin bridges
by morgan (＠morgan) 04 Dec '24

04 Dec '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f60ea24e by Cecylia Bocovich at 2024-12-04T19:53:35+00:00 Update STUN servers in Snowflake builtin bridges This removes STUN servers that are unreliable or no longer support NAT behaviour discovery, and adds a few new servers. - - - - - 1 changed file: - projects/tor-expert-bundle/pt_config.json Changes: ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -23,8 +23,8 @@ "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ], "snowflake" : [ - "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn", - "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.antisip.com:3478,stun:stun.epygi.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.mixvoip.com:3478,stun:stun.nextcloud.com:3478,stun:stun.bethesda.net:3478,stun:stun.nextcloud.com:443 utls-imitate=hellorandomizedalpn", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://1098762253.rsc.cdn77.org/ fronts=www.cdn77.com,www.phpmyadmin.net ice=stun:stun.antisip.com:3478,stun:stun.epygi.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.mixvoip.com:3478,stun:stun.nextcloud.com:3478,stun:stun.bethesda.net:3478,stun:stun.nextcloud.com:443 utls-imitate=hellorandomizedalpn" ] } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41331: Make update_responses find linux-aarch64 mar-tools
by boklm (＠boklm) 04 Dec '24

04 Dec '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 1453e769 by NoisyCoil at 2024-12-04T19:40:21+01:00 Bug 41331: Make update_responses find linux-aarch64 mar-tools - - - - - 1 changed file: - tools/update-responses/update_responses Changes: ===================================== tools/update-responses/update_responses ===================================== @@ -500,7 +500,7 @@ sub write_downloads_json { sub marzip_path { my ($config, $version) = @_; - for my $osname (qw/linux-x86_64 linux-i686 macos-x86_64 windows-x86_64 windows-i686/) { + for my $osname (qw/linux-x86_64 linux-i686 linux-aarch64 macos-x86_64 windows-x86_64 windows-i686/) { my $marzip = glob(version_dir($config, $version) . "/mar-tools-$osname-*.zip"); if ($marzip && -f $marzip) { return $marzip; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: fixup! Bug 42305: Add script to combine translation files across versions.
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 781f3a87 by Henry Wilkes at 2024-12-04T17:19:49+00:00 fixup! Bug 42305: Add script to combine translation files across versions. Bug 43337: Add option to search for translation files in only certain directories, and to specify the directory they should be placed in in the translation repository. - - - - - 174cf42e by Henry Wilkes at 2024-12-04T17:19:49+00:00 fixup! Add CI for Tor Browser Bug 43337: Add branding to translation CI. Each brand.ftl and brand.properties is identical between releases, so we only need to send `tb-release` to the translation repository. - - - - - 2 changed files: - .gitlab/ci/update-translations.yml - tools/torbrowser/l10n/combine-translation-versions.py Changes: ===================================== .gitlab/ci/update-translations.yml ===================================== @@ -20,18 +20,29 @@ combine-en-US-translations: image: python variables: PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - TRANSLATION_FILES: ' - tor-browser:tor-browser.ftl - tor-browser:aboutTBUpdate.dtd - tor-browser:torbutton.dtd - tor-browser:onionLocation.properties - tor-browser:settings.properties - tor-browser:torbutton.properties - tor-browser:torConnect.properties - tor-browser:torlauncher.properties - base-browser:base-browser.ftl - fenix-torbrowserstringsxml:torbrowser_strings.xml - ' + TRANSLATION_FILES: '[ + { + "name": "brand.ftl", + "where": ["browser/branding/tb-release", "toolkit/torbutton"], + "branch": "tor-browser", + "directory": "branding" + }, + { + "name": "brand.properties", + "where": ["browser/branding/tb-release", "toolkit/torbutton"], + "branch": "tor-browser" + }, + { "name": "tor-browser.ftl", "branch": "tor-browser" }, + { "name": "aboutTBUpdate.dtd", "branch": "tor-browser" }, + { "name": "torbutton.dtd", "branch": "tor-browser" }, + { "name": "onionLocation.properties", "branch": "tor-browser" }, + { "name": "settings.properties", "branch": "tor-browser" }, + { "name": "torbutton.properties", "branch": "tor-browser" }, + { "name": "torConnect.properties", "branch": "tor-browser" }, + { "name": "torlauncher.properties", "branch": "tor-browser" }, + { "name": "base-browser.ftl", "branch": "base-browser" }, + { "name": "torbrowser_strings.xml", "branch": "fenix-torbrowserstringsxml" } + ]' TRANSLATION_INCLUDE_LEGACY: "true" cache: paths: ===================================== tools/torbrowser/l10n/combine-translation-versions.py ===================================== @@ -15,7 +15,7 @@ arg_parser.add_argument( "current_branch", metavar="<current-branch>", help="branch for the newest version" ) arg_parser.add_argument( - "filenames", metavar="<filenames>", help="name of the translation files" + "files", metavar="<files>", help="JSON specifying the translation files" ) arg_parser.add_argument("outname", metavar="<json>", help="name of the json output") @@ -67,6 +67,14 @@ def git_lines(git_args: list[str]) -> list[str]: return [line for line in git_text(git_args).split("\n") if line] +class TranslationFile: + """Represents a translation file.""" + + def __init__(self, path: str, content: str) -> None: + self.path = path + self.content = content + + class BrowserBranch: """Represents a browser git branch.""" @@ -134,11 +142,27 @@ class BrowserBranch: def __gt__(self, other: "BrowserBranch") -> bool: return self._ordered > other._ordered - def get_file_content(self, filename: str) -> str | None: + def _matching_dirs(self, path: str, dir_list: list[str]) -> bool: + """Test that a path is contained in the list of dirs. + + :param path: The path to check. + :param dir_list: The list of directories to check against. + :returns: Whether the path matches. + """ + for dir_path in dir_list: + if os.path.commonpath([dir_path, path]) == dir_path: + return True + return False + + def get_file( + self, filename: str, search_dirs: list[str] | None + ) -> TranslationFile | None: """Fetch the file content for the named file in this branch. :param filename: The name of the file to fetch the content for. - :returns: The file content, or `None` if no file could be found. + :param search_dirs: The directories to restrict the search to, or None + to search for the file anywhere. + :returns: The file, or `None` if no file could be found. """ if self._file_paths is None: if not self._is_head: @@ -152,7 +176,10 @@ class BrowserBranch: ) matching = [ - path for path in self._file_paths if os.path.basename(path) == filename + path + for path in self._file_paths + if os.path.basename(path) == filename + and (search_dirs is None or self._matching_dirs(path, search_dirs)) ] if not matching: return None @@ -161,7 +188,9 @@ class BrowserBranch: path = matching[0] - return git_text(["cat-file", "blob", f"{self._ref}:{path}"]) + return TranslationFile( + path=path, content=git_text(["cat-file", "blob", f"{self._ref}:{path}"]) + ) def get_stable_branch( @@ -254,48 +283,63 @@ if os.environ.get("TRANSLATION_INCLUDE_LEGACY", "") != "true": files_list = [] -for translation_branch, name in ( - part.strip().split(":", 1) for part in args.filenames.split(" ") if part.strip() -): - current_content = current_branch.get_file_content(name) - stable_content = stable_branch.get_file_content(name) +for file_dict in json.loads(args.files): + name = file_dict["name"] + where_dirs = file_dict.get("where", None) + current_file = current_branch.get_file(name, where_dirs) + stable_file = stable_branch.get_file(name, where_dirs) - if current_content is None and stable_content is None: + if current_file is None and stable_file is None: # No file in either branch. logger.warning(f"{name} does not exist in either the current or stable branch") - elif current_content is None: + elif current_file is None: logger.warning(f"{name} deleted in the current branch") - elif stable_content is None: + elif stable_file is None: logger.warning(f"{name} does not exist in the stable branch") + elif current_file.path != stable_file.path: + logger.warning( + f"{name} has different paths in the current and stable branch. " + f"{current_file.path} : {stable_file.path}" + ) content = combine_files( name, - current_content, - stable_content, + None if current_file is None else current_file.content, + None if stable_file is None else stable_file.content, f"Will be unused in Tor Browser {current_branch.browser_version}!", ) if legacy_branch: - legacy_content = legacy_branch.get_file_content(name) - if ( - legacy_content is not None - and current_content is None - and stable_content is None - ): + legacy_file = legacy_branch.get_file(name, where_dirs) + if legacy_file is not None and current_file is None and stable_file is None: logger.warning(f"{name} still exists in the legacy branch") - elif legacy_content is None: + elif legacy_file is None: logger.warning(f"{name} does not exist in the legacy branch") + elif stable_file is not None and legacy_file.path != stable_file.path: + logger.warning( + f"{name} has different paths in the stable and legacy branch. " + f"{stable_file.path} : {legacy_file.path}" + ) + elif current_file is not None and legacy_file.path != current_file.path: + logger.warning( + f"{name} has different paths in the current and legacy branch. " + f"{current_file.path} : {legacy_file.path}" + ) + content = combine_files( name, content, - legacy_content, + legacy_file.content, f"Unused in Tor Browser {stable_branch.browser_version}!", ) files_list.append( { "name": name, - "branch": translation_branch, + # If "directory" is unspecified, we place the file directly beneath + # en-US/ in the translation repository. i.e. "". + "directory": file_dict.get("directory", ""), + "branch": file_dict["branch"], "content": content, } ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d80411… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d80411… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: fixup! Tor Browser strings
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 5b8b20de by Henry Wilkes at 2024-12-04T10:18:40+00:00 fixup! Tor Browser strings Bug 43336: Move branding strings from torbutton to browser/branding. - - - - - d8041158 by Henry Wilkes at 2024-12-04T10:19:19+00:00 fixup! Add TorStrings module for localization Bug 43336: Move branding strings out of torbutton. - - - - - 10 changed files: - toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl → browser/branding/tb-alpha/locales/en-US/brand.ftl - toolkit/torbutton/chrome/locale/en-US/brand.properties → browser/branding/tb-alpha/locales/en-US/brand.properties - browser/branding/tb-alpha/locales/jar.mn - + browser/branding/tb-nightly/locales/en-US/brand.ftl - + browser/branding/tb-nightly/locales/en-US/brand.properties - browser/branding/tb-nightly/locales/jar.mn - + browser/branding/tb-release/locales/en-US/brand.ftl - + browser/branding/tb-release/locales/en-US/brand.properties - browser/branding/tb-release/locales/jar.mn - toolkit/torbutton/jar.mn Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl → browser/branding/tb-alpha/locales/en-US/brand.ftl ===================================== ===================================== toolkit/torbutton/chrome/locale/en-US/brand.properties → browser/branding/tb-alpha/locales/en-US/brand.properties ===================================== ===================================== browser/branding/tb-alpha/locales/jar.mn ===================================== @@ -3,4 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# We provide all brand files in torbutton +[localization] @AB_CD@.jar: + branding (%*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.properties (%brand.properties) ===================================== browser/branding/tb-nightly/locales/en-US/brand.ftl ===================================== @@ -0,0 +1,14 @@ +# For Tor Browser, we use a new file (different than the brand.ftl file +# that is used by Firefox) to avoid picking up the -brand-short-name values +# that Mozilla includes in the Firefox language packs. + +-brand-shorter-name = Tor Browser +-brand-short-name = Tor Browser +-brand-full-name = Tor Browser +# This brand name can be used in messages where the product name needs to +# remain unchanged across different versions (Nightly, Beta, etc.). +-brand-product-name = Tor Browser +-vendor-short-name = Tor Project +# "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized). +# "The Tor Project, Inc." is an organisation name. +trademarkInfo = “Tor” and the Tor logo are registered trademarks of The Tor Project, Inc. ===================================== browser/branding/tb-nightly/locales/en-US/brand.properties ===================================== @@ -0,0 +1,8 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=Tor Browser +brandShortName=Tor Browser +brandFullName=Tor Browser ===================================== browser/branding/tb-nightly/locales/jar.mn ===================================== @@ -3,4 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# We provide all brand files in torbutton +[localization] @AB_CD@.jar: + branding (%*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.properties (%brand.properties) ===================================== browser/branding/tb-release/locales/en-US/brand.ftl ===================================== @@ -0,0 +1,14 @@ +# For Tor Browser, we use a new file (different than the brand.ftl file +# that is used by Firefox) to avoid picking up the -brand-short-name values +# that Mozilla includes in the Firefox language packs. + +-brand-shorter-name = Tor Browser +-brand-short-name = Tor Browser +-brand-full-name = Tor Browser +# This brand name can be used in messages where the product name needs to +# remain unchanged across different versions (Nightly, Beta, etc.). +-brand-product-name = Tor Browser +-vendor-short-name = Tor Project +# "Tor" is a trademark names, so should not be translated (not including the quote marks, which can be localized). +# "The Tor Project, Inc." is an organisation name. +trademarkInfo = “Tor” and the Tor logo are registered trademarks of The Tor Project, Inc. ===================================== browser/branding/tb-release/locales/en-US/brand.properties ===================================== @@ -0,0 +1,8 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=Tor Browser +brandShortName=Tor Browser +brandFullName=Tor Browser ===================================== browser/branding/tb-release/locales/jar.mn ===================================== @@ -3,4 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# We provide all brand files in torbutton +[localization] @AB_CD@.jar: + branding (%*.ftl) + +@AB_CD@.jar: +% locale branding @AB_CD@ %locale/branding/ + locale/branding/brand.properties (%brand.properties) ===================================== toolkit/torbutton/jar.mn ===================================== @@ -4,8 +4,5 @@ torbutton.jar: % resource torbutton % % category l10n-registry torbutton resource://torbutton/locale/{locale}/ -# browser branding -% override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties - % locale torbutton en-US %locale/en-US/ locale/en-US/ (chrome/locale/en-US/*) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/395fc1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/395fc1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 43336: Update handling of translation files.
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 61b37707 by Henry Wilkes at 2024-12-03T13:51:42+00:00 Bug 43336: Update handling of translation files. We make the handling of translation files more consistent between builds. For `base-browser` files: + We no longer copy to `browser/chrome/browser/` because we no longer have .properties files in this branch. For `tor-browser` files: + We use a symbolic link to translate from ja to ja-JP-mac. + We use pushd and popd. + We only copy the .properties files to torbutton since these are the only files left in this directory. - - - - - 6cf8f931 by Henry Wilkes at 2024-12-04T15:49:59+00:00 Bug 43336: Move tor-browser branding files to branding directory. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -114,6 +114,8 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" +branding_dir=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %] + [% IF c("var/has_l10n") -%] supported_locales="[% tmpl(c('var/locales').join(' ')) %]" @@ -129,28 +131,30 @@ mkdir "$HOME/.mozbuild" for lang in $supported_locales; do # Fluent mv $lang/base-browser.ftl "$l10ncentral/$lang/toolkit/toolkit/global/" - # Properties (they use a different directory) - mv $lang/* "$l10ncentral/$lang/browser/chrome/browser/" done popd [% IF c("var/tor-browser") -%] - # We will have to keep the torbutton.jar until we stop using dtds, because - # if we move them to the browser locale directory, browser.xhtml is not - # loaded. tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-tor-browser') %]" - transl_tor_browser="$rootdir/translation-tor-browser" + pushd "$rootdir/translation-tor-browser" + ln -s ja ja-JP-mac + for lang in $supported_locales; do + mv $lang/tor-browser.ftl "$l10ncentral/$lang/toolkit/toolkit/global/" + # Branding. Currently all releases use the same branding. + l10n_branding_dir="$l10ncentral/$lang/$branding_dir/" + mkdir -p "$l10n_branding_dir" + mv $lang/branding/brand.ftl "$l10n_branding_dir" + mv $lang/brand.properties "$l10n_branding_dir" + done + popd + + # torbutton properties files. + # TODO: Remove once we no longer have torbutton locale files. torbutton_locales="toolkit/torbutton/chrome/locale/" torbutton_jar="toolkit/torbutton/jar.mn" for lang in $supported_locales; do - source_lang=$lang - [% IF c("var/macos") -%] - if [ "$lang" == "ja-JP-mac" ]; then - source_lang="ja" - fi - [% END -%] - mv "$transl_tor_browser/$source_lang/tor-browser.ftl" "$l10ncentral/$lang/toolkit/toolkit/global/" - mv "$transl_tor_browser/$source_lang" "$torbutton_locales/$lang" + mkdir -p "$torbutton_locales/$lang" + mv "$rootdir/translation-tor-browser/$lang"/*.properties "$torbutton_locales/$lang/" echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" done @@ -176,7 +180,7 @@ echo "Starting ./mach configure $(date)" --with-distribution-id=org.torproject \ --with-base-browser-version=[% c("var/torbrowser_version") %] \ [% IF c("var/updater_enabled") -%]--enable-update-channel=[% c("var/channel") %][% END %] \ - [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \ + [% IF !c("var/base-browser") -%]--with-branding="$branding_dir"[% END %] \ [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] echo "Starting ./mach build $(date)" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.5.0esr-14.5-1] 3 commits: fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 93162bec by cypherpunks1 at 2024-12-04T10:41:13+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - cc08546c by NoisyCoil at 2024-12-04T10:41:53+01:00 fixup! Base Browser's .mozconfigs. Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 5f129674 by Pier Angelo Vendrame at 2024-12-04T10:43:03+01:00 fixup! MB 38: Mullvad Browser configuration Bug 43340: Add mozconfig-linux-aarch64-dev - - - - - 2 changed files: - + mozconfig-linux-aarch64-dev - services/settings/dumps/main/moz.build Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,19 @@ +. $topsrcdir/browser/config/mozconfigs/mullvad-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= +ac_add_options --with-branding=browser/branding/mb-nightly + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.5.0esr-14.5-1] Bug 43340: Add mozconfig-linux-aarch64-dev
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 47f3899c by NoisyCoil at 2024-12-04T10:40:10+01:00 Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 1 changed file: - + mozconfig-linux-aarch64-dev Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,18 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47f3899… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/47f3899… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.5.0esr-14.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 857bd22e by cypherpunks1 at 2024-12-04T10:38:17+01:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - 1 changed file: - services/settings/dumps/main/moz.build Changes: ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/857bd22… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/857bd22… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Pier Angelo Vendrame (＠pierov) 04 Dec '24

04 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 395fc108 by cypherpunks1 at 2024-12-04T09:32:06+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 43334: Restore RemoteSettings dumps for devtools-compatibility-browsers and devtools-devices - - - - - 1 changed file: - services/settings/dumps/main/moz.build Changes: ===================================== services/settings/dumps/main/moz.build ===================================== @@ -14,6 +14,8 @@ if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"): FINAL_TARGET_FILES.defaults.settings.main += [ "anti-tracking-url-decoration.json", "cookie-banner-rules-list.json", + "devtools-compatibility-browsers.json", + "devtools-devices.json", "example.json", "hijack-blocklists.json", "password-rules.json", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/395fc10… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: Revert "Bug 43099: 2024 YEC"
by morgan (＠morgan) 03 Dec '24

03 Dec '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f905a88c by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00 Revert "Bug 43099: 2024 YEC" Bug 43343: Revert YEC 2024 This reverts commit 245cd26bd665facee04c41032efd5687ed8dc625. - - - - - 035f30c6 by Pier Angelo Vendrame at 2024-12-03T19:11:20+00:00 Revert "Bug 43098: Year End Campaign 2024." Bug 43343: Revert YEC 2024 This reverts commit 31d3d5e6556a254802ad3f9754497305c2c77187. - - - - - 17 changed files: - browser/components/BrowserGlue.sys.mjs - browser/components/abouttor/AboutTorChild.sys.mjs - browser/components/abouttor/AboutTorParent.sys.mjs - browser/components/abouttor/content/aboutTor.css - browser/components/abouttor/content/aboutTor.html - browser/components/abouttor/content/aboutTor.js - − browser/components/abouttor/content/yec-2024-browse.svg - − browser/components/abouttor/content/yec-2024-fonts.css - − browser/components/abouttor/content/yec-2024-heart.svg - − browser/components/abouttor/content/yec-2024-search.svg - − browser/components/abouttor/content/yec-2024-speak.svg - browser/components/abouttor/jar.mn - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeScreenViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - − mobile/android/fenix/app/src/main/res/drawable/heart.xml - − mobile/android/fenix/app/src/main/res/drawable/illo_green_browse.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c1951f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 3 commits: Bug 43340: Add mozconfig-linux-aarch64-dev
by morgan (＠morgan) 03 Dec '24

03 Dec '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: d1eed871 by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Add mozconfig-linux-aarch64-dev Copy mozconfig-linux-x86_64-dev, except that linux-aarch64 does not support the {enable,disable}-eme options - - - - - 85faa5f2 by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Fetch aarch64 alphas for linux aarch64 dev builds - - - - - c1951fdb by NoisyCoil at 2024-12-03T18:56:33+00:00 Bug 43340: Use the correct vendor in linux aarch64 dev builds - - - - - 3 changed files: - + mozconfig-linux-aarch64-dev - tools/torbrowser/Makefile - tools/torbrowser/fetch.sh Changes: ===================================== mozconfig-linux-aarch64-dev ===================================== @@ -0,0 +1,20 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +# This mozconfig file is not used in official builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +# Moz switched to lld for all Linux targets in Bug 1839739. +ac_add_options --enable-linker=lld + +export MOZILLA_OFFICIAL= +export MOZ_APP_REMOTINGNAME="Tor Browser Dev" +ac_add_options --with-branding=browser/branding/tb-nightly + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update ===================================== tools/torbrowser/Makefile ===================================== @@ -12,11 +12,17 @@ ifeq ($(ARCHITECTURE), "arm64") ARCHITECTURE = "aarch64" endif +ifeq ($(ARCHITECTURE), "aarch64") + LINUX_VENDOR = "unknown" +else + LINUX_VENDOR = "pc" +endif + # Define build output path based on the platform. ifeq ("$(shell uname)", "Darwin") BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-apple-darwin$(shell uname -r)" else - BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-pc-linux-gnu" + BUILD_OUTPUT = "$(DEV_ROOT)/obj-$(ARCHITECTURE)-$(LINUX_VENDOR)-linux-gnu" endif # Define the run command based on the platform. ===================================== tools/torbrowser/fetch.sh ===================================== @@ -10,7 +10,7 @@ TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep if [ "$(uname)" = "Darwin" ]; then TOR_BROWSER_PACKAGE="tor-browser-macos-${TOR_BROWSER_VERSION}.dmg" else - TOR_BROWSER_PACKAGE="tor-browser-linux-x86_64-${TOR_BROWSER_VERSION}.tar.xz" + TOR_BROWSER_PACKAGE="tor-browser-linux-$(uname -m)-${TOR_BROWSER_VERSION}.tar.xz" fi TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/efd91f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.0-1] 2 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 03 Dec '24

03 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 096588f1 by Pier Angelo Vendrame at 2024-12-03T10:09:31+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42690: Add a Makefile target to build APKs. Now that we use a monorepo, we can extend our existing tools to build also Fenix and to install it via adb. Also, update the env templates. - - - - - 174d3f74 by Pier Angelo Vendrame at 2024-12-03T10:09:33+01:00 fixup! [android] Modify build system Bug 42690: Add a Makefile target to build APKs. Update the paths on tba-sign-devbuilds.sh (and make them more generic when possible). - - - - - 10 changed files: - mobile/android/fenix/tools/tba-sign-devbuilds.sh - tools/geckoview/Makefile - tools/geckoview/android-env-linux-template.sh - tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh - tools/geckoview/clobber.sh - tools/geckoview/config.sh - − tools/geckoview/fataar.py - − tools/geckoview/package-gradle.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -2,20 +2,38 @@ cd "$(dirname $(realpath "$0"))/.." -if [ -z "$TOR_BROWSER_BUILD" ]; then - TOR_BROWSER_BUILD=../../tor-browser-build +if [ -z "$APKSIGNER_ARGS" ]; then + if [ -z "$QA_KEY" ]; then + if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../../../../tor-browser-build + fi + QA_KEY="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" + fi + if [ ! -f "$QA_KEY" ]; then + echo "The QA key has not been found." + echo "Please define either \$QA_KEY with its path, or \$TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 + fi + APKSIGNER_ARGS="--ks "$QA_KEY" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android" fi -key="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" -if [ ! -f "$key" ]; then - echo "Please define TOR_BROWSER_BUILD with the path to tor-browser-build" - exit 2 + +if [ -z "$ANDROID_HOME" ]; then + ANDROID_HOME=~/Android fi -tools="$ANDROID_HOME/build-tools/31.0.0" -apksigner="$tools/apksigner" -zipalign="$tools/zipalign" -if [ ! -x "$apksigner" ]; then - echo "apksigner not found at $apksigner. Please make sure ANDROID_HOME is defined" +function find_tool() { + tool="$(find $ANDROID_HOME -name "$1" | head -1)" + if [ -z "$tool" ]; then + tool=$(which $1) + fi + echo $tool +} + +apksigner="$(find_tool apksigner)" +zipalign="$(find_tool zipalign)" +if [ -z "$apksigner" -o ! -x "$apksigner" -o -z "$zipalign" -o ! -x "$zipalign" ]; then + echo "apksigner or zipalign not found." + echo "Please make sure they are on your \$PATH, or define \$ANDROID_HOME." exit 3 fi @@ -40,8 +58,8 @@ sign () { popd > /dev/null rm -f "$aligned" "$zipalign" -p 4 "$apk" "$aligned" - "$apksigner" sign --ks "$key" --in "$aligned" --out "$out" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android - echo "Signed $out" + echo "Signing $out" + "$apksigner" sign --in "$aligned" --out "$out" $APKSIGNER_ARGS } for channel in app/build/outputs/apk/fenix/*; do ===================================== tools/geckoview/Makefile ===================================== @@ -1,9 +1,15 @@ .DEFAULT_GOAL := all # one of armv7 aarch64 x86 x86_64 -ARCH=aarch64 +ARCH := aarch64 +ANDROID_ARCH := $(ARCH) +ifeq ($(ANDROID_ARCH),aarch64) + ANDROID_ARCH := arm64-v8a +endif +ifeq ($(ANDROID_ARCH),armv7) + ANDROID_ARCH := armeabi-v7a +endif -ARCHS=$(ARCH) OS="${shell uname}" # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… @@ -17,23 +23,33 @@ clobber: env config: env ./config.sh $(DEV_ROOT) $(ARCH) -build: env - ./build.sh $(DEV_ROOT) $(ARCH) +geckoview: env + ./build-geckoview.sh $(DEV_ROOT) $(ARCH) -fataar: env - bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" - -package: env - ./package-gradle.sh $(DEV_ROOT) $(ARCH) - -show: - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) +# These targets do not depend on GeckoView so that you can build only Fenix if +# you are not changing GV code. +fenix-release: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Release +fenix-beta: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta +fenix-nightly: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly +fenix-debug: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug env: test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } -all: env build package +install-release: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-fenix-$(ANDROID_ARCH)-release-signed.apk" +install-beta: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/beta/app-fenix-$(ANDROID_ARCH)-beta-signed.apk" +install-nightly: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/nightly/app-fenix-$(ANDROID_ARCH)-nightly-signed.apk" + +all: env geckoview fenix-nightly install-nightly +all-release: env geckoview fenix-release install-release +all-beta: env geckoview fenix-beta install-beta jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -1,7 +1,6 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/r26c/ # for 128esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use export LOCAL_DEV_BUILD=1 export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -1,4 +1,3 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 +VARIANT=$3 + +source android-env.sh + +cd $DEV_ROOT/mobile/android/fenix +MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT +tools/tba-sign-devbuilds.sh ===================================== tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -7,4 +7,3 @@ source android-env.sh cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach clobber -MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/fataar.py deleted ===================================== @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -import re -import subprocess -import sys - -dev_root = sys.argv[1] -archs_in = re.split("\\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] -archs_out = [] -env = dict(os.environ) - -env["MOZCONFIG"] = "mozconfig-android-all" -if "armv7" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( - dev_root - + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("armeabi-v7a") -if "aarch64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( - dev_root - + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("arm64-v8a") -if "x86" in archs_in or "i686" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86"] = ( - dev_root - + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86") -if "x86_64" in archs_in or "x86-64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( - dev_root - + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86_64") -env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) - -if not archs_out: - print( - "The architectures have not specified or are not valid.", - file=sys.stderr, - ) - print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) - print( - "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", - file=sys.stderr, - ) - sys.exit(1) - -subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) -subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/geckoview/package-gradle.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -env ARCHS=$ARCH make fataar - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries -MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository -MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal - - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cad63… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8cad63… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] 2 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 03 Dec '24

03 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 81108ca4 by Pier Angelo Vendrame at 2024-12-03T09:45:46+01:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42690: Add a Makefile target to build APKs. Now that we use a monorepo, we can extend our existing tools to build also Fenix and to install it via adb. Also, update the env templates. - - - - - efd91fc3 by Pier Angelo Vendrame at 2024-12-03T09:45:52+01:00 fixup! [android] Modify build system Bug 42690: Add a Makefile target to build APKs. Update the paths on tba-sign-devbuilds.sh (and make them more generic when possible). - - - - - 10 changed files: - mobile/android/fenix/tools/tba-sign-devbuilds.sh - tools/geckoview/Makefile - tools/geckoview/android-env-linux-template.sh - tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh - tools/geckoview/clobber.sh - tools/geckoview/config.sh - − tools/geckoview/fataar.py - − tools/geckoview/package-gradle.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -2,20 +2,38 @@ cd "$(dirname $(realpath "$0"))/.." -if [ -z "$TOR_BROWSER_BUILD" ]; then - TOR_BROWSER_BUILD=../../tor-browser-build +if [ -z "$APKSIGNER_ARGS" ]; then + if [ -z "$QA_KEY" ]; then + if [ -z "$TOR_BROWSER_BUILD" ]; then + TOR_BROWSER_BUILD=../../../../tor-browser-build + fi + QA_KEY="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" + fi + if [ ! -f "$QA_KEY" ]; then + echo "The QA key has not been found." + echo "Please define either \$QA_KEY with its path, or \$TOR_BROWSER_BUILD with the path to tor-browser-build" + exit 2 + fi + APKSIGNER_ARGS="--ks "$QA_KEY" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android" fi -key="$TOR_BROWSER_BUILD/projects/browser/android-qa.keystore" -if [ ! -f "$key" ]; then - echo "Please define TOR_BROWSER_BUILD with the path to tor-browser-build" - exit 2 + +if [ -z "$ANDROID_HOME" ]; then + ANDROID_HOME=~/Android fi -tools="$ANDROID_HOME/build-tools/31.0.0" -apksigner="$tools/apksigner" -zipalign="$tools/zipalign" -if [ ! -x "$apksigner" ]; then - echo "apksigner not found at $apksigner. Please make sure ANDROID_HOME is defined" +function find_tool() { + tool="$(find $ANDROID_HOME -name "$1" | head -1)" + if [ -z "$tool" ]; then + tool=$(which $1) + fi + echo $tool +} + +apksigner="$(find_tool apksigner)" +zipalign="$(find_tool zipalign)" +if [ -z "$apksigner" -o ! -x "$apksigner" -o -z "$zipalign" -o ! -x "$zipalign" ]; then + echo "apksigner or zipalign not found." + echo "Please make sure they are on your \$PATH, or define \$ANDROID_HOME." exit 3 fi @@ -40,8 +58,8 @@ sign () { popd > /dev/null rm -f "$aligned" "$zipalign" -p 4 "$apk" "$aligned" - "$apksigner" sign --ks "$key" --in "$aligned" --out "$out" --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android - echo "Signed $out" + echo "Signing $out" + "$apksigner" sign --in "$aligned" --out "$out" $APKSIGNER_ARGS } for channel in app/build/outputs/apk/fenix/*; do ===================================== tools/geckoview/Makefile ===================================== @@ -1,9 +1,15 @@ .DEFAULT_GOAL := all # one of armv7 aarch64 x86 x86_64 -ARCH=aarch64 +ARCH := aarch64 +ANDROID_ARCH := $(ARCH) +ifeq ($(ANDROID_ARCH),aarch64) + ANDROID_ARCH := arm64-v8a +endif +ifeq ($(ANDROID_ARCH),armv7) + ANDROID_ARCH := armeabi-v7a +endif -ARCHS=$(ARCH) OS="${shell uname}" # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… @@ -17,23 +23,33 @@ clobber: env config: env ./config.sh $(DEV_ROOT) $(ARCH) -build: env - ./build.sh $(DEV_ROOT) $(ARCH) +geckoview: env + ./build-geckoview.sh $(DEV_ROOT) $(ARCH) -fataar: env - bash -c "source android-env.sh && ./fataar.py $(DEV_ROOT) $(ARCHS)" - -package: env - ./package-gradle.sh $(DEV_ROOT) $(ARCH) - -show: - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/ - ls -lh ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni/$(shell ls ~/.m2/repository/org/mozilla/geckoview/geckoview-default-omni | tail -n 2 | head -n 1) +# These targets do not depend on GeckoView so that you can build only Fenix if +# you are not changing GV code. +fenix-release: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Release +fenix-beta: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Beta +fenix-nightly: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Nightly +fenix-debug: env + ./build-fenix.sh $(DEV_ROOT) $(ARCH) Debug env: test -e android-env.sh || { echo "copy android-env-...-template.sh to android-env.sh and edit appropriatly"; exit 1; } -all: env build package +install-release: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/release/app-fenix-$(ANDROID_ARCH)-release-signed.apk" +install-beta: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/beta/app-fenix-$(ANDROID_ARCH)-beta-signed.apk" +install-nightly: + adb install "$(DEV_ROOT)/mobile/android/fenix/app/build/outputs/apk/fenix/nightly/app-fenix-$(ANDROID_ARCH)-nightly-signed.apk" + +all: env geckoview fenix-nightly install-nightly +all-release: env geckoview fenix-release install-release +all-beta: env geckoview fenix-beta install-beta jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/geckoview/android-env-linux-template.sh ===================================== @@ -1,7 +1,6 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export ANDROID_HOME=$HOME/.mozbuild/android-sdk-linux/ # or $HOME/Android/Sdk/ # Or .../android-toolchain/android-sdk-linux if you extract android-toolchain from tor-browser-build -export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313/ # for 115esr -export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-7.5.1 # Or the version that we currently use +export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/r26c/ # for 128esr +export GRADLE_HOME=/FULL/PATH/TO/tor-browser-build/out/gradle/gradle-8.8 # Or the version that we currently use export LOCAL_DEV_BUILD=1 export PATH=/FULL/PATH/TO/tor-browser-build/out/clang/clang-16.x.y-arm/bin/:$PATH # prepend our newly built and assembled clang to the path so it gets used to build geckoview ===================================== tools/geckoview/android-env-macos-template.sh ===================================== @@ -1,4 +1,3 @@ -export MOZ_BUILD_DATE=20230710165010 # This should match the data in [firefox-android](https://gitlab.torproject.org/tpo/applications/firefox-and… ~ln 12's def of the variable *version*, the date component export JAVA_HOME=/opt/homebrew/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ # for arm64. Or JAVA_HOME=/usr/local/opt/openjdk(a)11/libexec/openjdk.jdk/Contents/Home/ for x86_64. export ANDROID_HOME=$HOME/Library/Android/sdk # or $HOME/.mozbuild/android-sdk-macosx/ export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/23.2.8568313 # will need to download NDK 23.2.8568313 via android studio ===================================== tools/geckoview/build-fenix.sh ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +ARCH=$2 +VARIANT=$3 + +source android-env.sh + +cd $DEV_ROOT/mobile/android/fenix +MOZCONFIG=mozconfig-android-$ARCH $GRADLE_HOME/bin/gradle --no-daemon -Dorg.gradle.jvmargs=-Xmx20g -PdisableOptimization assemble$VARIANT +tools/tba-sign-devbuilds.sh ===================================== tools/geckoview/build.sh → tools/geckoview/build-geckoview.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build +MOZCONFIG=mozconfig-android-$ARCH ./mach build ===================================== tools/geckoview/clobber.sh ===================================== @@ -7,4 +7,3 @@ source android-env.sh cd $DEV_ROOT MOZCONFIG=mozconfig-android-$ARCH ./mach clobber -MOZCONFIG=mozconfig-android-all ./mach clobber ===================================== tools/geckoview/config.sh ===================================== @@ -6,4 +6,4 @@ ARCH=$2 source android-env.sh cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries +MOZCONFIG=mozconfig-android-$ARCH ./mach configure --without-wasm-sandboxed-libraries ===================================== tools/geckoview/fataar.py deleted ===================================== @@ -1,52 +0,0 @@ -#!/usr/bin/env python3 -import os -import re -import subprocess -import sys - -dev_root = sys.argv[1] -archs_in = re.split("\\s+|,", sys.argv[2]) if len(sys.argv) >= 3 else [] -archs_out = [] -env = dict(os.environ) - -env["MOZCONFIG"] = "mozconfig-android-all" -if "armv7" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARMEABI_V7A"] = ( - dev_root - + "/obj-arm-linux-androideabi/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("armeabi-v7a") -if "aarch64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_ARM64_V8A"] = ( - dev_root - + "/obj-aarch64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("arm64-v8a") -if "x86" in archs_in or "i686" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86"] = ( - dev_root - + "/obj-i386-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86") -if "x86_64" in archs_in or "x86-64" in archs_in: - env["MOZ_ANDROID_FAT_AAR_X86_64"] = ( - dev_root - + "/obj-x86_64-linux-android/gradle/build/mobile/android/geckoview/outputs/aar/geckoview-withGeckoBinaries-debug.aar" - ) - archs_out.append("x86_64") -env["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"] = ",".join(archs_out) - -if not archs_out: - print( - "The architectures have not specified or are not valid.", - file=sys.stderr, - ) - print('Usage: make fat-aar ARCHS="$archs"', file=sys.stderr) - print( - "Valid architectures are armv7 aarch64 x86 x86_64, and must be separated with a space.", - file=sys.stderr, - ) - sys.exit(1) - -subprocess.run(["./mach", "configure"], cwd=dev_root, env=env, check=True) -subprocess.run(["./mach", "build"], cwd=dev_root, env=env, check=True) ===================================== tools/geckoview/package-gradle.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -set -e -DEV_ROOT=$1 -ARCH=$2 - -source android-env.sh - -env ARCHS=$ARCH make fataar - -cd $DEV_ROOT -MOZCONFIG=mozconfig-android-$ARCH ./mach build binaries -MOZCONFIG=mozconfig-android-$ARCH ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenRepository -MOZCONFIG=mozconfig-android-all ./mach gradle geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal exoplayer2:publishDebugPublicationToMavenLocal - - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6756b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6756b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6756b736 by Pier Angelo Vendrame at 2024-12-02T18:33:34+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 43326: Restrict the changes to LD_LIBRARY_PATH. We used to set LD_LIBRARY_PATH for the tor daemon before launching the browser, but this does not work well for some distributions, which link to the latest version of OpenSSL, whereas we link to the LTS. To avoid conflicts, we can set a custom LD_LIBRARY_PATH only for the tor daemon. - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProcess.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -5,6 +5,8 @@ * Tor Launcher Util JS Module *************************************************************************/ +import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; + const lazy = {}; ChromeUtils.defineESModuleGetters(lazy, { @@ -335,6 +337,13 @@ export const TorLauncherUtil = Object.freeze({ return Services.appinfo.OS === "Android"; }, + get isLinux() { + // Use AppConstants for Linux rather then appinfo because we are sure it + // will catch also various Unix flavors for which unofficial ports might + // exist (which should work as Linux, as far as we know). + return AppConstants.platform === "linux"; + }, + get isMac() { return Services.appinfo.OS === "Darwin"; }, ===================================== toolkit/components/tor-launcher/TorProcess.sys.mjs ===================================== @@ -125,6 +125,16 @@ export class TorProcess { stderr: "stdout", workdir: lazy.TorLauncherUtil.getTorFile("pt-startup-dir", false).path, }; + if (lazy.TorLauncherUtil.isLinux) { + let ldLibPath = Services.env.get("LD_LIBRARY_PATH") ?? ""; + if (ldLibPath) { + ldLibPath = ":" + ldLibPath; + } + options.environment = { + LD_LIBRARY_PATH: this.#exeFile.parent.path + ldLibPath, + }; + options.environmentAppend = true; + } this.#subprocess = await Subprocess.call(options); this.#status = TorProcessStatus.Running; } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6756b73… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b7c816f8 by Pier Angelo Vendrame at 2024-12-02T18:34:39+01:00 Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH. We discovered in tor-browser#43326 that adding our OpenSSL to LD_LIBRARY_PATH might cause the browser not to work in some distros. So, we decided to add them to LD_LIBRARY_PATH only for the tor daemon, instead. - - - - - 1 changed file: - projects/firefox/start-firefox Changes: ===================================== projects/firefox/start-firefox ===================================== @@ -17,9 +17,6 @@ add_LD_LIBRARY_PATH() { if [ $? -ne 0 ]; then add_LD_LIBRARY_PATH "$basedir/[% IF c("var/tor-browser") -%]TorBrowser/Tor/[% END -%]libstdc++/" fi -[% IF c("var/tor-browser") -%] -add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" -[% END -%] export LD_LIBRARY_PATH exec "$basedir/[% c("var/exe_name") %].real" "$@" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41329: Add no_install_recommends option to container-image
by boklm (＠boklm) 02 Dec '24

02 Dec '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 78039907 by NoisyCoil at 2024-12-02T17:22:49+01:00 Bug 41329: Add no_install_recommends option to container-image - - - - - 8a16e82b by NoisyCoil at 2024-12-02T17:22:51+01:00 Bug 41329: Set no_install_recommends for linux-aarch64 firefox Avoids installing python2.7-minimal:arm64, which is never used and whose postinst script tries to execute the arm64 native python binary on x86_64 (affects every Debian release where it still exists) - - - - - 2 changed files: - projects/container-image/config - projects/firefox/config Changes: ===================================== projects/container-image/config ===================================== @@ -64,8 +64,9 @@ pre: | res_deps = res_deps.sort.unique; END; IF res_deps.size; + SET no_install_recommends = pc(c('origin_project'), 'var/no_install_recommends', { step => c('origin_step') }); FOREACH pkg IN res_deps; - GET c('install_package', { pkg_name => pkg }); + GET c('install_package', { pkg_name => pkg, no_install_recommends => no_install_recommends }); GET "\n"; END; END; ===================================== projects/firefox/config ===================================== @@ -146,6 +146,7 @@ targets: linux-aarch64: var: + no_install_recommends: 1 arch_deps: - libgtk2.0-dev:arm64 - libgtk-3-dev:arm64 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40081
by boklm (＠boklm) 02 Dec '24

02 Dec '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2eb95d67 by Nicolas Vigier at 2024-12-02T17:13:42+01:00 Update rbm for rbm#40081 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit f18daa3f93d1aec674e4ba0dfbd22ac6afd6f8c9 +Subproject commit c6a40950607fa73861f81185764dff2bab150010 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40081: Optionally pass --no-install-recommends to apt-get
by boklm (＠boklm) 02 Dec '24

02 Dec '24

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: c6a40950 by NoisyCoil at 2024-12-02T17:05:29+01:00 Bug 40081: Optionally pass --no-install-recommends to apt-get - - - - - 1 changed file: - lib/RBM/DefaultConfig.pm Changes: ===================================== lib/RBM/DefaultConfig.pm ===================================== @@ -554,7 +554,7 @@ OPT_END my $dnf = 'rpm -q [% c("pkg_name") %] > /dev/null || dnf install -y [% c("pkg_name") %]'; my $zypper = 'rpm -q [% c("pkg_name") %] > /dev/null || zypper install [% c("pkg_name") %]'; my $urpmi = 'rpm -q [% c("pkg_name") %] > /dev/null || urpmi [% c("pkg_name") %]'; - my $apt = 'dpkg -s [% c("pkg_name") %] 2> /dev/null | grep -q "^Status: install ok installed\$" || DEBIAN_FRONTEND=noninteractive apt-get install -q -y [% c("pkg_name") %]'; + my $apt = 'dpkg -s [% c("pkg_name") %] 2> /dev/null | grep -q "^Status: install ok installed\$" || DEBIAN_FRONTEND=noninteractive apt-get install -q -y [% IF c("no_install_recommends") %]--no-install-recommends [% END %][% c("pkg_name") %]'; my %install = ( Fedora => $dnf, 'Fedora-20' => $yum, View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c6a40950607fa73… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c6a40950607fa73… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.5.0esr-14.5-1] fixup! Bug 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: eb3fbc67 by Pier Angelo Vendrame at 2024-12-02T09:12:19+01:00 fixup! Bug 43140: Tighten up fonts on Linux. Bug 43330: System fonts leak when emptying the allow list on Linux. It seems for some reason we still need to define the configuration path and the file separately. - - - - - 1 changed file: - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1356,20 +1356,20 @@ static nsresult SetFontconfigConfigFile() { nsCOMPtr<nsIProperties> dirSvc( do_GetService("@mozilla.org/file/directory_service;1")); NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); - nsCOMPtr<nsIFile> appFile, confFile; + nsCOMPtr<nsIFile> appFile, confDir; nsresult rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(confFile)); + rv = appFile->GetParent(getter_AddRefs(confDir)); NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts"_ns); - NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts.conf"_ns); + rv = confDir->AppendNative("fonts"_ns); NS_ENSURE_SUCCESS(rv, rv); nsAutoCString confPath; - rv = confFile->GetNativePath(confPath); - if (setenv("FONTCONFIG_FILE", confPath.BeginReading(), 1) != 0) { + rv = confDir->GetNativePath(confPath); + NS_ENSURE_SUCCESS(rv, rv); + if (NS_WARN_IF(setenv("FONTCONFIG_PATH", confPath.BeginReading(), 1) != 0 || + setenv("FONTCONFIG_FILE", "fonts.conf", 1) != 0)) { return NS_ERROR_FAILURE; } return NS_OK; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/eb3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/eb3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.5.0esr-14.5-1] fixup! Bug 43140: Tighten up fonts on Linux.
by Pier Angelo Vendrame (＠pierov) 02 Dec '24

02 Dec '24

Pier Angelo Vendrame pushed to branch base-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 5b784090 by Pier Angelo Vendrame at 2024-12-02T09:08:41+01:00 fixup! Bug 43140: Tighten up fonts on Linux. Bug 43330: System fonts leak when emptying the allow list on Linux. It seems for some reason we still need to define the configuration path and the file separately. - - - - - 1 changed file: - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1356,20 +1356,20 @@ static nsresult SetFontconfigConfigFile() { nsCOMPtr<nsIProperties> dirSvc( do_GetService("@mozilla.org/file/directory_service;1")); NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); - nsCOMPtr<nsIFile> appFile, confFile; + nsCOMPtr<nsIFile> appFile, confDir; nsresult rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(confFile)); + rv = appFile->GetParent(getter_AddRefs(confDir)); NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts"_ns); - NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts.conf"_ns); + rv = confDir->AppendNative("fonts"_ns); NS_ENSURE_SUCCESS(rv, rv); nsAutoCString confPath; - rv = confFile->GetNativePath(confPath); - if (setenv("FONTCONFIG_FILE", confPath.BeginReading(), 1) != 0) { + rv = confDir->GetNativePath(confPath); + NS_ENSURE_SUCCESS(rv, rv); + if (NS_WARN_IF(setenv("FONTCONFIG_PATH", confPath.BeginReading(), 1) != 0 || + setenv("FONTCONFIG_FILE", "fonts.conf", 1) != 0)) { return NS_ERROR_FAILURE; } return NS_OK; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b78409… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5b78409… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.5.0esr-14.5-1] fixup! Bug 43140: Tighten up fonts on Linux.
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch tor-browser-128.5.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: c454273c by Pier Angelo Vendrame at 2024-11-27T18:39:16+01:00 fixup! Bug 43140: Tighten up fonts on Linux. Bug 43330: System fonts leak when emptying the allow list on Linux. It seems for some reason we still need to define the configuration path and the file separately. - - - - - 1 changed file: - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1356,20 +1356,20 @@ static nsresult SetFontconfigConfigFile() { nsCOMPtr<nsIProperties> dirSvc( do_GetService("@mozilla.org/file/directory_service;1")); NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE); - nsCOMPtr<nsIFile> appFile, confFile; + nsCOMPtr<nsIFile> appFile, confDir; nsresult rv = dirSvc->Get(XRE_EXECUTABLE_FILE, NS_GET_IID(nsIFile), getter_AddRefs(appFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = appFile->GetParent(getter_AddRefs(confFile)); + rv = appFile->GetParent(getter_AddRefs(confDir)); NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts"_ns); - NS_ENSURE_SUCCESS(rv, rv); - rv = confFile->AppendNative("fonts.conf"_ns); + rv = confDir->AppendNative("fonts"_ns); NS_ENSURE_SUCCESS(rv, rv); nsAutoCString confPath; - rv = confFile->GetNativePath(confPath); - if (NS_WARN_IF(setenv("FONTCONFIG_FILE", confPath.BeginReading(), 1) != 0)) { + rv = confDir->GetNativePath(confPath); + NS_ENSURE_SUCCESS(rv, rv); + if (NS_WARN_IF(setenv("FONTCONFIG_PATH", confPath.BeginReading(), 1) != 0 || + setenv("FONTCONFIG_FILE", "fonts.conf", 1) != 0)) { return NS_ERROR_FAILURE; } return NS_OK; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c454273… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c454273… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] 2 commits: Bug 40083: Use --force when running "git checkout main"
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: 02dde908 by Nicolas Vigier at 2024-11-27T12:45:12+01:00 Bug 40083: Use --force when running "git checkout main" - - - - - 1f3218f2 by Nicolas Vigier at 2024-11-27T18:59:22+01:00 Bug 40082: Add aarch64 Linux nightly builds for Tor and Mullvad Browser - - - - - 1 changed file: - TBBTestSuite/TestSuite/TorBrowserBuild.pm Changes: ===================================== TBBTestSuite/TestSuite/TorBrowserBuild.pm ===================================== @@ -68,6 +68,26 @@ sub set_tests { publish_dir => 'nightly-linux-i686', projectname => 'torbrowser', }, + { + name => 'torbrowser-nightly-linux-aarch64', + descr => 'build tor-browser nightly linux-aarch64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-linux-aarch64', + 'torbrowser', + ], + publish_dir => 'nightly-linux-aarch64', + }, + { + name => 'torbrowser-incrementals-nightly-linux-aarch64', + descr => 'create incrementals for tor-browser nightly linux-aarch64', + type => 'make_incrementals', + publish_dir => 'nightly-linux-aarch64', + projectname => 'torbrowser', + }, { name => 'torbrowser-nightly-windows-i686', descr => 'build tor-browser nightly windows-i686', @@ -201,6 +221,26 @@ sub set_tests { publish_dir => 'mullvadbrowser-nightly-linux-x86_64', projectname => 'mullvadbrowser', }, + { + name => 'mullvadbrowser-nightly-linux-aarch64', + descr => 'build mullvad-browser nightly linux-aarch64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'browser-linux-aarch64', + 'mullvadbrowser', + ], + publish_dir => 'mullvadbrowser-nightly-linux-aarch64', + }, + { + name => 'mullvadbrowser-incrementals-nightly-linux-aarch64', + descr => 'create incrementals for mullvad-browser nightly linux-aarch64', + type => 'make_incrementals', + publish_dir => 'mullvadbrowser-nightly-linux-aarch64', + projectname => 'mullvadbrowser', + }, { name => 'mullvadbrowser-nightly-windows-x86_64', descr => 'build mullvad-browser nightly windows-x86_64', @@ -286,7 +326,7 @@ sub pre_tests { git_url => 'https://gitlab.torproject.org/tpo/applications/tor-browser-build.git', }); $gr->clone_fetch; - $gr->cmd('git', 'checkout', 'main'); + $gr->cmd('git', 'checkout', 'main', '--force'); chdir $gr->clone_dir(); copy($tbbinfos->{rbm_local_conf}, $gr->clone_dir() . '/rbm.local.conf') if $tbbinfos->{rbm_local_conf}; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 0bad6cae by Nicolas Vigier at 2024-11-27T20:33:16+00:00 Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -164,7 +164,7 @@ sub convert_files { (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); exit_error "Error updating $output: $err" unless $success; - exit_error "make_full_update.sh failed. $output does not exist." + exit_error "make_full_update.sh failed. $output was not created.\n$err" unless -f $output; $pm->finish; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: bb8c25be by Nicolas Vigier at 2024-11-27T20:32:49+00:00 Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -165,7 +165,7 @@ sub convert_files { (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); exit_error "Error updating $output: $err" unless $success; - exit_error "make_full_update.sh failed. $output does not exist." + exit_error "make_full_update.sh failed. $output was not created.\n$err" unless -f $output; $pm->finish; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar
by morgan (＠morgan) 27 Nov '24

27 Nov '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 55c24300 by Nicolas Vigier at 2024-11-27T17:57:04+01:00 Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar - - - - - 1 changed file: - tools/dmg2mar Changes: ===================================== tools/dmg2mar ===================================== @@ -165,7 +165,7 @@ sub convert_files { (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); exit_error "Error updating $output: $err" unless $success; - exit_error "make_full_update.sh failed. $output does not exist." + exit_error "make_full_update.sh failed. $output was not created.\n$err" unless -f $output; $pm->finish; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0