September 2015 - tor-commits - lists.torproject.org

[gettor/master] Minor typo
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit b909ca8e28f2954aa137c91e6f6bde6e4a1d4cc9 Author: ilv <ilv(a)users.noreply.github.com> Date: Wed Mar 25 22:00:18 2015 -0300 Minor typo --- upload/fetch_latest_torbrowser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upload/fetch_latest_torbrowser.py b/upload/fetch_latest_torbrowser.py index 4bdb709..3fe1f9a 100644 --- a/upload/fetch_latest_torbrowser.py +++ b/upload/fetch_latest_torbrowser.py @@ -123,7 +123,7 @@ def main(): # latest version of Tor Browser has been syncronized # let's upload it for provider in UPLOAD_SCRIPTS: - os.sytem('python2.7 %s' % UPLOAD_SCRIPTS[provider]) + os.system('python2.7 %s' % UPLOAD_SCRIPTS[provider]) # if everything is OK, update the current version delivered by GetTor config.set('version', 'current', latest_version)

1 0

[gettor/master] Fixed typos
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit f22edd1bf1b7a1f745a07598b633c819800fa0dc Author: ilv <ilv(a)users.noreply.github.com> Date: Wed Feb 11 20:02:15 2015 -0300 Fixed typos --- upload/fetch_latest_torbrowser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/upload/fetch_latest_torbrowser.py b/upload/fetch_latest_torbrowser.py index 3aea7bc..4bdb709 100644 --- a/upload/fetch_latest_torbrowser.py +++ b/upload/fetch_latest_torbrowser.py @@ -37,8 +37,8 @@ def main(): Fetch the latest version of Tor Browser and upload it to the supported providers (e.g. Dropbox). Ideally, this script should be executed with - a cron in order to automate of updating the files served by GetTor when - a new version of Tor Browser is released. + a cron in order to automate the updating of the files served by GetTor + when a new version of Tor Browser is released. Usage: python2.7 fetch.py --os=<OS> --lc=<LC> @@ -51,7 +51,7 @@ def main(): $ python2.7 fetch.py --os=linux Fetch Tor Browser only for Windows and in US English: - $ python2.7 fetch.py --os=windows --lc=en-EN + $ python2.7 fetch.py --os=windows --lc=en-US Fetch Tor Browser for all platforms, but only in Spanish: $ python2.7 fetch.py --lc=es-ES

1 0

[gettor/master] replaced some hardcoded values
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit b8ebb4a2063caebafb26744827f4b0675e13739f Author: ilv <ilv(a)users.noreply.github.com> Date: Fri Apr 17 11:51:16 2015 -0300 replaced some hardcoded values --- upload/bundles2github.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/upload/bundles2github.py b/upload/bundles2github.py index 58ab01d..a7ca9ef 100644 --- a/upload/bundles2github.py +++ b/upload/bundles2github.py @@ -91,6 +91,15 @@ if __name__ == '__main__': # path to the fingerprint that signed the packages tb_key = os.path.abspath('tbb-key.asc') + # path to the latest version of Tor Browser + tb_path = os.path.abspath('upload/latest') + + # path to the repository where we upload Tor Browser + repo_path = os.path.abspath('dl') + + # wait time between pushing the files to GH and asking for its links + wait_time = 10 + # import key fingerprint gpg = gnupg.GPG() key_data = open(tb_key).read() @@ -115,20 +124,20 @@ if __name__ == '__main__': # 2) add files via sh.git # 3) make a commit for the new version # 4) push the changes - + shutil.copytree( - os.path.abspath('upload/latest'), - os.path.abspath('dl/%s' %version) + tb_path, + os.path.abspath('%s/%s' % (repo_path, version)) ) - git = sh.git.bake(_cwd=os.path.abspath('dl')) + git = sh.git.bake(_cwd=repo_path) git.add('%s' % version) git.commit(m=version) git.push() # it takes a while to process the recently pushed files print "Wait a few seconds before asking for the links to Github..." - time.sleep(10) + time.sleep(wait_time) gh = github.GitHub(gh_token, None) repocontent = gh.repo( @@ -144,7 +153,7 @@ if __name__ == '__main__': core.create_links_file('GitHub', readable_fp) for file in repocontent: - # e.g. https://raw.githubusercontent.com/ilv/gettor/master/upload/4.0.3/TorBrowser… + # e.g. https://raw.githubusercontent.com/gettorbrowser/dl/master/4.0.7/TorBrowser-… m = re.search('%s.*\/(.*)' % raw_content, file[u'download_url']) if m: filename = m.group(1) @@ -185,4 +194,3 @@ if __name__ == '__main__': core.add_link('GitHub', osys, lc, link) print "Github links updated!" -

