- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Merge remote-tracking branch 'mikeperry/bug15672'
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit 44e59e8d6e91bab002d93a978b8a4e36fbb5b9fb Merge: 33f867c c9266da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 20 08:41:44 2015 +0000 Merge remote-tracking branch 'mikeperry/bug15672' RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-)

1 0

[tor-browser-bundle/master] Bug #15672: Provide desktop app registration+unregistration for Linux
by gk＠torproject.org 20 Apr '15

20 Apr '15

commit c9266daa8ce6501e6f24446dc0da05caf7fa955d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 13 11:27:29 2015 -0700 Bug #15672: Provide desktop app registration+unregistration for Linux --- RelativeLink/start-tor-browser | 55 ++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index aac5a6e..098f506 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -100,11 +100,18 @@ fi debug=0 show_usage=0 +register_desktop_app=0 # !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 shift # pop the debug argument printf "\nDebug enabled.\n\n" +elif [ "$#" -ge 1 -a $ "x$1" = "x--register-app" -o "x$1" = "x-register-app" $ ]; then + register_desktop_app=1 + shift # pop the register arg +elif [ "$#" -ge 1 -a $ "x$1" = "x--unregister-app" -o "x$1" = "x-unregister-app" $ ]; then + register_desktop_app=-1 + shift # pop the register arg elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then show_usage=1 else @@ -160,6 +167,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# If ${PWD} results in a zero length string, we can try something else... +if [ ! "${PWD}" ]; then + # "hacking around some braindamage" + PWD="`pwd`" + surveysays="This system has a messed up shell.\n" +fi + # This is a fix for an ibus issue on some Linux systems. See #9353 for more # details. The symlink needs to be created before we change HOME. if [ ! -d ".config/ibus" ]; then @@ -167,23 +181,34 @@ if [ ! -d ".config/ibus" ]; then ln -nsf ~/.config/ibus/bus .config/ibus fi -# If ${PWD} results in a zero length HOME, we can try something else... -if [ ! "${PWD}" ]; then - # "hacking around some braindamage" - HOME="`pwd`" - export HOME - surveysays="This system has a messed up shell.\n" -else - HOME="${PWD}" - export HOME -fi - # Fix up .desktop Icon and Exec Paths, and update the .desktop file from the # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$HOME/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '\"$HOME/start-tor-browser\" || ([ ! -x \"$HOME/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop + +if [ "$register_desktop_app" -eq 1 ]; then + mkdir -p "$HOME/.local/share/applications/" + cp ../start-tor-browser.desktop "$HOME/.local/share/applications/" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been registered as a desktop app for this user in ~/.local/share/applications/\n" + exit 0 +fi + +if [ "$register_desktop_app" -eq -1 ]; then + if [ -e "$HOME/.local/share/applications/start-tor-browser.desktop" ]; then + rm -f "$HOME/.local/share/applications/start-tor-browser.desktop" + update-desktop-database "$HOME/.local/share/applications/" + printf "Tor Browser has been removed as a user desktop app (from ~/.local/share/applications/)\n" + else + printf "Tor Browser does not appear to be a desktop app (not present in ~/.local/share/applications/)\n" + fi + exit 0 +fi + +HOME="${PWD}" +export HOME SYSARCHITECTURE=$(getconf LONG_BIT) TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') @@ -279,7 +304,9 @@ if [ "$show_usage" -eq 1 ]; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ -profile TorBrowser/Data/Browser/profile.default "${@}" 2>/dev/null printf "\nTor Browser Script Options\n" - printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" + printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" + printf " --register-app Register Tor Browser as a desktop app for this user\n" + printf " --unregister-app Unregister Tor Browser as a desktop app for this user\n" elif [ "$debug" -ne 1 ] ; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ -profile TorBrowser/Data/Browser/profile.default "${@}" > /dev/null 2>&1 </dev/null &

1 0

[tor-launcher/master] Merge remote-tracking branch 'brade/bug11879-02'
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit 2d7e66fa39cf3e9da4242e17171ff02cf14bcf9a Merge: fd61cb0 81fd61c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Apr 16 18:57:54 2015 -0700 Merge remote-tracking branch 'brade/bug11879-02' src/chrome/content/progress.js | 29 ++++++++++++++++++++++++++++- src/components/tl-process.js | 1 + src/components/tl-protocol.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-)

1 0

