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

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 06 May '14

06 May '14

commit 622000edc3e083965f1d1681e4502142d0d5e014 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:45:36 2014 +0000 Update translations for tor-launcher-properties --- tr/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties index 1a0226b..a0d9e5a 100644 --- a/tr/torlauncher.properties +++ b/tr/torlauncher.properties @@ -41,8 +41,8 @@ torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuru torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelliyor torlauncher.bootstrapStatus.loading_status=Ağ yükleniyor torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını yüklüyor -torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor -torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor +torlauncher.bootstrapStatus.requesting_descriptors=Aktarıcı bilgisi isteniyor +torlauncher.bootstrapStatus.loading_descriptors=Aktarıcı bilgisi yükleniyor torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor torlauncher.bootstrapStatus.handshake_or=Tor ağına bağlantı sağlanıyor torlauncher.bootstrapStatus.done=Tor ağına bağlandı!

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 May '14

06 May '14

commit 8aae2de06a67048c0d040cf48795c64af0fe611b Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:45:17 2014 +0000 Update translations for torcheck_completed --- fr_CA/torcheck.po | 7 +++++-- tr/torcheck.po | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fr_CA/torcheck.po b/fr_CA/torcheck.po index 33b6f8a..b5b4b05 100644 --- a/fr_CA/torcheck.po +++ b/fr_CA/torcheck.po @@ -3,7 +3,7 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2012 -# bassmax <adr.poubelle(a)gmail.com>, 2013 +# bassmax, 2013 # Maijin <maijin21(a)gmail.com>, 2013 # Onizuka, 2013 # skhaen <skhaen(a)cyphercat.eu>, 2011 @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-02 18:40+0000\n" +"PO-Revision-Date: 2014-05-06 15:42+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -97,3 +97,6 @@ msgstr "JavaScript est activé." msgid "JavaScript is disabled." msgstr "JavaScript est désactivé." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Toutefois, ça ne semble pas être l'offre groupée de navigation Tor." diff --git a/tr/torcheck.po b/tr/torcheck.po index fed063e..8ddc096 100644 --- a/tr/torcheck.po +++ b/tr/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 15:13+0000\n" +"PO-Revision-Date: 2014-05-06 15:30+0000\n" "Last-Translator: Hakan Tekcan\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgid "" msgstr "Bir Tor kullanıcısı olmak istiyorsanız <a href=\"https://www.torproject.org/\">Tor websitesini</a> ve özellikle <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">Tor istemcisi yapılandırma talimatları</a> sayfasını inceleyiniz." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Üzgünüm, yapmış olduğunuz sorgu beklenmeyen şekilde sonuçlandı." +msgstr "Üzgünüz, yapmış olduğunuz sorgulama başarısız oldu ya da beklenmeyen bir cevap alındı." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -70,7 +70,7 @@ msgstr "Bu aynadan çıkma hakkında bilgi için, bkz:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy." +msgstr "Tor Projesi kendini çevrimiçi gizliliğin ve mahremiyetin araştırılmasına, geliştirilmesine ve eğitimine adamış ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur." msgid "Learn More »" msgstr "Daha Fazlasını Öğrenin »"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 May '14

06 May '14

