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

[ooni-probe/master] Issues with GPG homedir
by art＠torproject.org 30 Dec '13

30 Dec '13

commit b503292ccfedadd3b6b63bf3121edf99cb708469 Author: anadahz <anadahz> Date: Mon Dec 30 03:50:19 2013 +0100 Issues with GPG homedir gpg: fatal: can't create directory `/home/root/.gnupg': No such file or directory --- setup-dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index 87a71aa..f2dac3c 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -426,8 +426,8 @@ install_pip_securely() { echo "[+] Verifying PGP signature of pip" echo "${PIP_PUB_KEY}" > ${PIP_KEY_FILE} - DO "gpg --no-default-keyring --keyring $TMP_KEYRING --import $PIP_KEY_FILE" "0" - DO "gpg --no-default-keyring --keyring $TMP_KEYRING --verify $PKG_VERIFY" "0" + DO "gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --import $PIP_KEY_FILE" "0" + DO "gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --verify $PKG_VERIFY" "0" DO "tar xzf ${BUILD_DIR}/${PIP_PKG}" "0" DO "cd pip-*" "0" @@ -462,8 +462,8 @@ case $DISTRO_VERSION in DO "chmod 700 ${BUILD_DIR}" "0" # Import the Tor public key - DO "gpg --no-default-keyring --keyring $TMP_KEYRING --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x886DDD89" "0" - gpg --no-default-keyring --keyring $TMP_KEYRING --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - + DO "gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x886DDD89" "0" + gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - HAVE_TOR_REPO="`grep deb.torproject.org/torproject.org /etc/apt/sources.list /etc/apt/sources.list.d/* 2>&1|grep torproject|head -n 1`"; if [ -z "$HAVE_TOR_REPO" ]; then

1 0

[ooni-probe/master] Remove package python-pypcap
by art＠torproject.org 30 Dec '13

30 Dec '13

commit 765778062be4e06b36d60b5d8e2ada4bda2e77a0 Author: anadahz <anadahz> Date: Mon Dec 30 03:55:17 2013 +0100 Remove package python-pypcap Conflicts: due to unmet dependencies --- setup-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index f2dac3c..ef3ab16 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -481,7 +481,7 @@ case $DISTRO_VERSION in echo "[+] Updating OS package list..."; apt-get update 2>&1 > /dev/null; echo "[+] Installing packages for your system..."; - DO "apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython tor tor-geoipdb" "0" + DO "apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap python-dnspython tor tor-geoipdb" "0" if [ "${INSTALL_PIP}" -eq "1" ] ; then echo "[+] Installing pip securely"

1 0

[ooni-probe/master] Use the latest version of pygeoip from the github repo
by art＠torproject.org 30 Dec '13

30 Dec '13

commit 41e4683b766c076d7bf7cae4b829f9d257e2b85c Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Dec 30 16:23:50 2013 +0100 Use the latest version of pygeoip from the github repo --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 815bb89..0c2f2e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,9 @@ argparse>=1.2.1 docutils>=0.9.1 ipaddr>=2.1.10 pyOpenSSL>=0.13 -pygeoip>=0.2.5 +# XXX fix this once the following issue is resolved: https://github.com/appliedsec/pygeoip/issues/56 +https://github.com/appliedsec/pygeoip/archive/master.zip +#pygeoip>=0.3.1 txtorcon>=0.7 txsocksx>=0.0.2 Pyrex>=0.9.8.6

1 0

[ooni-probe/master] Removed dated reference to subversion
by art＠torproject.org 30 Dec '13

30 Dec '13

commit bda7e8ec6c717f2e07f469a2d4ce00c8aa3bd9c0 Author: anadahz <anadahz@github> Date: Thu Dec 5 04:43:49 2013 +0100 Removed dated reference to subversion The subversion requirement was introduced in ba331316b0cff1d71fb477487da93be0b8494b8d for checking out pypcap. Commit 1b53eb99e6c384b7f43f45f306e209894c8476bb switch to using a git url. --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 3a471be..2d0aee1 100644 --- a/README.md +++ b/README.md @@ -225,12 +225,6 @@ up to date. The version of pypcap and libdnet ooniprobe is current tested with are libdnet-1.12 and pypcap 1.1, any other version should be considered untested. -If you don't already have Subversion installed: - -``` -sudo apt-get install subversion -``` - For libdnet: ```

1 0

[ooni-probe/master] Merge pull request #255 from anadahz/fix_README
by art＠torproject.org 30 Dec '13

30 Dec '13

commit 7819f1aad796e860fe2e9680c5cfe19f00005525 Merge: 9ac195b bda7e8e Author: aagbsn <aagbsn(a)extc.org> Date: Thu Dec 5 07:50:48 2013 -0800 Merge pull request #255 from anadahz/fix_README Removed dated reference to subversion README.md | 6 ------ 1 file changed, 6 deletions(-)

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 30 Dec '13

30 Dec '13

commit 0bffe9d61cab0f22d73425819b1a02e24a9fa175 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 30 15:16:40 2013 +0000 Update translations for tails-perl5lib_completed --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index f37c3ae..2ffea60 100644 --- a/de.po +++ b/de.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# to_ba, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:50+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" +"PO-Revision-Date: 2013-12-30 15:10+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,4 +22,4 @@ msgstr "" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Das Gerät von dem Tails ausgeführt wird konnte nicht gefunden werden. Haben Sie vielleicht die `toram' Option benutzt?" +msgstr "Das Gerät von dem Tails ausgeführt wird konnte nicht gefunden werden. Haben Sie vielleicht die »toram« Option benutzt?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 30 Dec '13

30 Dec '13

commit 097fba6c5102b9d7811cbfca6e22d135ed97a7d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 30 15:16:37 2013 +0000 Update translations for tails-perl5lib --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index f37c3ae..2ffea60 100644 --- a/de.po +++ b/de.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# to_ba, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2013-12-30 04:50+0000\n" -"Last-Translator: Phoul <colin(a)torproject.org>\n" +"PO-Revision-Date: 2013-12-30 15:10+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,4 +22,4 @@ msgstr "" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "Das Gerät von dem Tails ausgeführt wird konnte nicht gefunden werden. Haben Sie vielleicht die `toram' Option benutzt?" +msgstr "Das Gerät von dem Tails ausgeführt wird konnte nicht gefunden werden. Haben Sie vielleicht die »toram« Option benutzt?"

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 30 Dec '13

30 Dec '13

commit 5344db70f88786a1af6b13b3ec89751080831328 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 30 15:16:31 2013 +0000 Update translations for torbutton-browserproperties_completed --- de/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/browser.properties b/de/browser.properties index 7a83d9d..df47914 100644 --- a/de/browser.properties +++ b/de/browser.properties @@ -2,7 +2,7 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=de_DE # Default search engine browser.search.defaultenginename=Startseite

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 30 Dec '13

30 Dec '13

commit 26a06e39b2d612e98e43aee7674ed99205691b01 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 30 15:16:29 2013 +0000 Update translations for torbutton-browserproperties --- de/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/browser.properties b/de/browser.properties index 7a83d9d..df47914 100644 --- a/de/browser.properties +++ b/de/browser.properties @@ -2,7 +2,7 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=en_US +spellchecker.dictionary=de_DE # Default search engine browser.search.defaultenginename=Startseite

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 30 Dec '13

30 Dec '13

commit 60c501a526e814e1b53b7db46868577db70e4746 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 30 15:16:27 2013 +0000 Update translations for torbutton-branddtd_completed --- de/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/brand.dtd b/de/brand.dtd index 9bb86e1..febd197 100644 --- a/de/brand.dtd +++ b/de/brand.dtd @@ -5,4 +5,4 @@ <!ENTITY brandShortName "TorBrowser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor-Projekt"> -<!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> +<!ENTITY trademarkInfo.part1 "Firefox und die Firefox-Logos sind Warenzeichen der Mozilla Foundation.">

1 0