[tor-launcher/master] Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked.
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit 81fd61c79e77e8dcbcfa42559a727ac384583f03 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 11:49:00 2015 -0400 Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked. Fix a related problem where the progress dialog immediately closed itself if an error had previously been reported. Send SETCONF DisableNetwork=0 instead of SETCONF DisableNetwork (this makes it easier to interpret debug logs). --- src/chrome/content/progress.js | 29 ++++++++++++++++++++++++++++- src/components/tl-process.js | 1 + src/components/tl-protocol.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 8208398..b44dca5 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -15,6 +15,9 @@ const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", + "resource://torlauncher/modules/tl-logger.jsm"); + var gObsSvc; var gOpenerCallbackFunc; // Set when opened from network settings. @@ -110,7 +113,7 @@ function onCancel() if (gOpenerCallbackFunc) { - // TODO: stop the bootstrapping process? + stopTorBootstrap(); gOpenerCallbackFunc(false); } else try @@ -126,11 +129,35 @@ function onCancel() function onOpenSettings() { + stopTorBootstrap(); cleanup(); window.close(); } +function stopTorBootstrap() +{ + // Tell tor to disable use of the network; this should stop the bootstrap + // process. + const kErrorPrefix = "Setting DisableNetwork=1 failed: "; + try + { + var svc = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports); + svc = svc.wrappedJSObject; + var settings = {}; + settings["DisableNetwork"] = true; + var errObj = {}; + if (!svc.TorSetConfWithReply(settings, errObj)) + TorLauncherLogger.log(5, kErrorPrefix + errObj.details); + } + catch(e) + { + TorLauncherLogger.log(5, kErrorPrefix + e); + } +} + + var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ef2b12c..80cd7ea 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -275,6 +275,7 @@ TorProcessService.prototype = TorClearBootstrapError: function() { + this.mBootstrapErrorOccurred = false; this.mLastTorWarningPhase = null; this.mLastTorWarningReason = null; }, diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 559bb37..fdc2394 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -206,6 +206,8 @@ TorProtocolService.prototype = // aSettingsObj should be a JavaScript object with keys (property values) // that correspond to tor config. keys. The value associated with each // key should be a simple string, a string array, or a Boolean value. + // If an associated value is undefined or null, a key with no value is + // passed in the SETCONF command. // If a fatal error occurs, null is returned. Otherwise, a reply object is // returned. TorSetConf: function(aSettingsObj) @@ -221,7 +223,7 @@ TorProtocolService.prototype = else cmdArgs += ' ' + key; var val = aSettingsObj[key]; - if (val) + if ((val !== undefined) && (val !== null)) { var valType = (typeof val); if ("boolean" == valType)

1 0

[tor-launcher/master] Bug 15704: Do not enable network if wizard is opened.
by mikeperry＠torproject.org 17 Apr '15

17 Apr '15

commit fd61cb0e01d9dfb8904be00019d0546330a91b06 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 12:24:27 2015 -0400 Bug 15704: Do not enable network if wizard is opened. If default bridges were configured and the network settings wizard was opened during a subsequent launch of Tor Browser (e.g., after a failed bootstrap), Tor Launcher was incorrectly setting DisableNetwork=0. --- src/components/tl-process.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index ef2b12c..9265052 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -559,12 +559,17 @@ TorProcessService.prototype = var errObj = {}; var didSucceed = this.mProtocolSvc.TorSetConfWithReply(settings, errObj); - settings = {}; - settings["DisableNetwork"] = false; - if (!this.mProtocolSvc.TorSetConfWithReply(settings, - (didSucceed) ? errObj : null)) + // If the network settings wizard was not opened at startup, enable the + // network so that bootstrapping will proceed with the default bridges. + if (!TorLauncherUtil.shouldShowNetworkSettings) { - didSucceed = false; + settings = {}; + settings["DisableNetwork"] = false; + if (!this.mProtocolSvc.TorSetConfWithReply(settings, + (didSucceed) ? errObj : null)) + { + didSucceed = false; + } } if (didSucceed)

1 0

[tor-browser-bundle/master] Bump versions of nightly components
by gk＠torproject.org 16 Apr '15

16 Apr '15

commit 33f867cc0b974a689a233dd7a3761d7c0bb7270c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 16 08:04:11 2015 +0000 Bump versions of nightly components --- gitian/versions.nightly | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9a1b73f..73bb2ad 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.5.0esr +FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -19,8 +19,7 @@ HTTPSE_TAG=master NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -# A mingw-w64 commit that works. The 3.1.0 tag is too old. -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master @@ -39,7 +38,7 @@ OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1l +OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -56,13 +55,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0development.2 +HTTPSE_VER=5.0.2 GO_VER=1.4.2 ## 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.14-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.21-sm+fn+fx.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 @@ -85,13 +84,13 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 +OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f -HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 +NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c +HTTPSE_HASH=a600ad019c982c8c90b8c5022dbf56722974bc1143f49c0db77704986f1b2ced MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Update obfs4proxy to 0.0.5, remove old go.net.
by gk＠torproject.org 16 Apr '15

