September 2020 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Re-enable mobile nightly builds
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit 901a970aea99b7f9e53350308fce21a5b28f35b8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 06:31:16 2020 +0000 Re-enable mobile nightly builds We are in shape now for having Fenix-based nightly builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index c185137..131983e 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: 778d9e09fe60b6a61f85f6830d046684c2230ae4 +testsuite_git_commit: f87d747ce6dc5eee2bbc2b878203f0fefbb06be7 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-bundle-testsuite/master] Revert "Temporarily disable android nightly builds"
by gk＠torproject.org 11 Sep '20

11 Sep '20

commit f87d747ce6dc5eee2bbc2b878203f0fefbb06be7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 11 06:27:52 2020 +0000 Revert "Temporarily disable android nightly builds" This reverts commit 778d9e09fe60b6a61f85f6830d046684c2230ae4. We should be in shape now for Fenix-based nightly builds. --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index 4a695cd..d391bac 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -118,6 +118,54 @@ sub set_tests { type => 'make_incrementals', publish_dir => 'nightly-osx-x86_64', }, + { + name => 'nightly-android-armv7', + descr => 'build tor-browser nightly android-armv7', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'torbrowser-android-armv7', + ], + publish_dir => 'nightly-android-armv7', + }, + { + name => 'nightly-android-x86', + descr => 'build tor-browser nightly android-x86', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'torbrowser-android-x86', + ], + publish_dir => 'nightly-android-x86', + }, + { + name => 'nightly-android-x86_64', + descr => 'build tor-browser nightly android-x86_64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'torbrowser-android-x86_64', + ], + publish_dir => 'nightly-android-x86_64', + }, + { + name => 'nightly-android-aarch64', + descr => 'build tor-browser nightly android-aarch64', + type => 'rbm_build', + project => 'release', + targets => [ + 'noversiondir', + 'nightly', + 'torbrowser-android-aarch64', + ], + publish_dir => 'nightly-android-aarch64', + }, ]; }

1 0

[tor-browser-build/master] Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit d40f58678503123fcbacbbbcd6c19b37e167ab86 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 5 11:25:23 2020 +0000 Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems --- projects/clang-source/build | 7 ++ projects/clang-source/config | 2 + projects/clang-source/no-seh.patch | 145 +++++++++++++++++++++++++++++++++++++ projects/firefox/build | 2 + projects/mingw-w64/build | 4 +- rbm.conf | 4 +- 6 files changed, 161 insertions(+), 3 deletions(-) diff --git a/projects/clang-source/build b/projects/clang-source/build index 860b8e4..d94fcbe 100644 --- a/projects/clang-source/build +++ b/projects/clang-source/build @@ -19,6 +19,13 @@ mv clang-tools-extra-[% c("version") %].src llvm/tools/clang/tools/extra mv libcxx-[% c("version") %].src llvm/projects/libcxx mv libcxxabi-[% c("version") %].src llvm/projects/libcxxabi mv lld-[% c("version") %].src llvm/tools/lld +[% IF c("var/windows-i686") %] + # mingw-w64 does not support SEH on 32bit systems. Make it possible to + # explicitly disable it. + cd llvm/tools + patch -p1 < $rootdir/no-seh.patch + cd ../../ +[% END %] mv compiler-rt-[% c("version") %].src llvm/projects/compiler-rt # We need libunwind only for mingw-w64-clang, don't include it as tightly by # putting it into projects/ diff --git a/projects/clang-source/config b/projects/clang-source/config index d0ae90c..8adb18e 100644 --- a/projects/clang-source/config +++ b/projects/clang-source/config @@ -30,3 +30,5 @@ input_files: name: libunwind file_gpg_id: 1 - filename: 43909.patch + - filename: no-seh.patch + enable: '[% c("var/windows-i686") %]' diff --git a/projects/clang-source/no-seh.patch b/projects/clang-source/no-seh.patch new file mode 100644 index 0000000..1a52e40 --- /dev/null +++ b/projects/clang-source/no-seh.patch @@ -0,0 +1,145 @@ +From 38cbe873d45cf3c881ef4113b48193edfd418f43 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st> +Date: Mon, 27 Jul 2020 23:44:41 +0300 +Subject: [PATCH] Implement the --no-seh flag + +Previously this flag was just ignored. If set, set the +IMAGE_DLL_CHARACTERISTICS_NO_SEH bit, regardless of the normal safeSEH +machinery. + +In mingw configurations, the safeSEH bit might not be set in e.g. object +files built from handwritten assembly, making it impossible to use the +normal safeseh flag. As mingw setups don't generally use SEH on 32 bit +x86 at all, it should be fine to set that flag bit though - hook up +the existing GNU ld flag for controlling that. + +Differential Revision: https://reviews.llvm.org/D84701 + +diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h +index 4b62cd05f4f..17ea0f8bcab 100644 +--- a/lld/COFF/Config.h ++++ b/lld/COFF/Config.h +@@ -135,6 +135,7 @@ struct Configuration { + bool safeSEH = false; + Symbol *sehTable = nullptr; + Symbol *sehCount = nullptr; ++ bool noSEH = false; + + // Used for /opt:lldlto=N + unsigned ltoo = 2; +diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp +index 15d6fb5121a..b569df07601 100644 +--- a/lld/COFF/Driver.cpp ++++ b/lld/COFF/Driver.cpp +@@ -1574,9 +1574,10 @@ void LinkerDriver::link(ArrayRef<const char *> argsArr) { + config->wordsize = config->is64() ? 8 : 4; + + // Handle /safeseh, x86 only, on by default, except for mingw. +- if (config->machine == I386 && +- args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw)) +- config->safeSEH = true; ++ if (config->machine == I386) { ++ config->safeSEH = args.hasFlag(OPT_safeseh, OPT_safeseh_no, !config->mingw); ++ config->noSEH = args.hasArg(OPT_noseh); ++ } + + // Handle /functionpadmin + for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt)) +diff --git a/lld/COFF/Options.td b/lld/COFF/Options.td +index 024b7be8f78..c7e2a5ea57e 100644 +--- a/lld/COFF/Options.td ++++ b/lld/COFF/Options.td +@@ -171,6 +171,7 @@ def include_optional : Joined<["/", "-", "/?", "-?"], "includeoptional:">, + HelpText<"Add symbol as undefined, but allow it to remain undefined">; + def kill_at : F<"kill-at">; + def lldmingw : F<"lldmingw">; ++def noseh : F<"noseh">; + def output_def : Joined<["/", "-", "/?", "-?"], "output-def:">; + def pdb_source_path : P<"pdbsourcepath", + "Base path used to make relative source file path absolute in PDB">; +diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp +index 5736281958f..aead781d38b 100644 +--- a/lld/COFF/Writer.cpp ++++ b/lld/COFF/Writer.cpp +@@ -1352,7 +1352,7 @@ template <typename PEHeaderTy> void Writer::writeHeader() { + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_GUARD_CF; + if (config->integrityCheck) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY; +- if (setNoSEHCharacteristic) ++ if (setNoSEHCharacteristic || config->noSEH) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_NO_SEH; + if (config->terminalServerAware) + pe->DLLCharacteristics |= IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE; +diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp +index be1b757e45b..1d292817cfb 100644 +--- a/lld/MinGW/Driver.cpp ++++ b/lld/MinGW/Driver.cpp +@@ -249,6 +249,8 @@ bool mingw::link(ArrayRef<const char *> argsArr, raw_ostream &diag) { + add("-kill-at"); + if (args.hasArg(OPT_appcontainer)) + add("-appcontainer"); ++ if (args.hasArg(OPT_no_seh)) ++ add("-noseh"); + + if (args.getLastArgValue(OPT_m) != "thumb2pe" && + args.getLastArgValue(OPT_m) != "arm64pe" && !args.hasArg(OPT_dynamicbase)) +diff --git a/lld/MinGW/Options.td b/lld/MinGW/Options.td +index 86400433d04..931cf264837 100644 +--- a/lld/MinGW/Options.td ++++ b/lld/MinGW/Options.td +@@ -45,6 +45,7 @@ def minor_subsystem_version_eq: Joined<["--"], "minor-subsystem-version=">, + Alias<minor_subsystem_version>; + def no_insert_timestamp: F<"no-insert-timestamp">, + HelpText<"Don't include PE header timestamp">; ++def no_seh: F<"no-seh">, HelpText<"Set the 'no SEH' flag in the executable">; + def no_whole_archive: F<"no-whole-archive">, + HelpText<"No longer include all object files for following archives">; + def large_address_aware: Flag<["--"], "large-address-aware">, +@@ -104,7 +105,6 @@ def: Flag<["--"], "full-shutdown">; + def: F<"high-entropy-va">; + def: S<"major-image-version">; + def: S<"minor-image-version">; +-def: F<"no-seh">; + def: F<"nxcompat">; + def: F<"pic-executable">; + def: S<"plugin">; +diff --git a/lld/test/COFF/noseh.s b/lld/test/COFF/noseh.s +new file mode 100644 +index 00000000000..44295228622 +--- /dev/null ++++ b/lld/test/COFF/noseh.s +@@ -0,0 +1,19 @@ ++# REQUIRES: x86 ++# RUN: llvm-mc -triple i686-w64-mingw32 %s -filetype=obj -o %t.obj ++# RUN: lld-link -lldmingw %t.obj -out:%t.exe -entry:main ++# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s --check-prefix=DEFAULT ++# RUN: lld-link -lldmingw %t.obj -out:%t.noseh.exe -entry:main -noseh ++# RUN: llvm-readobj --file-headers %t.noseh.exe | FileCheck %s --check-prefix=NOSEH ++ ++# DEFAULT: Characteristics [ ++# DEFAULT-NOT: IMAGE_DLL_CHARACTERISTICS_NO_SEH ++# DEFAULT: ] ++ ++# NOSEH: Characteristics [ ++# NOSEH: IMAGE_DLL_CHARACTERISTICS_NO_SEH ++# NOSEH: ] ++ ++ .text ++ .globl _main ++_main: ++ ret +diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test +index b8bc2ddea8a..1d53205927b 100644 +--- a/lld/test/MinGW/driver.test ++++ b/lld/test/MinGW/driver.test +@@ -204,3 +204,7 @@ APPCONTAINER: -appcontainer + RUN: ld.lld -### -m i386pep foo.o -delayload user32.dll --delayload shell32.dll | FileCheck -check-prefix DELAYLOAD %s + RUN: ld.lld -### -m i386pep foo.o -delayload=user32.dll --delayload=shell32.dll | FileCheck -check-prefix DELAYLOAD %s + DELAYLOAD: -delayload:user32.dll -delayload:shell32.dll ++ ++RUN: ld.lld -### -m i386pe foo.o -no-seh | FileCheck -check-prefix NOSEH %s ++RUN: ld.lld -### -m i386pe foo.o --no-seh | FileCheck -check-prefix NOSEH %s ++NOSEH: -noseh +-- +2.28.0 + diff --git a/projects/firefox/build b/projects/firefox/build index d3c7139..63be146 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -77,6 +77,8 @@ fi # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" patch -p1 < $rootdir/nsis-uninstall.patch + # mingw-w64 does not support SEH on 32bit systems. Be explicit about that. + export LDFLAGS="[% c('var/flag_noSEH') %]" [% END -%] [% IF c("var/namecoin") %] diff --git a/projects/mingw-w64/build b/projects/mingw-w64/build index c5fcda6..155c531 100644 --- a/projects/mingw-w64/build +++ b/projects/mingw-w64/build @@ -24,7 +24,7 @@ cd gcc tar xJf $rootdir/gcc-[% c("var/gcc_version") %].tar.xz # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. -export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" +export CFLAGS_FOR_TARGET="-Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" # Rust requires enabling pthreads gcc-[% c("var/gcc_version") %]/configure --prefix=$distdir --target=[% c("arch") %]-w64-mingw32 --with-gnu-ld --with-gnu-as --disable-multilib --enable-threads=posix --enable-languages=c,c++ make -j[% c("buildconf/num_procs") %] all-gcc @@ -40,7 +40,7 @@ make install mkdir -p /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread cd /var/tmp/build/builddir/mingw-w64/mingw-w64-pthread /var/tmp/build/[% project %]-[% c("version") %]/mingw-w64-libraries/winpthreads/configure \ - LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp" \ + LDFLAGS="-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp [% c('var/flag_noSEH') %]" \ --host=[% c("arch") %]-w64-mingw32 --prefix=$distdir/[% c("arch") %]-w64-mingw32 make -j[% c("buildconf/num_procs") %] make install diff --git a/rbm.conf b/rbm.conf index b5dff53..9ee4f18 100644 --- a/rbm.conf +++ b/rbm.conf @@ -368,6 +368,8 @@ targets: windows-i686: 1 windows-x86_64: 0 osname: windows-i686 + # mingw-w64 does not support SEH on 32bit systems. Be explicit about that. + flag_noSEH: '-Wl,--no-seh' windows: var: windows: 1 @@ -376,7 +378,7 @@ targets: arch: amd64 configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' - LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_noSEH") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1

1 0

[tor-browser-build/master] Bug 40077: Don't pass --no-insert-timestamp when building Firefox
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit f6e87613d6f36fded0674ad91e3937c7403bee26 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 5 15:00:56 2020 +0000 Bug 40077: Don't pass --no-insert-timestamp when building Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1612423 does that for us now when using mingw-w64. --- projects/firefox/build | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 4e1a077..d3c7139 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -77,8 +77,6 @@ fi # Make sure widl is not inserting random timestamps, see #21837. export WIDL_TIME_OVERRIDE="0" patch -p1 < $rootdir/nsis-uninstall.patch - # Make sure we link without inserting timestamps in general. - export LDFLAGS="-Wl,--no-insert-timestamp" [% END -%] [% IF c("var/namecoin") %]

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40078'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit a7e90a70837f085cdca27245f96fe4a448e8d929 Merge: dc1c703 68c652e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:54:02 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40078' projects/android-toolchain/build | 8 +++++--- projects/android-toolchain/config | 24 ++++++++++++++---------- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-)