commit 1de465d2c945a97a6dcda1c05351190c938007d9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:45:14 2014 +0000 Update translations for torcheck --- fr_CA/torcheck.po | 6 +++--- tr/torcheck.po | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA/torcheck.po b/fr_CA/torcheck.po index 623e512..b5b4b05 100644 --- a/fr_CA/torcheck.po +++ b/fr_CA/torcheck.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 15:42+0000\n" +"Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,4 +99,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript est désactivé." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Toutefois, ça ne semble pas être l'offre groupée de navigation Tor." diff --git a/tr/torcheck.po b/tr/torcheck.po index fed063e..8ddc096 100644 --- a/tr/torcheck.po +++ b/tr/torcheck.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 15:13+0000\n" +"PO-Revision-Date: 2014-05-06 15:30+0000\n" "Last-Translator: Hakan Tekcan\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgid "" msgstr "Bir Tor kullanıcısı olmak istiyorsanız <a href=\"https://www.torproject.org/\">Tor websitesini</a> ve özellikle <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">Tor istemcisi yapılandırma talimatları</a> sayfasını inceleyiniz." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Üzgünüm, yapmış olduğunuz sorgu beklenmeyen şekilde sonuçlandı." +msgstr "Üzgünüz, yapmış olduğunuz sorgulama başarısız oldu ya da beklenmeyen bir cevap alındı." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -70,7 +70,7 @@ msgstr "Bu aynadan çıkma hakkında bilgi için, bkz:" msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy." +msgstr "Tor Projesi kendini çevrimiçi gizliliğin ve mahremiyetin araştırılmasına, geliştirilmesine ve eğitimine adamış ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur." msgid "Learn More »" msgstr "Daha Fazlasını Öğrenin »"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 06 May '14

06 May '14

commit f30843ce1e649f9c93ba3f0523b05a9cca10bbc1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:45:09 2014 +0000 Update translations for gettor_completed --- tr/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/gettor.po b/tr/gettor.po index dfe4a2d..5ba95f7 100644 --- a/tr/gettor.po +++ b/tr/gettor.po @@ -7,14 +7,15 @@ # ercan <ercerden(a)gmail.com>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # emrahunsur <meu(a)emrahunsur.com>, 2014 +# Hakan Tekcan, 2014 # volkangezer <volkangezer(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-03-31 01:10+0000\n" -"Last-Translator: volkangezer <volkangezer(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 15:40+0000\n" +"Last-Translator: Hakan Tekcan\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +250,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Eğer İnternet bağlantınız Tor ağına ulaşımınızı engellerse bir köprü bağlantı noktası ihtiyacınız olabilir. Köprü bağlantı noktaları (kısaca: Köprüler) Tor ana dizininde listelenmemiş bağlantı noktalarıdır. Bunların tam bir listesi yayınlanmadığından servis sağlayıcınız bilinen her bağlantı noktasına ulaşımı engellese bile tüm köprülere ulaşımı engelleyemez." +msgstr "Eğer İnternet bağlantınız Tor ağına ulaşımınızı engellerse bir köprü aktarıcı noktasına ihtiyacınız olabilir. Köprü aktarıcı noktaları (kısaca: köprüler) ana dizinde listelenmemiş Tor aktarıcılarıdır. Bunların tam bir listesi yayınlanmadığından servis sağlayıcınız bilinen her Tor aktarıcısına bağlantıyı engelliyor olsa bile tüm köprülere ulaşımı engelleyemeyecektir." #: lib/gettor/i18n.py:167 msgid ""

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 06 May '14

06 May '14

commit 895f7158101d8c43519f9880f6d7b3152f655218 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:45:05 2014 +0000 Update translations for gettor --- tr/gettor.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tr/gettor.po b/tr/gettor.po index dfe4a2d..5ba95f7 100644 --- a/tr/gettor.po +++ b/tr/gettor.po @@ -7,14 +7,15 @@ # ercan <ercerden(a)gmail.com>, 2013 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # emrahunsur <meu(a)emrahunsur.com>, 2014 +# Hakan Tekcan, 2014 # volkangezer <volkangezer(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-03-31 01:10+0000\n" -"Last-Translator: volkangezer <volkangezer(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 15:40+0000\n" +"Last-Translator: Hakan Tekcan\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +250,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Eğer İnternet bağlantınız Tor ağına ulaşımınızı engellerse bir köprü bağlantı noktası ihtiyacınız olabilir. Köprü bağlantı noktaları (kısaca: Köprüler) Tor ana dizininde listelenmemiş bağlantı noktalarıdır. Bunların tam bir listesi yayınlanmadığından servis sağlayıcınız bilinen her bağlantı noktasına ulaşımı engellese bile tüm köprülere ulaşımı engelleyemez." +msgstr "Eğer İnternet bağlantınız Tor ağına ulaşımınızı engellerse bir köprü aktarıcı noktasına ihtiyacınız olabilir. Köprü aktarıcı noktaları (kısaca: köprüler) ana dizinde listelenmemiş Tor aktarıcılarıdır. Bunların tam bir listesi yayınlanmadığından servis sağlayıcınız bilinen her Tor aktarıcısına bağlantıyı engelliyor olsa bile tüm köprülere ulaşımı engelleyemeyecektir." #: lib/gettor/i18n.py:167 msgid ""

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 May '14

