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

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 06 Aug '13

06 Aug '13

commit 4e98cffce6c2dbd2078011afaeb400d3795616e9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 06:15:27 2013 +0000 Update translations for vidalia_alpha --- hi/vidalia_hi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po index 8920add..750e08c 100644 --- a/hi/vidalia_hi.po +++ b/hi/vidalia_hi.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2013-07-25 09:21+0000\n" +"PO-Revision-Date: 2013-08-06 05:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 06 Aug '13

06 Aug '13

commit fe9f71df9e8139d345ab50e9b9d7ae9e176d5a06 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 06:15:21 2013 +0000 Update translations for vidalia --- hi/qt_hi.po | 2 +- hi/vidalia_hi.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/qt_hi.po b/hi/qt_hi.po index c032490..153a71f 100644 --- a/hi/qt_hi.po +++ b/hi/qt_hi.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2013-07-18 09:50+0000\n" +"PO-Revision-Date: 2013-08-06 05:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n" diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po index 5bf86b6..af760a7 100644 --- a/hi/vidalia_hi.po +++ b/hi/vidalia_hi.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-07-25 09:21+0000\n" +"PO-Revision-Date: 2013-08-06 05:50+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 06 Aug '13

06 Aug '13

commit b88494def93c7f51e37ddd30f5499fd91af63348 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 05:46:24 2013 +0000 Update translations for torbirdy --- hi/torbirdy.dtd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd index 231b386..b023b0c 100644 --- a/hi/torbirdy.dtd +++ b/hi/torbirdy.dtd @@ -1,20 +1,20 @@ -<!ENTITY torbirdy.accountprefs.title ""> -<!ENTITY torbirdy.accountprefs.startup.label ""> -<!ENTITY torbirdy.accountprefs.startup.key ""> -<!ENTITY torbirdy.accountprefs.minutes.label ""> -<!ENTITY torbirdy.accountprefs.minutes.key ""> -<!ENTITY torbirdy.accountprefs.minutes.trail.label ""> +<!ENTITY torbirdy.accountprefs.title "खाता विन्यास"> +<!ENTITY torbirdy.accountprefs.startup.label "स्टार्टअप पर नए संदेशों की जाँच करें"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "नए संदेशों की जाँच करें हर"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "मिनिट"> <!ENTITY torbirdy.accountprefs.cancel.button "रद्द करें "> -<!ENTITY torbirdy.accountprefs.save.button "सुरक्षित करें "> -<!ENTITY torbirdy.accountprefs.save.key ""> +<!ENTITY torbirdy.accountprefs.save.button "संचय करें "> +<!ENTITY torbirdy.accountprefs.save.key "s"> -<!ENTITY torbirdy.prefs.title ""> -<!ENTITY torbirdy.prefs.save.button "सुरक्षित करें "> -<!ENTITY torbirdy.prefs.save.key ""> +<!ENTITY torbirdy.prefs.title "टॉरबर्डी प्राथमिकताएं"> +<!ENTITY torbirdy.prefs.save.button "संचय करें "> +<!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "रद्द करें "> -<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.button "परीक्षण के लिए पतिस्थितियां"> <!ENTITY torbirdy.prefs.extra2.key "P/प"> -<!ENTITY torbirdy.prefs.proxy.label "प्रोक्सी सेटींग"> +<!ENTITY torbirdy.prefs.proxy.label "प्रोक्सी पतिस्थितियां"> <!ENTITY torbirdy.prefs.privacy.label ""> <!ENTITY torbirdy.prefs.enigmail.label ""> <!ENTITY torbirdy.prefs.security.label "सुरक्षा सेटिंग"> @@ -46,7 +46,7 @@ <!ENTITY torbirdy.prefs.renegotiation.label ""> <!ENTITY torbirdy.prefs.renegotiation.key ""> <!ENTITY torbirdy.prefs.account_specific ""> -<!ENTITY torbirdy.prefs.select_account.key ""> +<!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label ""> <!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 Aug '13

06 Aug '13

