- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 11 Nov '12

11 Nov '12

commit cb75e343288ef371053c52f1d1802c6640b7c96d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 20:45:15 2012 +0000 Update translations for vidalia --- lv/vidalia_lv.po | 172 +++++++++++++++++++++++++++--------------------------- 1 files changed, 86 insertions(+), 86 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index e108c3d..805feff 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,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: 2012-11-11 20:14+0000\n" +"PO-Revision-Date: 2012-11-11 20:44+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -270,15 +270,15 @@ msgstr "Atiestatīt" msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "" +msgstr "Saņemšanas ātrums" msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "" +msgstr "Sūtīšanas ātrums" msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "" +msgstr "Vienmēr virspusē" msgctxt "BandwidthGraph" msgid "Style" @@ -286,7 +286,7 @@ msgstr "Stils" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "" +msgstr "Maina joslas platuma grafika caurredzamību" msgctxt "BandwidthGraph" msgid "100" @@ -294,7 +294,7 @@ msgstr "100" msgctxt "BandwidthGraph" msgid "% Opaque" -msgstr "" +msgstr "% necaurspīdīgs" msgctxt "BandwidthGraph" msgid "Save" @@ -306,31 +306,31 @@ msgstr "Atcelt" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "" +msgstr "Uzsāk HTTPS tilta pieprasījumu..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." -msgstr "" +msgstr "Savienojas ar %1:%2..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "" +msgstr "Sūta HTTPS pieprasījumu par tiltiem..." msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "" +msgstr "Lejupielādē tiltu sarakstu..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "" +msgstr "Lejupielādē tiltus" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "" +msgstr "Nevar lejupielādēt tiltus: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "" +msgstr "Atkārto tiltu pieprasījumu..." msgctxt "BridgeUsageDialog" msgid "Country" @@ -342,7 +342,7 @@ msgstr "# klienti" msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "" +msgstr "Šādu valstu klienti ir izmantojuši retranslatoru kopš %1" msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" @@ -362,7 +362,7 @@ msgstr "Atvērt" msgctxt "Circuit" msgid "Building" -msgstr "" +msgstr "Veidols" msgctxt "Circuit" msgid "Failed" @@ -390,89 +390,89 @@ msgstr "Statuss" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" -msgstr "" +msgstr "Tuvināt maršrutu" msgctxt "CircuitListWidget" msgid "Close Circuit (Del)" -msgstr "" +msgstr "Aizvērt maršrutu (Del)" msgctxt "CircuitListWidget" msgid "Close Stream (Del)" -msgstr "" +msgstr "Aizvērt plūsmu (Del)" msgctxt "ConfigDialog" msgid "General" -msgstr "" +msgstr "Vispārīgi" msgctxt "ConfigDialog" msgid "Network" -msgstr "" +msgstr "Tīkls" msgctxt "ConfigDialog" msgid "Sharing" -msgstr "" +msgstr "Koplietošana" msgctxt "ConfigDialog" msgid "Services" -msgstr "" +msgstr "Pakalpojumi" msgctxt "ConfigDialog" msgid "Appearance" -msgstr "" +msgstr "Izskats" msgctxt "ConfigDialog" msgid "Advanced" -msgstr "" +msgstr "Lietpratīgs" msgctxt "ConfigDialog" msgid "Help" -msgstr "" +msgstr "Palīdzība" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "" +msgstr "Kļūdu saglabāšanas iestatījumi" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." -msgstr "" +msgstr "Vidalia'i neizdevās saglabāt Jūsu %1 iestatījumus." msgctxt "ConfigDialog" msgid "Error Applying Settings" -msgstr "" +msgstr "Kļūdu lietošanas iestatījumi" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor." -msgstr "" +msgstr "Vidalia'i neizdevās piemērot Jūsu %1 iestatījumus Tor'am." msgctxt "ConfigDialog" msgid "Settings" -msgstr "" +msgstr "Iestatījumi" msgctxt "ControlConnection" msgid "Vidalia was unable to connect to Tor. (%1)" -msgstr "" +msgstr "Vidalia'i neizdevās pievienoties Tor. (%1)" msgctxt "ControlConnection" msgid "Control socket is not connected." -msgstr "" +msgstr "Vadības ligzda nav pievienota" msgctxt "ControlPasswordInputDialog" msgid "Password Required" -msgstr "" +msgstr "Nepieciešama parole" msgctxt "ControlPasswordInputDialog" msgid "Remember my password" -msgstr "" +msgstr "Atcerēties manu paroli" msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia has connected to a running Tor process that requires a password. " "Please enter your control password:" -msgstr "" +msgstr "Vidalia izveidoja savienbojumu ar darbojošos Tor'a procesu, kurš pieprasa paroli. Lūdzu ierakstiet savu kontroles paroli:" msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "" +msgstr "Vadības ligzda nav pievienota." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" @@ -660,203 +660,203 @@ msgstr "" msgctxt "CountryInfo" msgid "Dominica" -msgstr "" +msgstr "Dominika" msgctxt "CountryInfo" msgid "Dominican Republic" -msgstr "" +msgstr "Dominikānas Republika" msgctxt "CountryInfo" msgid "Ecuador" -msgstr "" +msgstr "Ekvadora" msgctxt "CountryInfo" msgid "Egypt" -msgstr "" +msgstr "Ēģipte" msgctxt "CountryInfo" msgid "El Salvador" -msgstr "" +msgstr "Salvadora" msgctxt "CountryInfo" msgid "Equatorial Guinea" -msgstr "" +msgstr "Ekvatoriālā Gvineja" msgctxt "CountryInfo" msgid "Eritrea" -msgstr "" +msgstr "Eritreja" msgctxt "CountryInfo" msgid "Estonia" -msgstr "" +msgstr "Igaunija" msgctxt "CountryInfo" msgid "France" -msgstr "" +msgstr "Francija" msgctxt "CountryInfo" msgid "Gabon" -msgstr "" +msgstr "Gabona" msgctxt "CountryInfo" msgid "Gambia" -msgstr "" +msgstr "Gambija" msgctxt "CountryInfo" msgid "Georgia" -msgstr "" +msgstr "Gruzija" msgctxt "CountryInfo" msgid "Germany" -msgstr "" +msgstr "Vācija" msgctxt "CountryInfo" msgid "Ghana" -msgstr "" +msgstr "Gana" msgctxt "CountryInfo" msgid "Grenada" -msgstr "" +msgstr "Grenāda" msgctxt "CountryInfo" msgid "Guatemala" -msgstr "" +msgstr "Gvatemala" msgctxt "CountryInfo" msgid "Guinea" -msgstr "" +msgstr "Gvineja" msgctxt "CountryInfo" msgid "Guinea-Bissau" -msgstr "" +msgstr "Gvineja-Bisava" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "Gajāna" msgctxt "CountryInfo" msgid "Hong Kong" -msgstr "" +msgstr "Honkonga" msgctxt "CountryInfo" msgid "Haiti" -msgstr "" +msgstr "Haiti" msgctxt "CountryInfo" msgid "Honduras" -msgstr "" +msgstr "Hondurasa" msgctxt "CountryInfo" msgid "Israel" -msgstr "" +msgstr "Izraēla" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Itālija" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Jamaika" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Japāna" msgctxt "CountryInfo" msgid "Jordan" -msgstr "" +msgstr "Jordānija" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "Kazahstāna" msgctxt "CountryInfo" msgid "Kenya" -msgstr "" +msgstr "Kenija" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "Kiribati" msgctxt "CountryInfo" msgid "Kuwait" -msgstr "" +msgstr "Kuveita" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "Kirgizstāna" msgctxt "CountryInfo" msgid "Laos" -msgstr "" +msgstr "Laosa" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Latvija" msgctxt "CountryInfo" msgid "Lebanon" -msgstr "" +msgstr "Libāna" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "Lesoto" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "Libērija" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "Lihtenšteina" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Lietuva" msgctxt "CountryInfo" msgid "Luxembourg" -msgstr "" +msgstr "Luksemburga" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "Maķedonija" msgctxt "CountryInfo" msgid "Madagascar" -msgstr "" +msgstr "Madagaskara" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "Malāvija" msgctxt "CountryInfo" msgid "Malaysia" -msgstr "" +msgstr "Mailaizija" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "Mali" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Malta" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "Māršala salas" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "Mauritānija" msgctxt "CountryInfo" msgid "Mauritius" -msgstr "" +msgstr "Maurīcija" msgctxt "CountryInfo" msgid "Micronesia" -msgstr "" +msgstr "Mikronēzija" msgctxt "CountryInfo" msgid "Moldova"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 11 Nov '12