1 0

[gettor/master] Added OS/LC filter for fetching
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 9c8e2ac20ac51fe6a67926b76285861685f0adc5 Author: ilv <ilv(a)users.noreply.github.com> Date: Wed Feb 11 19:54:49 2015 -0300 Added OS/LC filter for fetching --- upload/fetch_latest_torbrowser.py | 153 ++++++++++++++++++++++++++----------- 1 file changed, 110 insertions(+), 43 deletions(-) diff --git a/upload/fetch_latest_torbrowser.py b/upload/fetch_latest_torbrowser.py index b9b74bc..3aea7bc 100644 --- a/upload/fetch_latest_torbrowser.py +++ b/upload/fetch_latest_torbrowser.py @@ -1,10 +1,5 @@ # -*- coding: utf-8 -*- # -# Fetch the latest version of Tor Browser and upload it to the supported -# providers (e.g. Dropbox). Ideally, this script should be executed with -# a cron in order to automate of updating the files served by GetTor when -# a new version of Tor Browser is released. -# # This file is part of GetTor, a Tor Browser distribution system. # # :authors: Israel Leiva <ilv(a)torproject.org> @@ -13,11 +8,13 @@ # (c) 2015, Israel Leiva # # :license: This is Free Software. See LICENSE for license information. +# import os import urllib2 import json +import argparse import ConfigParser import shutil @@ -27,41 +24,111 @@ UPLOAD_SCRIPTS = { 'drive': 'bundles2drive.py' } -# server from which to download Tor Browser -dist_tpo = 'https://dist.torproject.org/torbrowser/' - -# find out the latest version -url = 'https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions' -response = urllib2.urlopen(url) -json_response = json.load(response) -latest_version = json_response[0] - -# find out the current version delivered by GetTor -config = ConfigParser.RawConfigParser() -config.read('latest_torbrowser.cfg') -current_version = config.get('version', 'current') - -if current_version != latest_version: - - # in wget we trust - mirror = '%s%s' % (dist_tpo, latest_version) - # download files for windows, osx, linux, signatures and checksums - params = '-nH --cut-dirs=1 -L 1 --accept exe,dmg,tar.xz,asc,txt' - cmd = 'wget %s --mirror %s' % (params, mirror) - # make the mirror - # a folder with the value of 'latest_version' will be created - os.system(cmd) - # everything inside upload will be uploaded by the provivers' scripts - shutil.move('latest', 'latest_backup') - shutil.move(latest_version, 'latest') - shutil.rmtree('latest_backup') - - # latest version of Tor Browser has been syncronized - # let's upload it - for provider in UPLOAD_SCRIPTS: - os.sytem('python2.7 %s' % UPLOAD_SCRIPTS[provider]) - - # if everything is OK, update the current version delivered by GetTor - config.set('version', 'current', latest_version) - with open(r'latest_torbrowser.cfg', 'wb') as config_file: - config.write(config_file) +# "regex" for filtering downloads in wget +OS_RE = { + 'windows': '%s.exe,%s.exe.asc', + 'linux': '%s.tar.xz,%s.tar.xz.asc', + 'osx': '%s.dmg,%s.dmg.asc', +} + + +def main(): + """Script to fetch the latest Tor Browser. + + Fetch the latest version of Tor Browser and upload it to the supported + providers (e.g. Dropbox). Ideally, this script should be executed with + a cron in order to automate of updating the files served by GetTor when + a new version of Tor Browser is released. + + Usage: python2.7 fetch.py --os=<OS> --lc=<LC> + + Some fetch examples: + + Fetch Tor Browser for all platforms and languages: + $ python2.7 fetch.py + + Fetch Tor Browser only for Linux: + $ python2.7 fetch.py --os=linux + + Fetch Tor Browser only for Windows and in US English: + $ python2.7 fetch.py --os=windows --lc=en-EN + + Fetch Tor Browser for all platforms, but only in Spanish: + $ python2.7 fetch.py --lc=es-ES + + """ + parser = argparse.ArgumentParser( + description='Utility to fetch the latest Tor Browser and upload it \ + to popular cloud services.' + ) + + # if no OS specified, download all + parser.add_argument('-o', '--os', default=None, + help='filter by OS') + + # if no LC specified, download all + parser.add_argument('-l', '--lc', default='', + help='filter by locale') + + args = parser.parse_args() + + # server from which to download Tor Browser + dist_tpo = 'https://dist.torproject.org/torbrowser/' + + # find out the latest version + url = 'https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions' + response = urllib2.urlopen(url) + json_response = json.load(response) + latest_version = json_response[0] + + # find out the current version delivered by GetTor + config = ConfigParser.RawConfigParser() + config.read('latest_torbrowser.cfg') + current_version = config.get('version', 'current') + + if current_version != latest_version: + mirror = '%s%s/' % (dist_tpo, latest_version) + + # what LC should we download? + lc_re = args.lc + + # what OS should we download? + if args.os == 'windows': + os_re = OS_RE['windows'] % (lc_re, lc_re) + + elif args.os == 'osx': + os_re = OS_RE['osx'] % (lc_re, lc_re) + + elif args.os == 'linux': + os_re = OS_RE['linux'] % (lc_re, lc_re) + + else: + os_re = '%s.exe,%s.exe.asc,%s.dmg,%s.dmg.asc,%s.tar.xz,%s.tar'\ + '.xz.asc' % (lc_re, lc_re, lc_re, lc_re, lc_re, lc_re) + + params = "-nH --cut-dirs=1 -L 1 --accept %s" % os_re + + # in wget we trust + cmd = 'wget %s --mirror %s' % (params, mirror) + + print "Going to execute %s" % cmd + # make the mirror + # a folder with the value of 'latest_version' will be created + os.system(cmd) + # everything inside upload will be uploaded by the provivers' scripts + shutil.move('latest', 'latest_backup') + shutil.move(latest_version, 'latest') + shutil.rmtree('latest_backup') + + # latest version of Tor Browser has been syncronized + # let's upload it + for provider in UPLOAD_SCRIPTS: + os.sytem('python2.7 %s' % UPLOAD_SCRIPTS[provider]) + + # if everything is OK, update the current version delivered by GetTor + config.set('version', 'current', latest_version) + with open(r'latest_torbrowser.cfg', 'wb') as config_file: + config.write(config_file) + +if __name__ == "__main__": + main()