06 May '14

commit 12dadaf7ebc3ba0497a759569ea80dbaa616fbc2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:15:13 2014 +0000 Update translations for torcheck_completed --- tr/torcheck.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tr/torcheck.po b/tr/torcheck.po index 2365d89..fed063e 100644 --- a/tr/torcheck.po +++ b/tr/torcheck.po @@ -4,13 +4,14 @@ # Translators: # canacar <canacar(a)gmail.com>, 2012 # erg26 <ergungorler(a)gmail.com>, 2012 +# Hakan Tekcan, 2014 # volkangezer <volkangezer(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-02-08 18:10+0000\n" -"Last-Translator: volkangezer <volkangezer(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 15:13+0000\n" +"Last-Translator: Hakan Tekcan\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">İndirme sayfasına gitmek için tıklayın</a>" msgid "Sorry. You are not using Tor." -msgstr "Üzgünüm. Tor kullanmıyorsunuz." +msgstr "Üzgünüz. Tor kullanmıyorsunuz." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -94,3 +95,6 @@ msgstr "JavaScript etkin." msgid "JavaScript is disabled." msgstr "JavaScript devre dışı." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Fakat, Tor Tarayıcı Paketiymiş gibi görünmüyor."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 May '14

06 May '14

commit 34112488058f57bb1126ec82c892d6dfac11b92f Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 6 15:15:11 2014 +0000 Update translations for torcheck --- tr/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tr/torcheck.po b/tr/torcheck.po index 68fc8d6..fed063e 100644 --- a/tr/torcheck.po +++ b/tr/torcheck.po @@ -4,13 +4,14 @@ # Translators: # canacar <canacar(a)gmail.com>, 2012 # erg26 <ergungorler(a)gmail.com>, 2012 +# Hakan Tekcan, 2014 # volkangezer <volkangezer(a)gmail.com>, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-05-06 15:13+0000\n" +"Last-Translator: Hakan Tekcan\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +38,7 @@ msgid "" msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">İndirme sayfasına gitmek için tıklayın</a>" msgid "Sorry. You are not using Tor." -msgstr "Üzgünüm. Tor kullanmıyorsunuz." +msgstr "Üzgünüz. Tor kullanmıyorsunuz." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -96,4 +97,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript devre dışı." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Fakat, Tor Tarayıcı Paketiymiş gibi görünmüyor."

1 0

[tor-browser-bundle/master] Make PT tags explicitly be git tag refs.
by mikeperry＠torproject.org 06 May '14

06 May '14

commit d1c5a171239d9a2a0a42b3d751ad38fee5bc6a90 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 6 07:57:56 2014 -0700 Make PT tags explicitly be git tag refs. Otherwise, alternate named refs can be inserted and used instead. --- gitian/mkbundle-linux.sh | 3 +++ gitian/mkbundle-mac.sh | 3 +++ gitian/mkbundle-windows.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 6101971..fc88092 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -91,6 +91,9 @@ then HTTPSE_TAG=refs/tags/$HTTPSE_TAG ZLIB_TAG=refs/tags/$ZLIB_TAG LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG + PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG + OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG + FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG fi cd $GITIAN_DIR diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 7681ed4..8d3c73e 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -93,6 +93,9 @@ then HTTPSE_TAG=refs/tags/$HTTPSE_TAG ZLIB_TAG=refs/tags/$ZLIB_TAG LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG + PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG + OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG + FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG fi cd $GITIAN_DIR diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index bf6a5d4..4a176bf 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -88,6 +88,9 @@ then HTTPSE_TAG=refs/tags/$HTTPSE_TAG ZLIB_TAG=refs/tags/$ZLIB_TAG LIBEVENT_TAG=refs/tags/$LIBEVENT_TAG + PYPTLIB_TAG=refs/tags/$PYPTLIB_TAG + OBFSPROXY_TAG=refs/tags/$OBFSPROXY_TAG + FLASHPROXY_TAG=refs/tags/$FLASHPROXY_TAG fi cd $GITIAN_DIR

