December 2013 - tor-commits - lists.torproject.org

[check/master] Add a donation button
by arlo＠torproject.org 09 Dec '13

09 Dec '13

commit b2fbe9a099d01dab41fdba3d377715bea19f1ee3 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Dec 8 22:40:52 2013 -0800 Add a donation button --- public/base.html | 45 ++-------------------------------- public/bulk.html | 6 +++++ public/index.html | 69 ++++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 69 insertions(+), 51 deletions(-) diff --git a/public/base.html b/public/base.html index 8414023..bd46b69 100644 --- a/public/base.html +++ b/public/base.html @@ -13,6 +13,7 @@ font-family: Helvetica, sans-serif; margin: 0; } + h1 { font-size: 2.4em; } a { text-decoration: none; } a:hover { text-decoration: underline; } ul { margin: 0; padding: 0; } @@ -22,35 +23,6 @@ list-style-type: none; margin: 0; } - .on { color: green; } - .off { color: red; } - .mid { margin: 3em 0; } - .mid a { - text-decoration: underline; - } - .small { font-size: 0.8em; } - .security { - margin: 2em 0; - padding: 1em; - font-size: 1.4em; - color: goldenrod; - background-color: ghostwhite; - border-radius: 5px; - } - .security a { - color: goldenrod; - text-decoration: underline; - } - .onion { - width: 128px; - height: 128px; - border: 0; - text-decoration: none; - } - .form { - display: inline; - margin-right: 0.4em; - } .content { padding: 4em; } @@ -67,20 +39,7 @@ margin: 0; font-size: 0.8em; } - .other { - width: 50%; - float: left; - } - .other p { - margin: 1em 4em; - } - .other p a { - display: block; - margin-bottom: 0.4em; - } - #js { - font-size: 0.8em; - } + {{ template "css" . }} </style> </head> <body> diff --git a/public/bulk.html b/public/bulk.html index 2460f81..70f3f06 100644 --- a/public/bulk.html +++ b/public/bulk.html @@ -1,6 +1,12 @@ {{ template "base.html" . }} {{ define "title" }}Bulk Tor Exit Exporter{{ end }} {{ define "head" }}{{ end }} +{{ define "css" }} + .form { + display: inline; + margin-right: 0.4em; + } +{{ end }} {{ define "body" }} <img src="/torcheck/img/tor-on.png" class="onion" /> <h4>Welcome to the Tor Bulk Exit List exporting tool.</h4> diff --git a/public/index.html b/public/index.html index 763a6eb..eb81799 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,56 @@ {{ template "base.html" . }} {{ define "title" }}{{ GetText .Lang "Are you using Tor?" }}{{ end }} +{{ define "css" }} + .on { color: green; } + .off { color: red; } + .mid { margin: 3em 0; } + .mid a { + text-decoration: underline; + } + .small { font-size: 0.8em; } + .security { + margin: 2em 0; + padding: 1em; + font-size: 1.4em; + color: goldenrod; + background-color: ghostwhite; + border-radius: 5px; + } + .security a { + color: goldenrod; + text-decoration: underline; + } + .onion { + width: 128px; + height: 128px; + border: 0; + text-decoration: none; + } + #js { + font-size: 0.8em; + } + #donate { + background-color: dodgerblue; + color: white; + text-decoration: none; + font-size: 1.4em; + font-weight: bold; + padding: 0.6em 2.4em; + border-radius: 0.2em; + display: inline-block; + } + #links { + margin-top: 0.6em; + } + #links li:after { + content: "|"; + padding: 0 0.2em; + } + #links li:last-child:after { + content: ""; + padding: 0; + } +{{ end }} {{ define "head" }} <form action="/" method="get" id="lang"> {{ if .Small }}<input type="hidden" name="small" value="1" />{{ end }} @@ -39,14 +90,16 @@ {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." | UnEscaped }} {{ end }} </p> - <div class="other"> - <p><a href="https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml">{{ GetText .Lang "Short User Manual" }}</a> - {{ GetText .Lang "The short user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network." }}</p> - </div> - <div class="other"> - <p><a href="https://tor.stackexchange.com/">{{ GetText .Lang "Tor Q&A Site" }}</a> - {{ GetText .Lang "Questions and answers site for researchers, developers, and users of Tor. Hosted on StackExchange. Currently only available in English." }}</p> - </div> + <a id="donate" href="https://www.torproject.org/donate/donate.html">Donate to Support Tor</a> + <ul id="links"> + <li> + <a href="https://torproject.org/dist/manual/short-user-manual_{{ UserManual .Lang }}.xhtml">{{ GetText .Lang "Short User Manual" }}</a> + </li><li> + <a href="https://tor.stackexchange.com/">{{ GetText .Lang "Tor Q&A Site" }}</a> + </li><li> + <a href="https://www.torproject.org/getinvolved/volunteer.html">{{ GetText .Lang "Volunteer" }}</a> + </li> + </ul> {{ end }} {{ define "foot" }} <p id="js">

