tbb-commits

tbb-commits@lists.torproject.org

1 participants
17962 discussions

[tor-browser-bundle/master] Update OpenSSL to 1.0.1g
by mikeperry＠torproject.org 07 Apr '14

07 Apr '14

commit 0dc9b5d20c312916ffec28dd0adc014a7cfae4a9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 7 16:04:19 2014 -0700 Update OpenSSL to 1.0.1g --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 4 ++-- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4a95497..3f12ac9 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser Bundle 3.5.4 -- Apr 7 2014 + * All Platforms + * Update OpenSSL to 1.0.1g + Tor Browser Bundle 3.5.3 -- Mar 19 2014 * All Platforms * Update Firefox to 24.4.0esr diff --git a/gitian/versions b/gitian/versions index f007100..739badc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.5.3 +TORBROWSER_VERSION=3.5.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 @@ -22,7 +22,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 176477a..9a7ac2f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.beta b/gitian/versions.beta index 4c66e6b..4d152dc 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 57157c0..6717ad2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1f +OPENSSL_VER=1.0.1g GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22

1 0

[tor-launcher/master] Bug #9665: Report error if no bridges are usable.
by brade＠torproject.org 07 Apr '14

07 Apr '14

commit 61ff5d51649158dc07353e2034473ba6287bdfe0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Apr 7 16:46:22 2014 -0400 Bug #9665: Report error if no bridges are usable. --- src/chrome/locale/en/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index a2550db..d04cac5 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -55,3 +55,4 @@ torlauncher.bootstrapWarning.identity=identity mismatch torlauncher.bootstrapWarning.timeout=connection timeout torlauncher.bootstrapWarning.noroute=no route to host torlauncher.bootstrapWarning.ioerror=read/write error +torlauncher.bootstrapWarning.pt_missing=missing pluggable transport

1 0

[tor-browser/tor-browser-24.4.0esr-1] fixup! Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 02 Apr '14

02 Apr '14

commit 0ae8ff689e7f6f0c07d15bfd7ad13d9f7bd54d55 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 2 04:42:20 2014 -0700 fixup! Add security enhancements suggested by Jesse Ruderman. It might be nice if I could cut and paste properly... --- browser/app/profile/000-tor-browser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 91f8697..4198843 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -143,9 +143,9 @@ pref("layers.acceleration.disabled", true); // Security enhancements // https://trac.torproject.org/projects/tor/ticket/9387#comment:17 pref("javascript.options.ion.content", false); -pref("javascripjavascript.options.baselinejit.content", false); -pref("javascripjavascript.options.asmjs", false); -pref("javascripjavascript.options.typeinference", false); +pref("javascript.options.baselinejit.content", false); +pref("javascript.options.asmjs", false); +pref("javascript.options.typeinference", false); // Version placeholder

1 0

[tor-browser-bundle/master] Bug 11240: Don't run chmod on (dangling) symlinks.
by gk＠torproject.org 02 Apr '14

02 Apr '14

commit 681b1598bbbb0704f620bc0e27624a46d6f51f89 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 2 10:30:11 2014 +0000 Bug 11240: Don't run chmod on (dangling) symlinks. --- gitian/build-helpers/dtar.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gitian/build-helpers/dtar.sh b/gitian/build-helpers/dtar.sh index 282ec2d..e8ec340 100755 --- a/gitian/build-helpers/dtar.sh +++ b/gitian/build-helpers/dtar.sh @@ -5,7 +5,8 @@ export LC_ALL=C TARFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# No need to execute chmod on (possibly) dangling symlinks. +find $@ ! -type l -executable -exec chmod 700 {} \; +find $@ ! -type l ! -executable -exec chmod 600 {} \; find $@ | sort | tar --no-recursion -Jcvf $TARFILE -T -

1 0

