July 2014 - tor-commits - lists.torproject.org

[stem/master] Fixing Socket module's header links
by atagar＠torproject.org 18 Jul '14

18 Jul '14

commit 1fc4bb4b12e27e851e987e7cfeb8522c29552e41 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 18 09:29:24 2014 -0700 Fixing Socket module's header links When moving documentation from our FAQ to socket module we didn't adjust the link paths to be accurate... Line: 92 https://stem.torproject.org/api/api/control.html Status: 404 Not Found Line: 92 https://stem.torproject.org/api/tutorials.html Status: 404 Not Found --- stem/socket.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index fe17380..1d664c0 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -7,8 +7,8 @@ allows us to send messages as basic strings, and receive responses as :class:`~stem.response.ControlMessage` instances. **This module only consists of low level components, and is not intended for -users.** See our `tutorials <tutorials.html>`_ and `Control Module -<api/control.html>`_ if you're new to Stem and looking to get started. +users.** See our `tutorials <../tutorials.html>`_ and `Control Module +<control.html>`_ if you're new to Stem and looking to get started. With that aside, these can still be used for raw socket communication with Tor...

1 0

[stem/master] Drop references to print.css and theme_extras.js
by atagar＠torproject.org 18 Jul '14

18 Jul '14

commit b61039c8de5e6ca67276e0e20159e7d59d49dbea Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 18 09:25:21 2014 -0700 Drop references to print.css and theme_extras.js Our Haiku theme has references to a print.css and theme_extras.js but those resources don't exist. Caught thanks to a quick run of the W3C broken link checker... Line: 29 https://stem.torproject.org/_static/theme_extras.js Status: 404 Not Found Line: 15 https://stem.torproject.org/_static/print.css Status: 404 Not Found --- docs/_templates/layout.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 5f60231..00caace 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -8,8 +8,6 @@ :license: BSD, see LICENSE for details. #} {% extends "basic/layout.html" %} -{% set script_files = script_files + ['_static/theme_extras.js'] %} -{% set css_files = css_files + ['_static/print.css'] %} {# do not display relbars #} {% block relbar1 %}{% endblock %}

1 0

[stem/master] Fixing broken links
by atagar＠torproject.org 18 Jul '14

18 Jul '14

commit 14861679a24e0cfb5949da8fd90f3a3c45016dfb Merge: cf6ca1b e83d331 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 18 09:40:52 2014 -0700 Fixing broken links Correcting issues spotted by the W3C broken link checker... http://validator.w3.org/checklink docs/_templates/layout.html | 2 -- docs/faq.rst | 2 +- docs/tutorials/tortoise_and_the_hare.rst | 2 +- stem/socket.py | 4 ++-- stem/util/term.py | 8 ++++---- 5 files changed, 8 insertions(+), 10 deletions(-)

1 0

[stem/master] Adjusting for HTTP redirects
by atagar＠torproject.org 18 Jul '14

18 Jul '14