commit dcea0042720c0dde6736c6885f9e5db906c993c7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 05:46:04 2013 +0000 Update translations for torcheck_completed --- hi/torcheck.po | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/hi/torcheck.po b/hi/torcheck.po new file mode 100644 index 0000000..ed3d234 --- /dev/null +++ b/hi/torcheck.po @@ -0,0 +1,58 @@ +# TorCheck gettext template +# Copyright (C) 2008-2012 The Tor Project, Inc +# +# Translators: +# inoui.im <inoui_iam(a)hotmail.com>, 2013 +# ubaid <ushowkat(a)gmail.com>, 2012 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2013-08-06 05:40+0000\n" +"Last-Translator: inoui.im <inoui_iam(a)hotmail.com>\n" +"Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: hi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "बधाई हो.आपका ब्राउज़र टॉर का उपयोग करने के लिए कॉन्फ़िगर है." + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "टोर का सुरक्षित रूप से उपयोग करने के लिये और अधिक जानकारी के लिए <a href=\"https://www.torproject.org/\">Tor website</a> पर जाएँ। अब आप गुमनाम रूप से इंटरनेट ब्राउज़ कर सकते हैं।" + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "टो ब्राउज़र बंडल के लिए एक सुरक्षा अद्यतन उपलब्ध है।" + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">डाउनलोड पृष्ठ पर जाने के लिए यहां क्लिक करें</a>" + +msgid "Sorry. You are not using Tor." +msgstr "आप के कंप्यूटर पर टोर संस्थापित नहीं है ।" + +msgid "" +"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>." +msgstr "यदि आप टोर क्लायंट का उपयोग का प्रयास कर रहे हैं तो कॄपिया <a href=\"https://www.torproject.org/\"> टोर वेबसाइट पर जाये </a> और विशेष रूप से <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> आप के टोर क्लायंट को संस्थापित करने के सामान्य अनुदेश पढे </a>" + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "हमे खेद है । आप की पूछताछ असफ़ल रही ।" + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "अस्थायी सेवा आउटेज हमें आपके स्रोत IP पते का यह निर्धारण करने से रोक रही है की यदि वह <a href=\"https://www.torproject.org/\">टॉर</a> आसंधि है।" + +msgid "Your IP address appears to be: " +msgstr "आप का IP पता है:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Aug '13

06 Aug '13

commit 76a29d6b3b82344b573e583c6e76bb882bd04d1d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 05:45:59 2013 +0000 Update translations for torcheck --- hi/torcheck.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hi/torcheck.po b/hi/torcheck.po index 42f6f5d..ed3d234 100644 --- a/hi/torcheck.po +++ b/hi/torcheck.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-08-06 05:14+0000\n" +"PO-Revision-Date: 2013-08-06 05:40+0000\n" "Last-Translator: inoui.im <inoui_iam(a)hotmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n" @@ -29,12 +29,12 @@ msgid "" msgstr "टोर का सुरक्षित रूप से उपयोग करने के लिये और अधिक जानकारी के लिए <a href=\"https://www.torproject.org/\">Tor website</a> पर जाएँ। अब आप गुमनाम रूप से इंटरनेट ब्राउज़ कर सकते हैं।" msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "टो ब्राउज़र बंडल के लिए एक सुरक्षा अद्यतन उपलब्ध है।" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">डाउनलोड पृष्ठ पर जाने के लिए यहां क्लिक करें</a>" msgid "Sorry. You are not using Tor." msgstr "आप के कंप्यूटर पर टोर संस्थापित नहीं है ।" @@ -44,7 +44,7 @@ msgid "" "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>." -msgstr "" +msgstr "यदि आप टोर क्लायंट का उपयोग का प्रयास कर रहे हैं तो कॄपिया <a href=\"https://www.torproject.org/\"> टोर वेबसाइट पर जाये </a> और विशेष रूप से <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> आप के टोर क्लायंट को संस्थापित करने के सामान्य अनुदेश पढे </a>" msgid "Sorry, your query failed or an unexpected response was received." msgstr "हमे खेद है । आप की पूछताछ असफ़ल रही ।" @@ -52,7 +52,7 @@ msgstr "हमे खेद है । आप की पूछताछ अस msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "अस्थायी सेवा आउटेज हमें आपके स्रोत IP पते का यह निर्धारण करने से रोक रही है की यदि वह <a href=\"https://www.torproject.org/\">टॉर</a> आसंधि है।" msgid "Your IP address appears to be: " msgstr "आप का IP पता है:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Aug '13

06 Aug '13