[tor-browser/tor-browser-24.4.0esr-1] Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 8896b493c0487ac7402514257d6e4acdde00ff64 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 23:58:04 2014 -0700 Add security enhancements suggested by Jesse Ruderman. We were going to put these in the security slider, but perhaps they should be set by default. There will be a perf impact, but let's see if anyone notices and complains, at least for a beta or two. If not, maybe we can even set these in a release. --- browser/app/profile/000-tor-browser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e2efc9..91f8697 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -140,5 +140,13 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); +// Security enhancements +// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 +pref("javascript.options.ion.content", false); +pref("javascripjavascript.options.baselinejit.content", false); +pref("javascripjavascript.options.asmjs", false); +pref("javascripjavascript.options.typeinference", false); + + // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-browser-bundle/master] Invoke prune-old-builds on success.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit f7a5306138e27cc2971ac263178ba15eb980ca6a Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:27:44 2014 +0100 Invoke prune-old-builds on success. --- tools/continuous-builds/park-nightly.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 1ac5b2c..dbc01e4 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -40,3 +40,5 @@ do_check $DSTDIR || exit 2 [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR cd ..; mv $DSTDIR $DIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" + +[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds ~/public_html/builds

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/tools'
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit ce74f8c3a85927cb70d2f5c1dc61a445662e9c1b Merge: 9dbf4b4 f7a5306 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:13:23 2014 -0700 Merge remote-tracking branch 'linus/tools' tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 51 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 44 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 120 insertions(+)

1 0

[tor-browser-bundle/master] Use an environment variable for selecting PGP key to sign with.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit c8fe0baedb139b4798dc484e993b417a2bb1ab0f Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:22:21 2014 +0100 Use an environment variable for selecting PGP key to sign with. --- tools/continuous-builds/build-tbb.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index c44e0fd..3ae1c92 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -1,6 +1,6 @@ #! /bin/sh # usage: -# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-SSH-KEY [BUILDDIR [DESTDIR [N]]]]]] # # Build TARGET in BUILDDIR, which will end up in DESTDIR # Try doing it N times. @@ -8,14 +8,17 @@ # TODO: # - if there's no new commits, don't build but make sure there's a symlink on perdulce +# - copy build logs to publish-host, at least when failing the build TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org -PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +PUBLISH_SSH_KEY=$3; [ -z "$PUBLISH_SSH_KEY" ] && PUBLISH_SSH_KEY=~/.ssh/perdulce-upload BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 +[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 + logfile=$(date -u +%s).log . ~/setup-gitian-build-env.sh @@ -39,10 +42,10 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.exe > sha256sums.txt - gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) - tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile fi

1 0