1 0

[tor-browser-bundle/master] Bug 11771: Verify all tags/hashes prior to each build invocation.
by mikeperry＠torproject.org 06 May '14

06 May '14

commit 0f6800a9fe4225915014140077e4ea1ec5919eb5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 6 07:14:49 2014 -0700 Bug 11771: Verify all tags/hashes prior to each build invocation. Only if VERIFY_TAGS=1 is set from the versions file though. --- gitian/fetch-inputs.sh | 2 ++ gitian/mkbundle-linux.sh | 9 +++++- gitian/mkbundle-mac.sh | 9 +++++- gitian/mkbundle-windows.sh | 9 +++++- gitian/verify-tags.sh | 76 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b542cf0..03827b6 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -44,6 +44,8 @@ cd "$INPUTS_DIR" CLEANUP=$(tempfile) trap "bash '$CLEANUP'; rm -f '$CLEANUP'" EXIT +# FIXME: This code is copied to verify-tags.sh.. Should we make a bash +# function library? verify() { local file="$1"; shift local keyring="$1"; shift diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 1328a9c..6101971 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -65,6 +65,13 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/linux-skeleton.zip . cd $WRAPPER_DIR +# FIXME: Library function? +die_msg() { + local msg="$1"; shift + printf "\n\n$msg\n" + exit 1 +} + # Let's preserve the original $FOO for creating proper symlinks after building # the utils both if we verify tags and if we don't. @@ -72,7 +79,7 @@ LIBEVENT_TAG_ORIG=$LIBEVENT_TAG if [ "z$VERIFY_TAGS" = "z1" ]; then - ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1 + ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || die_msg "You should run 'make prep' to ensure your inputs are up to date" # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index a9cbacb..7681ed4 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -72,9 +72,16 @@ $WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR +# FIXME: Library function? +die_msg() { + local msg="$1"; shift + printf "\n\n$msg\n" + exit 1 +} + if [ "z$VERIFY_TAGS" = "z1" ]; then - ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1 + ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || die_msg "You should run 'make prep' to ensure your inputs are up to date" # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 7ab0aa6..bf6a5d4 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -67,9 +67,16 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/windows-skeleton.zip . cd $WRAPPER_DIR +# FIXME: Library function? +die_msg() { + local msg="$1"; shift + printf "\n\n$msg\n" + exit 1 +} + if [ "z$VERIFY_TAGS" = "z1" ]; then - ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1 + ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || die_msg "You should run 'make prep' to ensure your inputs are up to date" # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 28c16f1..8829b9d 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -48,6 +48,43 @@ verify_git() { popd } +# FIXME: This code is copied from fetch-inputs.sh.. Should we make a bash +# function library? +verify() { + local file="$1"; shift + local keyring="$1"; shift + local suffix="$1"; shift + + local f + for f in "$file" "$file.$suffix" "$keyring"; do + if ! [ -e "$f" ]; then + echo >&2 "Error: Required file $f does not exist."; exit 1 + fi + done + + local tmpfile=$(tempfile) + echo "rm -f '$tmpfile'" >> "$CLEANUP" + local gpghome=$(mktemp -d) + echo "rm -rf '$gpghome'" >> "$CLEANUP" + exec 3> "$tmpfile" + + GNUPGHOME="$gpghome" gpg --no-options --no-default-keyring --trust-model=always --keyring="$keyring" --status-fd=3 --verify "$file.$suffix" "$file" >/dev/null 2>&1 + if grep -q '^\[GNUPG:\] GOODSIG ' "$tmpfile"; then + return 0 + else + return 1 + fi +} + +check_git_hash() { + local dir="$1"; shift + local commit="${1:-}" + + if [ -n "$commit" ]; then + (cd "$dir" && git checkout "$commit") + fi +} + while read dir keyring tag; do verify_git "$dir" "$WRAPPER_DIR/gpg/$keyring" "$tag" @@ -65,6 +102,45 @@ obfsproxy obfsproxy.gpg $OBFSPROXY_TAG flashproxy flashproxy.gpg $FLASHPROXY_TAG EOF +while read dir commit; do + check_git_hash "$dir" "$commit" +done << EOF +libdmg-hfsplus $LIBDMG_TAG +fteproxy $FTEPROXY_TAG +EOF + +# Verify signatures on signed packages +for i in BINUTILS GCC PYTHON PYCRYPTO M2CRYPTO PYTHON_MSI GMP LXML +do + PACKAGE="${i}_PACKAGE" + URL="${i}_URL" + if [ "${i}" == "PYTHON" -o "${i}" == "PYCRYPTO" -o "${i}" == "M2CRYPTO" -o \ + "${i}" == "PYTHON_MSI" -o "${i}" == "LXML" ]; then + SUFFIX="asc" + else + SUFFIX="sig" + fi + + if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then + echo "$i: GPG signature is broken for ${!URL}" + mv "${!PACKAGE}" "${!PACKAGE}.badgpg" + exit 1 + fi +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 MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +do + PACKAGE="${i}_PACKAGE" + HASH="${i}_HASH" + if ! echo "${!HASH} ${!PACKAGE}" | sha256sum -c -; then + echo "Package hash for ${!PACKAGE} differs from our locally stored sha256!" + exit 1 + fi +done + + cd "$INPUTS_DIR" verify_git "." "$WRAPPER_DIR/gpg/torbutton.gpg" "$GITIAN_TAG" git checkout "$GITIAN_TAG"

