- tbb-commits - lists.torproject.org

[tor-browser-build/master] Revert "Revert "Bug 33630: Pick up tor-android-service patch""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 66d52da6b8b6fccdadc926b85a49109f15ef00ab Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:16 2020 +0000 Revert "Revert "Bug 33630: Pick up tor-android-service patch"" This reverts commit 8c408b55345aec7af1be95d722e115df3f877beb. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..9754ebe 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 +git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 33877: Disable Samples and Regression tests For Libevent Build
by boklm＠torproject.org 14 Apr '20

14 Apr '20

commit f4792f507d57583fce4f52afcb927076762653a1 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 16:08:28 2020 -0800 Bug 33877: Disable Samples and Regression tests For Libevent Build --- projects/libevent/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libevent/build b/projects/libevent/build index 1d620d9..fe15e8e 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh -./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir +./configure --disable-static [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"

1 0

[tor-browser-build/master] Bug 28765: LibEvent Build for Android
by boklm＠torproject.org 14 Apr '20

14 Apr '20

commit 06bb0f2d4c91d7ac60ae180297d3c0707a004199 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 16:08:28 2020 -0800 Bug 28765: LibEvent Build for Android --- projects/libevent/build | 2 +- projects/libevent/config | 4 ++++ rbm.conf | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/projects/libevent/build b/projects/libevent/build index fe15e8e..9c4f190 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh -./configure --disable-static [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir +./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" diff --git a/projects/libevent/config b/projects/libevent/config index fa01c1c..2e5dee6 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -9,12 +9,16 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: container: use_container: 1 + configure_opt_project: --disable-static targets: osx-x86_64: var: arch_deps: - faketime + android: + var: + configure_opt_project: --disable-shared input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index a988c89..cd17da9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -289,12 +289,12 @@ targets: var: linux-i686: 1 osname: linux-i686 - configure_opt_i686: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' - configure_opt: '[% c("var/configure_opt_i686") %]' + configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 [% c("var/configure_opt_project") %]' linux: var: linux: 1 compiler: gcc + configure_opt: '[% c("var/configure_opt_project") %]' # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' @@ -343,7 +343,7 @@ targets: container: suite: stretch arch: amd64 - configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' + 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") %]' flag_mwindows: '-mwindows' @@ -372,7 +372,7 @@ targets: suite: stretch arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"' + configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]' FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" macosx_deployment_target: '10.9'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-31499d'
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit a017df805383561dde058f566255d709bc347834 Merge: 1557510 bb2d411 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 18:25:28 2020 +0200 Merge remote-tracking branch 'sisbell/bug-31499d' projects/libevent/autotools-openssl-mac.patch | 26 -------------------------- projects/libevent/build | 1 - projects/libevent/config | 4 +--- projects/tor/build | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-)

1 0

[tor-browser-build/master] Bug 31499: Update libevent to 2.1.11-stable
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit bb2d411f379c7b866dadc3d0ef18ce827c8d5260 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 15:58:00 2020 -0800 Bug 31499: Update libevent to 2.1.11-stable --- projects/libevent/autotools-openssl-mac.patch | 26 -------------------------- projects/libevent/build | 1 - projects/libevent/config | 4 +--- projects/tor/build | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch deleted file mode 100644 index 1ee2964..0000000 --- a/projects/libevent/autotools-openssl-mac.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas(a)gmail.com> -Date: Tue, 29 Aug 2017 00:44:57 -0700 -Subject: [PATCH] autotools: confirm openssl is working before using - -latest versions of macOS provide pkg-config and libraries for an ancient -version of openssl as part of the system, but no headers - -diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 -index c2040595..7b458134 100644 ---- a/m4/libevent_openssl.m4 -+++ b/m4/libevent_openssl.m4 -@@ -39,6 +39,10 @@ case "$enable_openssl" in - done - ;; - esac -+ CPPFLAGS_SAVE=$CPPFLAGS -+ CPPFLAGS+=$OPENSSL_INCS -+ AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no]) -+ CPPFLAGS=$CPPFLAGS_SAVE - AC_SUBST(OPENSSL_INCS) - AC_SUBST(OPENSSL_LIBS) - case "$have_openssl" in --- -2.17.0 - diff --git a/projects/libevent/build b/projects/libevent/build index de9ba80..1d620d9 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -6,7 +6,6 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] - patch -p1 < $rootdir/autotools-openssl-mac.patch # Setting this after `configure` but before `make` might be enough, but let's # not bet on that and just set it here. export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] diff --git a/projects/libevent/config b/projects/libevent/config index 386f746..fa01c1c 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.8 +version: 2.1.11 git_url: https://github.com/libevent/libevent.git git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 @@ -20,5 +20,3 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - filename: autotools-openssl-mac.patch - enable: '[% c("var/osx") %]' diff --git a/projects/tor/build b/projects/tor/build index 2d10fb3..0235da7 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -54,7 +54,7 @@ openssldir=/var/tmp/dist/openssl/openssl mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/" - cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.1.so.7 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old

