- tbb-commits - lists.torproject.org

[builders/tor-browser-build] branch master updated: Bug 40523: Add tor-announce to Release Prep template
by gitolite role 10 Jun '22

10 Jun '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new a53b419 Bug 40523: Add tor-announce to Release Prep template a53b419 is described below commit a53b419ba9a10677d29d4b511e4a23f2f871b190 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Fri Jun 10 12:19:18 2022 +0200 Bug 40523: Add tor-announce to Release Prep template --- .gitlab/issue_templates/Release Prep.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab/issue_templates/Release Prep.md b/.gitlab/issue_templates/Release Prep.md index d37b2b3..d5e596a 100644 --- a/.gitlab/issue_templates/Release Prep.md +++ b/.gitlab/issue_templates/Release Prep.md @@ -300,6 +300,9 @@ Tor Browser Alpha (and Nightly) are on the `master` branch, while Stable lives i - [ ] 100% rollout when publishing a security-driven release - [ ] ***Optional*** Update rollout percentage to 100% after confirmed no major issues +### tor-announce mailing list +- [ ] ***(Stable release only)*** : send an email to tor-announce(a)lists.torproject.org, using the same content as the blog post and subject "Tor Browser $version is released". + </details> /label ~"Release Prep" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40519: Add Alexis' latest PGP key to https-everywhere key ring
by gitolite role 10 Jun '22

10 Jun '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 81e0404 Bug 40519: Add Alexis' latest PGP key to https-everywhere key ring 81e0404 is described below commit 81e04042ebaaf04f1551455cfee0a74d8f964015 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Thu Jun 9 19:29:48 2022 +0000 Bug 40519: Add Alexis' latest PGP key to https-everywhere key ring --- keyring/https-everywhere.gpg | Bin 13943 -> 16526 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index 98b0ec6..36e35c7 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.9.0esr-11.5-1 updated: fixup! TB4: Tor Browser's Firefox preference overrides.
by gitolite role 09 Jun '22

09 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push: new e343af0c15ded fixup! TB4: Tor Browser's Firefox preference overrides. e343af0c15ded is described below commit e343af0c15deda60a509bafab68a30c3fc43f451 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Jun 7 17:54:36 2022 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 40797: Allow Menlo on macOS --- browser/app/profile/000-tor-browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 06e4366bccf54..c598d22865985 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -467,10 +467,10 @@ pref("extensions.torbutton.pref_fixup_version", 0); pref("gfx.bundled-fonts.activate", 1); #ifdef XP_MACOSX -pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mong [...] +pref("font.system.whitelist", "AppleGothic, Apple Color Emoji, Arial, Courier, Geneva, Georgia, Heiti TC, Helvetica, Helvetica Neue, .Helvetica Neue DeskInterface, Hiragino Kaku Gothic ProN, Lucida Grande, Menlo, Monaco, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sa [...] pref("font.name-list.cursive.x-unicode", "Apple Chancery, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.fantasy.x-unicode", "Papyrus, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); -pref("font.name-list.monospace.x-unicode", "Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); +pref("font.name-list.monospace.x-unicode", "Menlo, Courier, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.sans-serif.x-unicode", "Helvetica, Tahoma, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name-list.serif.x-unicode", "Times, Arial, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Tibetan, Noto Sans Yi"); pref("font.name.cursive.ar", "Arial"); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.9.0esr-11.5-1 updated: Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
by gitolite role 09 Jun '22

