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

[oonib/master] Grab oonib's pid from the .pid file for the CI test process killer.
by isis＠torproject.org 04 May '13

04 May '13

commit 093ebaa25d28df96be2e54c23bc086009e80c772 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 21 07:56:05 2013 +0000 Grab oonib's pid from the .pid file for the CI test process killer. * travis-lint checks out okay: (oonib)∃!isisⒶwintermute:~/code/torproject/ooni-backend ∴ date Sun Apr 21 07:55:19 UTC 2013 (oonib)∃!isisⒶwintermute:~/code/torproject/ooni-backend ∴ travis-lint Hooray, /home/isis/code/torproject/ooni-backend/.travis.yml seems to be solid! --- .travis.test.sh | 2 +- .travis.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.test.sh b/.travis.test.sh index 8af421d..559b099 100755 --- a/.travis.test.sh +++ b/.travis.test.sh @@ -24,7 +24,7 @@ function waitforit () { waitforit $1& prog=$! ; shift ; trap "killitwithfire" ALRM INT -"$@" & wait $1 +"$@"& wait `cat oonib.pid` RET=$? kill -ALRM $prog wait $prog diff --git a/.travis.yml b/.travis.yml index ac0bd29..8d7a00e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,5 @@ script: - openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt - test -f "private.key.org" && rm -f private.key.org - test -f "server.csr" && rm -f server.csr - - chmod +x .travis.test.sh && ./.travis.test.sh 30 bin/oonib + - chmod +x .travis.test.sh && ./.travis.test.sh 30 ./bin/oonib + - echo "Build successful."

1 0

[oonib/master] Testing the ooni-backend continuous integration buildbot notifications.
by isis＠torproject.org 04 May '13

04 May '13

commit 75c95e5a36c87bc6c8b7905f836f51200241b8c3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 21 11:10:52 2013 +0000 Testing the ooni-backend continuous integration buildbot notifications. --- .travis.yml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d7a00e..0a42f4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,19 @@ language: python +notifications: + irc: + channels: + - "irc.oftc.net#tor-bots" + - "irc.oftc.net#ooni" + on_success: always + on_failure: always + email: + recipients: + - isis(a)torproject.org + - aagbsn(a)torproject.org + - ioerror(a)torproject.org + - hellais(a)torproject.org + on_success: change + on_failure: always before_install: - echo "deb http://deb.torproject.org/torproject.org wheezy main" | sudo tee -a /etc/apt/sources.list - gpg --keyserver keys.gnupg.net --recv 886DDD89

1 0

[oonib/master] Only kill it if we didn't already killitwithfire().
by isis＠torproject.org 04 May '13

04 May '13

commit aae56483be0322b1f76412cdb6065d5b4500fb3d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Apr 21 09:31:19 2013 +0000 Only kill it if we didn't already killitwithfire(). --- .travis.test.sh | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.test.sh b/.travis.test.sh index 4ffe8d3..d7f5092 100755 --- a/.travis.test.sh +++ b/.travis.test.sh @@ -15,19 +15,21 @@ set -vx -- function killitwithfire () { trap - ALRM kill -ALRM $prog 2>/dev/null - kill $! 2>/dev/null && exit 124 + kill -9 $! 2>/dev/null && exit 0 } function waitforit () { trap "killitwithfire" ALRM - sleep $1 & wait + sleep $1& wait kill -ALRM $$ } waitforit $1& prog=$! ; shift ; trap "killitwithfire" ALRM INT -"$@"& wait `cat oonib.pid` +"$@"& wait $! RET=$? -kill -ALRM $prog -wait $prog +if [[ "$(ps -ef | awk -v pid=$prog '$2==pid{print}{}')" != "" ]]; then + kill -ALRM $prog + wait $prog +fi exit $RET

1 0

[oonib/master] Re-add install_requires and install_dependencies
by isis＠torproject.org 04 May '13

04 May '13

commit 149d986bcd98513cd9864b96ad7846aeb0d1f783 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat May 4 15:51:08 2013 +0200 Re-add install_requires and install_dependencies Add a note stating that pip must be run before running the setup.py script --- README.md | 3 +++ setup.py | 46 +++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 90a3d1a..06d5013 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,9 @@ setting up this up and installing are: mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib # ...and install ooni-backend (sudo is not necessary since we're in a virtualenv): pip install -r requirements.txt --use-mirrors + # Note: it is important that you install the requirements before you run + # the setup.py script. If you fail to do so they will be downloaded over + # plaintext. python setup.py install # Running an OONI collector diff --git a/setup.py b/setup.py index e474b0d..6151a72 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,27 @@ from __future__ import with_statement from setuptools import setup, find_packages -#def get_requirements(): -# with open('requirements.txt', 'r') as f: -# requirements = f.read().splitlines() -# -# # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in -# # requirements.txt we need to add the package name to install_requires and -# # the entire url to dependency_links. That way setuptools will be able to -# # satisfy the dependency using that url (as long as it is in standard sdist -# # format, a single .py file or an egg). -# pypi_packages = [] -# dependency_links = [] -# for package_desc in requirements: -# if '#egg=' in package_desc: -# dependency_links.append(package_desc) -# pypi_packages.append(package_desc.split('#egg=')[-1]) -# else: -# pypi_packages.append(package_desc) -# -# return pypi_packages, dependency_links -# -#install_requires, dependency_links = get_requirements() +def get_requirements(): + with open('requirements.txt', 'r') as f: + requirements = f.read().splitlines() + + # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in + # requirements.txt we need to add the package name to install_requires and + # the entire url to dependency_links. That way setuptools will be able to + # satisfy the dependency using that url (as long as it is in standard sdist + # format, a single .py file or an egg). + pypi_packages = [] + dependency_links = [] + for package_desc in requirements: + if '#egg=' in package_desc: + dependency_links.append(package_desc) + pypi_packages.append(package_desc.split('#egg=')[-1]) + else: + pypi_packages.append(package_desc) + + return pypi_packages, dependency_links + +install_requires, dependency_links = get_requirements() setup( name="oonib", version="0.9", @@ -31,6 +31,6 @@ setup( description="OONI-Probe Backend", scripts=["bin/oonib"], packages=find_packages(), - #install_requires=install_requires, - #dependency_links=dependency_links, + install_requires=install_requires, + dependency_links=dependency_links, )

1 0

[oonib/master] Add pysqlite as a dependency
by isis＠torproject.org 04 May '13

04 May '13

commit 77ce7294cf9be3d7846eeef1abde445dafcc18d4 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat May 4 15:56:14 2013 +0200 Add pysqlite as a dependency --- requirements.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/requirements.txt b/requirements.txt index fd6fb4b..813d840 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,3 +22,4 @@ pyOpenSSL>=0.13 zope.component>=4.0.0 zope.event>=4.0.0 zope.interface>=4.0.1 +pysqlite

1 0

[oonib/master] Remove extra commands from the top of README.md.
by isis＠torproject.org 04 May '13

04 May '13

commit 52d058b7029bd2a350e533f096f147d11c1a5dc9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 4 13:57:22 2013 +0000 Remove extra commands from the top of README.md. --- README.md | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 90a3d1a..ef9e9d5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ # Dependencies and Installation - - cp oonib.conf.example oonib.conf - - chmod +x .travis.test.sh && ./.travis.test.sh 30 ./bin/oonib - - echo "Build successful." ## Distro dependencies (Debian) There are a few dependencies which we recommend you get from your

1 0

[oonib/master] Add note about libyaml.h file in virtualenv.
by isis＠torproject.org 04 May '13

04 May '13

