September 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/rbm][main] Bug 40059: Make it possible to have empty sha256sum value to disable sha256sum check
by richard (＠richard) 06 Sep '23

06 Sep '23

richard pushed to branch main at The Tor Project / Applications / RBM Commits: c4c1716d by Nicolas Vigier at 2023-09-06T15:30:45+02:00 Bug 40059: Make it possible to have empty sha256sum value to disable sha256sum check - - - - - 2 changed files: - doc/rbm_input_files.asc - lib/RBM.pm Changes: ===================================== doc/rbm_input_files.asc ===================================== @@ -113,6 +113,7 @@ refresh_input:: sha256sum:: The sha256 checksum of the file. The build will fail with an error if the file does not match the expected sha256 checksum. + If the value is empty, the checksum is not checked. file_gpg_id:: If this option is set to 1, the file is checked for a gpg ===================================== lib/RBM.pm ===================================== @@ -782,14 +782,17 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) + && $t->('sha256sum') && $t->('sha256sum') ne sha256file($fname)) { sha256file($fname, { remove_cache => 1 }); $fname = undef; } if ($action eq 'input_files_id') { return undef if $input_file->{input_file_id}; - return undef if $input_file->{sha256sum}; - return undef if $input_file->{norec}{sha256sum}; + if ( ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) + && $t->('sha256sum') ) { + return undef; + } return undef if $input_file->{exec}; return undef if $fname; return 1 if $input_file->{URL}; @@ -814,7 +817,8 @@ sub input_file_id { my ($input_file, $t, $fname, $filename) = @_; return $t->('input_file_id') if $input_file->{input_file_id}; return $input_file->{project} . ':' . $filename if $input_file->{project}; - if ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) { + if ( ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) + && $t->('sha256sum') ) { return $filename . ':' . $t->('sha256sum'); } my $opts = { norec => { output_dir => '/out', getting_id => 1, }}; View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c4c1716dcbffa58… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/c4c1716dcbffa58… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Updated Lyrebird dependencies hash.
by Pier Angelo Vendrame (＠pierov) 06 Sep '23

06 Sep '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 1215282c by Pier Angelo Vendrame at 2023-09-06T16:09:37+00:00 Updated Lyrebird dependencies hash. utls has been updated to v1.5.3 and crypto to v0.13.0. - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -17,7 +17,7 @@ targets: version: '[% c("abbrev") %]' tag_gpg_id: 0 var: - go_vendor_sha256sum: 8e9a5fd52f5a3a2b2b891389a224fcfc83b6c081658161bf40882b23fb58834c + go_vendor_sha256sum: 028c4536c10266331d680c0618b859d8f4ea8d630cd8588f13cfcc5b2d4272a1 steps: build: 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-build][main] Bug 40943: Update libdmg-hfs to drop our patch
by Pier Angelo Vendrame (＠pierov) 06 Sep '23

