tbb-commits January 2015

tbb-commits@lists.torproject.org

3 participants
61 discussions

[tor-browser-bundle/master] Add goxcrypto to verifiy-tags.sh
by gk＠torproject.org 22 Jan '15

22 Jan '15

commit e0e53189158646aa2f01add172ec757ea7c1a921 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 22 09:26:08 2015 +0000 Add goxcrypto to verifiy-tags.sh --- gitian/verify-tags.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 09454bb..55bb857 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -116,6 +116,7 @@ txsocksx $TXSOCKSX_TAG faketime $FAKETIME_TAG ed25519 $GOED25519_TAG siphash $GOSIPHASH_TAG +goxcrypto $GO_X_CRYPTO_TAG EOF # Verify signatures on signed packages

1 0

[tor-browser-bundle/master] Add golang.org/x/crypto to the build process.
by gk＠torproject.org 22 Jan '15

22 Jan '15

commit e33339c763c212a09f9976d5c04f033c1ec7c18c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jan 21 19:34:00 2015 +0000 Add golang.org/x/crypto to the build process. This is required for any of: * Go >= 1.4.x (It is backwards compatible though). * obfs4proxy >= cdeda5724124ca393c87be6d01c84fe4f906d612 And replaces go.crypto (the developers moved/renamed the package). As there is no formal release process as far as I can tell for the codebase the current tip of tree commit is used for versions.alpha, and master for versions.nightly. When obfs4proxy 0.0.4 is tagged, the old go.crypto code can be removed from the build process after the new tag is added to all the versions.foo files. Fixes #14316. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 14 +++++++++++++- gitian/descriptors/mac/gitian-pluggable-transports.yml | 14 +++++++++++++- .../descriptors/windows/gitian-pluggable-transports.yml | 14 +++++++++++++- gitian/fetch-inputs.sh | 1 + gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 9 files changed, 45 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index e79e8af..d180f97 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -36,6 +36,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -242,7 +244,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 0931c59..9a86b1a 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -34,6 +34,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -270,7 +272,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 70d4b91..6e3c3a7 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -33,6 +33,8 @@ remotes: "dir": "ed25519" - "url": "https://github.com/dchest/siphash.git" "dir": "siphash" +- "url": "https://go.googlesource.com/crypto" + "dir": "goxcrypto" - "url": "https://git.torproject.org/pluggable-transports/obfs4.git" "dir": "obfs4" files: @@ -348,7 +350,17 @@ script: | go install github.com/dchest/siphash cd .. - # Building go.crypto + # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) + cd goxcrypto + find -type f | xargs touch --date="$REFERENCE_DATETIME" + mkdir -p "$GOPATH/src/golang.org/x/" + ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" + go install golang.org/x/crypto/curve25519 + go install golang.org/x/crypto/hkdf + go install golang.org/x/crypto/nacl/secretbox + cd .. + + # Building go.crypto (obfs4proxy <= 0.0.3) tar xjf go.crypto.tar.bz2 cd go.crypto find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 049824a..3311547 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -309,6 +309,7 @@ meek https://git.torproject.org/pluggable-transports/meek.git $ faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG ed25519 https://github.com/agl/ed25519.git $GOED25519_TAG siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG +goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG EOF diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 4a773b8..0dba906 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -224,7 +224,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index ed54dc6..09b3172 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -190,7 +190,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 945511b..39c57ce 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -194,7 +194,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 890b6a3..a0af194 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -29,6 +29,7 @@ MEEK_TAG=0.15 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 OBFS4_TAG=obfs4proxy-0.0.3 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d200f54..cb6e53a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -33,6 +33,7 @@ MEEK_TAG=master FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=master OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7

1 0

[tor-browser-bundle/master] Bump Firefox, NoScript, HTTPS-E version for nightly
by gk＠torproject.org 21 Jan '15

21 Jan '15