09 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push: new b9baf11cd15d0 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser b9baf11cd15d0 is described below commit b9baf11cd15d010a6fa511e5e189aeafab4e1bfc Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Thu May 5 20:15:01 2022 +0200 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. --- browser/base/content/browser-siteIdentity.js | 4 +- browser/components/about/AboutRedirector.cpp | 61 ++++++++++++++++++++++++++++ browser/components/about/components.conf | 1 + 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 5e70d458094cf..b7d59db3dd34d 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -58,8 +58,8 @@ var gIdentityHandler = { * the browser UI. */ _secureInternalPages: (AppConstants.TOR_BROWSER_UPDATE ? - /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|rulesets|sessionrestore|support|welcomeback|tor|torconnect|tbupdate)(?:[?#]|$)/i : - /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|rulesets|sessionrestore|support|welcomeback|tor|torconnect)(?:[?#]|$)/i), + /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|manual|preferences|protections|rights|rulesets|sessionrestore|support|welcomeback|tor|torconnect|tbupdate)(?:[?#]|$)/i : + /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|manual|preferences|protections|rights|rulesets|sessionrestore|support|welcomeback|tor|torconnect)(?:[?#]|$)/i), /** * Whether the established HTTPS connection is considered "broken". diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 57c4d40c8ef56..b46811eaadf74 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -18,6 +18,11 @@ #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/ContentParent.h" +// For Tor Browser manual +#include "nsTHashSet.h" +#include "mozilla/intl/LocaleService.h" +#include "mozilla/Omnijar.h" + namespace mozilla { namespace browser { @@ -136,6 +141,8 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, + // The correct URI must be obtained by GetManualChromeURI + {"manual", "about:blank", nsIAboutModule::ALLOW_SCRIPT}, }; static nsAutoCString GetAboutModuleName(nsIURI* aURI) { @@ -152,6 +159,52 @@ static nsAutoCString GetAboutModuleName(nsIURI* aURI) { return path; } +static nsTHashSet<nsCStringHashKey> GetManualLocales() +{ + nsTHashSet<nsCStringHashKey> locales; + RefPtr<nsZipArchive> zip = Omnijar::GetReader(Omnijar::APP); + UniquePtr<nsZipFind> find; + const nsAutoCString prefix("chrome/browser/content/browser/manual/"); + nsAutoCString needle = prefix; + needle.Append("*.html"); + if (NS_SUCCEEDED(zip->FindInit(needle.get(), getter_Transfers(find)))) { + const char* entryName; + uint16_t entryNameLen; + while (NS_SUCCEEDED(find->FindNext(&entryName, &entryNameLen))) { + // 5 is to remove the final `.html` + const size_t length = entryNameLen - prefix.Length() - 5; + locales.Insert(nsAutoCString(entryName + prefix.Length(), length)); + } + } + return locales; +} + +static nsAutoCString GetManualChromeURI() { + static nsTHashSet<nsCStringHashKey> locales = GetManualLocales(); + + nsAutoCString reqLocale; + intl::LocaleService::GetInstance()->GetAppLocaleAsBCP47(reqLocale); + // Check every time the URL is needed in case the lang has been changed. + // We do not provide multi-language builds at the moment, so this should not + // happen, at least in Tor Browser desktop, but we prepared the patch to be + // ready also in such a case. + if (!locales.Contains(reqLocale) && reqLocale.Length() > 2 && + reqLocale[2] == '-') { + // At the moment, codes in our manual output are either 2 letters (en) or + // 5 letters (pt-BR) + reqLocale.SetLength(2); + } + if (!locales.Contains(reqLocale)) { + reqLocale = "en"; + } + + // %s is the language + constexpr char model[] = "chrome://browser/content/manual/%s.html"; + nsAutoCString url; + url.AppendPrintf(model, reqLocale.get()); + return url; +} + NS_IMETHODIMP AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo, nsIChannel** result) { @@ -205,6 +258,10 @@ AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo, NS_ENSURE_SUCCESS(rv, rv); } + if (path.EqualsLiteral("manual")) { + url = GetManualChromeURI(); + } + // fall back to the specified url in the map if (url.IsEmpty()) { url.AssignASCII(redir.url); @@ -263,6 +320,10 @@ AboutRedirector::GetChromeURI(nsIURI* aURI, nsIURI** chromeURI) { nsAutoCString name = GetAboutModuleName(aURI); + if (name.EqualsLiteral("manual")) { + return NS_NewURI(chromeURI, GetManualChromeURI()); + } + for (const auto& redir : kRedirMap) { if (name.Equals(redir.id)) { return NS_NewURI(chromeURI, redir.url); diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index df7c05b3193d5..e8034b31d8699 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -12,6 +12,7 @@ pages = [ 'home', 'logins', 'loginsimportreport', + 'manual', 'newtab', 'pocket-home', 'pocket-saved', -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.9.0esr-11.5-1 updated: fixup! TB3: Tor Browser's official .mozconfigs.
by gitolite role 09 Jun '22

09 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push: new f460bf0f08f67 fixup! TB3: Tor Browser's official .mozconfigs. f460bf0f08f67 is described below commit f460bf0f08f6705fa908b4db46f13de5144f9250 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon May 23 17:01:24 2022 +0200 fixup! TB3: Tor Browser's official .mozconfigs. Bug 40477: Add a common mozconfig Bug 23656: Use .mozconfig files in tor-browser repo for rbm builds (WIP) --- .mozconfig | 40 ------------------- .mozconfig-asan | 46 --------------------- .mozconfig-mac | 57 --------------------------- .mozconfig-mingw | 32 --------------- browser/config/mozconfigs/base-browser | 34 ++++++++++++++++ browser/config/mozconfigs/tor-browser | 8 ++++ .mozconfig-android => mozconfig-android-armv7 | 0 mozconfig-linux-i686 | 9 +++++ mozconfig-linux-x86_64 | 9 +++++ mozconfig-linux-x86_64-asan | 22 +++++++++++ mozconfig-linux-x86_64-dev | 14 +++++++ mozconfig-macos-x86_64 | 5 +++ mozconfig-windows-i686 | 11 ++++++ mozconfig-windows-x86_64 | 11 ++++++ 14 files changed, 123 insertions(+), 175 deletions(-) diff --git a/.mozconfig b/.mozconfig deleted file mode 100755 index 7655f628415e9..0000000000000 --- a/.mozconfig +++ /dev/null @@ -1,40 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# This mozconfig file is not used in official Tor Browser builds. -# It is only intended to be used when doing incremental Linux builds -# during development. The platform-specific mozconfig configuration -# files used in official Tor Browser releases can be found in the -# tor-browser-build repo: -# https://gitweb.torproject.org/builders/tor-browser-build.git/ -# under: -# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= - -ac_add_options --enable-tor-launcher -ac_add_options --with-tor-browser-version=dev-build -ac_add_options --disable-tor-browser-update -ac_add_options --enable-verify-mar diff --git a/.mozconfig-asan b/.mozconfig-asan deleted file mode 100644 index 8bee813bfee8a..0000000000000 --- a/.mozconfig-asan +++ /dev/null @@ -1,46 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" -# We need to add -ldl explicitely due to bug 1213698 -export LDFLAGS="-fsanitize=address -ldl" - -# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff -# (which is part of mar-tools and is not distributed to end-users) with -# ASan. See bug 17858. -export HOST_CFLAGS="" -export HOST_CXXFLAGS="" -export HOST_LDFLAGS="-ldl" - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' - -ac_add_options --enable-address-sanitizer -ac_add_options --disable-jemalloc -ac_add_options --disable-elf-hack -ac_add_options --with-clang-path=/var/tmp/dist/clang/bin/clang - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -# Let's support GTK3 for ESR60 -ac_add_options --enable-default-toolkit=cairo-gtk3 - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --disable-strip -ac_add_options --disable-install-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-mac b/.mozconfig-mac deleted file mode 100644 index 5b4624ef1f673..0000000000000 --- a/.mozconfig-mac +++ /dev/null @@ -1,57 +0,0 @@ -# ld needs libLTO.so from llvm -mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib" - -CROSS_CCTOOLS_PATH=$topsrcdir/cctools -CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk -CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" - -export CC="$topsrcdir/clang/bin/clang $FLAGS" -export CXX="$topsrcdir/clang/bin/clang++ $FLAGS" -export CPP="$topsrcdir/clang/bin/clang $FLAGS -E" -export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config -export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip -Wl,-pie" -export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin10- -#TODO: bug 1184202 - would be nice if these could be detected with TOOLCHAIN_PREFIX automatically -export AR=${TOOLCHAIN_PREFIX}ar -export RANLIB=${TOOLCHAIN_PREFIX}ranlib -export STRIP=${TOOLCHAIN_PREFIX}strip -export OTOOL=${TOOLCHAIN_PREFIX}otool -export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil - -export HOST_CC="$topsrcdir/clang/bin/clang" -export HOST_CXX="$topsrcdir/clang/bin/clang++" -export HOST_CPP="$topsrcdir/clang/bin/clang -E" -export HOST_CFLAGS="-g" -export HOST_CXXFLAGS="-g" -export HOST_LDFLAGS="-g" - -ac_add_options --target=x86_64-apple-darwin -ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS - -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-application=browser -ac_add_options --enable-strip -ac_add_options --enable-official-branding -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --disable-debug - -ac_add_options --enable-tor-browser-data-outside-app-dir -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar - -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-tests -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/.mozconfig-mingw b/.mozconfig-mingw deleted file mode 100644 index ce6ace1dad67f..0000000000000 --- a/.mozconfig-mingw +++ /dev/null @@ -1,32 +0,0 @@ -CROSS_COMPILE=1 - -ac_add_options --enable-application=browser -ac_add_options --target=i686-w64-mingw32 -ac_add_options --with-toolchain-prefix=i686-w64-mingw32- -ac_add_options --enable-default-toolkit=cairo-windows -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 - -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-strip -ac_add_options --enable-official-branding - -ac_add_options --enable-tor-browser-update -ac_add_options --enable-verify-mar -ac_add_options --disable-bits-download - -# Let's make sure no preference is enabling either Adobe's or Google's CDM. -ac_add_options --disable-eme -ac_add_options --disable-crashreporter -ac_add_options --disable-maintenance-service -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls -ac_add_options --disable-tests -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= -ac_add_options --disable-default-browser-agent diff --git a/browser/config/mozconfigs/base-browser b/browser/config/mozconfigs/base-browser new file mode 100644 index 0000000000000..2b3e2bb8fa852 --- /dev/null +++ b/browser/config/mozconfigs/base-browser @@ -0,0 +1,34 @@ +# Shared build settings and settings to enhance security and privacy. + +. $topsrcdir/browser/config/mozconfig + +if test -f "$topsrcdir/mozconfig-toolchain"; then + . $topsrcdir/mozconfig-toolchain +fi + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ + +ac_add_options --enable-official-branding +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-rust-simd + +ac_add_options --enable-bundled-fonts + +ac_add_options --disable-tests +ac_add_options --disable-debug + +ac_add_options --disable-crashreporter +# Before removing, please notice that WebRTC does not work on mingw (Bug 1393901) +ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme +ac_add_options --enable-proxy-bypass-protection +# Disable system policies, see #30575 and #32418 +# Uncomment after the changes on "Bug 32418: Allow updates to be disabled via an enterprise policy." +# ac_add_options --disable-system-policies + +# Disable telemetry +ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/browser/config/mozconfigs/tor-browser b/browser/config/mozconfigs/tor-browser new file mode 100644 index 0000000000000..22f5184aa73b1 --- /dev/null +++ b/browser/config/mozconfigs/tor-browser @@ -0,0 +1,8 @@ +. $topsrcdir/browser/config/mozconfigs/base-browser + +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" + +ac_add_options --enable-tor-browser-update +ac_add_options --enable-verify-mar + +ac_add_options --with-distribution-id=org.torproject diff --git a/.mozconfig-android b/mozconfig-android-armv7 old mode 100755 new mode 100644 similarity index 100% rename from .mozconfig-android rename to mozconfig-android-armv7 diff --git a/mozconfig-linux-i686 b/mozconfig-linux-i686 new file mode 100644 index 0000000000000..4b03732c0e06f --- /dev/null +++ b/mozconfig-linux-i686 @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=i686-linux-gnu + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +# Bug 31448: ld.gold fails if we don't disable debug-symbols. +# Also, we keep strip enabled. +ac_add_options --disable-debug-symbols diff --git a/mozconfig-linux-x86_64 b/mozconfig-linux-x86_64 new file mode 100644 index 0000000000000..06cf6e75b14fd --- /dev/null +++ b/mozconfig-linux-x86_64 @@ -0,0 +1,9 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +# We want to bundle an own geckodriver, so we can use it for QA and other work +ac_add_options --enable-geckodriver diff --git a/mozconfig-linux-x86_64-asan b/mozconfig-linux-x86_64-asan new file mode 100644 index 0000000000000..ec9c8c086eca4 --- /dev/null +++ b/mozconfig-linux-x86_64-asan @@ -0,0 +1,22 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc" +# We need to add -ldl explicitely due to bug 1213698 +export LDFLAGS="-fsanitize=address -ldl" + +# Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff +# (which is part of mar-tools and is not distributed to end-users) with +# ASan. See bug 17858. +export HOST_CFLAGS="" +export HOST_CXXFLAGS="" +export HOST_LDFLAGS="-ldl" + +ac_add_options --enable-address-sanitizer +ac_add_options --disable-jemalloc +ac_add_options --disable-elf-hack + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev new file mode 100644 index 0000000000000..b7f78e11a5736 --- /dev/null +++ b/mozconfig-linux-x86_64-dev @@ -0,0 +1,14 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. + +ac_add_options --enable-default-toolkit=cairo-gtk3 + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +ac_add_options --enable-tor-launcher +ac_add_options --disable-tor-browser-update +ac_add_options --with-tor-browser-version=dev-build diff --git a/mozconfig-macos-x86_64 b/mozconfig-macos-x86_64 new file mode 100644 index 0000000000000..e2286f972e627 --- /dev/null +++ b/mozconfig-macos-x86_64 @@ -0,0 +1,5 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --enable-strip + +ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/mozconfig-windows-i686 b/mozconfig-windows-i686 new file mode 100644 index 0000000000000..78ff05ecc8105 --- /dev/null +++ b/mozconfig-windows-i686 @@ -0,0 +1,11 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=i686-w64-mingw32 +ac_add_options --with-toolchain-prefix=i686-w64-mingw32- + +ac_add_options --enable-strip + +# Bits is Background Intelligent Transfer Service +ac_add_options --disable-bits-download +ac_add_options --disable-maintenance-service +ac_add_options --disable-default-browser-agent diff --git a/mozconfig-windows-x86_64 b/mozconfig-windows-x86_64 new file mode 100644 index 0000000000000..93b7a28fd361f --- /dev/null +++ b/mozconfig-windows-x86_64 @@ -0,0 +1,11 @@ +. $topsrcdir/browser/config/mozconfigs/tor-browser + +ac_add_options --target=x86_64-w64-mingw32 +ac_add_options --with-toolchain-prefix=x86_64-w64-mingw32- + +ac_add_options --enable-strip + +# Bits is Background Intelligent Transfer Service +ac_add_options --disable-bits-download +ac_add_options --disable-maintenance-service +ac_add_options --disable-default-browser-agent -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 34451: Include Tor Browser Manual in packages during build
by gitolite role 09 Jun '22

09 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 2853461 Bug 34451: Include Tor Browser Manual in packages during build 2853461 is described below commit 28534614fd06a4422eb5959d153a592347094a27 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri May 20 19:55:29 2022 +0200 Bug 34451: Include Tor Browser Manual in packages during build Include an output of the Tor Browser manual optimized for offline docs in the browser/omni.ja file. See also tor-browser#11698. --- doc/how-to-update-the-manual.txt | 8 +++++++ projects/manual/build | 11 +++++++++ projects/manual/config | 21 +++++++++++++++++ projects/manual/packagemanual.py | 50 ++++++++++++++++++++++++++++++++++++++++ projects/tor-browser/build | 10 ++++++++ projects/tor-browser/config | 3 +++ 6 files changed, 103 insertions(+) diff --git a/doc/how-to-update-the-manual.txt b/doc/how-to-update-the-manual.txt new file mode 100644 index 0000000..334701c --- /dev/null +++ b/doc/how-to-update-the-manual.txt @@ -0,0 +1,8 @@ +1. Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/ +2. Open the latest build stage +3. Download the artifacts (they come in a .zip file). +4. Rename it to manual_$PIPELINEID.zip +5. Upload it to people.tpo +6. Update projects/manual/config + 6.1 Change the version to $PIPELINEID + 6.2 Update the URL if it was different from the previous uploader diff --git a/projects/manual/build b/projects/manual/build new file mode 100644 index 0000000..d569632 --- /dev/null +++ b/projects/manual/build @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] + +mkdir -p chrome/browser/content/browser/manual +unzip $rootdir/[% c('input_files_by_name/manual') %] +python3 $rootdir/[% c('input_files_by_name/package_script') %] public chrome/browser/content/browser/manual + +[% c('tar', { + tar_src => [ 'chrome' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/manual/config b/projects/manual/config new file mode 100644 index 0000000..fa01356 --- /dev/null +++ b/projects/manual/config @@ -0,0 +1,21 @@ +# To update, see doc/how-to-update-the-manual.txt +version: 40628 +filename: 'manual-[% c("version") %].tar.gz' + +var: + container: + use_container: 1 + suite: bullseye + arch: amd64 + deps: + - python3 + - unzip + pre_pkginst: '' + +input_files: + - project: container-image + - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' + name: manual + sha256sum: 64bab7e8b26014277b55cf2afc4f676f3a164f466fc33e72aa62004318994c3a + - filename: packagemanual.py + name: package_script diff --git a/projects/manual/packagemanual.py b/projects/manual/packagemanual.py new file mode 100755 index 0000000..f4a3b98 --- /dev/null +++ b/projects/manual/packagemanual.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 +from pathlib import Path +import re +import sys +import shutil + + +PAGE_NAME = 'offline-docs' +STATIC_PATH = 'chrome://browser/content/manual/static' + +if len(sys.argv) < 3: + print(f'Usage: {sys.argv[0]} lektor-out-directory target-directory') + sys.exit(1) + +source = Path(sys.argv[1]) +target = Path(sys.argv[2]) +if not target.exists(): + target.mkdir(exist_ok=True) + +static_re = re.compile('"(?:../)*static/([^"]+)"') +link_re = re.compile('href="../([^"]+)"') + + +def clean_urls(match): + m = re.match(r'(?:../)?([^/#]+)[/]?[#]?(.*)', match.group(1)) + slug = m.group(1) + if m.group(2): + anchor = '_' + m.group(2) + else: + anchor = '' + return f'href="#{slug}{anchor}"' + + +htmls = source.rglob(f'{PAGE_NAME}/index.html') +for page in htmls: + with page.open(encoding='utf8') as f: + contents = f.read() + contents = static_re.sub(f'"{STATIC_PATH}/\\1"', contents) + contents = link_re.sub(clean_urls, contents) + + rel = page.relative_to(source) + dest_name = str(list(rel.parents)[-2].name) + if dest_name == PAGE_NAME: + dest_name = 'en' + dest_name += '.html' + with (target / dest_name).open('w', encoding='utf8') as f: + f.write(contents) + +shutil.rmtree(target / 'static', ignore_errors=True) +shutil.copytree(source / 'static', target / 'static') diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 049bf1c..e1de23b 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -83,6 +83,16 @@ find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[ popd rm -rf $TMP_HTTPS_EVERYWHERE_PATH +# Include the Tor Browser manual +TMP_MANUAL_PATH=$rootdir/tmp_manual/ +mkdir $TMP_MANUAL_PATH +pushd $TMP_MANUAL_PATH +tar -xf $rootdir/[% c('input_files_by_name/manual') %] +find . -exec [% c("var/touch") %] {} \; +find chrome/ | sort | zip -X -@ "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]/browser/omni.ja" +popd +rm -rf $TMP_MANUAL_PATH + tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz [% IF c("var/namecoin") %] # Extract Electrum-NMC diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d1a889f..9620b6b 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -123,3 +123,6 @@ input_files: enable: '[% ! c("var/android") %]' - filename: bridges_list.snowflake.txt enable: '[% ! c("var/android") %]' + - project: manual + name: manual + enable: '[% ! c("var/android") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: fixup! Bug 40451: Create Release Prep issue template
by gitolite role 08 Jun '22

08 Jun '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 6553058 fixup! Bug 40451: Create Release Prep issue template 6553058 is described below commit 6553058c347677de7eba281d3bb1fee2e90682e5 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Wed Jun 8 21:09:57 2022 +0000 fixup! Bug 40451: Create Release Prep issue template added android rebasing steps and other misc fixes --- .gitlab/issue_templates/Release Prep.md | 70 +++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 7 deletions(-) diff --git a/.gitlab/issue_templates/Release Prep.md b/.gitlab/issue_templates/Release Prep.md index 86318d0..d37b2b3 100644 --- a/.gitlab/issue_templates/Release Prep.md +++ b/.gitlab/issue_templates/Release Prep.md @@ -21,6 +21,8 @@ - example : either `0` or `5`; Alpha's is always `(Stable + 5) % 10` - `$(FIREFOX_BUILD_N)` : the firefox build revision within a given `tor-browser` branch; this is separate from the `$(TOR_BROWSER_BUILD_N) ` value - example : `build1` +- `$(GECKOVIEW_BUILD_N)` : like `$(FIREFOX_BUILD_N)` but for geckoview branches +- `$(FENIX_BUILD_N)` : like `$(FIREFOX_BUILD_N)` but for fenix branches - `$(TOR_BROWSER_BUILD_N)` : the tor-browser build revision for a given Tor Browser release; used in tagging git commits - example : `build2` - **NOTE** : `$(FIREFOX_BUILD_N)` and `$(TOR_BROWSER_BUILD_N)` typically are the same, but it is possible for them to diverge. For example : @@ -115,16 +117,56 @@ - [ ] Push tag to origin ### **tba-translation** ***(Optional)***: https://git.torproject.org/translation.git -_TODO_ +- [ ] Fetch latest and identify new HEAD of `fenix-torbrowserstringsxml` branch + - [ ] `origin/fenix-torbrowserstringsxml` : `INSERT COMMIT HASH HERE` ### **android-components** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/android-components.git -_TODO_ +- [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` + - Upstream git repo : https://github.com/mozilla-mobile/android-components.git + - [ ] Identify the `mozilla-mobile` git tag to start from + - Seem to be in the form `v$(RR_VERSION)` (for example, `v99.0.3`) + - [ ] Create new branch from tag named `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1` + - [ ] Push new branch to origin + - [ ] Rebase `android-components` patches + - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts + - [ ] Open MR for the rebase + - [ ] Merge + Push + - [ ] ***(Optional)*** Backport any required patches to Stable + - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue + - [ ] Close associated `Backport` issues + - [ ] Open MR for the backport commits + - [ ] Merge + Push +- [ ] Sign/Tag commit: + - Tag : `android-components-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - Message: `Tagging $(BUILD_N) for $(RR_VERSION)-based (alpha|stable)` +- [ ] Push tag to origin ### **tor-android-service** ***(Optional)***: https://git.torproject.org/tor-android-service.git -_TODO_ +- [ ] Fetch latest and identify new HEAD of `master` branch + - [ ] `origin/master` : `INSERT COMMIT HASH HERE` ### **fenix** ***(Optional)***: https://gitlab.torproject.org/tpo/applications/fenix.git -_TODO_ +- [ ] ***(Optional)*** Rebase to `$(RR_VERSION)` + - Upstream git repo : https://github.com/mozilla-mobile/fenix.git + - [ ] Identify the `mozilla-mobile` git tag to start from + - Seem to be in the form `v$(RR_VERSION)` (for example, `v96.3.0`) + - [ ] Create new branch from tag named `tor-browser-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1` + - **NOTE** : it is weird but we do use `tor-browser` here rather than `fenix` + - [ ] Push new branch to origin + - [ ] Rebase `fenix` patches + - [ ] Perform rangediff to ensure nothing weird happened resolving conflicts + - [ ] Open MR for the rebase + - [ ] Merge + Push + - ***(Optional)*** Backport any required patches to Stable +- [ ] ***(Optional)*** Backport any required patches to Stable + - [ ] cherry-pick patches on top of rebased branch (issues to backport should have `Backport` label and be linked to the associated `Release Prep` issue + - [ ] Close associated `Backport` issues + - [ ] Open MR for the backport commits + - [ ] Merge + Push +- [ ] Sign/Tag commit: + - Tag : `tor-browser-$(RR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - Message: `Tagging $(BUILD_N) for $(RR_VERSION)-based (alpha|stable)` +- [ ] Push tag to origin </details> @@ -138,10 +180,21 @@ Tor Browser Alpha (and Nightly) are on the `master` branch, while Stable lives i - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - [ ] `var/torbrowser_incremental_from` : update to previous version - - [ ] **IMPORTANT**: Really actually make sure this is the previous Desktop/Android version or else the `make incrementals-*` step will fail + - [ ] **IMPORTANT**: Really actually make sure this is the previous Desktop version or else the `make incrementals-*` step will fail - [ ] Update `projects/firefox/config` - - [ ] `git_hash` : update the $(FIREFOX_BUILD_N) section to match `tor-browser` tag + - [ ] `git_hash` : update the `$(FIREFOX_BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest $(ESR_VERSION) if rebased +- [ ] ***(Android Only)*** Update `projects/geckoview/config` + - [ ] `git_hash` : update the `$(GECKOVIEW_BUILD_N)` section to match `geckoview` tag + - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(RR_VERSION)` if rebased +- [ ] ***(Android Only, Optional)*** Update `projects/tba-translations/config`: + - [ ] `git_hash` : update with HEAD commit of project's `fenix-torbrowserstringsxml` branch +- [ ] ***(Android Only, Optional)*** Update `projects/tor-android-service/config` + - [ ] `git_hash` : update with HEAD commit of project's `master` branch +- [ ] ***(Android Only, Optionl)*** Update `projects/fenix/config` + - [ ] `git_hash` : update the `$(FENIX_BUILD_N)` section to match `fenix` tag + - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(RR_VERSION)` if rebased +- [ ] ***(Android Only)*** Update allowed_addons.json by running (from `tor-browser-build` root)`./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - [ ] ***(Optional)*** If version available, update `noscript` section of `input_files` in `projects/tor-browser/config` - [ ] `URL` @@ -157,7 +210,6 @@ Tor Browser Alpha (and Nightly) are on the `master` branch, while Stable lives i - [ ] ***(Optional)*** If new go version is available, update `projects/go/config` - [ ] `version` : update go version - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) -- [ ] ***(Android Only)*** Update allowed_addons.json by running (from `tor-browser-build` root)`./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json - [ ] Update `ChangeLog.txt` - [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches - [ ] Open MR with above changes @@ -217,6 +269,10 @@ Tor Browser Alpha (and Nightly) are on the `master` branch, while Stable lives i - [ ] `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - [ ] `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - [ ] `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script: + - `cd tor-browser-build/tools/signing/` + - `./macos-signer-proxy` +- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 - [ ] ***(Android Only)*** : *TODO* - [ ] run do-all-signing script: - `cd tor-browser-build/tools/signing/` -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.9.0esr-11.5-1 updated: fixup! Bug 40458: Implement .tor.onion aliases
by gitolite role 08 Jun '22

08 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.9.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.9.0esr-11.5-1 by this push: new 9a9e310c88404 fixup! Bug 40458: Implement .tor.onion aliases 9a9e310c88404 is described below commit 9a9e310c88404aff750737a018a61abf48115285 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Wed Jun 8 19:11:27 2022 +0200 fixup! Bug 40458: Implement .tor.onion aliases Restored .tor.onion and .securedrop.tor.onion as effective TLD domains. --- netwerk/dns/effective_tld_names.dat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat index 4c0c6e9a98695..bdad4efc7f99b 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat @@ -5527,6 +5527,8 @@ pro.om // onion : https://tools.ietf.org/html/rfc7686 onion +tor.onion +securedrop.tor.onion // org : https://en.wikipedia.org/wiki/.org org -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.0 updated: Bug 40497: Check that directory does not exist before starting macOS signing
by gitolite role 08 Jun '22

08 Jun '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.0 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.0 by this push: new bfb21a2 Bug 40497: Check that directory does not exist before starting macOS signing bfb21a2 is described below commit bfb21a2a023767583a3a8963caf8681e9cb57643 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jun 6 12:36:58 2022 +0200 Bug 40497: Check that directory does not exist before starting macOS signing --- tools/signing/do-all-signing | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/signing/do-all-signing b/tools/signing/do-all-signing index dcf6a02..784255c 100755 --- a/tools/signing/do-all-signing +++ b/tools/signing/do-all-signing @@ -31,6 +31,18 @@ function sync-builder-unsigned-to-local-signed { "$script_dir/sync-builder-unsigned-to-local-signed" } +function macos-signer-directory-not-present { + # To avoid doing two signings at the same time, or to avoid unknowingly + # using parts from a previous signing attempt, we check that the + # directory does not exist yet (see tor-browser-build#40497) + if ssh "$ssh_host_macos_signer" "test -d $tbb_version" + then + echo "The directory $tbb_version already exists on $ssh_host_macos_signer" + return 1 + fi + return 0 +} + function sync-scripts-to-macos-signer { "$script_dir/sync-scripts-to-macos-signer" } @@ -168,6 +180,7 @@ function do_step { do_step wait-for-finished-build do_step sync-builder-unsigned-to-local-signed +do_step macos-signer-directory-not-present do_step sync-scripts-to-macos-signer do_step macos-signer-enable-network-proxy-settings do_step macos-signer-gatekeeper-signing -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40497: Check that directory does not exist before starting macOS signing
by gitolite role 08 Jun '22

08 Jun '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new e94220d Bug 40497: Check that directory does not exist before starting macOS signing e94220d is described below commit e94220d6600b97ced499c6d23b95abbf329a4455 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jun 6 12:36:58 2022 +0200 Bug 40497: Check that directory does not exist before starting macOS signing --- tools/signing/do-all-signing | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/signing/do-all-signing b/tools/signing/do-all-signing index dcf6a02..784255c 100755 --- a/tools/signing/do-all-signing +++ b/tools/signing/do-all-signing @@ -31,6 +31,18 @@ function sync-builder-unsigned-to-local-signed { "$script_dir/sync-builder-unsigned-to-local-signed" } +function macos-signer-directory-not-present { + # To avoid doing two signings at the same time, or to avoid unknowingly + # using parts from a previous signing attempt, we check that the + # directory does not exist yet (see tor-browser-build#40497) + if ssh "$ssh_host_macos_signer" "test -d $tbb_version" + then + echo "The directory $tbb_version already exists on $ssh_host_macos_signer" + return 1 + fi + return 0 +} + function sync-scripts-to-macos-signer { "$script_dir/sync-scripts-to-macos-signer" } @@ -168,6 +180,7 @@ function do_step { do_step wait-for-finished-build do_step sync-builder-unsigned-to-local-signed +do_step macos-signer-directory-not-present do_step sync-scripts-to-macos-signer do_step macos-signer-enable-network-proxy-settings do_step macos-signer-gatekeeper-signing -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0