1 0

[gettor/master] Removed system calls. Add wait time before interacting with GH
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit b1dca3c582d476fab9dcf915c940aae58016f947 Author: ilv <ilv(a)users.noreply.github.com> Date: Thu Apr 16 17:58:47 2015 -0300 Removed system calls. Add wait time before interacting with GH --- upload/bundles2github.py | 59 ++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/upload/bundles2github.py b/upload/bundles2github.py index 6468320..58ab01d 100644 --- a/upload/bundles2github.py +++ b/upload/bundles2github.py @@ -12,8 +12,11 @@ # import os -import sys import re +import sh +import sys +import time +import shutil import hashlib from libsaas.services import github @@ -83,10 +86,10 @@ if __name__ == '__main__': version = sys.argv[1] # the token allow us to run this script without GitHub user/pass - gh_token = 'secret-token' + gh_token = '' # path to the fingerprint that signed the packages - tb_key = 'upload/torbrowser-key.asc' + tb_key = os.path.abspath('tbb-key.asc') # import key fingerprint gpg = gnupg.GPG() @@ -99,31 +102,42 @@ if __name__ == '__main__': readable_fp = ' '.join(fp[i:i+4] for i in xrange(0, len(fp), 4)) # we should have previously created a repository on GitHub where we - # want to push the files using a SSH key (to avoid using user/pass) + # want to push the files using an SSH key (to avoid using user/pass) remote = 'origin' branch = 'master' - user = 'ilv' - repo = 'gettor' - path = 'upload' - raw_content = 'https://raw.githubusercontent.com/%s/%s/%s/%s/' %\ - (user, repo, branch, path) - - # steps: 1) create dir for the new version, copy the latest Tor Browser - # files there, add the files via git, make a commit for the new version - # and push the changes (easier with system calls) - os.system('mkdir %s' % version) - os.system('cp latest/* %s' % version) - os.system('git add %s;git commit -m "%s"' % (version, version)) - os.system('cd %s;git push %s %s' % (version, remote, branch)) + user = 'gettorbrowser' + repo = 'dl' + raw_content = 'https://raw.githubusercontent.com/%s/%s/%s/' %\ + (user, repo, branch) + + # steps: + # 1) copy folder with latest version of Tor Browser + # 2) add files via sh.git + # 3) make a commit for the new version + # 4) push the changes + + shutil.copytree( + os.path.abspath('upload/latest'), + os.path.abspath('dl/%s' %version) + ) + + git = sh.git.bake(_cwd=os.path.abspath('dl')) + git.add('%s' % version) + git.commit(m=version) + git.push() + + # it takes a while to process the recently pushed files + print "Wait a few seconds before asking for the links to Github..." + time.sleep(10) gh = github.GitHub(gh_token, None) repocontent = gh.repo( user, repo - ).contents().get('%s/%s' % (path, version)) + ).contents().get('%s' % version) core = gettor.core.Core( - '/path/to/gettor/core.cfg' + os.path.abspath('core.cfg') ) # erase old links, if any @@ -151,7 +165,11 @@ if __name__ == '__main__': # don't care about other files (asc or txt) continue - sha256 = get_file_sha256('%s/%s/%s' % (path, version, filename)) + sha256 = get_file_sha256( + os.path.abspath( + 'dl/%s/%s' % (version, filename) + ) + ) # since the url is easy to construct and it doesn't involve any # kind of unique hash or identifier, we get the link for the @@ -167,3 +185,4 @@ if __name__ == '__main__': core.add_link('GitHub', osys, lc, link) print "Github links updated!" +

