- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Merge remote-tracking branch 'pc/bug13091'
by gk＠torproject.org 11 Sep '14

11 Sep '14

commit e21bb4837a7affd469e413a2664f4a2bb5c2de4e Merge: b5f07db 41b90ea Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 11 10:38:02 2014 +0000 Merge remote-tracking branch 'pc/bug13091' gitian/build-helpers/fix-info-plist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-bundle/master] Bug 13091: Use "Tor Browser" everywhere (space included)
by gk＠torproject.org 11 Sep '14

11 Sep '14

commit 41b90eae7d3d1a3664bc0d482862961a8ed3fcad Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 10 09:52:33 2014 -0400 Bug 13091: Use "Tor Browser" everywhere (space included) Use "TorBrowser" instead "Tor Browser" in Info.plist on Mac OS. --- gitian/build-helpers/fix-info-plist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/build-helpers/fix-info-plist.py b/gitian/build-helpers/fix-info-plist.py index ccb6c68..ac531ec 100755 --- a/gitian/build-helpers/fix-info-plist.py +++ b/gitian/build-helpers/fix-info-plist.py @@ -25,7 +25,7 @@ COPYRIGHT = "Tor Browser %s Copyright %s The Tor Project" % (TORBROWSER_VERSION, plist = plistlib.readPlist(sys.stdin) -plist["CFBundleGetInfoString"] = "TorBrowser %s" % TORBROWSER_VERSION +plist["CFBundleGetInfoString"] = "Tor Browser %s" % TORBROWSER_VERSION plist["CFBundleShortVersionString"] = TORBROWSER_VERSION plist["NSHumanReadableCopyright"] = COPYRIGHT

1 0

[tor-browser-bundle/master] Use meek 0.11.
by gk＠torproject.org 10 Sep '14

10 Sep '14

commit b5f07db7e42d1e31a44f3254f8889b2e12e545c5 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 9 00:20:43 2014 +0000 Use meek 0.11. 0.11 has a fix for #11612, which would prevent some users from being able to bootstrap for the first time. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 5f99e3a..319a0de 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.10 +MEEK_TAG=0.11 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8fcde6e..2e45f76 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.10 +MEEK_TAG=0.11 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.beta b/gitian/versions.beta index b6ad5bb..ca9d053 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.10 +MEEK_TAG=0.11 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser-bundle/master] Include the Go license as required for certain PTs.
by gk＠torproject.org 04 Sep '14

04 Sep '14

commit 2326062d5c514ee4ce45783b1ff05af6eadfdb52 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Sep 2 14:49:59 2014 +0000 Include the Go license as required for certain PTs. Go license taken from http://golang.org/LICENSE?m=text Fixes bug #13039. --- .../Docs/Licenses/PluggableTransports/LICENSE | 9 +++++++ .../Docs/Licenses/PluggableTransports/LICENSE.GO | 27 ++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE index 162589c..749986b 100644 --- a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE +++ b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE @@ -13,6 +13,15 @@ file LICENSE.PYTHON. =============================================================================== +Go + +Some pluggable transports are written in Go and the binary packages include +parts of the Go runtime library. A copy of the Go license (which itself +includes the licenses of some of Go's components) is included in the file +LICENSE.GO. + +=============================================================================== + OpenSSL (From http://openssl.org/source/license.html.) diff --git a/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO new file mode 100644 index 0000000..7448756 --- /dev/null +++ b/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.GO @@ -0,0 +1,27 @@ +Copyright (c) 2012 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[tor-browser-bundle/maint-3.6] Bug 9150: Make RPATH unavailable on Linux builds.
by gk＠torproject.org 02 Sep '14

02 Sep '14

commit 4abb92271aef3256ca1838c5c9669d73cd605641 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 2 15:53:55 2014 +0000 Bug 9150: Make RPATH unavailable on Linux builds. Thanks to a patch by a cypherpunk we make now RPATH unavailable on Linux builds. --- gitian/descriptors/linux/gitian-tor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index fa1badb..c76e026 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -61,6 +61,8 @@ script: | cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ chmod 700 $INSTDIR/Tor/*so* + # This is needed to make RPATH unavailable. See bug 9150. + export LD_LIBRARY_PATH="$INSTDIR/Tor/" # Building tor cd tor

1 0

[tor-browser-bundle/master] Bug 9150: Make RPATH unavailable on Linux builds.
by gk＠torproject.org 02 Sep '14

02 Sep '14

commit 29c156d5085d2c186cf6f0cc12eba45dcea8992e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 2 15:49:19 2014 +0000 Bug 9150: Make RPATH unavailable on Linux builds. Thanks to a patch by a cypherpunk we make now RPATH unavailable on Linux builds. --- gitian/descriptors/linux/gitian-tor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 277a8e4..bb99d02 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -61,6 +61,8 @@ script: | cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ chmod 700 $INSTDIR/Tor/*so* + # This is needed to make RPATH unavailable. See bug 9150. + export LD_LIBRARY_PATH="$INSTDIR/Tor/" # Building tor cd tor

1 0

[tor-browser-bundle/master] Bug 10077: Make binutils independent of mingw-w64.
by gk＠torproject.org 01 Sep '14

01 Sep '14

commit 5a3ca06d4d031019aadc0a50aa209a5ca86c2b3f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 1 09:12:35 2014 +0000 Bug 10077: Make binutils independent of mingw-w64. We might want to bump the binutils version independent of the mingw-w64 version. This does not work anymore if we don't at least touch a binutils related file containing the currently built/used binutils version. --- gitian/descriptors/windows/gitian-utils.yml | 2 ++ gitian/mkbundle-windows.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 2d0b3db..75e5662 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -152,6 +152,8 @@ script: | # Grabbing the remaining results cd $INSTDIR + # We might want to bump binutils independent of bumping mingw-w64. + touch binutils-$BINUTILS_VER-win32-utils.zip ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index dfc326b..595ff29 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -96,7 +96,8 @@ fi cd $GITIAN_DIR -if [ ! -f inputs/gcclibs-$GCC_VER-win32-utils.zip -o \ +if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ + ! -f inputs/gcclibs-$GCC_VER-win32-utils.zip -o \ ! -f inputs/mingw-w64-$GCC_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \

1 0

[tor-browser-bundle/master] Don't distribute mar tools. They are not reproducible (yet).
by mikeperry＠torproject.org 01 Sep '14

01 Sep '14

commit 6de616f8de99af3343a85346028a1538e89f7f49 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 31 17:32:47 2014 -0700 Don't distribute mar tools. They are not reproducible (yet). --- gitian/mkbundle-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index dd8e00a..e3b145d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -248,7 +248,7 @@ then mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/ cp -a build/out/tor-browser-linux*xz* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 cp -a build/out/*.mar $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 - cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 + #cp -a inputs/mar-tools-linux*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 cp -a inputs/*debug.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1 touch inputs/bundle-linux.gbuilt else

1 0

[tor-browser-bundle/master] Update NoScript to 2.6.8.39.
by mikeperry＠torproject.org 01 Sep '14

01 Sep '14

commit f8ed0cfe8eba91741eca5c33cdb852cc0aa8a123 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 31 17:42:21 2014 -0700 Update NoScript to 2.6.8.39. --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/versions.alpha | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d511d84..29082ac 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr + * Update NoScript to 2.6.8.39 * Update Tor Launcher to 0.2.7.0 * Bug 11405: Remove firewall prompt from wizard. * Bug 12895: Mention @riseup.net as a valid bridge request email address @@ -26,6 +27,7 @@ Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 Tor Browser Bundle 3.6.5 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr + * Update NoScript to 2.6.8.39 * Update HTTPS Everywhere to 4.0.0 * Update Torbutton to 1.6.12.1 * Bug 12684: New strings for canvas image extraction message diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6d93b6..8fcde6e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -52,7 +52,7 @@ GO_VER=1.3 ## 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.6.8.36-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.39-fx+sm+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -80,7 +80,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 +NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -102,7 +102,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI…

1 0

[tor-browser-bundle/maint-3.6] Bump NoScript version.
by mikeperry＠torproject.org 01 Sep '14

01 Sep '14

commit 21000b7eb3bcfced485cdf279fc16d1d1976d0c8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 31 17:20:43 2014 -0700 Bump NoScript version. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 8bb3eae..6688bf1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser Bundle 3.6.5 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr + * Update NoScript to 2.6.8.39 * Update HTTPS Everywhere to 4.0.0 * Update Torbutton to 1.6.12.1 * Bug 12684: New strings for canvas image extraction message diff --git a/gitian/versions b/gitian/versions index 14803a8..4096ec0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -47,7 +47,7 @@ HTTPSE_VER=4.0.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-2.6.8.36-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.39-fx+sm+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -75,7 +75,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=3c8ed31dbd67634debf333f957ba5c08bf3596408c9d09b5bf4da98499733af4 +NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 HTTPSE_HASH=1241631091f9ceb417f639a6df76425cda36ee4b38b78ce8d318088eb17a7219 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -97,7 +97,7 @@ TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} -NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/user-media/addons/722/${NOSCRIPT_PACKAGE} HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_…

1 0