- tbb-commits - lists.torproject.org

[tor-browser-build/master] Update NoScript
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 90fc7e48dcda13988516e83ff9bfb16939472804 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:26:27 2017 +0000 Update NoScript --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index eb0a5d0..9aff47d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b + sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-build/master] Preparing build3 for 7.5a9
by gk＠torproject.org 06 Dec '17

06 Dec '17

commit 826d27b49fb16d0188efedd6bca7962d14abba16 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 6 08:27:58 2017 +0000 Preparing build3 for 7.5a9 Changelog update to pick up new release date and newer NoScript version. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c7ac62f..c92b0c0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,9 +1,9 @@ -Tor Browser 7.5a9 -- December 05 2017 +Tor Browser 7.5a9 -- December 08 2017 * All Platforms * Update Firefox to 52.5.2esr * Update Tor to 0.3.2.6-alpha * Update HTTPS-Everywhere to 2017.11.21 - * Update NoScript to 5.1.7 + * Update NoScript to 5.1.8.1 * Update sandboxed-tor-browser to 0.0.16 Tor Browser 7.5a8 -- November 15 2017 diff --git a/rbm.conf b/rbm.conf index 4f74450..6e0790a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Preparing build2 for 7.5a9
by gk＠torproject.org 02 Dec '17

02 Dec '17

commit a718f53f4667e679cabf5d9bc42a0f6a75c3127d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:24:41 2017 +0000 Preparing build2 for 7.5a9 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++---- projects/tor/config | 2 +- rbm.conf | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0123357..d3cc063 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.1 + firefox_platform_version: 52.5.2 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9d9a975..c7ac62f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,7 @@ -Tor Browser 7.5a9 -- November 30 2017 +Tor Browser 7.5a9 -- December 05 2017 * All Platforms - * Update Firefox to 52.5.1esr - * Bug 24040: Tor Browser crashes at riot.im/app - * Update Tor to 0.3.2.5-alpha + * Update Firefox to 52.5.2esr + * Update Tor to 0.3.2.6-alpha * Update HTTPS-Everywhere to 2017.11.21 * Update NoScript to 5.1.7 * Update sandboxed-tor-browser to 0.0.16 diff --git a/projects/tor/config b/projects/tor/config index c49ebb5..f662561 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.5-alpha +version: 0.3.2.6-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index 62b7902..4f74450 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '7.5a9' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5a8 project_name: tor-browser

1 0

[tor-browser-build/master] Getting 7.5a9 built earlier using the 52.5.1esr lang packs
by gk＠torproject.org 02 Dec '17

02 Dec '17

commit 1ea5f33989925e3cc0217b45623f7044461a7972 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Dec 2 20:23:30 2017 +0000 Getting 7.5a9 built earlier using the 52.5.1esr lang packs --- projects/firefox-langpacks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..c5384e3 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -3,7 +3,7 @@ version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' var: - ff_version: '[% pc("firefox", "var/firefox_version") %]' + ff_version: 52.5.1esr ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

1 0

[tor-browser-build/master] Bug 24477: Fix generation of Windows 64 mar files
by gk＠torproject.org 01 Dec '17

01 Dec '17

commit 0abccfe4258218612f38ac1c2d762c319781386f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 1 00:48:20 2017 +0100 Bug 24477: Fix generation of Windows 64 mar files --- projects/tor-browser/build | 5 +++++ projects/tor-browser/config | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 022d6e9..56d6294 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -43,6 +43,11 @@ mkdir -p $TBDIR/$MEEKPROFILEPATH/extensions # Extract the MAR tools. unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip MARTOOLS=$rootdir/mar-tools +[% IF c("var/windows-x86_64") -%] + # Workaround for bug 24477 + rm -Rf $MARTOOLS + unzip -d $rootdir $rootdir/mar-tools-linux32.zip +[% END -%] mv [% c('input_files_by_name/tor-launcher') %] $TBDIR/$EXTSPATH/tor-launcher(a)torproject.org.xpi mv [% c('input_files_by_name/torbutton') %] $TBDIR/$EXTSPATH/torbutton(a)torproject.org.xpi diff --git a/projects/tor-browser/config b/projects/tor-browser/config index c00af05..eb0a5d0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -85,3 +85,9 @@ input_files: enable: '[% c("var/windows") %]' - filename: pe_checksum_fix.py enable: '[% c("var/windows") %]' + # Workaround for bug 24477 + - URL: https://archive.torproject.org/tor-package-archive/torbrowser/7.5a7/mar-too… + sig_ext: asc + file_gpg_id: 1 + gpg_keyring: torbrowser.gpg + enable: '[% c("var/windows-x86_64") %]'

1 0