commit 364e84e7d4ecdb889ed7e00fddbd30bdf68cc7ea Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 21 09:08:02 2015 +0000 Bump Firefox, NoScript, HTTPS-E version for nightly --- gitian/versions.nightly | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 14093cb..d200f54 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.3.0esr +FIREFOX_VERSION=31.4.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -40,7 +40,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -54,13 +54,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.1 +HTTPSE_VER=5.0development.2 GO_VER=1.3.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.9.5-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.10-sm+fx+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 @@ -90,8 +90,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a -HTTPSE_HASH=d97ec822641d4ebf404fee1179497e1d80f2b8344d5fa485169ef045ba184db0 +NOSCRIPT_HASH=e1670ebc03810f82f61179fa158085df86b8f2a01d63ea16fa3f031242e4ec42 +HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Fix emailing of log files and remove a couple of default values.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit db856ac0155791bbca283da574b14ed4ae5bd515 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:32:36 2015 +0100 Fix emailing of log files and remove a couple of default values. --- tools/continuous-builds/build-tbb.sh | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 010b41d..ab8d36f 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -18,12 +18,29 @@ 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 +# Set PGPKEYID="--local-user KEY-ID" to override default PGP key used +# for signing. +[ -z "$PGPKEYID" ] && PGPKEYID="" +# mail(1) from Debian package bsd-mailx lost `-f envelope-sender' in +# DSA-3104-1. Install package heirloom-mailx and set +# MAILX=/usr/bin/heirloom-mailx in order to override envelope sender +# using `-r' in LOGSENDER. +[ -z "$MAILX" ] && MAILX="" + +# Name of log file. logfile=$(date -u +%s).log -logrecipients="gk(a)torproject.org linus(a)torproject.org" -. ~/setup-gitian-build-env.sh +# LOGRECIPIENTS is a space separated list of email addresses or an +# empty string. +[ -z "$LOGRECIPIENTS" ] && LOGRECIPIENTS="" + +# Set LOGSENDER to "-r user@domain" to override envelope sender. If +# empty the default envelope sender is used. +[ -z "$LOGSENDER" ] && LOGSENDER="" + +[ -f ~/setup-gitian-build-env.sh ] && . ~/setup-gitian-build-env.sh + cd $BUILDDIR || exit 1 status=init n=0 @@ -45,11 +62,17 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.dmg *.exe > sha256sums.txt - gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 + gpg -a --clearsign $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile - tail -n 50 $logfile ../../gitian-builder/var/build.log ../../gitian-builder/var/target.log | mail -s "Nightly build failure -- $(date +%F)" $logrecipients + if [ -n "$LOGRECIPIENTS" ]; then + FILES="$logfile \ + ../../gitian-builder/var/build.log \ + ../../gitian-builder/var/target.log" + tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ + $sender -- $LOGRECIPIENTS + fi fi

1 0

[tor-browser-bundle/master] Fix a log printout.
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit d39450e0386b211b7e813d43320100067e08f0e6 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Jan 20 16:42:58 2015 +0100 Fix a log printout. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index ab8d36f..271f1ec 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -51,7 +51,7 @@ while [ $status != done ]; do date | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $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 + printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile MAKE_TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor-browser-bundle/master] Bug 14303: Adapt fix for #13015 to signing script
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit c2f819863f5dd5031346fd483c7adf2d77bec42e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 20 11:41:44 2015 +0000 Bug 14303: Adapt fix for #13015 to signing script --- gitian/signmars.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/signmars.sh b/gitian/signmars.sh index fdb531e..ed42971 100755 --- a/gitian/signmars.sh +++ b/gitian/signmars.sh @@ -30,6 +30,7 @@ if ! [ -e $VERSIONS_FILE ]; then fi . $VERSIONS_FILE +eval $(./get-tb-version $TORBROWSER_VERSION_TYPE) export LC_ALL=C

1 0

[tor-browser-bundle/master] Fix Changelog
by gk＠torproject.org 20 Jan '15

20 Jan '15