1 0

[metrics-web/master] Add 0.2.5 to known versions, change color palette.
by karsten＠torproject.org 09 Dec '13

09 Dec '13

commit e51bd2b036fabba330115483562508d110bc7f3c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 07:07:09 2013 +0100 Add 0.2.5 to known versions, change color palette. The Accent palette only supports up to 8 different colors, but by now we have 9 Tor versions which could, in theory, all be displayed in a single graph. Paired supports up to 12 different colors. --- rserve/graphs.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index b862584..bf6f8c7 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -385,9 +385,9 @@ plot_versions <- function(start, end, path) { s <- data.frame(date = as.Date(s$date, "%Y-%m-%d"), version = s$version, relays = s$relays) known_versions <- c("0.1.0", "0.1.1", "0.1.2", "0.2.0", "0.2.1", - "0.2.2", "0.2.3", "0.2.4") + "0.2.2", "0.2.3", "0.2.4", "0.2.5") colours <- data.frame(breaks = known_versions, - values = brewer.pal(length(known_versions), "Accent"), + values = brewer.pal(length(known_versions), "Paired"), stringsAsFactors = FALSE) versions <- s[s$version %in% known_versions, ] visible_versions <- sort(unique(versions$version))

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere version.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 502c3bab938b7181c3c5b0c64562b8e88759d6d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Dec 8 21:09:48 2013 -0800 Bump HTTPS-Everywhere version. This makes use of a custom HTTPS-Everywhere release that has better support for enabling/disabling mixed content blocking and associated broken rulesets. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fdbabfc..b8d8b82 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ TOR_TAG=tor-0.2.4.18-rc OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=3.4.2 +HTTPSE_TAG=3.4.4tbb NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[torbutton/master] Bug #8167: Update cache isolation to use getFirstPartyURIFromChannel()
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 46dda37f29379b74cb43460befd90792065df8e9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Sun Dec 8 21:08:37 2013 -0800 Bug #8167: Update cache isolation to use getFirstPartyURIFromChannel() Required for cache isolation under FF24. --- src/chrome/content/stanford-safecache.js | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index 48f6d88..0ef52ad 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -61,7 +61,10 @@ function SSC_dump(msg) { function SSC_RequestListener(controller) { this.controller = controller; - this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"].getService(Ci.nsICookiePermission); + this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. + getService(Ci.mozIThirdPartyUtil); + this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. + getService(Ci.nsICookiePermission); } SSC_RequestListener.prototype = @@ -77,11 +80,13 @@ SSC_RequestListener.prototype = subject.QueryInterface(Components.interfaces.nsIHttpChannel); subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); subject.QueryInterface(Components.interfaces.nsICachingChannel); + subject.QueryInterface(Components.interfaces.nsIChannel); this.onModifyRequest(subject); } else if (topic == 'http-on-examine-response') { subject.QueryInterface(Components.interfaces.nsIHttpChannel); subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); subject.QueryInterface(Components.interfaces.nsICachingChannel); + subject.QueryInterface(Components.interfaces.nsIChannel); this.onExamineResponse(subject); } } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} @@ -135,13 +140,22 @@ SSC_RequestListener.prototype = } else if(!parent_host) { // Questionable first party interaction.. try { - var anuri = this.cookie_permissions.getOriginatingURI(channel); + var anuri = null; + try { + anuri = this.thirdPartyUtil.getFirstPartyURIFromChannel(channel, false); + } catch (e) { + torbutton_safelog(2, "FirstParty API failed to get parent: "+e+" ", channel.URI.spec); + // We are not using the TBB based on ESR 24. Falling back to the old + // method. + anuri = this.cookie_permissions.getOriginatingURI(channel); + } parent_host = anuri.host; parent_spec = anuri.spec; } catch(e) { - torbutton_safelog(2, "Cookie API failed to get parent: "+e,channel.URI.spec); + // XXX: This can still fail for OCSP and other windowless requests.. + torbutton_safelog(3, "Cookie API failed to get parent: "+e+" ",channel.URI.spec); if (!channel.referrer) { - torbutton_safelog(3, "SSC: No parent for ", channel.URI.spec); + torbutton_safelog(3, "SSC: No cache isolation parent for ", channel.URI.spec); } else { parent_host = channel.referrer.host; parent_spec = channel.referrer.spec;