11 Nov '12

commit 72579e0580e5dc856359cd7e4333e902a8d457c1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 11 20:15:16 2012 +0000 Update translations for vidalia --- lv/vidalia_lv.po | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 5864140..e108c3d 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,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: 2012-11-10 18:33+0000\n" +"PO-Revision-Date: 2012-11-11 20:14+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -67,31 +67,31 @@ msgstr "Neizdevās izveidot %1 [%2]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "" +msgstr "Izvēlieties direktoriju, kuru lietot Tor datiem" msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "" +msgstr "Neizdevās noņemt Tor pakalpojumu" msgctxt "AdvancedPage" msgid "Unable to install Tor Service" -msgstr "" +msgstr "Neizdevās instalēt Tor pakalpojumu" msgctxt "AdvancedPage" msgid "Vidalia was unable to install the Tor service." -msgstr "" +msgstr "Vidalia'i neizdevās instalēt Tor pakalpojumu." msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "" +msgstr "Autentifikācija:" msgctxt "AdvancedPage" msgid "Address:" -msgstr "" +msgstr "Adrese:" msgctxt "AdvancedPage" msgid "None" -msgstr "" +msgstr "Nav" msgctxt "AdvancedPage" msgid "Cookie" @@ -111,15 +111,15 @@ msgstr ":" msgctxt "AdvancedPage" msgid "Tor Configuration File" -msgstr "" +msgstr "Tor konfigurācijas datne" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "" +msgstr "Palaidiet Tor programmatūru, lietojot norādīto konfigurācijas datni (torrc)" msgctxt "AdvancedPage" msgid "Select path to your configuration file" -msgstr "" +msgstr "Izvēlieties ceļu uz savu konfigurācijas datni" msgctxt "AdvancedPage" msgid "Browse" @@ -131,11 +131,11 @@ msgstr "Datu direktorijs" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "" +msgstr "Tor programmatūras datus glabāt šajā direktorijā" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" -msgstr "" +msgstr "Izvēlēties direktoriju, kuru lietot Tor programmatūras datu glabāšanai" msgctxt "AdvancedPage" msgid "Tor Control" @@ -209,7 +209,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "" +msgstr "Vidalia neizdevās noņemt Tor pakalpojumu.\n\nIespējams, tas Jums būs jānoņem manuāli." msgctxt "AppearancePage" msgid "Language" @@ -217,19 +217,19 @@ msgstr "Valoda" msgctxt "AppearancePage" msgid "Choose the language used in Vidalia" -msgstr "" +msgstr "Izvēlēties Vidalia lietoto valodu" msgctxt "AppearancePage" msgid "Style" -msgstr "" +msgstr "Stils" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "" +msgstr "Izvēlieties Vidalia's saskarnes stilu" msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." -msgstr "" +msgstr "Vidalia'i neizdevās ielādēt izvēlētās valodas tulkojumu." msgctxt "AppearancePage" msgid "" @@ -262,11 +262,11 @@ msgstr "Rādīt iestatījumus" msgctxt "BandwidthGraph" msgid "Tor Bandwidth Usage" -msgstr "" +msgstr "Tora izmantotais joslas platums" msgctxt "BandwidthGraph" msgid "Reset" -msgstr "" +msgstr "Atiestatīt" msgctxt "BandwidthGraph" msgid "Receive Rate"