[tor-browser-build/master] Release preparations for 7.5a9
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit 9d501237c3f8269ce7ea97787bf5773d452c3e5b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 08:57:10 2017 +0000 Release preparations for 7.5a9 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/sandbox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 7 +++---- 8 files changed, 19 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 04cd7dd..4e42939 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 5b64726..0123357 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.5.0 + firefox_platform_version: 52.5.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 237272b..57e1338 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.10.30 +version: 2017.11.21 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/sandbox/config b/projects/sandbox/config index 03b6f6d..a7ed768 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.15 +version: 0.0.16 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e458f61..9d9a975 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser 7.5a9 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update Tor to 0.3.2.5-alpha + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + * Update sandboxed-tor-browser to 0.0.16 + Tor Browser 7.5a8 -- November 15 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 06400be..c00af05 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c + sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor/config b/projects/tor/config index e704f13..c49ebb5 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.4-alpha +version: 0.3.2.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index f4fbb08..62b7902 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,11 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a8' - torbrowser_build: 'build3' + torbrowser_version: '7.5a9' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a6 - - 7.5a7 + - 7.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.11
by gk＠torproject.org 29 Nov '17

29 Nov '17

commit fd56a5b5d2c822166baaf8bfb7baeef404e6b51a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 29 07:47:32 2017 +0000 Release preparations for 7.0.11 Versions bump, changelog update, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 11 +++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cecf4e9..1abe1ba 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 7.0.11 -- November 30 2017 + * All Platforms + * Update Firefox to 52.5.1esr + * Bug 24040: Tor Browser crashes at riot.im/app + * Update HTTPS-Everywhere to 2017.11.21 + * Update NoScript to 5.1.7 + Tor Browser 7.0.10 -- November 14 2017 * All Platforms * Update Firefox to 52.5.0esr diff --git a/gitian/versions b/gitian/versions index 1f08327..26545b9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.5.0esr +FIREFOX_VERSION=52.5.1esr TORBROWSER_UPDATE_CHANNEL=release @@ -18,7 +18,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.8 TORLAUNCHER_TAG=0.2.12.3 TORBUTTON_TAG=1.9.7.10 -HTTPSE_TAG=2017.10.30 +HTTPSE_TAG=2017.11.21 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -45,7 +45,7 @@ GITIAN_TAG=tor-browser-builder-4-5 OPENSSL_VER=1.0.2k GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 CLANG_VER=3.8.0 @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.1.5-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.7-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c +NOSCRIPT_HASH=617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 628b131..dda82ef 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,14 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.10 + release: 7.0.11 versions: - 7.0.10: - platformVersion: 52.5.0 - detailsURL: https://blog.torproject.org/tor-browser-7010-released + 7.0.11: + platformVersion: 52.5.1 + detailsURL: https://blog.torproject.org/tor-browser-7011-released incremental_from: - - 7.0.8 - - 7.0.9 + - 7.0.10 migrate_archs: osx32: osx64 migrate_langs:

1 0

[tor-browser-build/master] Bug 24361: Bump rbm commit to pick up a fixup for 24361
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 57b65bcc24372b0d7eaff35bd8cf5089fd33b035 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:46:01 2017 +0000 Bug 24361: Bump rbm commit to pick up a fixup for 24361 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a5a1748..5c89374 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a5a1748894ae3e84cb81467b972010969f1b5c88 +Subproject commit 5c89374df7957238a9565c0b938ee3f30f880438

1 0

[rbm/master] fixup! Bug 24361: use Path::Tiny instead of File::Slurp
by gk＠torproject.org 27 Nov '17

27 Nov '17

commit 5c89374df7957238a9565c0b938ee3f30f880438 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 27 11:41:34 2017 +0000 fixup! Bug 24361: use Path::Tiny instead of File::Slurp --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index b2ef57f..73b7d6c 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -707,7 +707,7 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && $input_file->{sha256sum} - && $t->('sha256sum') ne sha256_hex(read_file($fname))) { + && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { $fname = undef; } if ($action eq 'input_files_id') {

1 0

[tor-browser-build/master] Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny)
by boklm＠torproject.org 27 Nov '17

27 Nov '17

commit 39b88a7e8b03877bf478cafd1b72e9abc5694ca6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 27 12:33:05 2017 +0100 Bug 24361: fix Path::Tiny package name (File::Tiny => Path::Tiny) --- README | 4 ++-- tools/ansible/roles/tbb-builder/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 9639d2e..a449f9d 100644 --- a/README +++ b/README @@ -25,7 +25,7 @@ You also need a few perl modules installed: - IO::Handle - IO::CaptureOutput - File::Temp -- File::Tiny +- Path::Tiny - File::Path - File::Copy::Recursive - String::ShellQuote @@ -38,7 +38,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libfile-tiny-perl \ + libio-captureoutput-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index de8cce3..f27c6cf 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -12,7 +12,7 @@ - libio-handle-util-perl - libio-all-perl - libio-captureoutput-perl - - libfile-tiny-perl + - libpath-tiny-perl - libstring-shellquote-perl - libsort-versions-perl - libdigest-sha-perl

1 0