16 Apr '15

commit 10b91ff2b78e0cfe72f432fe661fddb9f5f45fd7 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Apr 15 21:31:29 2015 +0000 Update obfs4proxy to 0.0.5, remove old go.net. Update the obfs4proxy tag to 0.0.5, and remove the go.net tarball fetch/build process as that is no longer needed in the latest version. Fixes #15702. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 10 ---------- gitian/descriptors/mac/gitian-pluggable-transports.yml | 10 ---------- .../descriptors/windows/gitian-pluggable-transports.yml | 10 ---------- gitian/fetch-inputs.sh | 13 +------------ gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 7 files changed, 3 insertions(+), 50 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 1ae9c0c..1130cdf 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -56,7 +56,6 @@ files: - "gmp-linux64-utils.zip" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" -- "go.net.tar.bz2" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" @@ -263,15 +262,6 @@ script: | go install golang.org/x/net/proxy cd .. - # Building go.net (obfs4proxy <= 0.0.4) - tar xjf go.net.tar.bz2 - cd go.net - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" - go install code.google.com/p/go.net/proxy - cd .. - # Building obfs4proxy cd obfs4 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 e2693e1..30f6444 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -52,7 +52,6 @@ files: - "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" -- "go.net.tar.bz2" - "gmp-mac64-utils.zip" - "openssl-mac64-utils.zip" script: | @@ -291,15 +290,6 @@ script: | go install golang.org/x/net/proxy cd .. - # Building go.net (obfs4proxy <= 0.0.4) - tar xjf go.net.tar.bz2 - cd go.net - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" - go install code.google.com/p/go.net/proxy - cd .. - # Building obfs4proxy cd obfs4 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 0f5ec84..339a63e 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -59,7 +59,6 @@ files: - "openssl-win32-utils.zip" - "gmp-win32-utils.zip" - "gcclibs-win32-utils.zip" -- "go.net.tar.bz2" script: | # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. function py2exe_zip_timestomp { @@ -369,15 +368,6 @@ script: | go install golang.org/x/net/proxy cd .. - # Building go.net (obfs4proxy <= 0.0.4) - tar xjf go.net.tar.bz2 - cd go.net - find -type f | xargs touch --date="$REFERENCE_DATETIME" - mkdir -p "$GOPATH/src/code.google.com/p/" - ln -sf "$PWD" "$GOPATH/src/code.google.com/p/go.net" - go install code.google.com/p/go.net/proxy - cd .. - # Building obfs4proxy cd obfs4 find -type f | xargs touch --date="$REFERENCE_DATETIME" diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e86ad6d..188c702 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -6,7 +6,6 @@ MIRROR_URL=https://people.torproject.org/~mikeperry/mirrors/sources/ MIRROR_URL_DCF=https://people.torproject.org/~dcf/mirrors/sources/ MIRROR_URL_ASN=https://people.torproject.org/~asn/mirrors/sources/ -MIRROR_URL_YAWNING=https://people.torproject.org/~yawning/mirrors/sources/ set -e set -u umask 0022 @@ -163,22 +162,13 @@ do get "${!PACKAGE}" "${!URL}" done -# XXX/Yawning. As far as I can tell, this gitian thing doesn't support -# fetching from hg repositories. -for i in GONET -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL_YAWNING}${!PACKAGE}" - get "${!PACKAGE}" "${MIRROR_URL_YAWNING}${!PACKAGE}" -done - # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} wget -U "" -N ${HTTPSE_URL} # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -232,7 +222,6 @@ ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$LXML_PACKAGE" lxml.tar.gz ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz ln -sf "$GO_PACKAGE" go.tar.gz -ln -sf "$GONET_PACKAGE" go.net.tar.bz2 # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 79c452b..846b575 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -141,7 +141,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC GONET +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ee69d08..0077361 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -31,7 +31,7 @@ GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 -OBFS4_TAG=obfs4proxy-0.0.4 +OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-7 @@ -79,7 +79,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 @@ -101,7 +100,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -127,4 +125,3 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index cf0aecf..9a1b73f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -83,7 +83,6 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz -GONET_PACKAGE=go.net-9c0f9daaa74b.tar.bz2 # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 @@ -105,7 +104,6 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e -GONET_HASH=1812fec55256e1a6fe546111cc658520b80972f38826c94ec11ef24315d32353 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -131,4 +129,3 @@ SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PAC… GO_URL=https://golang.org/dl/${GO_PACKAGE} -GONET_URL=https://people.torproject.org/~yawning/mirrors/sources/${GONET_PACKAGE}

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 10761: Fix shutdown crashes on Windows
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit c9944b9ca97a238304b61e822d7509ec4ac85a12 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 6 07:47:41 2015 +0000 Bug 10761: Fix shutdown crashes on Windows Jacek Caban gave us this patch which should fix the shutdown crashes on Windows (#10761 and #14454) as newer GCC/Binutils versions do not need the workaround anymore that got implemented back then in https://bugzilla.mozilla.org/show_bug.cgi?id=337887. --- security/nss/coreconf/WIN32.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/security/nss/coreconf/WIN32.mk b/security/nss/coreconf/WIN32.mk index afece49..5c6cae0 100644 --- a/security/nss/coreconf/WIN32.mk +++ b/security/nss/coreconf/WIN32.mk @@ -94,10 +94,7 @@ endif DLL_SUFFIX = dll ifdef NS_USE_GCC - # The -mnop-fun-dllimport flag allows us to avoid a drawback of - # the dllimport attribute that a pointer to a function marked as - # dllimport cannot be used as as a constant address. - OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport + OS_CFLAGS += -mwindows -mms-bitfields _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY) DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB)) ifdef BUILD_OPT

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit e1a8bafb44367592bc982c2a65752ec439b515a6 Merge: 5ad57a0 c9944b9c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 15 22:16:33 2015 -0700 Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1 security/nss/coreconf/WIN32.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Revert "TB1: Add a string-based cacheKey."
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit 5ad57a0b24c85d19427eddebc2f647296063acfd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 15 22:07:27 2015 -0700 Revert "TB1: Add a string-based cacheKey." This reverts commit 53f8f2506cb21bf1847a4261ef383db9be55a93c. This used to be used by Torbutton/SafeCache, but we moved the cache isolation to direct C++ patches instead. --- netwerk/base/public/nsICachingChannel.idl | 7 ------- netwerk/protocol/http/nsHttpChannel.cpp | 23 ----------------------- netwerk/protocol/http/nsHttpChannel.h | 1 - 3 files changed, 31 deletions(-) diff --git a/netwerk/base/public/nsICachingChannel.idl b/netwerk/base/public/nsICachingChannel.idl index 09b1f75..9c1b0a6 100644 --- a/netwerk/base/public/nsICachingChannel.idl +++ b/netwerk/base/public/nsICachingChannel.idl @@ -64,13 +64,6 @@ interface nsICachingChannel : nsICacheInfoChannel */ attribute nsISupports cacheKey; - /** - * Set/get the cache domain... uniquely identifies the data in the cache - * for this channel. Holding a reference to this key does NOT prevent - * the cached data from being removed. - */ - attribute AUTF8String cacheDomain; - /************************************************************************** * Caching channel specific load flags: */ diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 59ba71b..bba507e 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -3271,12 +3271,6 @@ nsHttpChannel::AssembleCacheKey(const char *spec, uint32_t postID, cacheKey.Append(buf); } - if (strlen(mCacheDomain.get()) > 0) { - cacheKey.AppendLiteral("domain="); - cacheKey.Append(mCacheDomain.get()); - cacheKey.AppendLiteral("&"); - } - if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } @@ -5563,23 +5557,6 @@ nsHttpChannel::SetCacheTokenCachedCharset(const nsACString &aCharset) PromiseFlatCString(aCharset).get()); } - -NS_IMETHODIMP -nsHttpChannel::GetCacheDomain(nsACString &value) -{ - value = mCacheDomain; - - return NS_OK; -} - -NS_IMETHODIMP -nsHttpChannel::SetCacheDomain(const nsACString &value) -{ - mCacheDomain = value; - - return NS_OK; -} - //----------------------------------------------------------------------------- // nsHttpChannel::nsICachingChannel //----------------------------------------------------------------------------- diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index a76ed8e..ef59c0b 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -354,7 +354,6 @@ private: nsCOMPtr<nsICacheEntry> mOfflineCacheEntry; uint32_t mOfflineCacheLastModifiedTime; nsCOMPtr<nsIApplicationCache> mApplicationCacheForWrite; - nsCString mCacheDomain; // auth specific data nsCOMPtr<nsIHttpChannelAuthProvider> mAuthProvider;

1 0