06 Sep '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2941c888 by Pier Angelo Vendrame at 2023-09-05T16:56:42+02:00 Bug 40943: Update libdmg-hfs to drop our patch We have uplifted one of our libdmg-hfs patches, so we can update our git_hash to the upstream commit that includes it. Also, deleted the OpenSSL 1.0.2 project in favor of a patch to optionally completely disable OpenSSL, since we do not need the functionalities it provides. - - - - - 7 changed files: - projects/libdmg-hfsplus/build - projects/libdmg-hfsplus/config - − projects/libdmg-hfsplus/libdmg.patch - + projects/libdmg-hfsplus/no-openssl.diff - − projects/openssl-1.0.2/build - − projects/openssl-1.0.2/config - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/libdmg-hfsplus/build ===================================== @@ -4,15 +4,14 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] -[% IF c("container/global_disable") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl-1.0.2') %] -[% END -%] export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] cd /var/tmp/build/[% project %]-[% c('version') %] -patch -p1 < "$rootdir/libdmg.patch" +[% IF c("container/global_disable") -%] + patch -p1 < "$rootdir/no-openssl.diff" +[% END -%] cmake . -GNinja -DCMAKE_BUILD_TYPE=Release [% c("var/cmake_opts") %] ninja -j[% c("num_procs") %] -v ===================================== projects/libdmg-hfsplus/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/libdmg-hfsplus -git_hash: 2ee327795680101d36f9700bd0fb618362237718 +git_hash: 2cb30de5b277bf2bc1fc129899bb9382bb56ccca filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -13,16 +13,12 @@ var: targets: no_containers: var: - cmake_opts: | - -DOPENSSL_USE_STATIC_LIBS=1 \ - -DOPENSSL_ROOT_DIR=/var/tmp/dist/openssl + cmake_opts: '-DUSE_OPENSSL=OFF' input_files: - project: container-image - name: cmake project: cmake - name: ninja project: ninja - - filename: libdmg.patch - - name: openssl-1.0.2 - project: openssl-1.0.2 + - filename: no-openssl.diff enable: '[% c("container/global_disable") %]' ===================================== projects/libdmg-hfsplus/libdmg.patch deleted ===================================== @@ -1,39 +0,0 @@ -From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 -From: Mike Perry <mikeperry-git(a)torproject.org> -Date: Thu, 6 Mar 2014 19:47:05 -0800 -Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. - -Some of the struct padding and fields contained unitialized memory, which -caused two successive invocations to produce archives that differed in some -bytes. ---- - dmg/dmglib.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/dmg/dmglib.c b/dmg/dmglib.c -index f481b1f..b74e50b 100644 ---- a/dmg/dmglib.c -+++ b/dmg/dmglib.c -@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { - ChecksumToken dataForkToken; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - off_t plistOffset; - uint32_t plistSize; - uint32_t dataForkChecksum; -@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { - uint64_t numSectors; - - UDIFResourceFile koly; -- -+ memset(&koly, 0, sizeof(koly)); -+ - char partitionName[512]; - - off_t fileLength; --- -1.8.1.2 - ===================================== projects/libdmg-hfsplus/no-openssl.diff ===================================== @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79d4302..b54e81d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6) + + project (libdmg-hfsplus) + ++option(USE_OPENSSL "Enable or disable OpenSSL (1.0.x is currently required)" ON) ++ + # We want win32 executables to build staticly by default, since it's more difficult to keep the shared libraries straight on Windows + IF(WIN32) + SET(BUILD_STATIC ON CACHE BOOL "Force compilation with static libraries") +diff --git a/dmg/CMakeLists.txt b/dmg/CMakeLists.txt +index 36f6bb6..ffdac77 100644 +--- a/dmg/CMakeLists.txt ++++ b/dmg/CMakeLists.txt +@@ -18,14 +18,14 @@ link_directories(${PROJECT_BINARY_DIR}/common ${PROJECT_BINARY_DIR}/hfs) + + add_library(dmg adc.c checksum.c dmgfile.c dmglib.c filevault.c io.c partition.c resources.c udif.c ../includes/dmg/adc.h ../includes/dmg/dmg.h ../includes/dmg/dmgfile.h ../includes/dmg/dmglib.h ../includes/dmg/filevault.h) + +-IF(OPENSSL_FOUND) ++IF(OPENSSL_FOUND AND USE_OPENSSL) + add_definitions(-DHAVE_CRYPT) + include_directories(${OPENSSL_INCLUDE_DIR}) + target_link_libraries(dmg ${OPENSSL_CRYPTO_LIBRARY} $<$<BOOL:${OPENSSL_USE_STATIC_LIBS}>:${CMAKE_DL_LIBS}>) + IF(WIN32) + TARGET_LINK_LIBRARIES(dmg gdi32) + ENDIF(WIN32) +-ENDIF(OPENSSL_FOUND) ++ENDIF(OPENSSL_FOUND AND USE_OPENSSL) + + target_link_libraries(dmg common hfs z bz2) + ===================================== projects/openssl-1.0.2/build deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/openssl -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf openssl-[% c('version') %].tar.[% c('compress_tar') %] -cd /var/tmp/build/openssl-[% c('version') %] -export SOURCE_DATE_EPOCH='[% c("timestamp") %]' -./Configure --prefix="$distdir" -shared enable-ec_nistp_64_gcc_128 linux-x86_64 -make -j[% c("num_procs") %] -make -j[% c("num_procs") %] install -cd /var/tmp/dist -[% c('tar', { - tar_src => [ 'openssl' ], - tar_args => '-caf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/openssl-1.0.2/config deleted ===================================== @@ -1,11 +0,0 @@ -# vim: filetype=yaml sw=2 -# -# We need openssl-1.0.2 for building libdmg-hfsplus: -# https://github.com/planetbeing/libdmg-hfsplus/issues/14 -# -version: 1.0.2u -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' - -input_files: - - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -39,7 +39,7 @@ test -f $faketime_path || \ exit_error "$faketime_path is missing" test -d $macos_stapled_dir || \ exit_error "The stapled macos zip files should be placed in directory $macos_stapled_dir" -libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2ee327795680-555a7e.tar.gz" +libdmg_file="$script_dir/../../out/libdmg-hfsplus/libdmg-hfsplus-2cb30de5b277-68b0fc.tar.zst" test -f "$libdmg_file" || \ exit_error "$libdmg_file is missing." \ "You can build it with:" \ 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/tor-browser][tor-browser-115.2.0esr-13.0-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 05 Sep '23

05 Sep '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 7263a6fd by Richard Pospesel at 2023-09-05T20:56:49+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha - - - - - 182afa03 by Richard Pospesel at 2023-09-05T20:56:49+00:00 fixup! Bug 40458: Implement .tor.onion aliases Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha - - - - - 2 changed files: - browser/components/rulesets/content/aboutRulesets.css - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/rulesets/content/aboutRulesets.css ===================================== @@ -43,7 +43,7 @@ select, option { dt { margin: var(--ruleset-vmargin) 0 0 0; padding: 0; - color: var(--in-content-deemphasized-text); + color: var(--text-color-deemphasized); font-size: 85%; } @@ -220,7 +220,7 @@ aside { #ruleset-list .description { font-size: 85%; - color: var(--in-content-deemphasized-text); + color: var(--text-color-deemphasized); } #ruleset-list .selected { @@ -280,7 +280,7 @@ aside { #ruleset-updated { margin-top: 24px; - color: var(--in-content-deemphasized-text); + color: var(--text-color-deemphasized); font-size: 85%; } @@ -291,7 +291,7 @@ aside { } #edit-ruleset label { - color: var(--in-content-deemphasized-text); + color: var(--text-color-deemphasized); display: block; } ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -164,7 +164,7 @@ flex: 1; margin: 0 8px; overflow: hidden; - color: var(--in-content-deemphasized-text); + color: var(--text-color-deemphasized); white-space: nowrap; text-overflow: ellipsis; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fc3260… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fc3260… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 05 Sep '23

05 Sep '23

richard pushed to branch base-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 9491fec6 by Pier Angelo Vendrame at 2023-09-05T18:51:58+00:00 fixup! Firefox preference overrides. Bug 41675: Remove javascript.options.large_arraybuffers. It has been removed with MozBug 1703508 in Firefox 110. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -330,7 +330,6 @@ pref("dom.textMetrics.emHeight.enabled", false); pref("dom.textMetrics.fontBoundingBox.enabled", false); // tor-browser#40424 pref("pdfjs.enableScripting", false); -pref("javascript.options.large_arraybuffers", false); // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9491fec… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9491fec… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 05 Sep '23

05 Sep '23

richard pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: fc3260a1 by Pier Angelo Vendrame at 2023-09-05T18:50:43+00:00 fixup! Firefox preference overrides. Bug 41675: Remove javascript.options.large_arraybuffers. It has been removed with MozBug 1703508 in Firefox 110. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -330,7 +330,6 @@ pref("dom.textMetrics.emHeight.enabled", false); pref("dom.textMetrics.fontBoundingBox.enabled", false); // tor-browser#40424 pref("pdfjs.enableScripting", false); -pref("javascript.options.large_arraybuffers", false); // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fc3260a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fc3260a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] 3 commits: fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Pier Angelo Vendrame (＠pierov) 05 Sep '23

05 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 3fe30891 by clairehurst at 2023-08-31T03:24:27+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment - - - - - a3e812a8 by clairehurst at 2023-08-31T03:24:27+00:00 fixup! Base Browser's .mozconfigs. Bug 42035: Update mozconfig for macos development - - - - - ee028c84 by clairehurst at 2023-08-31T03:24:27+00:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 42035: update mozconfig for macos development - - - - - 5 changed files: - + mozconfig-macos-dev - tools/torbrowser/Makefile - + tools/torbrowser/browser-self-sign-macos.sh - tools/torbrowser/deploy.sh - tools/torbrowser/fetch.sh Changes: ===================================== mozconfig-macos-dev ===================================== @@ -0,0 +1,24 @@ +. $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 macOS builds +# during development. + +ac_add_options --disable-strip +ac_add_options --disable-install-strip + +# See bug #13379 +ac_add_options --enable-nss-mar + +# See bug #41131 +ac_add_options --disable-update-agent + +ac_add_options --with-relative-data-dir=../TorBrowser-Data/Browser + +#copied from the diff between mozconfig-linux-x86_64 and mozconfig-linux-x86_64-dev +export MOZILLA_OFFICIAL= +export MOZ_APP_REMOTINGNAME="Tor Browser Dev" + +ac_add_options --with-branding=browser/branding/tb-nightly +ac_add_options --with-base-browser-version=dev-build +ac_add_options --disable-base-browser-update ===================================== tools/torbrowser/Makefile ===================================== @@ -1,11 +1,30 @@ .DEFAULT_GOAL := all # https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… -mkfile_path := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) - -DEV_ROOT = $(mkfile_path)/../.. -BINARIES = $(DEV_ROOT)/.binaries -BUILD_OUTPUT = $(DEV_ROOT)/obj-x86_64-pc-linux-gnu +mkfile_path := "$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))" + +DEV_ROOT = "$(mkfile_path)/../.." +BINARIES = "$(DEV_ROOT)/.binaries" +ARCHITECTURE = "$(shell uname -m)" + +# Correct the architecture naming for ARM to match what mozilla has +ifeq ($(ARCHITECTURE), "arm64") + ARCHITECTURE = "aarch64" +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" +endif + +# Define the run command based on the platform. +ifeq ("$(shell uname)", "Darwin") + RUN_CMD := cd "$(BINARIES)/Tor Browser.app/Contents/MacOS/" && ./firefox +else + RUN_CMD := "$(BINARIES)/dev/Browser/start-tor-browser" -v $(ARGS) +endif config: ./config.sh $(DEV_ROOT) @@ -34,7 +53,7 @@ fat-aar: all: build deploy run: - $(BINARIES)/dev/Browser/start-tor-browser -v $(ARGS) + $(RUN_CMD) jslint: ./jslint.sh $(DEV_ROOT) $(JS) ===================================== tools/torbrowser/browser-self-sign-macos.sh ===================================== @@ -0,0 +1,110 @@ +#!/bin/bash + +CERTNAME=my-codesign-cert-tor +BROWSERPATH=. + +if [ $# -ge 1 ] +then + BROWSERPATH=$1 +fi + + +security find-certificate -c $CERTNAME > /dev/null + +if [ $? -ne 0 ] +then + echo "" + echo "ERROR: Self Signing Certificate not found, please create:" + echo " 1. In the Keychain Access app on your Mac, choose Keychain Access > Certificate Assistant > Create a Certificate." + echo " 2. Enter the name '$CERTNAME' for the certificate" + echo " 3. Choose an identity type: Self Signed Root" + echo " 4. Certificate Type > Code Signing" + echo " 5. Check 'Let me override defaults' & click Continue." + echo " 6. Enter a unique Serial Number. (123 is fine)" + echo " 7. Enter a big Validity Period (days), like 3560 & click Continue." + echo " 8. Fill in your personal information & click Continue." + echo " 9. Accept defaults for the rest of the dialog boxes. (Continue several times)" + echo " 10. Certificate Created! Click Done." + echo "" + echo "For additional help see:" + echo " https://support.apple.com/en-ca/guide/keychain-access/kyca8916/mac" + echo " https://stackoverflow.com/questions/58356844/what-are-the-ways-or-technolog…" + + echo "" + read -n 1 -r -s -p $'Press enter to launch "Keychain Access"...\n' + open /System/Applications/Utilities/Keychain\ Access.app + + exit -1 +fi + +echo "Found $CERTNAME, looking for browser to sign..." + +if [ ! -f "$BROWSERPATH/XUL" ] +then + TESTPATH="$BROWSERPATH/Contents/MacOS" + if [ -f "$TESTPATH/XUL" ] + then + BROWSERPATH=$TESTPATH + else + echo "Error: browser files not detected in $BROWSERPATH!" + echo " This script needs to be run in the 'Contents/MacOS' directory of a SomeBrowser.app directory" + exit -1 + fi +fi + +echo "Mozilla based browser found, signing..." +echo ' Will be asked for password to certificate for all the things that need to be signed. Click "Always Allow" to automate' + +cd "$BROWSERPATH" + +codesign -s $CERTNAME *.dylib +codesign -s $CERTNAME plugin-container.app + +if [ -d Tor ] +then + codesign -s $CERTNAME Tor/PluggableTransports/* + codesign -s $CERTNAME Tor/libevent-2.1.7.dylib + if [ -f Tor/tor.real ] + then + codesign -s $CERTNAME Tor/tor.real + fi + if [ -f Tor/tor ] + then + codesign -s $CERTNAME Tor/tor + fi +fi + +codesign -s $CERTNAME XUL + +if [ -d updater.app ] +then + codesign -s $CERTNAME updater.app +fi + +# mullvadbrowser +if [ -f mullvadbrowser ] +then + codesign -s $CERTNAME mullvadbrowser +fi + +# BB or TB +if [ -f firefox ] +then + codesign -s $CERTNAME firefox +fi + +echo "" +echo "Browser signing step done!" +echo "" + +echo "App still needs one more override to be easily opened with double click in Finder" +echo "Alternatively you can right click it, select 'Open' and then select 'Open' from the override popup" +echo "Or to enable it to be double clicked to open perform the following" +echo "" +echo "Double click the app and select either 'Ok' or 'Cancel' from the warning popup depending on which you get (Do Not 'Move to Trash')" +echo 'Go to Preferences -> Security & Privacy and click on padlock to allow changes. ' +echo ' Then in "Allow appications downloaded from" select either:' +echo ' - App Store and identified developers' +echo ' - Anywhere' +echo ' Below that may be a notice about your specific app saying it was blocked because it was not from an identified developer. Click "Open Anyways" and "Open"' + ===================================== tools/torbrowser/deploy.sh ===================================== @@ -1,30 +1,50 @@ #!/bin/bash set -e -BINARIES=$1 -BUILD_OUTPUT=$2 -SCRIPT_DIR=$(realpath "$(dirname "$0")") +BINARIES="$1" +BUILD_OUTPUT="$2" +SCRIPT_DIR="$(realpath "$(dirname "$0")")" + +RESDIR="$BUILD_OUTPUT/dist/firefox" +if [ "$(uname)" = "Darwin" ]; then + RESDIR="$RESDIR/Tor Browser.app/Contents/Resources" +fi # Add built-in bridges -mkdir -p $BUILD_OUTPUT/_omni/defaults/preferences -cat $BUILD_OUTPUT/dist/bin/browser/defaults/preferences/000-tor-browser.js $SCRIPT_DIR/bridges.js >> $BUILD_OUTPUT/_omni/defaults/preferences/000-tor-browser.js -cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja defaults/preferences/000-tor-browser.js -rm -rf $BUILD_OUTPUT/_omni +mkdir -p "$BUILD_OUTPUT/_omni/defaults/preferences" +cat "$BUILD_OUTPUT/dist/bin/browser/defaults/preferences/000-tor-browser.js" "$SCRIPT_DIR/bridges.js" >> "$BUILD_OUTPUT/_omni/defaults/preferences/000-tor-browser.js" +cd "$BUILD_OUTPUT/_omni" +zip -Xmr "$RESDIR/browser/omni.ja" "defaults/preferences/000-tor-browser.js" +rm -rf "$BUILD_OUTPUT/_omni" # Repackage the manual # rm -rf $BUILD_OUTPUT/_omni # mkdir $BUILD_OUTPUT/_omni # unzip $BINARIES/dev/Browser/browser/omni.ja -d $BUILD_OUTPUT/_omni -# cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja chrome/browser/content/browser/manual +# cd $BUILD_OUTPUT/_omni && zip -Xmr $RESDIR/browser/omni.ja chrome/browser/content/browser/manual # rm -rf $BUILD_OUTPUT/_omni -# backup the startup script -mv $BINARIES/dev/Browser/firefox $BINARIES/dev/Browser/firefox.bak +if [ "$(uname)" = "Darwin" ]; then + + # copy binaries + cp -r "$BUILD_OUTPUT/dist/firefox/Tor Browser.app/Contents/"* "$BINARIES/Tor Browser.app/Contents/" + rm -rf "$BINARIES/TorBrowser-Data/Browser/Caches/*.default/startupCache" + + # Self sign the Binaries + cd "$BINARIES/Tor Browser.app/Contents/MacOS" + "$SCRIPT_DIR/browser-self-sign-macos.sh" + + else + + # backup the startup script + mv "$BINARIES/dev/Browser/firefox" "$BINARIES/dev/Browser/firefox.bak" + + # copy binaries + cp -r "$RESDIR/"* "$BINARIES/dev/Browser" + rm -rf "$BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache" -# copy binaries -cp -r $BUILD_OUTPUT/dist/firefox/* $BINARIES/dev/Browser -rm -rf $BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache + # shuffle firefox bin around and restore script to match a real deployment + mv "$BINARIES/dev/Browser/firefox" "$BINARIES/dev/Browser/firefox.real" + mv "$BINARIES/dev/Browser/firefox.bak" "$BINARIES/dev/Browser/firefox" -# shuffle firefox bin around and restore script to match a real deployment -mv $BINARIES/dev/Browser/firefox $BINARIES/dev/Browser/firefox.real -mv $BINARIES/dev/Browser/firefox.bak $BINARIES/dev/Browser/firefox +fi ===================================== tools/torbrowser/fetch.sh ===================================== @@ -1,30 +1,40 @@ #!/bin/sh set -e -BINARIES_DIR=$1 +BINARIES_DIR="$1" # download the current downloads.json wget https://aus1.torproject.org/torbrowser/update_3/alpha/downloads.json -# get url for latest alpha linux en_US package +# get url for latest alpha linux package TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+") -TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_ALL.tar.xz" +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" +fi TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" # remove download manifest rm downloads.json # clear out previous tor-browser and previous package -rm -rf "${BINARIES_DIR}/dev" +rm -rf "${BINARIES_DIR}" rm -f "${TOR_BROWSER_PACKAGE}" # download -rm -f "${TOR_BROWSER_PACKAGE}" wget "${TOR_BROWSER_PACKAGE_URL}" mkdir -p "${BINARIES_DIR}" # and extract -tar -xf ${TOR_BROWSER_PACKAGE} -C "${BINARIES_DIR}" -mv "${BINARIES_DIR}/tor-browser" "${BINARIES_DIR}/dev" +if [ "$(uname)" = "Darwin" ] + then + hdiutil attach "${TOR_BROWSER_PACKAGE}" + cp -R "/Volumes/Tor Browser/Tor Browser.app" "${BINARIES_DIR}" + hdiutil detach "/Volumes/Tor Browser" + else + tar -xf "${TOR_BROWSER_PACKAGE}" -C "${BINARIES_DIR}" + mv "${BINARIES_DIR}/tor-browser" "${BINARIES_DIR}/dev" +fi -# cleanup +# Final cleanup rm -f "${TOR_BROWSER_PACKAGE}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7eaa9c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7eaa9c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40942: Do not customize git_hash for Base Browser
by Pier Angelo Vendrame (＠pierov) 05 Sep '23

05 Sep '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: cb4f1150 by Pier Angelo Vendrame at 2023-09-05T08:57:10+02:00 Bug 40942: Do not customize git_hash for Base Browser - - - - - 1 changed file: - projects/firefox/config Changes: ===================================== projects/firefox/config ===================================== @@ -72,8 +72,6 @@ steps: targets: basebrowser: - # basebrowser tag always has a -build1 suffix - git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1' var: nightly_updates_publish_dir_prefix: basebrowser- 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