- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40102: Use Debian Stretch for Linux builds
by boklm (＠boklm) 27 Jun '23

27 Jun '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c606a927 by Nicolas Vigier at 2023-06-27T16:53:41+02:00 Bug 40102: Use Debian Stretch for Linux builds - - - - - 18 changed files: - projects/binutils/build - projects/binutils/config - − projects/bison/build - − projects/bison/config - projects/cmake/build - projects/container-image/config - projects/firefox/build - projects/firefox/config - projects/firefox/mozconfig - projects/gcc/build - projects/gcc/config - − projects/mmdebstrap-image/apt-key-allow-expired-key.patch - projects/mmdebstrap-image/config - projects/ninja/build - projects/rust/build - projects/sqlcipher/build - projects/stemns/build - rbm.conf Changes: ===================================== projects/binutils/build ===================================== @@ -2,17 +2,7 @@ [% c("var/set_default_env") -%] mkdir /var/tmp/dist distdir=/var/tmp/dist/binutils -[% IF c("var/linux") %] - # Config options for hardening-wrapper - export DEB_BUILD_HARDENING=1 - export DEB_BUILD_HARDENING_STACKPROTECTOR=1 - export DEB_BUILD_HARDENING_FORTIFY=1 - export DEB_BUILD_HARDENING_FORMAT=1 - export DEB_BUILD_HARDENING_PIE=1 - - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/bison') %] - export PATH=/var/tmp/dist/bison/bin:$PATH -[% END %] +[% IF c("var/linux"); GET c("var/set_hardened_build_flags"); END %] tar xf [% project %]-[% c("version") %].tar.xz cd [% project %]-[% c("version") %] @@ -23,20 +13,6 @@ cd [% project %]-[% c("version") %] make -j[% c("num_procs") %] MAKEINFO=true make install MAKEINFO=true -# gold is disabled for linux-cross, because of -# https://sourceware.org/bugzilla/show_bug.cgi?id=14995 -# Once we upgrade to glibc 2.26, we might be able to enable gold for -# linux-cross. -[% IF c("var/linux") && ! c("var/linux-cross") %] - # Make sure gold is used with the hardening wrapper for full RELRO, see #13031. - cd $distdir/bin - rm ld - cp /usr/bin/hardened-ld ./ - mv ld.gold ld.gold.real - ln -sf hardened-ld ld.gold - ln -sf ld.gold ld -[% END %] - cd /var/tmp/dist [% c('tar', { tar_src => [ project ], ===================================== projects/binutils/config ===================================== @@ -22,7 +22,3 @@ input_files: file_gpg_id: 1 gpg_keyring: binutils.gpg - project: container-image - - project: bison - name: bison - # We try to use system's bison, but Jessie's is too old - enable: '[% c("var/linux") %]' ===================================== projects/bison/build deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/bison -tar xf [% project %]-[% c("version") %].tar.xz -cd [% project %]-[% c("version") %] -./configure --prefix=$distdir -make -j[% c("num_procs") %] -make install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/bison/config deleted ===================================== @@ -1,10 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 3.8.2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -input_files: - - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz - sha256: 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2 - - project: container-image ===================================== projects/cmake/build ===================================== @@ -5,7 +5,7 @@ distdir=/var/tmp/dist/[% project %] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] [% END -%] -mkdir /var/tmp/build +mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ./bootstrap --prefix=$distdir ===================================== projects/container-image/config ===================================== @@ -11,8 +11,8 @@ var: lsb_release: id: Debian - codename: jessie - release: 8.11 + codename: stretch + release: 9.13 targets: no_containers: @@ -33,18 +33,13 @@ pre: | # version of required packages. apt-get update -y -q [% IF pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) -%] - [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %] - [% IF c("var/linux-cross") -%] - dpkg --add-architecture [% c("var/arch_debian") %] - [% END -%] - [% IF c("var/container/suite") == "jessie" -%] - # We need to use faketime to run `apt-get update` on jessie, because of - # expired key. See tor-browser-build#40693 - dpkg -i ./libfaketime_0.9.6-3_amd64.deb ./faketime_0.9.6-3_amd64.deb - [% END -%] - # Update the package cache again because `pre_pkginst` may change the - # package manager configuration. - [% IF c("var/container/suite") == "jessie" %]faketime '2018-12-24 08:15:42' [% END %]apt-get update -y -q + [% pc(c('origin_project'), 'var/pre_pkginst', { step => c('origin_step') }) %] + [% IF c("var/linux-cross") -%] + dpkg --add-architecture [% c("var/arch_debian") %] + [% END -%] + # Update the package cache again because `pre_pkginst` may change the + # package manager configuration. + apt-get update -y -q [% END -%] apt-get upgrade -y -q [% @@ -87,9 +82,3 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' - - URL: http://archive.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd6… - sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 - enable: '[% c("var/container/suite") == "jessie" %]' - - URL: http://archive.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_a… - sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 - enable: '[% c("var/container/suite") == "jessie" %]' ===================================== projects/firefox/build ===================================== @@ -1,6 +1,9 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + hardened_gcc => 0, # don't set hardened_gcc since firefox is setting the hardened flags + }) %] distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build mkdir -p [% dest_dir _ '/' _ c('filename') %] ===================================== projects/firefox/config ===================================== @@ -96,7 +96,6 @@ targets: - libgtk-3-dev - libdbus-glib-1-dev - libxt-dev - - hardening-wrapper # To pass configure since ESR 31 - libpulse-dev # To pass configure since ESR 52 @@ -116,7 +115,6 @@ targets: - libgtk-3-dev:i386 - libdbus-glib-1-dev:i386 - libxt-dev:i386 - - hardening-wrapper # To pass configure since ESR 31 - libpulse-dev:i386 # To pass configure since ESR 52 ===================================== projects/firefox/mozconfig ===================================== @@ -10,6 +10,9 @@ HOST_CXX=$CXX export BINDGEN_CFLAGS='--gcc-toolchain=/var/tmp/dist/gcc' + + # set LDFLAGS for Full RELRO + export LDFLAGS="-Wl,-z,relro -Wl,-z,now" [% END -%] [% IF c("var/windows") -%] ===================================== projects/gcc/build ===================================== @@ -1,23 +1,23 @@ #!/bin/sh [% c("var/set_default_env") -%] -[% IF c("var/linux") -%] - # Config options for hardening-wrapper +mkdir -p /var/tmp/build +[% IF c("var/linux") && ! c("var/linux-cross") -%] + # Config options for hardening export DEB_BUILD_HARDENING=1 - export DEB_BUILD_HARDENING_STACKPROTECTOR=1 - export DEB_BUILD_HARDENING_FORTIFY=1 # Since r223796 landed on GCC master enforcing PIE breaks GCC compilation. # The compiler gets built with `-fno-PIE` and linked with `-no-pie` as not # doing so would make precompiled headers (PCH) fail. # It is okay for us to omit this right now as it does not change any hardening # flags in the resulting bundles. - export DEB_BUILD_HARDENING_PIE=0 + # # We need to disable `-Werror=format-security` as GCC does not build with it # anymore. It seems it got audited for those problems already: # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. - export DEB_BUILD_HARDENING_FORMAT=0 + export DEB_BUILD_OPTIONS=hardening=+bindnow,+relro,-pie,+fortify,+stackprotector,+stackprotectorstrong,-format + eval $(cd /var/tmp/build; dpkg-buildflags --export=sh) + export OPT_LDFLAGS="$LDFLAGS" [% END -%] distdir=/var/tmp/dist/[% c("var/distdir") %] -mkdir /var/tmp/build [% IF c("var/linux-cross") -%] ===================================== projects/gcc/config ===================================== @@ -18,26 +18,7 @@ var: [% IF ! c("var/linux-cross") -%] export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64:/var/tmp/dist/[% c("var/distdir") %]/lib32 [% END -%] - - [% IF c("hardened_gcc") -%] - # Config options for hardening-wrapper - export DEB_BUILD_HARDENING=1 - export DEB_BUILD_HARDENING_STACKPROTECTOR=1 - export DEB_BUILD_HARDENING_FORTIFY=1 - export DEB_BUILD_HARDENING_FORMAT=1 - export DEB_BUILD_HARDENING_PIE=1 - - # Make sure we use the hardening wrapper - pushd /var/tmp/dist/[% c("var/distdir") %]/bin - cp /usr/bin/hardened-cc ./ - mv [% c("var/target_prefix") %]gcc [% c("var/target_prefix") %]gcc.real - mv [% c("var/target_prefix") %]c++ [% c("var/target_prefix") %]c++.real - mv [% c("var/target_prefix") %]g++ [% c("var/target_prefix") %]g++.real - ln -sf hardened-cc [% c("var/target_prefix") %]gcc - ln -sf hardened-cc [% c("var/target_prefix") %]c++ - ln -sf hardened-cc [% c("var/target_prefix") %]g++ - popd - [% END -%] + [% IF c("hardened_gcc"); GET c("var/set_hardened_build_flags"); END %] targets: windows: @@ -51,7 +32,6 @@ targets: var: configure_opt: --enable-multilib --enable-languages=c,c++ --with-arch_32=i686 arch_deps: - - hardening-wrapper - libc6-dev-i386 linux-cross: var: @@ -64,7 +44,6 @@ targets: glibc_version: 2.26 linux_version: 4.10.1 arch_deps: - - hardening-wrapper - libc6-dev-i386 - gawk linux-arm: ===================================== projects/mmdebstrap-image/apt-key-allow-expired-key.patch deleted ===================================== @@ -1,23 +0,0 @@ ---- o/apt-key 2022-11-30 14:57:12.742026261 +0000 -+++ n/apt-key 2022-12-01 08:38:08.170140893 +0000 -@@ -815,11 +815,18 @@ - create_gpg_home - fi - setup_merged_keyring -+ tmpfile=$(mktemp) -+ set +e - if [ -n "$FORCED_KEYRING" ]; then -- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" -+ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@") - else -- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" -+ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@") - fi -+ err=$? -+ set -e -+ cat "$tmpfile" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' >&${GPGSTATUSFD} -+ rm -f "$tmpfile" -+ exit $err - ;; - help) - usage ===================================== projects/mmdebstrap-image/config ===================================== @@ -6,7 +6,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04.1 + ubuntu_version: 22.04.2 pre: | #!/bin/sh @@ -16,14 +16,6 @@ pre: | apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg - [% IF c("var/container/suite") == "jessie" -%] - apt-get install -y -q patch - cd /usr/bin - # The gpg key for jessie is expired. We patch apt-key to accept expired keys. - patch -p1 < $rootdir/apt-key-allow-expired-key.patch - cd $rootdir - [% END -%] - export SOURCE_DATE_EPOCH='[% c("timestamp") %]' tar -xf [% c('input_files_by_name/mmdebstrap') %] ./mmdebstrap/mmdebstrap --mode=unshare [% c("var/container/mmdebstrap_opt") %] [% c("var/container/suite") %] output.tar.gz [% c("var/container/debian_mirror") %] @@ -39,16 +31,16 @@ pre: | mv output.tar.gz [% dest_dir %]/[% c("filename") %] targets: - jessie-amd64: + stretch-amd64: var: - minimal_apt_version: 1.0.9.8.6 - + minimal_apt_version: 1.4.11 container: - suite: jessie + suite: stretch arch: amd64 debian_mirror: > - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian/ jessie main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian-security/ jessie/updates main" + "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://archive.debian.org/debian-archive/debian/ stretch main" + "deb [signed-by=/usr/share/keyrings/debian-archive-keyring.gpg] http://archive.debian.org/debian-archive/debian-security/ stretch/updates main" + bullseye-amd64: var: @@ -62,6 +54,4 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: e1f9200c99da008a473c9ae7b51e13f5ea05dc4c2e12beb43f0f9cbbbf6216f4 - - filename: apt-key-allow-expired-key.patch - enable: '[% c("var/container/suite") == "jessie" %]' + sha256sum: 373f064df30519adc3344a08d774f437caabd1479d846fa2ca6fed727ea7a53d ===================================== projects/ninja/build ===================================== @@ -8,7 +8,7 @@ distdir=/var/tmp/dist/[% project %] [% IF c("var/linux") -%] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] [% END -%] -mkdir /var/tmp/build +mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] ===================================== projects/rust/build ===================================== @@ -50,7 +50,7 @@ EOF [% END %] cd $rootdir -mkdir /var/tmp/build +mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] cd /var/tmp/build/rustc-[% c('version') %]-src ===================================== projects/sqlcipher/build ===================================== @@ -3,7 +3,7 @@ [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] distdir=/var/tmp/dist/sqlcipher builddir=/var/tmp/build/[% project %] -mkdir /var/tmp/build +mkdir -p /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/nss') %] [% IF ! c("var/sqlcipher-linux-x86_64") -%] ===================================== projects/stemns/build ===================================== @@ -1,8 +1,8 @@ #!/bin/sh [% c("var/set_default_env") -%] distdir=/var/tmp/dist/StemNS -mkdir /var/tmp/build -mkdir /var/tmp/dist +mkdir -p /var/tmp/build +mkdir -p /var/tmp/dist # Extract StemNS tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz ===================================== rbm.conf ===================================== @@ -491,7 +491,7 @@ targets: # Temporarily disabled until we have a fix for tor-browser-build#40845 #namecoin: '[% c("var/nightly") && c("var/tor-browser") %]' container: - suite: jessie + suite: stretch arch: amd64 pre_pkginst: dpkg --add-architecture i386 deps: @@ -503,13 +503,18 @@ targets: - build-essential - python - bison - - hardening-wrapper - automake - libtool - zip - unzip - xz-utils - patch + - less + set_hardened_build_flags: | + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_OPTIONS='hardening=+bindnow,+relro,+pie,+fortify,+stackprotector,+stackprotectorstrong,+format' + mkdir -p /var/tmp/build + eval $(cd /var/tmp/build; dpkg-buildflags --export=sh) linux-asan: var: asan: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by ma1 (＠ma1) 27 Jun '23