1 0

[ooni-probe/master] Change required version of txtorcon to that which is stored on pypi.
by art＠torproject.org 11 Nov '12

11 Nov '12

commit d88a54c113869fecc83374d340c7ecfe5f8f1220 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 20:40:26 2012 +0100 Change required version of txtorcon to that which is stored on pypi. * Refactor README.md with easier installation of scapy. --- README.md | 37 +++++++++++-------------------------- requirements.txt | 2 +- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index a6e3469..98edd1e 100644 --- a/README.md +++ b/README.md @@ -37,31 +37,9 @@ The python dependencies required for running ooniprobe are: * BeautifulSoup: http://www.crummy.com/software/BeautifulSoup/ * txtorcon: https://github.com/meejah/txtorcon -### Installing scapy - -Unfortunately the version of scapy that is stored on pypi is out of date, this -means that you will have to manually download and install scapy. - -This can be done like so: - - wget http://www.secdev.org/projects/scapy/files/scapy-latest.tar.gz - tar xzf scapy-latest.tar.gz - cd scapy-* - python setup.py install - -If you are not inside of a virtual env the last command will have to be: - - sudo python setup.py install - -### Installing the rest of dependencies - -The other dependencies can be installed from the requirements.txt with: - - sudo pip install -r requirements.txt - -You are highly recommended to do so from inside of a virtual environment, since -pip does not download the packages via SSL and you will need to install it -system wide. +You are highly recommended to install depedencies from inside of a virtual +environment, since pip does not download the packages via SSL and you will need +to install it system wide. This will require you to have installed virtualenv. @@ -73,7 +51,14 @@ To create a new virtual environment do Then install OONI with: - pip install -r requirements.txt + pip install https://hg.secdev.org/scapy/archive/tip.zip + pip install -r requirements.txt + +If you decided not to install virtual env and want to download code via http as +run it as root, you may easily do so with: + + pip install https://hg.secdev.org/scapy/archive/tip.zip + sudo pip install -r requirements.txt ## Including your geo data in the test report diff --git a/requirements.txt b/requirements.txt index 4b7e59e..e9a7bfc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ repoze.sphinx.autointerface>=0.7.1 scapy>=2.1.0 storm>=0.19 transaction>=1.3.0 -txtorcon>=0.7 +txtorcon>=0.6 wsgiref>=0.1.2 zope.component>=4.0.0 zope.event>=4.0.0