1 0

[gettor/master] Avoiding conflicts with LICENSEs files
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 4ac2acdecb09048ca6d6b5ee247b64df80315674 Author: ilv <ilv(a)users.noreply.github.com> Date: Tue Sep 22 20:11:35 2015 -0300 Avoiding conflicts with LICENSEs files --- LICENSE | 31 ------------------------------- LICENSE.old | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f9bb73f..0000000 --- a/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -gettor is distributed under this license: - -Copyright (c) 2008, The Tor Project, Inc. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - - * Neither the names of the copyright owners nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.old b/LICENSE.old new file mode 100644 index 0000000..f9bb73f --- /dev/null +++ b/LICENSE.old @@ -0,0 +1,31 @@ +gettor is distributed under this license: + +Copyright (c) 2008, The Tor Project, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1 0

[gettor/master] Adapted github script to new links message
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 21816d165531b9943f4f2b5527736522ea6e85d8 Author: ilv <ilv(a)users.noreply.github.com> Date: Sun Jul 12 18:40:42 2015 -0300 Adapted github script to new links message --- upload/bundles2github.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/upload/bundles2github.py b/upload/bundles2github.py index a7ca9ef..41cd8d7 100644 --- a/upload/bundles2github.py +++ b/upload/bundles2github.py @@ -185,8 +185,9 @@ if __name__ == '__main__': # asc signature just by adding '.asc' link_asc = file[u'download_url'].replace(filename, filename_asc) - link = "Package (%s-bit): %s\nASC signature (%s-bit): %s\n"\ - "Package SHA256 checksum (%s-bit): %s\n" %\ + link = "Tor Browser %s-bit:\n%s$Tor Browser's signature %s-bit:"\ + "\n%s$SHA256 checksum of Tor Browser %s-bit (advanced):"\ + "\n%s$" %\ (arch, file[u'download_url'], arch, link_asc, arch, sha256)

1 0

[gettor/master] Merge branch 'master' of ssh://git-rw.torproject.org/user/ilv/gettor
by ilv＠torproject.org 22 Sep '15

22 Sep '15

1 0