1 0

[tor/master] Fix compilation with DEBUG_DNS_CACHE
by nickm＠torproject.org 06 May '14

06 May '14

commit 78301d99fe0a9464992baea22be3c6fd42b7dcad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 6 10:18:34 2014 -0400 Fix compilation with DEBUG_DNS_CACHE Reported by cypherpunks. Fix for #11761; bugfix on 0.2.3.13-alpha where we made ht.h stop using _identifiers. --- changes/bug11761 | 4 ++++ src/ext/ht.h | 1 + src/or/dns.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug11761 b/changes/bug11761 new file mode 100644 index 0000000..ffcae5a --- /dev/null +++ b/changes/bug11761 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix compilation when DNS_CACHE_DEBUG is enabled. Fixes bug 11761; + bugfix on 0.2.3.13-alpha. Found by "cypherpunks". + diff --git a/src/ext/ht.h b/src/ext/ht.h index 4a68673..871f5bb 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -58,6 +58,7 @@ #define HT_NEXT_RMV(name, head, elm) name##_HT_NEXT_RMV((head), (elm)) #define HT_CLEAR(name, head) name##_HT_CLEAR(head) #define HT_INIT(name, head) name##_HT_INIT(head) +#define HT_REP_IS_BAD_(name, head) name##_HT_REP_IS_BAD_(head) /* Helper: */ static INLINE unsigned ht_improve_hash(unsigned h) diff --git a/src/or/dns.c b/src/or/dns.c index 3627193..a9c4318 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -2174,7 +2174,7 @@ static void assert_cache_ok_(void) { cached_resolve_t **resolve; - int bad_rep = _cache_map_HT_REP_IS_BAD(&cache_root); + int bad_rep = HT_REP_IS_BAD_(cache_map, &cache_root); if (bad_rep) { log_err(LD_BUG, "Bad rep type %d on dns cache hash table", bad_rep); tor_assert(!bad_rep);

1 0