1 0

[tor-browser-build/master] Bug 40078: Include Gradle 6.5.1 and use it for fenix
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 68c652e12775f4c473866874e9f6e6be273132db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 7 08:16:01 2020 +0000 Bug 40078: Include Gradle 6.5.1 and use it for fenix --- projects/android-toolchain/build | 8 +++++--- projects/android-toolchain/config | 24 ++++++++++++++---------- projects/fenix/build | 4 ++-- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 74a49f1..a0d5ee8 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -15,11 +15,13 @@ unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME # GeckoView is still using an older Android NDK, bundle it, too. unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME -unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME # GeckoView is still using an older Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME # application-services is using a comparatively new Gradle, bundle it, too. -unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME +unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME +# Fenix switched to a fairly recent Gradle, add it as well. +unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME # NDK Archive for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 9fd997d..b8ef898 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -19,16 +19,17 @@ var: export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export ANDROID_HOME=$ANDROID_SDK_HOME export GRADLE_USER_HOME=$GRADLE_HOME - export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin + export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin google_repo: https://dl.google.com/android/repository android_api_level: 29 android_platform_revision: 04 android_ndk_version: 21 android_ndk_version_old: 20 android_ndk_revision: d - gradle_version_new: 6.3 - gradle_version: 5.6.4 - gradle_version_old: 5.1.1 + gradle651: 6.5.1 + gradle63: 6.3 + gradle564: 5.6.4 + gradle511: 5.1.1 input_files: - project: container-image - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' @@ -55,12 +56,15 @@ input_files: - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' name: android_ndk_compiler_old sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip - name: gradle_bin_new + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip + name: gradle651 + sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip + name: gradle63 sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip - name: gradle_bin + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip + name: gradle564 sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d - - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip - name: gradle_bin_old + - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip + name: gradle511 sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 diff --git a/projects/fenix/build b/projects/fenix/build index 0cde15d..806044b 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -31,7 +31,7 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ [% IF c("var/fetch_gradle_dependencies") %] - gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint [% ELSE %] # Prepare Glean dependencies for offline build tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 @@ -45,7 +45,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ # not only for geckoview-beta. cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar - gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint + $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]