1 0

[ooni-probe/master] Update nettests/core/url_list.py
by art＠torproject.org 11 Nov '12

11 Nov '12

commit c67d69ec432e32479daca2ed65b27529260c9ba5 Author: jonmtoz <jonmtoz(a)gmail.com> Date: Sat Nov 10 22:54:34 2012 +0200 Update nettests/core/url_list.py --- nettests/core/url_list.py | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/nettests/core/url_list.py b/nettests/core/url_list.py index 43f819e..9db912d 100644 --- a/nettests/core/url_list.py +++ b/nettests/core/url_list.py @@ -21,4 +21,20 @@ class URLList(httpt.HTTPTest): return self.doRequest(self.url) + def test_post(self): + if self.input: + self.url = self.input + else: + raise Exception("No input specified") + + return self.doRequest(self.url, method="POST") + + def test_put(self): + if self.input: + self.url = self.input + else: + raise Exception("No input specified") + + return self.doRequest(self.url, method="PUT") +

1 0

[ooni-probe/master] Update nettests/core/url_list.py
by art＠torproject.org 11 Nov '12

11 Nov '12

commit 28241124e6094b224f4a3b4f6c0a8e8a69a7eeb6 Author: jonmtoz <jonmtoz(a)gmail.com> Date: Sat Nov 10 23:04:06 2012 +0200 Update nettests/core/url_list.py --- nettests/core/url_list.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nettests/core/url_list.py b/nettests/core/url_list.py index 9db912d..fe678be 100644 --- a/nettests/core/url_list.py +++ b/nettests/core/url_list.py @@ -19,7 +19,7 @@ class URLList(httpt.HTTPTest): else: raise Exception("No input specified") - return self.doRequest(self.url) + return self.doRequest(self.url, method="GET") def test_post(self): if self.input:

1 0

[ooni-probe/master] Merge pull request #7 from jonmtoz/master
by art＠torproject.org 11 Nov '12

11 Nov '12

commit 8e1b6ba589bd426dc551efa5d54eaf491ee96db4 Merge: a744bd1 2824112 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sun Nov 11 10:22:33 2012 -0800 Merge pull request #7 from jonmtoz/master Added POST and PUT requests nettests/core/url_list.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' of github.com:hellais/ooni-probe
by art＠torproject.org 11 Nov '12

11 Nov '12

commit 7b8637806845a6dcb295368d7074d7580d679f7e Merge: b97ee25 8e1b6ba Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 19:39:23 2012 +0100 Merge branch 'master' of github.com:hellais/ooni-probe * 'master' of github.com:hellais/ooni-probe: Update nettests/core/url_list.py Update nettests/core/url_list.py nettests/core/url_list.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-)

1 0

[ooni-probe/master] Remove cyclone, numpy and bs4 from the dependencies of ooniprobe.
by art＠torproject.org 11 Nov '12

11 Nov '12