commit cff131e9c9e239e7af62ccb5233a7d7d87f3e54d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Aug 6 05:15:58 2013 +0000 Update translations for torcheck --- hi/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hi/torcheck.po b/hi/torcheck.po index a6e8329..42f6f5d 100644 --- a/hi/torcheck.po +++ b/hi/torcheck.po @@ -2,15 +2,16 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# inoui.im <inoui_iam(a)hotmail.com>, 2013 # ubaid <ushowkat(a)gmail.com>, 2012 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-04-29 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"PO-Revision-Date: 2013-08-06 05:14+0000\n" +"Last-Translator: inoui.im <inoui_iam(a)hotmail.com>\n" +"Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,7 +26,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "टोर का सुरक्षित रूप से उपयोग करने के लिये और अधिक जानकारी के लिए <a href=\"https://www.torproject.org/\">Tor website</a> पर जाएँ। अब आप गुमनाम रूप से इंटरनेट ब्राउज़ कर सकते हैं।" msgid "There is a security update available for the Tor Browser Bundle." msgstr ""

1 0

[tor-browser-bundle/master] Fix a miscommit of some debugging.
by mikeperry＠torproject.org 06 Aug '13

06 Aug '13

commit fd787badd83c17af6aa80e465ffcaa1957831c43 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 6 04:42:56 2013 +0200 Fix a miscommit of some debugging. --- gitian/make-vms.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh index 32d0b71..d5615a6 100755 --- a/gitian/make-vms.sh +++ b/gitian/make-vms.sh @@ -57,8 +57,7 @@ build_and_test_vm() { while ! build_and_test_vm lucid i386 32 do stop-target 32 lucid - exit 1 - #rm ./base-lucid-i386* + rm ./base-lucid-i386* echo echo "Lucid i386 VM build failed... Trying again" echo

1 0

[tor-browser-bundle/master] Remove an old XXX from LXC.
by mikeperry＠torproject.org 06 Aug '13

06 Aug '13

commit 8cd46e6f5ce7bcc4f0d77f1d4d239c501da058d0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 6 04:45:15 2013 +0200 Remove an old XXX from LXC. --- gitian/check-prerequisites.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index ed96c91..b4df5a3 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -45,9 +45,6 @@ then echo "Note that LXC requires a sudo invocation for each Gitian command. " echo "If you require LXC, you may wish to increase your sudo timeout, " echo "or simply run the build directly from a root shell. " - echo - echo "XXX: Issues with file ordering in zip files currently prevent" - echo "LXC bundles from matching the SHA hashes of bundles made by KVM..." exit 1 fi

1 0

[tor-browser-bundle/master] Refactor vm creation to happen at the start of the build process.
by mikeperry＠torproject.org 06 Aug '13

06 Aug '13

commit ea56372e656bf81ecbeaed25b01d601faf2cc31a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Aug 6 04:30:35 2013 +0200 Refactor vm creation to happen at the start of the build process. Also restart vm creation if it fails. --- gitian/Makefile | 2 ++ gitian/make-vms.sh | 84 ++++++++++++++++++++++++++++++++++++++++++++ gitian/mkbundle-linux.sh | 36 ++----------------- gitian/mkbundle-mac.sh | 20 ++--------- gitian/mkbundle-windows.sh | 20 ++--------- 5 files changed, 92 insertions(+), 70 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index 223366f..a866da6 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -18,6 +18,8 @@ clean: vmclean: rm -rf ../../gitian-builder/*.qcow2 + rm -rf ../../gitian-builder/base-* + rm -rf ../../gitian-builder/target-* distclean: vmclean rm -rf ../../gitian-builder/inputs/* diff --git a/gitian/make-vms.sh b/gitian/make-vms.sh new file mode 100755 index 0000000..32d0b71 --- /dev/null +++ b/gitian/make-vms.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +. ./versions + +WRAPPER_DIR=$PWD +GITIAN_DIR=$PWD/../../gitian-builder +DESCRIPTOR_DIR=$PWD/descriptors/ + +if [ ! -f $GITIAN_DIR/bin/gbuild ]; +then + echo "Gitian not found. You need a Gitian checkout in $GITIAN_DIR" + exit 1 +fi + +if [ -z "$NUM_PROCS" ]; +then + export NUM_PROCS=2 +fi + +cd $GITIAN_DIR +export PATH=$PATH:$PWD/libexec + +build_and_test_vm() { + local dist="$1"; shift + local arch="$1"; shift + local bits="$1"; shift + + if [ ! -f ./base-$dist-$arch.qcow2 ]; + then + if [ "z$USE_LXC" = "z1" ]; + then + ./bin/make-base-vm --suite $dist --lxc --arch $arch + else + ./bin/make-base-vm --suite $dist --arch $arch + fi + + make-clean-vm --suite $dist --arch $arch + if [ $? -ne 0 ]; + then + echo "$arch $dist VM creation failed" + exit 1 + fi + + stop-target $bits $dist + start-target $bits $dist-$arch & + for i in 1 2 3 + do + sleep 2 + on-target /bin/true && break + done + return $? + fi + + return 0 +} + +while ! build_and_test_vm lucid i386 32 +do + stop-target 32 lucid + exit 1 + #rm ./base-lucid-i386* + echo + echo "Lucid i386 VM build failed... Trying again" + echo +done + +while ! build_and_test_vm lucid amd64 64 +do + stop-target 64 lucid + rm ./base-lucid-amd64* + echo + echo "Lucid amd64 VM build failed... Trying again" + echo +done + +while ! build_and_test_vm precise i386 32 +do + stop-target 32 precise + rm ./base-precise-i386* + echo + echo "Lucid amd64 VM build failed... Trying again" + echo +done + diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 91156cd..be2eacf 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -20,43 +20,11 @@ then export NUM_PROCS=2 fi +./make-vms.sh + cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -# TODO: Make a super-fresh option that kills the base vms -if [ ! -f ./base-lucid-i386.qcow2 ]; -then - if [ "z$USE_LXC" = "z1" ]; - then - ./bin/make-base-vm --lxc --arch i386 - else - ./bin/make-base-vm --arch i386 - fi - - if [ $? -ne 0 ]; - then - echo "i386 VM creation failed" - exit 1 - fi - stop-target -fi - -if [ ! -f ./base-lucid-amd64.qcow2 ]; -then - if [ "z$USE_LXC" = "z1" ]; - then - ./bin/make-base-vm --lxc --arch amd64 - else - ./bin/make-base-vm --arch amd64 - fi - if [ $? -ne 0 ]; - then - echo "amd64 VM creation failed" - exit 1 - fi - stop-target -fi - echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Linux\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index bd3ecac..6ca7e49 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -20,27 +20,11 @@ then export NUM_PROCS=2 fi +./make-vms.sh + cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -# TODO: Make a super-fresh option that kills the base vms -if [ ! -f base-precise-i386.qcow2 ]; -then - if [ "z$USE_LXC" = "z1" ]; - then - ./bin/make-base-vm --lxc --suite precise --arch i386 - else - ./bin/make-base-vm --suite precise --arch i386 - fi - - if [ $? -ne 0 ]; - then - echo "i386 VM creation failed" - exit 1 - fi - stop-target -fi - echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-MacOS\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 0315c9d..f020675 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -20,27 +20,11 @@ then export NUM_PROCS=2 fi +./make-vms.sh + cd $GITIAN_DIR export PATH=$PATH:$PWD/libexec -# TODO: Make a super-fresh option that kills the base vms -if [ ! -f base-precise-i386.qcow2 ]; -then - if [ "z$USE_LXC" = "z1" ]; - then - ./bin/make-base-vm --lxc --suite precise --arch i386 - else - ./bin/make-base-vm --suite precise --arch i386 - fi - - if [ $? -ne 0 ]; - then - echo "i386 VM creation failed" - exit 1 - fi - stop-target -fi - echo "pref(\"torbrowser.version\", \"$TORBROWSER_VERSION-Windows\");" > $GITIAN_DIR/inputs/torbrowser.version echo "$TORBROWSER_VERSION" > $GITIAN_DIR/inputs/bare-version

1 0

[torbirdy/master] Remove redundant files and update Makefile
by sukhbir＠torproject.org 05 Aug '13

05 Aug '13

commit 7000618010b5b54355fb198796a6c4e6a3004f0b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Aug 5 18:32:50 2013 -0400 Remove redundant files and update Makefile --- Makefile | 2 +- README.RELEASE | 94 -------------------------------------------------------- TODO | 16 ---------- 3 files changed, 1 insertion(+), 111 deletions(-) diff --git a/Makefile b/Makefile index dd2b113..96673df 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL := /bin/bash VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1) make-xpi: - zip -r ../torbirdy-$(VERSION).xpi * -x "/screenshots/*" -x "*/screenshots/*" -x "debian/*" -x "patches/*" -x "TODO" -x "ChangeLog" -x "Makefile" + zip -r ../torbirdy-$(VERSION).xpi * -x "/screenshots/*" -x "*/screenshots/*" -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" clean: rm -f ../torbirdy-$(VERSION).xpi diff --git a/README.RELEASE b/README.RELEASE deleted file mode 100644 index a61c704..0000000 --- a/README.RELEASE +++ /dev/null @@ -1,94 +0,0 @@ -# Magical TorBirdy Release Process Incantations -# -# "May this part of my job one day be replaced by a small shell script" -# -# This is adapted from Mike Perry's Torbutton release notes -# - -#. Decide the version number. - - export VERSION="0.0.4" - vim ./src/install.rdf # edit <em:version> tag to reflect version - -#. Test upgrades of candidate XPI in latest Thunderbird/Iceweasel/etc product matrix - - # TODO: Currently manual - -#. Generate changelog from git shortlog - - # TODO: Currently manual - -#. tx noise: https://svn.torproject.org/svn/translation/trunk/documentation/howto.txt - -# XXX TODO: i18n/l10n this project! - -#. Tag the release: -# The easy way: - make git-tag - -# The hard way: - git tag -u 0xD81D840E -s ${VERSION} - git push --tags - -#. Create the .xpi - - cd /tmp/ - git clone git://github.com/ioerror/torbirdy.git torbirdy-release - cd torbirdy-release - git tag -v ${VERSION} - git checkout -b tag-${VERSION} ${VERSION} - make - -#. SHA1 + Sign the .xpi - - gpg -abs ../torbirdy-${VERSION}.xpi - sha1sum ../torbirdy-${VERSION}.xpi - -#. Upload .xpi to website - - chmod 664 ../torbirdy-${VERSION}.xpi* - scp ../torbirdy-${VERSION}.xpi* vescum:/srv/www-master.torproject.org/htdocs/dist/torbirdy/ - scp ../torbirdy-${VERSION}.xpi vescum:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current… - scp ../torbirdy-${VERSION}.xpi.asc vescum:/srv/www-master.torproject.org/htdocs/dist/torbirdy/torbirdy-current… - -#. Update update.rdf - - cd website-svn - vim ./include/versions.wmi # Add sha1 and version - vim ./torbirdy/update.rdf # Add <li> and <description> w/ sha1 and version - -#. Sign the new update.rdf. - - # Key creation based on these instructions: - # Command line: http://blog.techno-barje.fr/post/2009/10/08/How-to-setup-a-mozilla-extensio… - # Gui: https://www.binaryturf.com/steps-release-extension-firefox-3/ - - # TODO: Process currently manual due to offline signing. - # No need to fear the reaper, man. We can do online signing if we just put - # our minds to it: https://trac.torproject.org/projects/tor/ticket/6011 - - # Special note: I was unable to update an already signed - # copy of the update.rdf for a new release. We probably need to - # keep the unsigned version around as input? See the root directory - # of the torbutton.git for a copy. - ./mccoy-cli.x86/mccoy -profile ./.mozilla/mccoy/*.default/ -signRDF update-unsigned.rdf -key Torbutton - - # Copy the signed update.rdf into place in the website svn - -#. Update website - - torsocks svn up . - torsocks svn commit . - - torsocks ssh vescum "/home/mirroradm/bin/trigger-mirrors" - -#. Test firefox autoupdate - - # Wait for mirrors to sync first.. Pester phobos/weasel/helix/Sebastian for - # website push + dist chown + mirror update. - # TODO: Currently manual - -#. Announce on tor-talk - - # FIXME: May need eventual minor improvements - echo "Troll food." | mail tor-talk(a)lists.torproject.org -s "Feed the trolls" diff --git a/TODO b/TODO deleted file mode 100644 index 7254d6c..0000000 --- a/TODO +++ /dev/null @@ -1,16 +0,0 @@ -Enhance the privacy of the emails -Protect against all kinds of HTML issues -Support Tor's prop 171 -Add new TODO items - -These bugs must be fixed in Thunderbird: - https://bugzilla.mozilla.org/show_bug.cgi?id=684035 - -Required reading: - https://lists.torproject.org/pipermail/tor-talk/2011-September/021398.html - -Mixmaster/MixMinion integration - eg: "write anonymous email" button -https://trac.torproject.org/projects/tor/ticket/6020 - -Open Tickets for TorBirdy: - https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…

1 0