1 0

[tor-browser-build/master] Bug 40052: Bump NSIS to 3.06.1
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 1e1d42ffe955803ac13dc1e95e7bae1a29a7dd7b Author: Georg Koppen <gk(a)torproject.org> Date: Sun Sep 6 17:43:01 2020 +0000 Bug 40052: Bump NSIS to 3.06.1 It seems our timestamp related patch is not needed anymore as building the .exe files twice without it gives the exact same result. --- projects/nsis/build | 5 ----- projects/nsis/config | 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --------------------------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/projects/nsis/build b/projects/nsis/build index c6a6d3e..54287db 100755 --- a/projects/nsis/build +++ b/projects/nsis/build @@ -8,11 +8,6 @@ tar -C /var/tmp/build -xf nsis-[% c('version') %].tar.bz2 tar -C /var/tmp/build -xf [% c('input_files_by_name/zlib') %] cd /var/tmp/build/nsis-[% c('version') %]-src -# Adding --no-insert-timestamp to APPEND_LINKFLAGS is not working as it -# is used for both the host and cross-compiled parts, but this option is -# only valid for the Windows linker. Therefore we add it using a patch -# to the cross-compilation part only. -patch -p1 < $rootdir/no-insert-timestamp.patch [% IF c("var/windows-x86_64") %] # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp diff --git a/projects/nsis/config b/projects/nsis/config index ed9823d..36f29e2 100644 --- a/projects/nsis/config +++ b/projects/nsis/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.05 +version: 3.06.1 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: container: @@ -16,8 +16,7 @@ input_files: - project: container-image - filename: 'nsis-[% c("version") %].tar.bz2' URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2' - sha256sum: b6e1b309ab907086c6797618ab2879cb95387ec144dab36656b0b5fb77e97ce9 - - filename: no-insert-timestamp.patch + sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0 - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zlib diff --git a/projects/nsis/no-insert-timestamp.patch b/projects/nsis/no-insert-timestamp.patch deleted file mode 100644 index 8053b82..0000000 --- a/projects/nsis/no-insert-timestamp.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur nsis-3.03-src/SCons/Config/gnu nsis-3.03-src.n/SCons/Config/gnu ---- nsis-3.03-src/SCons/Config/gnu 2017-10-06 15:30:20.000000000 -0400 -+++ nsis-3.03-src.n/SCons/Config/gnu 2018-06-17 13:26:05.945495151 -0400 -@@ -102,6 +102,7 @@ - stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries - stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align - stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file -+stub_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - stub_uenv = stub_env.Clone() - stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -142,6 +143,7 @@ - plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file - plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency - plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency -+plugin_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - plugin_uenv = plugin_env.Clone() - plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) -@@ -181,6 +183,7 @@ - - util_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables - util_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align -+util_env.Append(LINKFLAGS = ['-Wl,--no-insert-timestamp']) # remove timestamps for reproducible builds - - - conf = FlagsConfigure(util_env)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40052_v2'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit dc1c7038f4d7cbb37b00bbbeb29667c069018a1f Merge: 3aef0b0 1e1d42f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:46:18 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40052_v2' projects/nsis/build | 5 ----- projects/nsis/config | 5 ++--- projects/nsis/no-insert-timestamp.patch | 27 --------------------------- 3 files changed, 2 insertions(+), 35 deletions(-)