27 Jun '23

ma1 pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4a13c283 by hackademix at 2023-06-27T07:54:52+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt - - - - - 1 changed file: - browser/components/onionservices/content/authPrompt.js Changes: ===================================== browser/components/onionservices/content/authPrompt.js ===================================== @@ -73,8 +73,18 @@ const OnionAuthPrompt = (function() { ); }, + _autoFocus(event) { + event.target.ownerGlobal.focus(); + }, + _onPromptShowing(aWarningMessage) { let xulDoc = this._browser.ownerDocument; + + // Force back focus: tor-browser#41856 + (this._popupElem = xulDoc.getElementById( + `${OnionAuthUtil.domid.notification}-notification` + ))?.addEventListener("click", this._autoFocus); + let descElem = xulDoc.getElementById(OnionAuthUtil.domid.description); if (descElem) { // Handle replacement of the onion name within the localized @@ -159,6 +169,9 @@ const OnionAuthPrompt = (function() { this._boundOnKeyFieldInput = undefined; } } + if (this._popupElem) { + this._popupElem.removeEventListener("click", this._autoFocus); + } }, _onKeyFieldKeyPress(aEvent) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4a13c28… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4a13c28… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40085: Bump version of snowflake to v2.6.0
by boklm (＠boklm) 26 Jun '23

26 Jun '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: bac08eff by Cecylia Bocovich at 2023-06-26T14:15:23+00:00 Bug 40085: Bump version of snowflake to v2.6.0 - - - - - 1 changed file: - projects/snowflake/config Changes: ===================================== projects/snowflake/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… -git_hash: 7b77001eaa90e09d41172a2b170dabd3f1922b4a +git_hash: 08d1c6d6551464d526d4bbe608384b8e7dec32ee #v2.6.0 container: use_container: 1 @@ -20,6 +20,6 @@ steps: pkg_type: go_vendor project: snowflake norec: - sha256sum: a4bfd990bb3c0ce131ddd056c779d1c7be8f624aaff6fa1dbf865cc9f2950620 + sha256sum: 62f9065881f5a3cbe5ea5a9802e961e1821d9e468cb2a85ebab1e8afcc0cc953 target_replace: '^torbrowser-.*': 'torbrowser-linux-x86_64' 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 40887: Update Webtunnel Version to 38eb5505
by boklm (＠boklm) 26 Jun '23

26 Jun '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3aeaa51c by Shelikhoo at 2023-06-26T14:04:15+00:00 Bug 40887: Update Webtunnel Version to 38eb5505 - - - - - 1 changed file: - projects/webtunnel/config Changes: ===================================== projects/webtunnel/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webt… -git_hash: 2ecf64381bad8a5db45c5871dcad7d12831dca69 +git_hash: 38eb55054a5c3c072acc1d8f9a9afa36e3a5c9b7 container: use_container: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-12.5-build1
by richard (＠richard) 23 Jun '23

23 Jun '23

richard pushed new tag mb-12.5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] ChangeLog.txt updates
by richard (＠richard) 23 Jun '23

