August 2016 - tor-commits - lists.torproject.org

[tor-browser-bundle/hardened-builds] Version bumps for hardened nightly
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0d8810c64d578e2b7cf659f2aecfe12b07d2fab5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 07:21:00 2016 +0000 Version bumps for hardened nightly --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index dead59c..1d216fa 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.2.0esr +FIREFOX_VERSION=45.3.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -55,7 +55,7 @@ GITIAN_TAG=tor-browser-builder-4 OPENSSL_VER=1.0.1t 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.2.0 CLANG_VER=r247539 @@ -77,7 +77,7 @@ ELFUTILS_VER=0.160 ## 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-2.9.0.11-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -112,7 +112,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] NoScript version bump for nightlies
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 0a0a8c01236ddb50f5f4f87da28758f8e65214de Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 07:19:11 2016 +0000 NoScript version bump for nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 749f8ea..f92a471 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -75,7 +75,7 @@ NSIS_VER=2.51 ## 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-2.9.0.12-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -109,7 +109,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7 +NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Fold in stable changelog
by gk＠torproject.org 19 Aug '16

19 Aug '16

commit 10aa41a5d6abf25a912616c39d9e39ebb7cc29d6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 19 09:15:28 2016 +0200 Fold in stable changelog --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c0abf86..4506e37 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 6.0.4 -- August 16 + * All Platforms + * Update Tor to 0.2.8.6 + * Update NoScript to 2.9.0.14 + * Bug 19890: Disable installation of system addons + Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Update Firefox to 45.3.0esr

1 0

[tor-messenger-build/master] Update libgcrypt to 1.6.6 for CVE-2016-6316
by arlo＠torproject.org 19 Aug '16

19 Aug '16

commit a82a7c1bd2258e404569841a01ea450debfbb4cc Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 18 22:39:46 2016 -0700 Update libgcrypt to 1.6.6 for CVE-2016-6316 * See https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html * Also, bump libgpg-error to 1.24 --- ChangeLog | 2 ++ projects/libgcrypt/config | 2 +- projects/libgpg-error/config | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc7841f..a392187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Tor Messenger 0.1.0b7 -- * Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45 * Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45 * Bug 19053: Display plaintext in notifications + * Update libgpg-error to 1.24 + * Update libgcrypt to 1.6.6 for CVE-2016-6316 * ctypes-otr * GH 66: Provide functionality for adding verified fingerprints (patch by Vu Quoc Huy) * GH 73: Show progress during verification in notification box (patch by Vu Quoc Huy) diff --git a/projects/libgcrypt/config b/projects/libgcrypt/config index 307643f..2b43818 100644 --- a/projects/libgcrypt/config +++ b/projects/libgcrypt/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.6.4 +version: 1.6.6 remote_docker: 1 var: deps: diff --git a/projects/libgpg-error/config b/projects/libgpg-error/config index 48c10be..ed98a5e 100644 --- a/projects/libgpg-error/config +++ b/projects/libgpg-error/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.20 +version: 1.24 remote_docker: 1 var: deps:

1 0

[tor-messenger-build/updater] Update mozconfigs for Linux and OS X
by sukhbir＠torproject.org 19 Aug '16

19 Aug '16

commit 2b37c6555053ff2402405ffb95610afdef85c9fd Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 16 14:43:28 2016 -0400 Update mozconfigs for Linux and OS X Add --disable-maintenance-service --- projects/instantbird/mozconfig-linux-i686 | 1 + projects/instantbird/mozconfig-linux-x86_64 | 1 + projects/instantbird/mozconfig-osx-x86_64 | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index eb59441..34d7b81 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -20,6 +20,7 @@ ac_add_options --host=i686-linux-gnu ac_add_options --with-branding=im/branding/messenger +ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 3148b44..0264f8f 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -15,6 +15,7 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger +ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 963191a..9eaed84 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -22,6 +22,7 @@ ac_add_options --with-l10n-base=.. ac_add_options --with-branding=im/branding/messenger +ac_add_options --disable-maintenance-service ac_add_options --disable-crashreporter ac_add_options --disable-webrtc ac_add_options --disable-tests