1 0

[tor-browser/tor-browser-24.1.1esr-1] fixup! Add mozIThirdPartyUtil.getFirstPartyURI API
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 2df3a6e502c52c4a8e3bc34921aad0eda80af340 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Dec 6 10:54:24 2013 -0500 fixup! Add mozIThirdPartyUtil.getFirstPartyURI API Add mozIThirdPartyUtil.getFirstPartyURIFromChannel() API. Marked getFirstPartyURI() as [noscript] since it cannot be called from JS due to its use of an nsIDocument parameter. See Tor bug # 8167. --- content/base/src/ThirdPartyUtil.cpp | 20 +++++++++++++++++++- content/base/src/ThirdPartyUtil.h | 2 ++ netwerk/base/public/mozIThirdPartyUtil.idl | 24 ++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 6c17974..55eb316 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -411,11 +411,21 @@ ThirdPartyUtil::GetBaseDomain(nsIURI* aHostURI, return NS_OK; } +// Not scriptable due to the use of an nsIDocument parameter. NS_IMETHODIMP ThirdPartyUtil::GetFirstPartyURI(nsIChannel *aChannel, nsIDocument *aDoc, nsIURI **aOutput) { + return GetFirstPartyURIInternal(aChannel, aDoc, true, aOutput); +} + +nsresult +ThirdPartyUtil::GetFirstPartyURIInternal(nsIChannel *aChannel, + nsIDocument *aDoc, + bool aLogErrors, + nsIURI **aOutput) +{ nsresult rv = NS_ERROR_NULL_POINTER; if (!aOutput) @@ -490,7 +500,7 @@ ThirdPartyUtil::GetFirstPartyURI(nsIChannel *aChannel, } // Log failure to error console. - if (NS_FAILED(rv)) { + if (aLogErrors && NS_FAILED(rv)) { nsCOMPtr<nsIConsoleService> console (do_GetService(NS_CONSOLESERVICE_CONTRACTID)); if (console) { @@ -525,6 +535,14 @@ ThirdPartyUtil::GetFirstPartyURI(nsIChannel *aChannel, } NS_IMETHODIMP +ThirdPartyUtil::GetFirstPartyURIFromChannel(nsIChannel *aChannel, + bool aLogErrors, + nsIURI **aOutput) +{ + return GetFirstPartyURIInternal(aChannel, nullptr, aLogErrors, aOutput); +} + +NS_IMETHODIMP ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, nsACString& aHost) { diff --git a/content/base/src/ThirdPartyUtil.h b/content/base/src/ThirdPartyUtil.h index 93d3e1f..8777f44 100644 --- a/content/base/src/ThirdPartyUtil.h +++ b/content/base/src/ThirdPartyUtil.h @@ -30,6 +30,8 @@ private: bool SchemeIsWhiteListed(nsIURI *aURI); static already_AddRefed<nsIURI> GetURIFromWindow(nsIDOMWindow* aWin); static nsresult GetOriginatingURI(nsIChannel *aChannel, nsIURI **aURI); + nsresult GetFirstPartyURIInternal(nsIChannel *aChannel, nsIDocument *aDoc, + bool aLogErrors, nsIURI **aOutput); nsCOMPtr<nsIEffectiveTLDService> mTLDService; nsCOMPtr<nsICookiePermission> mCookiePermissions; diff --git a/netwerk/base/public/mozIThirdPartyUtil.idl b/netwerk/base/public/mozIThirdPartyUtil.idl index b602ac3..6137274 100644 --- a/netwerk/base/public/mozIThirdPartyUtil.idl +++ b/netwerk/base/public/mozIThirdPartyUtil.idl @@ -161,8 +161,28 @@ interface mozIThirdPartyUtil : nsISupports * @throws if the URI cannot be obtained or the URI lacks a hostname and the * URI's scheme is not white listed. */ - nsIURI getFirstPartyURI(in nsIChannel aChannel, - in nsIDocument aDoc); + [noscript] nsIURI getFirstPartyURI(in nsIChannel aChannel, + in nsIDocument aDoc); + + /** + * getFirstPartyURIFromChannel + * + * Obtain the top-level url bar URI for a channel. + * + * @param aChannel + * An arbitrary channel for some content element of a first party + * load. + * + * @param aLogErrors + * If true, log errors to the Error Console. + * + * @return the first party url bar URI for the load. + * + * @throws if the URI cannot be obtained or the URI lacks a hostname and the + * URI's scheme is not white listed. + */ + nsIURI getFirstPartyURIFromChannel(in nsIChannel aChannel, + in bool aLogErrors); /** * getFirstPartyHostForIsolation