23 Jun '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c5bfcc1a by Richard Pospesel at 2023-06-23T17:05:58+00:00 ChangeLog.txt updates - migrated Docs-PB to Docs-MB in browser project - updated browser build script to take new path into account - created separate ChangeLog-MB.txt softlink, migrate ChangeLog.txt softlink to ChangeLog-TBB.txt - updated changelog-format-blog-post script to reference correct file and fix bug in raw changelog link - - - - - 6 changed files: - + ChangeLog-MB.txt - ChangeLog.txt → ChangeLog-TBB.txt - + projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt - projects/browser/build - tools/changelog-format-blog-post Changes: ===================================== ChangeLog-MB.txt ===================================== @@ -0,0 +1 @@ +projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt \ No newline at end of file ===================================== ChangeLog.txt → ChangeLog-TBB.txt ===================================== ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== ===================================== projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt ===================================== ===================================== projects/browser/build ===================================== @@ -241,7 +241,7 @@ do [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \ -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x [% ELSIF c("var/mullvad-browser") -%] - cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH" + cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH" [% END -%] done ===================================== tools/changelog-format-blog-post ===================================== @@ -12,7 +12,7 @@ sub version_type { my ($changelog, $current_tbversion, $last_tbversion); -if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog.txt")) { +if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog-TBB.txt")) { print STDERR "Error opening changelog file\n"; exit 1; } @@ -49,6 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) { my @v = split(/\./, $current_tbversion); $changelog_branch = "maint-$v[0].$v[1]"; } -print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs/ChangeLog.txt) is:\n\n"; +print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt) is:\n\n"; print $changelog; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.5] 2 commits: ChangeLog.txt updates
by richard (＠richard) 23 Jun '23