1 0

[tor-browser-build/master] Bug 40072: Pick up the dependency changes due to fenix#40001
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit df7f1b01d6ac61df5ed5095243a4eaf9d3d94c63 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 4 19:14:10 2020 +0000 Bug 40072: Pick up the dependency changes due to fenix#40001 --- projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index 33d4e44..034714f 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -14,7 +14,7 @@ var: container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 3 + gradle_dependencies_version: 4 # Switch to make it easier to grab all dependencies during a dry-run. fetch_gradle_dependencies: 0 diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index 4957902..bf237cb 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -565,6 +565,8 @@ fbd052d2d4cd16f707547c468621c6b7fb842c7ec8866d012ecbc6178de1f394 | https://jcent 6f59f847f37a7a052243e97a3b24d6e834833fca3a48d6980f96f7779fe5ff98 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-agent/1.9.7/byte-buddy… 93d9d380779cd1768c52b4bcee82cbfaedef9a4a30de87ae06b441e1634fd38c | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.10.9/byte-bud… 259079927014348a555c0969dbae9339c3cc33895a05ffec8e0a25dd50c82278 | https://jcenter.bintray.com/net/bytebuddy/byte-buddy-parent/1.9.7/byte-budd… +ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… +3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://jcenter.bintray.com/net/freehaven/tor/control/jtorctl/0.2/jtorctl-0… c83a9c71358d781539c34b38d76a88e3ec8e2d587c7f04b611acc9041919b310 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.aar 0271ae7fc162a5e69c337f36d86fdb94a8a232c5c42a80d8a7424071addd1fdc | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.jar aafe6935d6bedb89a6aa32563d441fbe305da1de193d6f71a45a0212acf9b756 | https://jcenter.bintray.com/net/java/dev/jna/jna/5.2.0/jna-5.2.0.pom @@ -868,9 +870,11 @@ d445923ab7dfbb93d086b070b64f07495b0a1804b9ce1f51815d6034c31f781a | https://jcent 9ebcfff0b872eaeeae47b2a9f9653c4e40041193a7c16e6a774f73d79aca8b57 | https://jcenter.bintray.com/org/robolectric/utils/4.3.1/utils-4.3.1.pom 9d7bf2557947d44d6f3ed76ec5231e8b72e33eb61c65ac9e149ad307b0eb936c | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-ref… a04c2bdefec0b5b492de86365e49537df6d39b04f3823619c94ba2b8937d8670 | https://jcenter.bintray.com/org/robolectric/utils-reflector/4.3.1/utils-ref… -baf3c7fe15fefeaf9e5b000d94547379dc48370f22a8797e239c127e7d7756ec | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.jar -d7a15266d22fadc1c81bbc3b62637801d116e484eb6c831217dc36c537be48d2 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.24/slf4j-api-1.7.24.pom -36367d127a586d502b60bf54db2d7397ec94573620eff523873ec12a12e54839 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.24/slf4j-parent-1.7.… +fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://jcenter.bintray.com/org/slf4j/slf4j-android/1.7.25/slf4j-android-1.… +18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar +7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.pom +18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://jcenter.bintray.com/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1.7.… c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/4/oss-parent-4.pom b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/9/oss-parent-9.pom

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40072'
by sysrqb＠torproject.org 10 Sep '20

10 Sep '20

commit 3aef0b0a63aaab19d2318b17a6973874e06cd842 Merge: 7e49b0e df7f1b0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 10 15:15:51 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40072' projects/fenix/config | 2 +- projects/fenix/gradle-dependencies-list.txt | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0