commit df55f898a05620110275c3e6e72c3cfbc54aca3d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 20 11:36:02 2015 +0000 Fix Changelog --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7416e0c..2dd58e7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.5-alpha-3 -- Jan 16 2015 +Tor Browser 4.5a3 -- Jan 19 2015 * All Platforms * Update Firefox to 31.4.0esr * Update Tor to 0.2.6.2-alpha @@ -16,6 +16,7 @@ Tor Browser 4.5-alpha-3 -- Jan 16 2015 * Bug 13671: Fixup for circuit display if bridges are used * Translation updates * Update Tor Launcher to 0.2.7.1 + * Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set * Translation updates * Bug 13379: Sign our MAR files * Bug 13788: Fix broken meek in 4.5-alpha series

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Fixup! Bug #9701: Prevent ClipBoardCache from writing to disk.
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit a78a094886091a90e5f4e13c0579f9ad730ea8b5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 19 16:45:26 2015 -0500 Fixup! Bug #9701: Prevent ClipBoardCache from writing to disk. Update the DataStruct::SetData() prototype (my clang-based Mac build failed). --- widget/xpwidgets/nsTransferable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget/xpwidgets/nsTransferable.h b/widget/xpwidgets/nsTransferable.h index 4c80bfe..73dcf49 100644 --- a/widget/xpwidgets/nsTransferable.h +++ b/widget/xpwidgets/nsTransferable.h @@ -27,7 +27,7 @@ struct DataStruct ~DataStruct(); const nsCString& GetFlavor() const { return mFlavor; } - void SetData( nsISupports* inData, uint32_t inDataLen ); + void SetData( nsISupports* inData, uint32_t inDataLen, bool aIsPrivBrowsing ); void GetData( nsISupports** outData, uint32_t *outDataLen ); already_AddRefed<nsIFile> GetFileSpec(const char* aFileName); bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Revert "Bug #9701: Prevent ClipBoardCache from writing to disk."
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit ba4eca38fdad352c564719ff49aaa8c87e8a8ded Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jan 19 16:01:11 2015 -0500 Revert "Bug #9701: Prevent ClipBoardCache from writing to disk." This reverts commit ba34a65a5e33473cb6f53b06542a3ce087c26115. An improved fix is forthcoming. --- widget/xpwidgets/nsTransferable.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index e6af15e..094836b 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -58,7 +58,6 @@ DataStruct::~DataStruct() void DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) { -#if 0 // Remove unnecessary disk caching to accommodate https://www.torproject.org/projects/torbrowser/design/#disk-avoidance // Now, check to see if we consider the data to be "too large" if (aDataLen > kLargeDatasetSize) { // if so, cache it to disk instead of memory @@ -67,7 +66,6 @@ DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) else NS_WARNING("Oh no, couldn't write data to the cache file"); } -#endif // #if 0 mData = aData; mDataLen = aDataLen;

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] Bug #9701: Prevent ClipBoardCache from writing to disk.
by brade＠torproject.org 19 Jan '15

19 Jan '15

commit 453b4ee4b2cd1c3dd22ee2040b38f09d26e8a60f Author: Michael Schloh von Bennewitz <michael(a)schloh.com> Date: Mon Jan 19 16:04:36 2015 -0500 Bug #9701: Prevent ClipBoardCache from writing to disk. Do not write clipboard data to disk when private browsing mode is on. --- widget/xpwidgets/nsTransferable.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp index 094836b..1a0e96e 100644 --- a/widget/xpwidgets/nsTransferable.cpp +++ b/widget/xpwidgets/nsTransferable.cpp @@ -56,19 +56,20 @@ DataStruct::~DataStruct() //------------------------------------------------------------------------- void -DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen ) +DataStruct::SetData ( nsISupports* aData, uint32_t aDataLen, bool aIsPrivBrowsing ) { // Now, check to see if we consider the data to be "too large" - if (aDataLen > kLargeDatasetSize) { + // as well as ensuring that private browsing mode is disabled + if (aDataLen > kLargeDatasetSize && !aIsPrivBrowsing) { // if so, cache it to disk instead of memory if ( NS_SUCCEEDED(WriteCache(aData, aDataLen)) ) return; else - NS_WARNING("Oh no, couldn't write data to the cache file"); - } + NS_WARNING("Oh no, couldn't write data to the cache file"); + } mData = aData; - mDataLen = aDataLen; + mDataLen = aDataLen; } @@ -401,7 +402,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_ for (i = 0; i < mDataArray.Length(); ++i) { DataStruct& data = mDataArray.ElementAt(i); if ( data.GetFlavor().Equals(aFlavor) ) { - data.SetData ( aData, aDataLen ); + data.SetData ( aData, aDataLen, mPrivateData ); return NS_OK; } } @@ -417,7 +418,7 @@ nsTransferable::SetTransferData(const char *aFlavor, nsISupports *aData, uint32_ nsCOMPtr<nsISupports> ConvertedData; uint32_t ConvertedLen; mFormatConv->Convert(aFlavor, aData, aDataLen, data.GetFlavor().get(), getter_AddRefs(ConvertedData), &ConvertedLen); - data.SetData(ConvertedData, ConvertedLen); + data.SetData(ConvertedData, ConvertedLen, mPrivateData); return NS_OK; } }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits January 2015