1 0

[tor-browser-bundle/master] Record tor-browser commit in bundle.inputs.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 28acf4aca081bceb84d2c3d178987fe094574b01 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Dec 8 20:31:02 2013 -0800 Record tor-browser commit in bundle.inputs. How did we leave this out? --- gitian/record-inputs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/record-inputs.sh b/gitian/record-inputs.sh index 4fc79dd..0d44b1a 100755 --- a/gitian/record-inputs.sh +++ b/gitian/record-inputs.sh @@ -48,6 +48,7 @@ fi echo "`cd zlib && git log --format=%H -1 $ZLIB_TAG` zlib.git" >> bundle.inputs echo "`cd tor && git log --format=%H -1 $TOR_TAG` tor.git" >> bundle.inputs +echo "`cd tor-browser && git log --format=%H -1 $TORBROWSER_TAG` tor-browser.git" >> bundle.inputs echo "`cd torbutton && git log --format=%H -1 $TORBUTTON_TAG` torbutton.git" >> bundle.inputs echo "`cd tor-launcher && git log --format=%H -1 $TORLAUNCHER_TAG` tor-launcher.git" >> bundle.inputs echo "`cd https-everywhere && git log --format=%H -1 $HTTPSE_TAG` https-everywhere.git" >> bundle.inputs

1 0

[tor-browser/tor-browser-24.1.1esr-1] Bug 10252: backout of Mozilla's #872649 as this breaks TBB on Windows
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit a03b3123483bc1e79cf9da7a491ab4b9340cc41e Author: Georg Koppen <g.koppen(a)jondos.de> Date: Sun Dec 8 13:51:49 2013 +0100 Bug 10252: backout of Mozilla's #872649 as this breaks TBB on Windows --- configure.in | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index 7569b26..e4e78d2 100644 --- a/configure.in +++ b/configure.in @@ -9400,29 +9400,20 @@ if test -z "$MOZ_NATIVE_NSPR"; then fi ac_configure_args="$ac_configure_args $NSPR_CONFIGURE_ARGS" - # Save these, so we can mess with them for the subconfigure .. - _SAVE_CFLAGS="$CFLAGS" - _SAVE_CPPFLAGS="$CPPFLAGS" - _SAVE_LDFLAGS="$LDFLAGS" - if test -n "$MOZ_LINKER" -a "$ac_cv_func_dladdr" = no ; then # dladdr is supported by the new linker, even when the system linker doesn't # support it. Trick nspr into using dladdr when it's not supported. + _SAVE_CPPFLAGS="$CPPFLAGS" export CPPFLAGS="-include $_topsrcdir/mozglue/linker/dladdr.h $CPPFLAGS" fi + _SAVE_LDFLAGS="$LDFLAGS" export LDFLAGS="$LDFLAGS $NSPR_LDFLAGS" - export CFLAGS="$CFLAGS $MOZ_FRAMEPTR_FLAGS" - AC_OUTPUT_SUBDIRS(nsprpub) - - # .. and restore them - unset CFLAGS - unset CPPFLAGS - unset LDFLAGS - CFLAGS="$_SAVE_CFLAGS" - CPPFLAGS="$_SAVE_CPPFLAGS" LDFLAGS="$_SAVE_LDFLAGS" - + if test -n "$MOZ_LINKER" -a "$ac_cv_func_dladdr" = no; then + unset CPPFLAGS + CPPFLAGS="$_SAVE_CFLAGS" + fi ac_configure_args="$_SUBDIR_CONFIG_ARGS" fi

1 0

