- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_29181_v2'
by gk＠torproject.org 31 Jan '19

31 Jan '19

commit 929c3f8d6fe4d6182d4dfce2472581ccc45824f0 Merge: 9bac5b8 592aced Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 30 19:51:34 2019 +0000 Merge remote-tracking branch 'boklm/bug_29181_v2' projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 29167: Upgrade go to 1.11.5.
by gk＠torproject.org 31 Jan '19

31 Jan '19

commit 9bac5b8ddc129cc0349f1c6350f819f8ba29af94 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jan 24 21:00:34 2019 +0000 Bug 29167: Upgrade go to 1.11.5. --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 1841705..be9f84d 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.1 +version: 1.11.5 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 + sha256sum: bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Bug 29193: Update goxnet commit in nightly
by gk＠torproject.org 30 Jan '19

30 Jan '19

commit 23f8101525288ccdd6ccef2035a698c4e9f1b232 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 29 15:26:50 2019 +0100 Bug 29193: Update goxnet commit in nightly --- projects/goxnet/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/goxnet/config b/projects/goxnet/config index f33cb32..6aa5a0e 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -13,6 +13,12 @@ var: go_lib_install: - golang.org/x/net/proxy +targets: + nightly: + # Nightly version of obfs4 requires a more recent version of goxnet + # See bug 29193 + git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 + input_files: - project: container-image - name: go

1 0

[tor-browser-build/master] Bug 29178: Don't build master of goxcrypto, goxnet, uniuri and go-webrtc
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit 5bad67e4f31d984702c530cbd423d83d009e699a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 28 12:11:24 2019 +0100 Bug 29178: Don't build master of goxcrypto, goxnet, uniuri and go-webrtc --- projects/go-webrtc/config | 2 -- projects/goxcrypto/config | 4 ---- projects/goxnet/config | 4 ---- projects/uniuri/config | 4 ---- 4 files changed, 14 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 8b171f9..8136122 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -35,8 +35,6 @@ var: [% END -%] targets: - master: - git_hash: master linux: var: arch_deps: diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index fe73f93..698f94b 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -19,10 +19,6 @@ var: go_lib_deps: - goxsys -targets: - nightly: - git_hash: master - input_files: - project: container-image - name: go diff --git a/projects/goxnet/config b/projects/goxnet/config index ec368a2..f33cb32 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -13,10 +13,6 @@ var: go_lib_install: - golang.org/x/net/proxy -targets: - nightly: - git_hash: master - input_files: - project: container-image - name: go diff --git a/projects/uniuri/config b/projects/uniuri/config index e4c7294..5eea6e2 100644 --- a/projects/uniuri/config +++ b/projects/uniuri/config @@ -11,10 +11,6 @@ var: use_container: 1 go_lib: github.com/dchest/uniuri -targets: - nightly: - git_hash: master - input_files: - project: container-image - name: go

1 0

[tor-browser-build/master] Revert "Bug 28546: Rebrand Tor Browser's Window's Installer"
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit b25cd533f1ae26c2ee65bc5bef57a33d98f83363 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 28 09:32:00 2019 +0000 Revert "Bug 28546: Rebrand Tor Browser's Window's Installer" This reverts commit 031ecd732636c627ea3b6343869d96ccbf3d2df0. We need to back this out for now because it is causing reproducibility issues, see #29185. --- projects/tbb-windows-installer/config | 2 +- projects/tor-browser/build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tbb-windows-installer/config b/projects/tbb-windows-installer/config index 0ec7b0a..a990229 100644 --- a/projects/tbb-windows-installer/config +++ b/projects/tbb-windows-installer/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.6 +version: 0.5 git_url: https://github.com/moba/tbb-windows-installer.git git_hash: 'v[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/build b/projects/tor-browser/build index bc663c2..4661f7a 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -303,7 +303,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("var/touch") %] {} \; pushd "$PKG_DIR" - makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi + makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py @@ -392,7 +392,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% ELSIF c("var/windows") %] find "[% tbdir %]" -exec [% c("var/touch") %] {} \; pushd "[% tbdir %]" - makensis -DCHANNEL=[% c("var/channel") %] torbrowser.nsi + makensis torbrowser.nsi # Working around NSIS braindamage mv torbrowser-install.exe torbrowser-install-tmp.exe python $rootdir/pe_checksum_fix.py

1 0

[tor-browser-build/master] Tagging build4 to fix Windows reproducibility issues
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit c027caa95d205ec3761215e8b671c999866435b1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 28 09:33:24 2019 +0000 Tagging build4 to fix Windows reproducibility issues --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - rbm.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c0e2a38..5a9feb7 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -24,7 +24,6 @@ Tor Browser 8.5a7 -- January 29 2019 * Bug 22654: Firefox icon is shown for Tor Browser on Windows 10 start menu * Bug 27503: Compile with accessibility support * Bug 28874: Bump mingw-w64 commit to fix WebGL crash - * Bug 28546: Rebrand Tor Browser's Window's Installer * Bug 12885: Windows Jump Lists fail for Tor Browser * Bug 28618: Set MOZILLA_OFFICIAL for Windows build * OS X diff --git a/rbm.conf b/rbm.conf index 74d922b..810eae8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser-build/master] Fix 8.5a7 release year
by gk＠torproject.org 28 Jan '19

28 Jan '19

commit 2ffa418535f8a9baf7ba4894610e91633d876670 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jan 27 15:53:56 2019 +0000 Fix 8.5a7 release year 2018 is gone. Get over it. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 46ba50f..c0e2a38 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 8.5a7 -- January 29 2018 +Tor Browser 8.5a7 -- January 29 2019 * All Platforms * Update Firefox to 60.5.0esr * Update Torbutton to 2.1.4

1 0

[tor-browser-build/master] Picking up fix for Android build bustage
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit 71b5a3b40429a4286b4aafbb3f9cb5b168aeff99 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 26 09:19:08 2019 +0000 Picking up fix for Android build bustage --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 2556313..59ec1ee 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 2636d31..74d922b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.5.0esr-8.5-1] Bug 29182: Fix Android build bustage
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit 4d0f9fa5fdd5831fbc2e28cb6c7b1056bd4deeab Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 26 08:10:39 2019 +0000 Bug 29182: Fix Android build bustage Updating the expat library (bug 1374012) resulted in broken compilation of Android builds as `arc4random_buf` is not defined compiling with our current toolchain. The upstream bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1516642. Patch by a cypherpunk (mac198442). --- parser/expat/lib/xmlparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c index 209f20e094dc..95ff14f8e154 100644 --- a/parser/expat/lib/xmlparse.c +++ b/parser/expat/lib/xmlparse.c @@ -839,7 +839,7 @@ generate_hash_secret_salt(XML_Parser parser) { unsigned long entropy; (void)parser; -#if defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__) +#if !defined(__ANDROID__) && (defined(HAVE_ARC4RANDOM_BUF) || defined(__CloudABI__)) (void)gather_time_entropy; arc4random_buf(&entropy, sizeof(entropy)); return ENTROPY_DEBUG("arc4random_buf", entropy);

1 0

[tor-browser-build/master] Use build2 for locales for mobile as well
by gk＠torproject.org 26 Jan '19

26 Jan '19

commit cac6014790f79e8819191ff9af9a69b10f2b52d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 25 16:21:20 2019 +0000 Use build2 for locales for mobile as well --- projects/firefox-locale-bundle/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/rbm.conf b/rbm.conf index e929728..2636d31 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.5a7' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5a6 project_name: tor-browser

1 0