- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] No patch for bug 11200 when using tor 0.2.5.7-rc.
by gk＠torproject.org 18 Sep '14

18 Sep '14

commit 174db93d1c62bf7542757e3096150e46b1956615 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 18 10:49:58 2014 +0000 No patch for bug 11200 when using tor 0.2.5.7-rc. tor 0.2.5.7-rc already includes the fix for bug 11200 which breaks our build as we try to apply it, too. Thus, we remove it if building bundles with a tor 0.2.5.x from now on. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 3678913..2dccff6 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,7 +30,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -86,7 +85,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 88fb40f..ee8a556 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,7 +27,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -81,7 +80,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ad218f5..c326157 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -27,7 +27,6 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" -- "bug11200-hang-0.2.5.patch" - "binutils.tar.bz2" - "dzip.sh" - "mingw-w64-win32-utils.zip" @@ -81,7 +80,6 @@ script: | elif [ ${TOR_TAG::9} == "tor-0.2.5" ]; then git am ~/build/bug8402-master.patch - git am ~/build/bug11200-hang-0.2.5.patch fi fi mkdir -p $OUTDIR/src

1 0

[tor-browser-bundle/master] Change the URL to the NoScript .xpi, too.
by gk＠torproject.org 17 Sep '14

17 Sep '14

commit 5d2f2409807c1d01a5a71867af2b2e800a7f26d3 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 11:25:57 2014 +0000 Change the URL to the NoScript .xpi, too. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d9b7f0a..1d3285d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -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/master] Use latest NoScript for nightlies.
by gk＠torproject.org 17 Sep '14

17 Sep '14

commit 6998ff48dbc146b062760063ed822a09816dad01 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:23:03 2014 +0000 Use latest NoScript for nightlies. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 4f483be..d9b7f0a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -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.41-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=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Changelog for 4.0a3 and versions bump.
by gk＠torproject.org 17 Sep '14

17 Sep '14

commit 69d519ab9d7da77ff944d7141b9c7b7ce103a845 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 17 10:17:31 2014 +0000 Changelog for 4.0a3 and versions bump. --- Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++ gitian/versions.alpha | 10 +++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 29082ac..bd49d11 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,16 @@ +Tor Browser 4.0-alpha-3 -- Sep 21 2014 + * All Platforms + * Update Tor to 0.2.5.7-rc + * Update meek to 0.11 + * Update NoScript to 2.6.8.41 + * Update Torbutton to 1.6.12.2 + * Bug 13091: Use "Tor Browser" everywhere + * Bug 13091: Use "Tor Browser" everywhere + * Bug 13049: Browser update failure (self.update is undefined) + * Bug 13047: Updater should not send Kernel and GTK version + * Linux: + * Bug 9150: Make RPATH unavailable on Tor binary. + Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2e45f76..25b35e5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0-alpha-2 +TORBROWSER_VERSION=4.0-alpha-3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -9,9 +9,9 @@ FIREFOX_VERSION=24.8.0esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 -TOR_TAG=tor-0.2.5.6-alpha +TOR_TAG=tor-0.2.5.7-rc TORLAUNCHER_TAG=0.2.7.0 -TORBUTTON_TAG=1.6.12.1 +TORBUTTON_TAG=1.6.12.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -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.39-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.41-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=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 +NOSCRIPT_HASH=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] No need to apply the patch for bug 8402 anymore.
by gk＠torproject.org 11 Sep '14

11 Sep '14

commit 416e13ed4e32164d9fa56173cd517c4b2be45b6e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 11 13:10:53 2014 +0000 No need to apply the patch for bug 8402 anymore. Bug 8402 landed on tor master recently which breaks compilation if we'd still apply the patch for it when building nightlies. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- 3 files changed, 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index bb99d02..3678913 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -87,8 +87,6 @@ script: | then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch - else - git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 7a75287..88fb40f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -82,8 +82,6 @@ script: | then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch - else - git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 277f2d0..ad218f5 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -82,8 +82,6 @@ script: | then git am ~/build/bug8402-master.patch git am ~/build/bug11200-hang-0.2.5.patch - else - git am ~/build/bug8402-master.patch fi fi mkdir -p $OUTDIR/src

1 0

[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