[gettor/master] Changed links message (SMTP)
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 038ab13c87e2f28116180ec63853a225aebbce77 Author: ilv <ilv(a)users.noreply.github.com> Date: Sun Jul 12 18:39:20 2015 -0300 Changed links message (SMTP) --- gettor/core.py | 45 +++++++++++++++++++++++++---- lang/core/i18n/en/en.po | 9 ++++++ lang/smtp/i18n/en/LC_MESSAGES/en.po | 53 +++-------------------------------- upload/bundles2dropbox.py | 5 ++-- 4 files changed, 55 insertions(+), 57 deletions(-) diff --git a/gettor/core.py b/gettor/core.py index 88fb707..df596a9 100644 --- a/gettor/core.py +++ b/gettor/core.py @@ -13,6 +13,7 @@ import os import re import logging +import gettext import tempfile import ConfigParser @@ -121,6 +122,11 @@ class Core(object): loglevel = config.get('log', 'level') except ConfigParser.Error as e: raise ConfigError("Couldn't read 'level' from 'log'") + + try: + self.i18ndir = config.get('i18n', 'dir') + except ConfigParser.Error as e: + raise ConfigError("Couldn't read 'dir' from 'i18n'") try: logdir = config.get('log', 'dir') @@ -137,6 +143,22 @@ class Core(object): # stop logging on stdout from now on log.propagate = False + def _get_msg(self, msgid, lc): + """Get message identified by msgid in a specific locale. + + :param: msgid (string) the identifier of a string. + :param: lc (string) the locale. + + :return: (string) the message from the .po file. + + """ + # obtain the content in the proper language + t = gettext.translation(lc, self.i18ndir, languages=[lc]) + _ = t.ugettext + + msgstr = _(msgid) + return msgstr + def get_links(self, service, os, lc): """Get links for OS in locale. @@ -201,6 +223,9 @@ class Core(object): # links were found providers = {} + # separator + spt = '=' * 72 + # reading links from providers directory for name in links: # we're reading files listed on linksdir, so they must exist! @@ -216,17 +241,17 @@ class Core(object): try: providers[pname] = config.get(osys, lc) # avoid showing it all together - providers[pname] = providers[pname].replace(",", "\n") + providers[pname] = providers[pname].replace(",", "") + providers[pname] = providers[pname].replace("$", "\n\n") except ConfigParser.Error as e: raise InternalError("Couldn't get %s from %s (%s)" % (lc, osys, name)) - # each provider must have a fingerprint of the key used to - # sign the uploaded packages + # all packages are signed with the same key (Tor Browser developers) try: fingerprint = config.get('key', 'fingerprint') - providers[pname] = "%s\n\nFingerprint: %s" %\ - (providers[pname], fingerprint) + fingerprint_msg = self._get_msg('fingerprint', lc) + fingerprint_msg = fingerprint_msg % fingerprint except ConfigParser.Error as e: raise InternalError("Couldn't get 'fingerprint' from 'key'") @@ -234,10 +259,18 @@ class Core(object): all_links = [] for key in providers.keys(): + # get more friendly description of the provider + provider_desc = self._get_msg('provider_desc', lc) + provider_desc = provider_desc % key + all_links.append( - "\n%s\n\n%s\n" % (key, ''.join(providers[key])) + "%s\n%s\n\n%s%s\n\n\n" % + (provider_desc, spt, ''.join(providers[key]), spt) ) + # add fingerprint after the links + all_links.append(fingerprint_msg) + if all_links: return "".join(all_links) else: diff --git a/lang/core/i18n/en/en.po b/lang/core/i18n/en/en.po new file mode 100644 index 0000000..b8d4509 --- /dev/null +++ b/lang/core/i18n/en/en.po @@ -0,0 +1,9 @@ +domain "en" + +#: Fingerprint message +msgid "fingerprint" +msgstr "Fingerprint of the key used to sign Tor Browser:\n%s" + +#: Provider description +msgid "provider_desc" +msgstr "[From %s]" diff --git a/lang/smtp/i18n/en/LC_MESSAGES/en.po b/lang/smtp/i18n/en/LC_MESSAGES/en.po index 6f78da2..906dbb8 100644 --- a/lang/smtp/i18n/en/LC_MESSAGES/en.po +++ b/lang/smtp/i18n/en/LC_MESSAGES/en.po @@ -4,18 +4,10 @@ domain "en" msgid "links_subject" msgstr "[GetTor] Links for your request" -#: Links subject (PT) -msgid "links_pt_subject" -msgstr "[GetTor] Links for your request" - #: Help subject msgid "help_subject" msgstr "[GetTor] Help" -#: Delay subject -msgid "delay_subject" -msgstr "[GetTor] Delay message" - # Unsupported locale subject msgid "unsupported_locale_subject" msgstr "[GetTor] Unsupported locale" @@ -26,44 +18,11 @@ msgstr "The locale you requested '%s' is not supported." #: Links message msgid "links_msg" -msgstr "Thank you for your request for %s-%s.\n\ -\n\ -Here are the download links:\n\ -\n\ -===\n\ -Tor Browser Bundle:\n\ -===\n\ -%s\n\ -===\n\ -\n\ -===\n\ -Support:\n\ -===\n\ -\n\ -Still need help? If you have any questions, trouble connecting to Tor\n\ -network, or need to talk to a human, please contact our support team at:\n\ +msgstr "Hello there! this is the 'GetTor' robot.\n\ \n\ - help(a)rt.torproject.org\n\ +Below are the links for your request (Tor Browser for %s, %s package):\n\ \n\ -We are ready to answer your queries in English, Farsi, Chinese, Arabic,\n\ -French and Spanish." - -#: Links message (PT) -msgid "links_pt_msg" -msgstr "Thank you for your request for %s-%s.\n\ -\n\ -Here are the download links:\n\ -\n\ -===\n\ -Tor Browser Bundle:\n\ -===\n\ %s\n\ -===\n\ -Info about pluggable transports.\n\ -\n\ -===\n\ -Support:\n\ -===\n\ \n\ Still need help? If you have any questions, trouble connecting to Tor\n\ network, or need to talk to a human, please contact our support team at:\n\ @@ -75,10 +34,10 @@ French and Spanish." #: Help message msgid "help_msg" -msgstr "Hello, this is the 'GetTor' robot.\n\ +msgstr "Hello there! this is the 'GetTor' robot.\n\ \n\ Thank you for your request. I am here to help you download the latest\n\ -Tor Browser Bundle.\n\ +Tor Browser.\n\ \n\ Please reply to this message with one of the options below:\n\ \n\ @@ -89,7 +48,3 @@ Please reply to this message with one of the options below:\n\ And I will send you the download instructions quickly.\n\ \n\ Tip: Just send a blank reply to this message if you are not sure." - -#: Delay message -msgid "delay_msg" -msgstr "Delay message." diff --git a/upload/bundles2dropbox.py b/upload/bundles2dropbox.py index a1328d8..bedeec0 100644 --- a/upload/bundles2dropbox.py +++ b/upload/bundles2dropbox.py @@ -236,8 +236,9 @@ if __name__ == '__main__': elif p3.match(file): osys, arch, lc = get_bundle_info(file, 'osx') - link = "Package (%s-bit): %s\nASC signature (%s-bit): %s\n"\ - "Package SHA256 checksum (%s-bit): %s\n" %\ + link = "Tor Browser %s-bit:\n%s$Tor Browser's signature %s-bit:"\ + "\n%s$SHA256 checksum of Tor Browser %s-bit (advanced):"\ + "\n%s$" %\ (arch, link_file[u'url'], arch, link_asc[u'url'], arch, sha_file)