[tor-browser-bundle/master] Update the Gitian Firefox descriptor for Mac OS X
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 7e4c6fd54c0ec46a2ccfceca5b6e9c649572dec4 Author: Georg Koppen <georg(a)getfoxyproxy.org> Date: Mon Dec 2 05:26:17 2013 -0800 Update the Gitian Firefox descriptor for Mac OS X Should now be able to build with our new cross-compiler for Firefox 24 ESRs. --- gitian/descriptors/mac/gitian-firefox.yml | 38 +++++++++++------------------ gitian/make-vms.sh | 9 +++++++ gitian/versions.alpha | 6 ++--- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index d6e5b4a..74b4287 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -3,8 +3,8 @@ name: "torbrowser-mac" suites: - "precise" architectures: -- "i386" -packages: +- "amd64" +packages: - "git-core" - "unzip" - "zip" @@ -12,7 +12,7 @@ packages: - "autoconf2.13" - "faketime" - "yasm" -#- "libssl0.9.8" +- "zlib1g-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -20,26 +20,17 @@ remotes: files: - "torbrowser.version" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" -- "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" -- "i686-apple-darwin11-gcc" -- "i686-apple-darwin11-g++" -- "i686-apple-darwin11-ld" +- "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" - "python.tar.bz2" - "versions" -#- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" -#- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" script: | INSTDIR="$HOME/install/" source versions export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC - export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" - export CXXFLAGS=$CFLAGS - export LDFLAGS=$CFLAGS - export PATH="$PATH:/usr/apple-osx/bin/" export LC_ALL=C umask 0022 # @@ -60,14 +51,13 @@ script: | fi # sudo dpkg -i *.deb - chmod 755 i686* - sudo cp i686* /usr/bin/ - cd /usr - sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz - cd ~/build + tar -xavf x86_64-apple-darwin10.tar.xz + # XXX: Needed for the otool patch. But we should replace that one with a + # better solution. See: comment 15 in + # https://bugzilla.mozilla.org/show_bug.cgi?id=936115 + export PATH=$PATH:/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin # FIXME: path hacks: sudo mkdir -p /System/Library/ - sudo ln -s /usr/apple-osx/bin/i686-apple-darwin11-otool /usr/bin/otool sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/ /System/Library/ @@ -88,16 +78,16 @@ script: | make -f client.mk configure find -type f | xargs touch --date="$REFERENCE_DATETIME" # - # XXX: Probably should fix this some other way than just letting it fail once.. - make $MAKEOPTS -f client.mk build HOST_CFLAGS="" HOST_CXXFLAGS="" # || true - #make $MAKEOPTS -f client.mk build HOST_CFLAGS="" HOST_CXXFLAGS="" CC="apple-osx-gcc $CFLAGS" + make $MAKEOPTS -f client.mk build # - make -C obj-* package INNER_MAKE_PACKAGE=true - cp -a obj-*/dist/firefox/* $INSTDIR + make -C obj-macos package INNER_MAKE_PACKAGE=true + cp -a obj-macos/dist/firefox/* $INSTDIR # Remove firefox-bin (we don't use it, see ticket #10126) rm -f $INSTDIR/Browser/firefox-bin # cd $INSTDIR + # XXX: Find a better way to tell that we are having a 32bit build + GBUILD_BITS=32 ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja if [ -f TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then # FF24 includes a third .ja diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index d5615a6..d4902ce 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -81,3 +81,12 @@ do echo done +while ! build_and_test_vm precise amd64 64 +do + stop-target 64 precise + rm ./base-precise-amd64* + echo + echo "Lucid amd64 VM build failed... Trying again" + echo +done + diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ab6e9cb..0f843c5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ PYTHON_VER=2.7.5 ## File names for the source packages # OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi -TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -36,14 +36,14 @@ PYTHON_PACKAGE=Python-${PYTHON_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs # OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc -TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 +TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs # OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} -TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACKAGE} +TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_PACKAGE} 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}

1 0

[tor-browser-bundle/master] Build Torbutton and Tor Launcher from master for now.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 5abedb0fcb28187bf306f7baf939ffac7502aeba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 3 02:24:56 2013 -0800 Build Torbutton and Tor Launcher from master for now. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 0f843c5..78033c1 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -6,8 +6,8 @@ VERIFY_TAGS=0 TORBROWSER_TAG=tor-browser-24.1.1esr-1 TOR_TAG=tor-0.2.4.18-rc OPENSSL_TAG=openssl-101e-no-gmt-time-v1 -TORLAUNCHER_TAG=0.2.3.2-rc -TORBUTTON_TAG=1.6.4.1 +TORLAUNCHER_TAG=master +TORBUTTON_TAG=master HTTPSE_TAG=3.4.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Disable HTTPS-Everywhere's first run tooltips.
by mikeperry＠torproject.org 09 Dec '13

09 Dec '13

commit 5153caee05ee3fdb8d84a7e2aacb1af1c91fd61b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Dec 3 05:25:05 2013 -0800 Disable HTTPS-Everywhere's first run tooltips. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index dff61f5..206f868 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -13,6 +13,7 @@ pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); diff --git a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js index dff61f5..206f868 100644 --- a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js @@ -13,6 +13,7 @@ pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index dff61f5..206f868 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -13,6 +13,7 @@ pref("extensions.torbutton.tz_string", "UTC+00:00"); # HTTPS Everywhere Preferences: pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess");

1 0