1 0

[tor-messenger-build/updater] Bump Tor Browser to 6.0.4
by sukhbir＠torproject.org 19 Aug '16

19 Aug '16

commit 65ea7974c036f2d0e6608b39b3a84cad960857de Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 16 16:32:36 2016 -0400 Bump Tor Browser to 6.0.4 --- projects/tor-browser/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 55a295c..15e73ff 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.0.2 +version: 6.0.4 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[tor-messenger-build/updater] Bump ctypes-tor to f5cc35a7
by sukhbir＠torproject.org 19 Aug '16

19 Aug '16

commit da31b34f3cd4b8b468fc71ed6c41878450a9a0b5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 18 09:34:29 2016 -0700 Bump ctypes-tor to f5cc35a7 --- projects/ctypes-otr/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config index 250d4b0..5d7ea81 100644 --- a/projects/ctypes-otr/config +++ b/projects/ctypes-otr/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/arlolra/ctypes-otr -git_hash: add9fd19015e9d25c73ba00cc832b98b0cefec2b +git_hash: f5cc35a72065d56df9e1fac47cf9a247aebc787b filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: lib_glob: 'lib/*.so*'

1 0

[tor-messenger-build/updater] Update gpg_wrapper to accept git tags signed with an expired key
by sukhbir＠torproject.org 19 Aug '16

19 Aug '16

commit 5401a9966d29f3a79cd78f6497c1166e174392e0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Aug 17 23:17:27 2016 +0200 Update gpg_wrapper to accept git tags signed with an expired key --- rbm.conf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/rbm.conf b/rbm.conf index c3b3a3b..61a5f35 100644 --- a/rbm.conf +++ b/rbm.conf @@ -82,3 +82,23 @@ targets: docker_image: '[% pc("docker-image", "docker_save_image") %]' hg_opt: '--config extensions.bundleclone=[% shell_quote(c("basedir") _ "/tools/version-control-tools/hgext/bundleclone/__init__.py") %]' + +# change the default gpg_wrapper to allow git tag signed using an +# expired key. +# https://bugs.torproject.org/19737 +gpg_wrapper: | + #!/bin/bash + export LC_ALL=C + [% + IF c('gpg_keyring'); + SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; + END; + -%] + if [ $# -eq 4 ] && [ "$1" = '--status-fd=1' ] \ + && [ "$2" = '--verify' ] + then + [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' + exit ${PIPESTATUS[0]} + else + exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "$@" + fi

1 0

[tor-messenger-build/updater] Use commit 44c1cc instead of signed tag for Tor Launcher
by sukhbir＠torproject.org 19 Aug '16

19 Aug '16

commit 4a89c6533fbe2537fab77bd74003ed8720dc710c Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 17 13:52:11 2016 -0400 Use commit 44c1cc instead of signed tag for Tor Launcher --- projects/tor-launcher/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index fac0888..f4dc4ee 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 version: 0.2.9.3 git_url: https://git.torproject.org/tor-launcher.git -git_hash: '[% c("version") %]' -gpg_keyring: gk.gpg -tag_gpg_id: 1 +git_hash: 44c1cc246e8736e88906c74058f2c582aa6178ed +#gpg_keyring: gk.gpg +#tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: torbirdy.png

1 0

[tor-messenger-build/updater] Update gk's key
by sukhbir＠torproject.org 19 Aug '16

19 Aug '16

commit 9b8b99341d746aeb04596387ef067415934f84a7 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 18 09:42:09 2016 -0700 Update gk's key * 638d79fccb2e49ad871616e3cc339ff031df524c and 2dcef4073f367121ba4a4e80a0a62892ffb011c7 from tor-browser-bundle. --- keyring/gk.gpg | Bin 33866 -> 41255 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/gk.gpg b/keyring/gk.gpg index ad731ca..9037e43 100644 Binary files a/keyring/gk.gpg and b/keyring/gk.gpg differ

1 0