1 0

[gettor/master] Info about current, pending, and new ideas for providers and distribution methods
by ilv＠torproject.org 22 Sep '15

22 Sep '15

commit 7a4fe26f81bb1309c88ea58c27a727a084475c5e Author: ilv <ilv(a)users.noreply.github.com> Date: Wed Oct 29 22:37:34 2014 -0300 Info about current, pending, and new ideas for providers and distribution methods --- distribution_methods.txt | 21 +++++++++++++++++++++ providers.txt | 12 ++++++++++++ 2 files changed, 33 insertions(+) diff --git a/distribution_methods.txt b/distribution_methods.txt new file mode 100644 index 0000000..5cc25c8 --- /dev/null +++ b/distribution_methods.txt @@ -0,0 +1,21 @@ +================================== CURRENT ==================================== + +* SMTP: this one is ready and tested. + +* XMPP: this one is ready and tested. We'll probably deploy SMTP, tough. + + +================================== IN DEVELOPMENT ============================= + +* Twitter: This one is half done. I forked a twitter bot from wfn's work on +BridgeDB, but I got confused with some Twitter policies. I thought that the +bot *had* to follow someone back to send him/her DMs, but it turns out that +you just need to be followed, not follow back (thanks to mrphs for pointing +out this). + + + +================================== (CRAZY) IDEAS ============================== + +* Dropbox: This is just a thought, I haven't done proper research. What if +someone could ask for gettor links like this: "!gettor"? diff --git a/providers.txt b/providers.txt new file mode 100644 index 0000000..5fc8ac7 --- /dev/null +++ b/providers.txt @@ -0,0 +1,12 @@ +================================== CURRENT ==================================== + +* Dropbox: Implemented. + +================================== TO BE IMPLEMENTED ========================= + +* Google Drive: Not implemented yet. + +================================== IDEAS ===================================== + +* Dropbox: it is known that one can download tarballs from Github. Maybe we +can have an official gettor account and a folder synchronized with dist.tp.o.

1 0