commit b97ee255c462f00c37a7a0be6c2d411b13aa9e17 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 19:35:06 2012 +0100 Remove cyclone, numpy and bs4 from the dependencies of ooniprobe. * These should only be depedencies of oonib and of "advanced" users of ooniprobe --- oonib/requirements.txt | 24 ++++++++++++++++++++++++ requirements.txt | 45 +++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 24 deletions(-) diff --git a/oonib/requirements.txt b/oonib/requirements.txt new file mode 100644 index 0000000..f9d7541 --- /dev/null +++ b/oonib/requirements.txt @@ -0,0 +1,24 @@ +BeautifulSoup==3.2.1 +Jinja2==2.6 +PyYAML==3.10 +Pygments==1.5 +Sphinx==1.1.3 +Twisted==12.2.0 +argparse==1.2.1 +cyclone==1.0-rc13 +distribute==0.6.24 +dnspython==1.10.0 +docutils==0.9.1 +ipaddr==2.1.10 +numpy==1.6.2 +pyOpenSSL==0.13 +pygeoip==0.2.5 +repoze.sphinx.autointerface==0.7.1 +scapy==2.1.0 +storm==0.19 +transaction==1.3.0 +txtorcon==0.7 +wsgiref==0.1.2 +zope.component==4.0.0 +zope.event==4.0.0 +zope.interface==4.0.1 diff --git a/requirements.txt b/requirements.txt index f9d7541..4b7e59e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,21 @@ -BeautifulSoup==3.2.1 -Jinja2==2.6 -PyYAML==3.10 -Pygments==1.5 -Sphinx==1.1.3 -Twisted==12.2.0 -argparse==1.2.1 -cyclone==1.0-rc13 -distribute==0.6.24 -dnspython==1.10.0 -docutils==0.9.1 -ipaddr==2.1.10 -numpy==1.6.2 -pyOpenSSL==0.13 -pygeoip==0.2.5 -repoze.sphinx.autointerface==0.7.1 -scapy==2.1.0 -storm==0.19 -transaction==1.3.0 -txtorcon==0.7 -wsgiref==0.1.2 -zope.component==4.0.0 -zope.event==4.0.0 -zope.interface==4.0.1 +Jinja2>=2.6 +PyYAML>=3.10 +Pygments>=1.5 +Sphinx>=1.1.3 +Twisted>=12.0.0 +argparse>=1.2.1 +distribute>=0.6.24 +dnspython>=1.10.0 +docutils>=0.9.1 +ipaddr>=2.1.10 +pyOpenSSL>=0.13 +pygeoip>=0.2.5 +repoze.sphinx.autointerface>=0.7.1 +scapy>=2.1.0 +storm>=0.19 +transaction>=1.3.0 +txtorcon>=0.7 +wsgiref>=0.1.2 +zope.component>=4.0.0 +zope.event>=4.0.0 +zope.interface>=4.0.1

1 0

[ooni-probe/master] Add sudo to commands that must be run as root
by art＠torproject.org 11 Nov '12

11 Nov '12

commit a744bd1b8ae1d29633bc27b4f95ce55d60cafe40 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 19:07:59 2012 +0100 Add sudo to commands that must be run as root --- README.md | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9d41eea..a6e3469 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ If you are not inside of a virtual env the last command will have to be: The other dependencies can be installed from the requirements.txt with: - pip install -r requirements.txt + sudo pip install -r requirements.txt You are highly recommended to do so from inside of a virtual environment, since pip does not download the packages via SSL and you will need to install it @@ -65,7 +65,7 @@ system wide. This will require you to have installed virtualenv. - apt-get install python-virtualenv + sudo apt-get install python-virtualenv To create a new virtual environment do @@ -75,7 +75,6 @@ Then install OONI with: pip install -r requirements.txt - ## Including your geo data in the test report Including geografical information on where your probe is located helps us @@ -92,7 +91,6 @@ directory is located for example: geoip_data_dir: /home/your_user/ooni-probe/data/ - ## Running some tests To see the possible command line options run: @@ -116,4 +114,3 @@ test result, nor create a pcap file. This behavior can be personalized by editing your ooniprobe.conf configuration file. -

1 0

[ooni-probe/master] Fix typo in README for installation of scapy
by art＠torproject.org 11 Nov '12

11 Nov '12

commit df94c8bbbcdd7ec46976d54c00dd312154a910c4 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Nov 11 18:58:11 2012 +0100 Fix typo in README for installation of scapy * Make import of pygeoip soft --- README.md | 3 +-- ooni/utils/geodata.py | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c3ef8a6..9d41eea 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,7 @@ This can be done like so: wget http://www.secdev.org/projects/scapy/files/scapy-latest.tar.gz tar xzf scapy-latest.tar.gz - cd scapy-latest.tar.gz - cd scapy-latest + cd scapy-* python setup.py install If you are not inside of a virtual env the last command will have to be: diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py index 5c3c481..447d2eb 100644 --- a/ooni/utils/geodata.py +++ b/ooni/utils/geodata.py @@ -10,7 +10,6 @@ import re import os -import pygeoip from twisted.web.client import Agent from twisted.internet import reactor, defer, protocol @@ -18,6 +17,11 @@ from twisted.internet import reactor, defer, protocol from ooni.utils import log, net from ooni import config +try: + import pygeoip +except ImportError: + log.err("Unable to import pygeoip. We will not be able to run geo IP related measurements") + @defer.inlineCallbacks def myIP(): target_site = 'https://check.torproject.org/'

1 0