23 Jun '23

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build Commits: dbd79b03 by Richard Pospesel at 2023-06-21T21:06:53+00:00 ChangeLog.txt updates - migrated Docs-PB to Docs-MB in browser project - updated browser build script to take new path into account - created separate ChangeLog-MB.txt softlink, migrate ChangeLog.txt softlink to ChangeLog-TBB.txt - updated changelog-format-blog-post script to reference correct file and fix bug in raw changelog link - - - - - 0836bd0b by Richard Pospesel at 2023-06-22T20:03:17+00:00 Bug 40872: Mullvad Browser 12.5 - - - - - 9 changed files: - + ChangeLog-MB.txt - ChangeLog.txt → ChangeLog-TBB.txt - + projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt - projects/browser/build - projects/browser/config - projects/firefox/config - rbm.conf - tools/changelog-format-blog-post Changes: ===================================== ChangeLog-MB.txt ===================================== @@ -0,0 +1 @@ +projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt \ No newline at end of file ===================================== ChangeLog.txt → ChangeLog-TBB.txt ===================================== ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -0,0 +1,31 @@ +Mullvad Browser 12.5 - June 21 2023 + * All Platforms + * Updated uBlock Origin to 1.50.0 + * Updated mullvad-browser-extension to version 0.8.3 + * Windows + macOS + Linux + * Bug 41577: Disable profile migration [tor-browser] + * Bug 41595: Disable pagethumbnails capturing [tor-browser] + * Bug 41609: Move the disabling of Firefox Home (Activity Stream) to base-browser [tor-browser] + * Bug 41668: Move part of the updater patches to base browser [tor-browser] + * Bug 41686: Move the 'Bug 11641: Disable remoting by default' commit from base-browser to tor-browser [tor-browser] + * Bug 41695: Port warning on maximized windows without letterboxing from torbutton [tor-browser] + * Bug 41701: Reporting an extension does not work [tor-browser] + * Bug 41711: Race condition when opening a new window in New Identity [tor-browser] + * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser] + * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser] + * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser] + * Windows + Linux + * Bug 41654: UpdateInfo jumped into Data [tor-browser] + * Linux + * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build] + * Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP [tor-browser] + * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser] + * Build System + * All Platforms + * Bug 40837: Rebase mullvad-browser build changes onto main [tor-browser-build] + * Bug 40870: Remove url without browser name from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Windows + macOS + Linux + * Bug 40826: Correctly set appname_marfile for basebrowser in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 40866: Remove `Using ansible to set up a nightly build machine` from README [tor-browser-build] + * macOS + * Bug 40858: Create script to assist testers self sign Mac builds to allow running on Arm processors [tor-browser-build] ===================================== projects/browser/Bundle-Data/Docs-PB/Licenses/uBlockOrigin.txt → projects/browser/Bundle-Data/Docs-MB/Licenses/uBlockOrigin.txt ===================================== ===================================== projects/browser/build ===================================== @@ -237,7 +237,7 @@ do [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] \ -c . | tar -C "$tbdir[% IF ! c("var/macos") %]/[% c('var/ProjectName') %][% END %]" -x [% ELSIF c("var/mullvad-browser") -%] - cp -a Bundle-Data/Docs-PB/* "$tbdir/$DOCSPATH" + cp -a Bundle-Data/Docs-MB/* "$tbdir/$DOCSPATH" [% END -%] done ===================================== projects/browser/config ===================================== @@ -106,13 +106,13 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.… name: noscript sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e - - URL: https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4… + - URL: https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.5… name: ublock-origin - sha256sum: 39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d + sha256sum: 10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3 enable: '[% c("var/mullvad-browser") %]' - - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.9-firef… + - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firef… name: mullvad-extension - sha256sum: 17ce31b32e8be0f0db86a5a5ed93607cc84d5e2092341aee0b8eaba1c0746390 + sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox/config ===================================== @@ -85,7 +85,7 @@ targets: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' - browser_build: 1 + browser_build: 2 gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser linux-x86_64: ===================================== rbm.conf ===================================== @@ -277,8 +277,7 @@ targets: exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' locales: [] - torbrowser_incremental_from: - - 12.5a6 + torbrowser_build: 'build1' torbrowser-testbuild: - testbuild ===================================== tools/changelog-format-blog-post ===================================== @@ -12,7 +12,7 @@ sub version_type { my ($changelog, $current_tbversion, $last_tbversion); -if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog.txt")) { +if (!open(CHANGELOG, '<', "$FindBin::Bin/../ChangeLog-TBB.txt")) { print STDERR "Error opening changelog file\n"; exit 1; } @@ -49,6 +49,6 @@ if (! ( $current_tbversion =~ m/a/ ) ) { my @v = split(/\./, $current_tbversion); $changelog_branch = "maint-$v[0].$v[1]"; } -print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs/ChangeLog.txt) is:\n\n"; +print "The full changelog since [Tor Browser $last_tbversion](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$changelog_branch/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt) is:\n\n"; print $changelog; 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-update-responses][main] release: new version, 12.5
by richard (＠richard) 22 Jun '23

22 Jun '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 741176fa by Richard Pospesel at 2023-06-22T18:46:35+00:00 release: new version, 12.5 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/12.0.4-12.0.7-linux32-ALL.xml - − update_3/release/12.0.4-12.0.7-linux64-ALL.xml - − update_3/release/12.0.4-12.0.7-macos-ALL.xml - − update_3/release/12.0.4-12.0.7-win32-ALL.xml - − update_3/release/12.0.4-12.0.7-win64-ALL.xml - − update_3/release/12.0.5-12.0.7-linux32-ALL.xml - − update_3/release/12.0.5-12.0.7-linux64-ALL.xml - − update_3/release/12.0.5-12.0.7-macos-ALL.xml - − update_3/release/12.0.5-12.0.7-win32-ALL.xml - − update_3/release/12.0.5-12.0.7-win64-ALL.xml - + update_3/release/12.0.5-12.5-linux32-ALL.xml - + update_3/release/12.0.5-12.5-linux64-ALL.xml - + update_3/release/12.0.5-12.5-macos-ALL.xml - + update_3/release/12.0.5-12.5-win32-ALL.xml - + update_3/release/12.0.5-12.5-win64-ALL.xml - − update_3/release/12.0.6-12.0.7-linux32-ALL.xml - − update_3/release/12.0.6-12.0.7-linux64-ALL.xml - − update_3/release/12.0.6-12.0.7-macos-ALL.xml - − update_3/release/12.0.6-12.0.7-win32-ALL.xml - − update_3/release/12.0.6-12.0.7-win64-ALL.xml - + update_3/release/12.0.6-12.5-linux32-ALL.xml - + update_3/release/12.0.6-12.5-linux64-ALL.xml - + update_3/release/12.0.6-12.5-macos-ALL.xml - + update_3/release/12.0.6-12.5-win32-ALL.xml - + update_3/release/12.0.6-12.5-win64-ALL.xml - + update_3/release/12.0.7-12.5-linux32-ALL.xml - + update_3/release/12.0.7-12.5-linux64-ALL.xml - + update_3/release/12.0.7-12.5-macos-ALL.xml - + update_3/release/12.0.7-12.5-win32-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40886: Add Arch instructions to README
by boklm (＠boklm) 22 Jun '23

22 Jun '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: cb783947 by Dan Ballard at 2023-06-21T16:17:32-07:00 Bug 40886: Add Arch instructions to README - - - - - 1 changed file: - README Changes: ===================================== README ===================================== @@ -42,6 +42,20 @@ If you are running Debian or Ubuntu, you can install them with: libfile-copy-recursive-perl libfile-slurp-perl git \ mercurial uidmap +If you are running an Arch based system, you should be able to install them with: + +# pacman -S perl-datetime perl-path-tiny perl-yaml perl-yaml-libyaml \ + perl-yaml-tiny perl-template-toolkit perl-io-captureoutput \ + perl-file-copy-recursive perl-string-shellquote \ + perl-sort-versions perl-data-uuid perl-data-dump perl-json \ + perl-digest-sha1 perl-io-all perl-file-slurp perl-sys-syscall \ + perl-parallel-forkmanager perl-xml-libxml perl-lwp-protocol-https + +On Arch based systems you also need to generate some .ph files RBM expects: + + # cd /usr/include/sys; h2ph syscall.h + # cd /usr/include/; h2ph asm/unistd.h asm/unistd_64.h bits/syscall.h + The build system is based on rbm, which is included as a git submodule in the rbm/ directory. You can fetch the rbm git submodule by running 'make submodule-update'. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Adding issue and merge request templates
by richard (＠richard) 21 Jun '23

21 Jun '23

richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9d876ebb by Richard Pospesel at 2023-06-21T18:06:08+00:00 fixup! Adding issue and merge request templates - added potential reviewer list with associated focus areas - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -25,12 +25,34 @@ ### Merging - [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports -- [ ] Merge to `base-browser` -`!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports +- [ ] Merge to `base-browser` - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging ### Issue Tracking - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation -## Change Description - - \ No newline at end of file +### Review + +#### Request Reviewer + +- [ ] Request review from an applications developer depending on modified system: + - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer) + - **accessibility** : henry + - **android** : dan + - **build system** : boklm + - **extensions** : ma1 + - **firefox internals (XUL/JS/XPCOM)** : ma1 + - **fonts** : pierov + - **frontend (implementation)** : henry + - **frontend (review)** : donuts, richard + - **localization** : henry, pierov + - **nightly builds** : boklm + - **rebases/release-prep** : dan_b, ma1, pierov, richard + - **security** : ma1 + - **signing** : boklm, richard + - **updater** : pierov + - **misc/other** : pierov, richard + +#### Change Description + + View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d876eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d876eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0