1 0

[tor-browser-build/master] Add 9.5a10 ChangeLog
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 3296c9e14bb7551f4f12763f8992e632f80b0887 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 15:52:26 2020 +0200 Add 9.5a10 ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 93999a3..9026f19 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,11 @@ Tor Browser 9.5a11 -- April 8 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.5a10 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.5a9 -- March 25 2020 * All Platforms * Translations update

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.8 and 9.0.9
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 155751006dfe77e0215ad016ed41a3231e96175a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 15:53:44 2020 +0200 Fold in stable changelog for 9.0.8 and 9.0.9 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9026f19..1b34667 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,11 +21,27 @@ Tor Browser 9.5a11 -- April 8 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.0.9 -- April 7 2020 + * All Platforms + * Update Firefox to 68.7.0esr + * Bump NoScript to 11.0.23 + * Bug 33630: Remove noisebridge01 default bridge + * Windows + OS X + Linux + * Bug 33771: Update some existing licenses and add Libevent license + * Bug 33723: Bump openssl version to 1.1.1f + * Windows + * Bug 33805: Remove escape-openssldir.patch + Tor Browser 9.5a10 -- April 5 2020 * All Platforms * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly * Mozilla Bug 1626728 - Normalize shutdown +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.5a9 -- March 25 2020 * All Platforms * Translations update

1 0

[tor-browser-build/maint-9.0] Add 9.0.8 ChangeLog
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 36d601c965a000a15c13ee40573cca9e754de69a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 14:44:24 2020 +0200 Add 9.0.8 ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 00e36da..7e24574 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,6 +9,11 @@ Tor Browser 9.0.9 -- April 7 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.0.7 -- March 20 2020 * All Platforms * Bump NoScript to 11.0.19

1 0

[tor-browser-build/master] Bug 33749: stemns: Bump stem to 1.8.0
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit d84dcbad93df0427467fb3c63bfef09d1e30eee6 Author: JeremyRand <jeremyrand(a)airmail.cc> Date: Fri Mar 27 09:33:03 2020 +0000 Bug 33749: stemns: Bump stem to 1.8.0 This pulls in the fix for Bug 30882 --- projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/stemns/config b/projects/stemns/config index 6c83335..df2ac5c 100644 --- a/projects/stemns/config +++ b/projects/stemns/config @@ -6,12 +6,12 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: use_container: 1 - stem-version: 1.7.1 + stem-version: 1.8.0 input_files: - project: container-image - URL: 'https://files.pythonhosted.org/packages/source/s/stem/stem-[% c("var/stem-version") %].tar.gz' - sha256sum: c9eaf3116cb60c15995cbd3dec3a5cbc50e9bb6e062c4d6d42201e566f498ca2 + sha256sum: a0b48ea6224e95f22aa34c0bc3415f0eb4667ddeae3dfb5e32a6920c185568c2 # TODO: This sha256sum was grabbed from PyPI and hasn't been verified. We should probably switch to using an OpenPGP sig. - filename: settings_port.py - filename: settings_services.py

1 0

[tor-browser-build/master] Merge remote-tracking branch 'JeremyRand/stem-1.8.0'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 026dd67289580ff00b31f6c7c26328a9d2ecefed Merge: 44a18de d84dcba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:48:52 2020 +0200 Merge remote-tracking branch 'JeremyRand/stem-1.8.0' projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0