commit 30a1e07c7c063ba2dc2139900fc0788e5ae15aef Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 4 13:58:21 2013 +0000 Add note about libyaml.h file in virtualenv. --- scripts/init/initialize.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/init/initialize.sh b/scripts/init/initialize.sh index a5b8138..c15fdc5 100755 --- a/scripts/init/initialize.sh +++ b/scripts/init/initialize.sh @@ -4,6 +4,9 @@ # we should have everything in the virtualenv? Or do we need to also get some # system libraries? libyaml, anyone? # XXX: Can we get a newer version of libyaml from a fc-xx repo? +# +# we'll need libyaml.h from the system's libraries, afaik. i don't know what +# the fc* repos have though. --isis source /etc/mlab/slice-functions # 2. Generate a ssl certificate

1 0

[oonib/master] Add hack to allow running oonib
by isis＠torproject.org 04 May '13

04 May '13

commit 34c10dbc836709e7a2e885f304c8b6cc87b27223 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat May 4 15:56:25 2013 +0200 Add hack to allow running oonib --- bin/oonib | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/bin/oonib b/bin/oonib index f629ed7..cda5bc0 100755 --- a/bin/oonib +++ b/bin/oonib @@ -6,6 +6,10 @@ from twisted.python import log, usage from twisted.internet import reactor from twisted.application import app +# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. +sys.path[:] = map(os.path.abspath, sys.path) +sys.path.insert(0, os.path.abspath(os.getcwd())) + from oonib import runner, config from oonib.oonibackend import application

1 0

[atlas/master] Filled in some tooltip data.
by karsten＠torproject.org 04 May '13

04 May '13

commit ca8781c17eca008a93290434d9a7c8951c3d0f11 Author: Ben Cartwright Cox <ben(a)benjojo.co.uk> Date: Fri May 3 09:12:50 2013 -0500 Filled in some tooltip data. --- templates/details/main.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details/main.html b/templates/details/main.html index 38f890f..5d3f714 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -87,7 +87,7 @@ <dt>Descriptor Published</dt> <dd><%= relay.get('desc_published') %></dd> - <dt>Platform</dt> + <dt>Platform</dt> <dd><%= _.escape(relay.get('platform')) %></dd> </dl> @@ -98,7 +98,7 @@ <dt>Uptime</dt> <dd><%= relay.get('uptime_hrfull') %></dd> - <dt>Running</dt> + <dt>Running</dt> <dd><%= relay.get('running') %></dd> </div>

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 04 May '13

04 May '13

commit 912610be697f8e994a775ca35c7f4a6bff43fbb5 Author: Translation commit bot <translation(a)torproject.org> Date: Sat May 4 02:46:29 2013 +0000 Update translations for tor-launcher-properties_completed --- fr/torlauncher.properties | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties new file mode 100644 index 0000000..9a47316 --- /dev/null +++ b/fr/torlauncher.properties @@ -0,0 +1,30 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +torlauncher.error_title=Lanceur Tor + +torlauncher.tor_exited=Tor s'est fermé de manière innatendue. +torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor. +torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer. +torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor.\n\n%S + +torlauncher.unable_to_start_tor=Impossible de démarrer Tor. +torlauncher.tor_missing=L'exécutable Tor est introuvable. +torlauncher.torrc_missing=Le fichier torrc est manquant. +torlauncher.datadir_missing=Le répertoire de données Tor n'existe pas. +torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffré. + +torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S +torlauncher.failed_to_save_settings=Impossible de sauvegarder les paramètres de Tor.\n\n%S +torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancé. + +torlauncher.error_proxy_addr_missing=Vous devez spécifier une adresse IP ou un nom d'hôte et un numéro de port, pour configurer Tor afin qu'il utilise un proxy pour accéder à l'Internet. +torlauncher.error_proxy_type_missing=Vous devez sélectionner un type de proxy. +torlauncher.error_bridges_missing=Vous devez spécifier une ou plusieurs passerelles. + +torlauncher.connect=Connecter +torlauncher.quit=Quitter +torlauncher.quit_win=Sortir +torlauncher.done=Terminer + +torlauncher.forAssistance=Pour obtenir de l'aide contactez %S

1 0