commit e83d3311406f35d57580e7b8cb42ae0a11d469b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 18 09:31:26 2014 -0700 Adjusting for HTTP redirects Adjusting our OFTC link since the old resource is now a redirect... Line: 479 http://www.oftc.net/oftc/ redirected to http://www.oftc.net/ Status: 301 -> 200 OK Python docs and PyPI now have a http => https redirects... Line: 102 http://docs.python.org/2/howto/curses.html redirected to https://docs.python.org/2/howto/curses.html Status: 301 -> 200 OK Line: 179 http://pypi.python.org/pypi/colorama redirected to https://pypi.python.org/pypi/colorama Status: 301 -> 200 OK Line: 178 http://pypi.python.org/pypi/termcolor redirected to https://pypi.python.org/pypi/termcolor Status: 301 -> 200 OK Django has moved its repository links to github... Line: 177 https://code.djangoproject.com/browser/django/trunk/django/utils/termcolors… redirected to https://github.com/django/django/tree/master/django/utils/termcolors.py Wikipedia doesn't have a separate subdomain for SSL... Line: https://secure.wikimedia.org/wikipedia/en/wiki/ANSI_escape_code redirected to https://en.wikipedia.org/wiki/ANSI_escape_code Status: 301 -> 200 OK --- docs/faq.rst | 2 +- docs/tutorials/tortoise_and_the_hare.rst | 2 +- stem/util/term.py | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 123002f..aa9b7f9 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -448,7 +448,7 @@ The best way of getting involved with any project is to jump right in! Our `bug tracker <https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs>`_ lists several development tasks. In particular look for the 'easy' keyword when getting started. If you have any questions then I'm always more than happy to -help! I'm **atagar** on `oftc <http://www.oftc.net/oftc/>`_ and also available +help! I'm **atagar** on `oftc <http://www.oftc.net/>`_ and also available `via email <https://www.atagar.com/contact/>`_. To start hacking on Stem please do the following and don't hesitate to let me diff --git a/docs/tutorials/tortoise_and_the_hare.rst b/docs/tutorials/tortoise_and_the_hare.rst index 50edba6..a458e0d 100644 --- a/docs/tutorials/tortoise_and_the_hare.rst +++ b/docs/tutorials/tortoise_and_the_hare.rst @@ -18,7 +18,7 @@ single dedicated event thread, and blocking this thread will prevent the delivery of further events. With that out of the way lets see an example. The following is a `curses -<http://docs.python.org/2/howto/curses.html>`_ application that graphs the +<https://docs.python.org/2/howto/curses.html>`_ application that graphs the bandwidth usage of Tor... .. image:: /_static/bandwidth_graph_output.png diff --git a/stem/util/term.py b/stem/util/term.py index 42e3fc4..869449a 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -68,12 +68,12 @@ RESET = CSI % '0' def format(msg, *attr): """ Simple terminal text formatting using `ANSI escape sequences - <https://secure.wikimedia.org/wikipedia/en/wiki/ANSI_escape_code#CSI_codes>`_. + <https://en.wikipedia.org/wiki/ANSI_escape_code#CSI_codes>`_. The following are some toolkits providing similar capabilities: - * `django.utils.termcolors <https://code.djangoproject.com/browser/django/trunk/django/utils/termcolors…>`_ - * `termcolor <http://pypi.python.org/pypi/termcolor>`_ - * `colorama <http://pypi.python.org/pypi/colorama>`_ + * `django.utils.termcolors <https://github.com/django/django/blob/master/django/utils/termcolors.py>`_ + * `termcolor <https://pypi.python.org/pypi/termcolor>`_ + * `colorama <https://pypi.python.org/pypi/colorama>`_ :param str msg: string to be formatted :param str attr: text attributes, this can be :data:`~stem.util.term.Color`,

1 0

[support-tools/master] rt-articles: fix path in README
by lunar＠torproject.org 18 Jul '14

18 Jul '14

commit b2fb521087af61de2b2a770d6b5bd53607373d70 Author: Lunar <lunar(a)torproject.org> Date: Fri Jul 18 15:56:56 2014 +0200 rt-articles: fix path in README --- rt-articles/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt-articles/README b/rt-articles/README index 7fb39c2..d89e94e 100644 --- a/rt-articles/README +++ b/rt-articles/README @@ -66,4 +66,4 @@ Also clone the script repository: And add the symlink: mkdir -p bin - ln -s ../support-tools/receive_rt_articles bin + ln -s ../support-tools/rt-articles/receive_rt_articles bin

1 0

[support-tools/master] Add scripts to monitor changes to RT articles
by lunar＠torproject.org 18 Jul '14

18 Jul '14

commit 26e45154a20650fa8d2ae2c2891f7aa864d7d750 Author: Lunar <lunar(a)torproject.org> Date: Fri Jul 18 15:54:13 2014 +0200 Add scripts to monitor changes to RT articles --- rt-articles/README | 69 +++++++++++++++++++++++++++++++++++++++ rt-articles/dump_rt_articles | 69 +++++++++++++++++++++++++++++++++++++++ rt-articles/push_rt_articles | 11 +++++++ rt-articles/receive_rt_articles | 19 +++++++++++ 4 files changed, 168 insertions(+) diff --git a/rt-articles/README b/rt-articles/README new file mode 100644 index 0000000..7fb39c2 --- /dev/null +++ b/rt-articles/README @@ -0,0 +1,69 @@ +This is a set of script to extract RT articles from the database and +track when they change. + +Setup notes +=========== + +Two systems are involved. rude.torproject.org which hosts RT and +perdulce.torproject.org which hosts people.torproject.org. We are going +to allow a very restricted push of data from the formor to the latter. + +On rude.torproject.org +---------------------- + +Create SSH key: + + ssh-keygen -t rsa -b 4096 -N '' -f .ssh/id_rsa_rt_articles + +Configure SSH (through `~/.ssh/config`): + + Host perdulce.torproject.org + BatchMode yes + IdentityFile ~/.ssh/id_rsa_rt_articles + +Add cron job: + + 17,47 * * * * /srv/rtstuff/support-tools/rt-articles/push_rt_articles + +On perdulce.torproject.org +-------------------------- + +Install the public key from rude. To do that, use email interface of +ud-ldap: <https://db.debian.org/doc-mail.html>. *But replace +`debian.org` with `torproject.org`!* + + ssh-rsa AAAA…== usual key + allowed_hosts=perdulce.debian.org from="rude.torproject.org",command="~/bin/receive_rt_articles",no-pty,no-port-forwarding ssh-rsa AAAA…== key from rude + +Create the Git repository: + + cd public_html + mkdir rt-articles.git && cd rt-articles.git + git init --bare + vi description + mv hooks/post-update.sample hooks/post-update + chmod +x hooks/post-update + +Configure the email notification: + + echo 'sh /usr/share/git-core/contrib/hooks/post-receive-email' >> hooks/post-receive + chmod +x hooks/post-receive + git config hooks.mailinglist lunar(a)torproject.org + git config hooks.envelopesender lunar+rt-articles(a)torproject.org + git config hooks.emailprefix '[RT Articles] ' + git config hooks.diffopts '--stat --summary --find-copies-harder -p' + +Do the initial clone: + + cd $HOME + git clone public_html/rt-articles.git + +Also clone the script repository: + + cd $HOME + git clone https://git.torproject.org/support-tools.git + +And add the symlink: + + mkdir -p bin + ln -s ../support-tools/receive_rt_articles bin diff --git a/rt-articles/dump_rt_articles b/rt-articles/dump_rt_articles new file mode 100755 index 0000000..b47bf2f --- /dev/null +++ b/rt-articles/dump_rt_articles @@ -0,0 +1,69 @@ +#!/usr/bin/python +# +# This program is free software. It comes without any warranty, to +# the extent permitted by applicable law. You can redistribute it +# and/or modify it under the terms of the Do What The Fuck You Want +# To Public License, Version 2, as published by Sam Hocevar. See +# http://sam.zoy.org/wtfpl/COPYING for more details. +# +# This script will dump all RT articles to a given directory. +# Ideally, the directory should be empty. + +import psycopg2 +import re +import sys +import os +import os.path + +RT_CONNINFO = "host=drobovi.torproject.org sslmode=require user=rtreader dbname=rt" + +SELECT_TRANSACTIONS_QUERY = """ +SELECT classes.name AS class, + articles.name AS title, + CASE WHEN objectcustomfieldvalues.content != '' THEN objectcustomfieldvalues.content + ELSE objectcustomfieldvalues.largecontent + END AS content, + objectcustomfieldvalues.lastupdated, + articles.id + FROM classes, articles, objectcustomfieldvalues + WHERE articles.class = classes.id + AND objectcustomfieldvalues.objecttype = 'RT::Article' + AND objectcustomfieldvalues.objectid = articles.id + AND objectcustomfieldvalues.id = ( + SELECT objectcustomfieldvalues.id + FROM objectcustomfieldvalues + WHERE objectcustomfieldvalues.objectid = articles.id + AND objectcustomfieldvalues.disabled = 0 + ORDER BY objectcustomfieldvalues.lastupdated DESC + LIMIT 1) + ORDER BY classes.id, articles.id +""" + +def slugify(title): + return re.sub(r'\W+', '-', title) + +def dump_rt_articles(con, path): + cur = con.cursor() + cur.execute(SELECT_TRANSACTIONS_QUERY) + for article_class, title, content, last_updated, article_id in cur: + class_slug = slugify(article_class) + class_dir = os.path.join(path, class_slug) + if not os.path.isdir(class_dir): + os.mkdir(class_dir) + filename = os.path.join(class_dir, "%03d_%s" % (article_id, slugify(title))) + with open(filename, 'w') as f: + f.write('Title: %s\n' % title) + f.write('Last-updated: %s\n\n' % last_updated) + f.write(content) + +if __name__ == '__main__': + if len(sys.argv) != 2: + print >>sys.stderr, "Usage: %s DIR" % (sys.argv[0]) + sys.exit(1) + path = sys.argv[1] + if not os.path.isdir(path): + print >>sys.stderr, "Usage: %s DIR" % (sys.argv[0]) + sys.exit(2) + con = psycopg2.connect(RT_CONNINFO) + dump_rt_articles(con, path) + con.close() diff --git a/rt-articles/push_rt_articles b/rt-articles/push_rt_articles new file mode 100755 index 0000000..a48b801 --- /dev/null +++ b/rt-articles/push_rt_articles @@ -0,0 +1,11 @@ +#!/bin/sh + +# To be run on rude.torproject.org from a cronjob + +set -e + +DIR=$(mktemp -d) +trap "rm -r '$DIR'" EXIT + +$(dirname "$0")/dump_rt_articles "$DIR" +tar -C "$DIR" -zcf - . | ssh perdulce.torproject.org bin/receive_rt_articles diff --git a/rt-articles/receive_rt_articles b/rt-articles/receive_rt_articles new file mode 100755 index 0000000..9e1fe68 --- /dev/null +++ b/rt-articles/receive_rt_articles @@ -0,0 +1,19 @@ +#!/bin/sh + +# To be run from perdule.torproject.org through a restricted SSH command. +# stdin will be a gzipped tarball with the articles + +# Must be a Git repository +DEST="$HOME/rt-articles" + +set -e + +( +cd "$DEST" +git rm --quiet --force -r . || true +tar -zxf - +git add . +git diff --cached --quiet || + git commit --quiet --author='An automated script <lunar+rt-articles(a)torproject.org>' -m "Update RT articles" +git push --quiet origin master +)

1 0

[tor-browser-bundle/master] Use -s when linking golang programs.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit a2010553088bdb19b0cdd3b022c882b90c7046b3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 17 14:35:38 2014 +0000 Use -s when linking golang programs. -s is "omit the symbol table and debug information." It saves a MB or so on linux64 according to tests at https://trac.torproject.org/projects/tor/ticket/12387#comment:7. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 4 ++-- gitian/descriptors/mac/gitian-pluggable-transports.yml | 4 ++-- gitian/descriptors/windows/gitian-pluggable-transports.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index aaaa0f8..f9e2b51 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -207,11 +207,11 @@ script: | cd meek find -type f | xargs touch --date="$REFERENCE_DATETIME" cd meek-client - go build + go build -ldflags '-s' cp -a meek-client $PTDIR cd .. cd meek-client-torbrowser - go build + go build -ldflags '-s' cp -a meek-client-torbrowser $PTDIR cd .. mkdir -p $INSTDIR/Docs/meek diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 51fe9d0..d0322f8 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -236,11 +236,11 @@ script: | cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. - go build + go build -ldflags '-s' cp -a meek-client $PTDIR cd .. cd meek-client-torbrowser - go build + go build -ldflags '-s' cp -a meek-client-torbrowser $PTDIR cd .. mkdir -p $TBDIR/Docs/meek diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index fc06cd9..341c6aa 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -304,15 +304,15 @@ script: | cd meek find -type f | xargs touch --date="$REFERENCE_DATETIME" cd meek-client - go build + go build -ldflags '-s' cp -a meek-client.exe $PTDIR cd .. cd meek-client-torbrowser - go build + go build -ldflags '-s' cp -a meek-client-torbrowser.exe $PTDIR cd .. cd terminateprocess-buffer - go build + go build -ldflags '-s' cp -a terminateprocess-buffer.exe $PTDIR cd .. mkdir -p $INSTDIR/Docs/meek

1 0

[tor-browser-bundle/master] Upgrade go to 1.3.
by gk＠torproject.org 18 Jul '14

18 Jul '14

commit 5ae0dd9faf3457d7302069345a366a92b8b3fde0 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 17 17:01:19 2014 +0000 Upgrade go to 1.3. The cross-cgo.patch file is deleted, because cgo in cross builds is fixed in 1.3. http://golang.org/doc/go1.3#gocmd https://code.google.com/p/go/issues/detail?id=4714#c28 The download page moved to http://golang.org/dl/. golang.org has https, but the Wget 1.13.4 from Ubuntu 12.04 doesn't have SNI support, which appears to be necessary: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653267 --2014-07-17 17:20:11-- https://golang.org/dl/go1.3.src.tar.gz Resolving golang.org (golang.org) 74.125.20.141, 2607:f8b0:400e:c01::8d Connecting to golang.org (golang.org)|74.125.20.141|:443... connected. ERROR: no certificate subject alternative name matches requested host name `golang.org'. To connect to golang.org insecurely, use `--no-check-certificate'. --- .../mac/gitian-pluggable-transports.yml | 20 ++++++++++---------- .../windows/gitian-pluggable-transports.yml | 20 +++++++++++--------- gitian/fetch-inputs.sh | 4 ++-- gitian/patches/cross-cgo.patch | 16 ---------------- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 6 +++--- gitian/versions.nightly | 6 +++--- 8 files changed, 35 insertions(+), 49 deletions(-) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 420b94d..51fe9d0 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -41,7 +41,6 @@ files: - "m2crypto.tar.gz" - "parsley.tar.gz" - "go.tar.gz" -- "cross-cgo.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -85,12 +84,13 @@ script: | export GOOS=darwin export GOARCH=386 tar xvf go.tar.gz - cd go - patch -p1 < ~/build/cross-cgo.patch - cd src - # Disable CC et al. that are set up for cross builds. (The Go compiler is a - # cross-compiler, but it needs to run on *this* host.) - CC= CFLAGS= LDFLAGS= LDSHARED= ./make.bash + cd go/src + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="$CC $CFLAGS $LDFLAGS" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" @@ -227,7 +227,7 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" - CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go install git.torproject.org/pluggable-transports/goptlib.git + go install git.torproject.org/pluggable-transports/goptlib.git cd .. # Building meek @@ -236,11 +236,11 @@ script: | cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. - CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go build + go build cp -a meek-client $PTDIR cd .. cd meek-client-torbrowser - CGO_ENABLED=1 CC="$CC $CFLAGS $LDFLAGS" go build + go build cp -a meek-client-torbrowser $PTDIR cd .. mkdir -p $TBDIR/Docs/meek diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index d68ace4..fc06cd9 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -48,7 +48,6 @@ files: - "python.msi" - "py2exe.exe" - "go.tar.gz" -- "cross-cgo.patch" - "dzip.sh" - "pyc-timestamp.sh" - "openssl-win32-utils.zip" @@ -139,10 +138,13 @@ script: | export GOOS=windows export GOARCH=386 tar xvf go.tar.gz - cd go - patch -p1 < ~/build/cross-cgo.patch - cd src - ./make.bash + cd go/src + # http://golang.org/cmd/cgo/: + # "To enable cgo during cross compiling builds, set the CGO_ENABLED + # environment variable to 1 when building the Go tools with make.bash. Also, + # set CC_FOR_TARGET to the C cross compiler for the target. CC will be used + # for compiling for the host." + CGO_ENABLED=1 CC_FOR_TARGET="i686-w64-mingw32-gcc" CC= CFLAGS= LDFLAGS= ./make.bash cd ../.. export PATH="$PATH:$PWD/go/bin" @@ -295,22 +297,22 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go install git.torproject.org/pluggable-transports/goptlib.git + go install git.torproject.org/pluggable-transports/goptlib.git cd .. # Building meek cd meek find -type f | xargs touch --date="$REFERENCE_DATETIME" cd meek-client - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build + go build cp -a meek-client.exe $PTDIR cd .. cd meek-client-torbrowser - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build + go build cp -a meek-client-torbrowser.exe $PTDIR cd .. cd terminateprocess-buffer - CGO_ENABLED=1 CC="i686-w64-mingw32-gcc" go build + go build cp -a terminateprocess-buffer.exe $PTDIR cd .. mkdir -p $INSTDIR/Docs/meek diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index d318fa5..086085c 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -158,7 +158,7 @@ done # XXX: Omit googlecode.com packages because Google won't allow wget -N # and because the download seems to 404 about 50% of the time. -for i in ARGPARSE GO +for i in ARGPARSE do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL_DCF}${!PACKAGE}" @@ -172,7 +172,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY GO do URL="${i}_URL" PACKAGE="${i}_PACKAGE" diff --git a/gitian/patches/cross-cgo.patch b/gitian/patches/cross-cgo.patch deleted file mode 100644 index eebe0d0..0000000 --- a/gitian/patches/cross-cgo.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/cmd/go/build.go 2014-02-17 05:38:55.806060278 +0000 -+++ b/src/cmd/go/build.go 2014-02-17 05:39:40.414057143 +0000 -@@ -1928,9 +1928,10 @@ - ) - - func (b *builder) cgo(p *Package, cgoExe, obj string, gccfiles []string, gxxfiles []string) (outGo, outObj []string, err error) { -- if goos != toolGOOS { -- return nil, nil, errors.New("cannot use cgo when compiling for a different operating system") -- } -+ // https://code.google.com/p/go/issues/detail?id=4714#c7 -+ // if goos != toolGOOS { -+ // return nil, nil, errors.New("cannot use cgo when compiling for a different operating system") -+ // } - - cgoCPPFLAGS := stringList(envList("CGO_CPPFLAGS"), p.CgoCPPFLAGS) - cgoCFLAGS := stringList(envList("CGO_CFLAGS"), p.CgoCFLAGS) diff --git a/gitian/versions b/gitian/versions index e1b4f55..0372cf7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,7 +89,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -114,4 +114,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… 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://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b406f45..6be86bd 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.3 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,7 +89,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -114,4 +114,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… 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://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index 2594f60..aedcf44 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -91,7 +91,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -116,4 +116,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… 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://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5398126..59c55dc 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -44,7 +44,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.3 -GO_VER=1.2 +GO_VER=1.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -89,7 +89,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=9ab83fb8eafe39f4204ef0f8e84e5ff7e8f1d533ddb05f51e6dc81503e8c0ae4 +GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -114,4 +114,4 @@ PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… 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://go.googlecode.com/files/${GO_PACKAGE} +GO_URL=http://golang.org/dl/${GO_PACKAGE}

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 18 Jul '14

18 Jul '14

commit f4d884b1b3cca5426ffba3247c9c31597c76689b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 18 05:45:44 2014 +0000 Update translations for torbutton-torbuttonproperties --- hi/torbutton.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hi/torbutton.properties b/hi/torbutton.properties index 62286bd..32bde7b 100644 --- a/hi/torbutton.properties +++ b/hi/torbutton.properties @@ -1,7 +1,7 @@ -torbutton.button.tooltip.disabled = Enable Tor -torbutton.button.tooltip.enabled = Disable Tor -torbutton.panel.tooltip.disabled = Click to enable Tor -torbutton.panel.tooltip.enabled = Click to disable Tor +torbutton.button.tooltip.disabled = टॉर सक्षम करें +torbutton.button.tooltip.enabled = टॉर अक्षम करें +torbutton.panel.tooltip.disabled = टॉर सक्षम करने के लिए क्लिक करें +torbutton.panel.tooltip.enabled = टॉर अक्षम करने के लिए क्लिक करें torbutton.panel.plugins.disabled = Click to enable plugins torbutton.panel.plugins.enabled = Click to disable plugins torbutton.panel.label.disabled = Tor Disabled

1 0

[meek/master] fmt.
by dcf＠torproject.org 18 Jul '14

18 Jul '14

commit 2ef6e31de94eb10d40464a38909373114ff44132 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jul 17 12:46:53 2014 -0700 fmt. --- meek-client/meek-client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index ff1ab04..5b62199 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -156,7 +156,7 @@ again: err = errors.New(fmt.Sprintf("status code was %d, not %d", resp.StatusCode, http.StatusOK)) if limit > 0 { log.Printf("%s; trying again after %.f seconds (%d)", err, retryDelay.Seconds(), limit) - time.Sleep(retryDelay); + time.Sleep(retryDelay) goto again } }

1 0