[tor-browser-bundle/master] Add tools directory with scripts for nightly builds.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 784bac5f84c7b4b02e11e74070d57c944d1dc291 Author: Linus Nordberg <linus(a)nordberg.se> Date: Sat Mar 15 16:42:50 2014 +0100 Add tools directory with scripts for nightly builds. --- tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 48 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 42 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 115 insertions(+) diff --git a/tools/continuous-builds/README b/tools/continuous-builds/README new file mode 100644 index 0000000..c60f19f --- /dev/null +++ b/tools/continuous-builds/README @@ -0,0 +1,14 @@ +Nightly builds can be produced and uploaded to a publishing host by +running build-tbb.sh. The checkout-tbb.sh script can be used to check +out the latest master before starting a build. + +The publishing host should handle uploaded tar file using the +park-nightly.sh script through the command option in sshd's +AuthorizedKeysFile. + + command="[ $(hostname) = perdulce ] && ~/park-nightly.sh",no-pty ssh-rsa ... + +In order to not grow the disk usage too much on the publishing host, +the following script can be run by cron: +https://github.com/boklm/prune-old-builds. + diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh new file mode 100755 index 0000000..c44e0fd --- /dev/null +++ b/tools/continuous-builds/build-tbb.sh @@ -0,0 +1,48 @@ +#! /bin/sh +# usage: +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# +# Build TARGET in BUILDDIR, which will end up in DESTDIR +# Try doing it N times. +# Upload result to PUBLISH-HOST using SSH key PUBLISH-KEY. + +# TODO: +# - if there's no new commits, don't build but make sure there's a symlink on perdulce + +TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly +PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org +PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian +DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET +N=$6; [ -z "$N" ] && N=16 + +logfile=$(date -u +%s).log + +. ~/setup-gitian-build-env.sh +cd $BUILDDIR || exit 1 +status=init +n=0 +while [ $status != done ]; do + n=$(expr $n + 1) + printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile + date | tee -a $logfile + killall qemu-system-i386 qemu-system-x86_64 + make $TARGET > build-$(date -u +%s).log && status=done + printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + TARGET=build-nightly + [ $n -ge $N ] && break +done + +if [ $status = done ]; then + NEWDESTDIR=$DESTDIR-$(date +%F) + echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile + mv $DESTDIR $NEWDESTDIR + cd $NEWDESTDIR || exit 3 + sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + cd .. + D=$(basename $NEWDESTDIR) + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile +else + echo "$0: giving up after $n tries" | tee -a $logfile +fi diff --git a/tools/continuous-builds/checkout-tbb.sh b/tools/continuous-builds/checkout-tbb.sh new file mode 100755 index 0000000..f8a7929 --- /dev/null +++ b/tools/continuous-builds/checkout-tbb.sh @@ -0,0 +1,8 @@ +#! /bin/sh + +BUILDDIR=$1 +[ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian + +cd $BUILDDIR || exit 1 +git checkout master +git pull diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh new file mode 100755 index 0000000..1ac5b2c --- /dev/null +++ b/tools/continuous-builds/park-nightly.sh @@ -0,0 +1,42 @@ +#! /bin/sh +# usage: park-nightly.sh [DIR] + +V=1 #debug is enabled by default for now + +if [ "$1" = "-v" ]; then + V=1 + shift +fi + +DIR=$1 +[ -z "$DIR" ] && DIR=~/public_html/builds + +DSTDIR=tbb-nightly-$(date +%F) +[ -z "$V" ] || echo "Aiming to fill up $DSTDIR" + +do_check() { + [ -z "$1" ] || cd $1 || exit 5 + [ -z "$V" ] || echo "Verifying sha256sums.txt" + gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3 + [ -z "$V" ] || echo "Checking sha256sums.txt" + sha256sum --strict --quiet -c sha256sums.txt || exit 4 +} + +if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then + [ -z "$V" ] || echo "Files already here, just doing the checking" + do_check $DIR/$DSTDIR + exit +fi + +[ -d .staging ] || mkdir .staging +chmod 700 .staging; cd .staging +[ -z "$V" ] || echo "Saving files to disk" +TAROPT=x +[ -z "$V" ] || TAROPT=${TAROPT}v +tar $TAROPT -f - || exit 6 +touch $DSTDIR/tbb-nightly.stamp + +do_check $DSTDIR || exit 2 +[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR +cd ..; mv $DSTDIR $DIR/ || exit 1 +[ -z "$V" ] || echo "All good, all good" diff --git a/tools/continuous-builds/setup-gitian-build-env.sh b/tools/continuous-builds/setup-gitian-build-env.sh new file mode 100644 index 0000000..e9f435a --- /dev/null +++ b/tools/continuous-builds/setup-gitian-build-env.sh @@ -0,0 +1,3 @@ +# source me! +export LC_ALL=C +export NUM_PROCS=10

1 0

[tor-browser-bundle/master] Use a TORSOCKS make variable.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 93a1c3135730f10575e6a0aa368bedd087cb4618 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 24 14:47:28 2014 -0700 Use a TORSOCKS make variable. This allows you to selectively disable torsocks from the command line using a command like make prep TORSOCKS= --- gitian/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index e483735..cec338d 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,3 +1,5 @@ +TORSOCKS = torsocks + all: clean prep build nightly: clean prep-nightly build-nightly @@ -31,32 +33,32 @@ build-beta: ./hash-bundles.sh versions.beta sign: - torsocks ./upload-signature.sh versions + $(TORSOCKS) ./upload-signature.sh versions sign-alpha: - torsocks ./upload-signature.sh versions.alpha + $(TORSOCKS) ./upload-signature.sh versions.alpha sign-nightly: ./upload-signature.sh versions.nightly sign-beta: - torsocks ./upload-signature.sh versions.beta + $(TORSOCKS) ./upload-signature.sh versions.beta match: - torsocks ./check-match.sh versions + $(TORSOCKS) ./check-match.sh versions match-nightly: ./check-match.sh versions.nightly match-alpha: - torsocks ./check-match.sh versions.alpha + $(TORSOCKS) ./check-match.sh versions.alpha match-beta: - torsocks ./check-match.sh versions.beta + $(TORSOCKS) ./check-match.sh versions.beta prep: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions prep-nightly: ./check-prerequisites.sh @@ -64,11 +66,11 @@ prep-nightly: prep-alpha: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha prep-beta: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta clean: rm -f ../../gitian-builder/inputs/*gbuilt*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits