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

[stem/master] Accepting "NEVER" expiration in ADDRMAP events
by atagar＠torproject.org 10 Feb '13

10 Feb '13

commit 2a952ec98054cf656efd5d9b2bffa1960cdf5b42 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 9 15:29:00 2013 -0800 Accepting "NEVER" expiration in ADDRMAP events The expiry value in ADDRMAP events can be 'NEVER'. This is a little troublesome since it means that the field might or might not be quoted (making this unique among all tor events). Caught by Desoxy on 'https://trac.torproject.org/8162'. --- stem/response/events.py | 21 ++++++++++++++------- test/unit/response/events.py | 12 ++++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index 24692d6..861459a 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -30,10 +30,11 @@ class Event(stem.response.ControlMessage): :var dict keyword_args: key/value arguments of the event """ - _POSITIONAL_ARGS = () # attribute names for recognized positional arguments - _KEYWORD_ARGS = {} # map of 'keyword => attribute' for recognized attributes - _QUOTED = () # positional arguments that are quoted - _SKIP_PARSING = False # skip parsing contents into our positional_args and keyword_args + _POSITIONAL_ARGS = () # attribute names for recognized positional arguments + _KEYWORD_ARGS = {} # map of 'keyword => attribute' for recognized attributes + _QUOTED = () # positional arguments that are quoted + _OPTIONALLY_QUOTED = () # positional arguments that may or may not be quoted + _SKIP_PARSING = False # skip parsing contents into our positional_args and keyword_args _VERSION_ADDED = stem.version.Version('0.1.1.1-alpha') # minimum version with control-spec V1 event support def _parse_message(self, arrived_at): @@ -93,7 +94,7 @@ class Event(stem.response.ControlMessage): attr_value = None if positional: - if attr_name in self._QUOTED: + if attr_name in self._QUOTED or (attr_name in self._OPTIONALLY_QUOTED and positional[0].startswith('"')): attr_values = [positional.pop(0)] if not attr_values[0].startswith('"'): @@ -164,14 +165,20 @@ class AddrMapEvent(Event): "error": "error", "EXPIRES": "utc_expiry", } - _QUOTED = ("expiry") + _OPTIONALLY_QUOTED = ("expiry") def _parse(self): if self.destination == "<error>": self.destination = None if self.expiry is not None: - self.expiry = datetime.datetime.strptime(self.expiry, "%Y-%m-%d %H:%M:%S") + if self.expiry == "NEVER": + self.expiry = None + else: + try: + self.expiry = datetime.datetime.strptime(self.expiry, "%Y-%m-%d %H:%M:%S") + except ValueError: + raise stem.ProtocolError("Unable to parse date in ADDRMAP event: %s" % self) if self.utc_expiry is not None: self.utc_expiry = datetime.datetime.strptime(self.utc_expiry, "%Y-%m-%d %H:%M:%S") diff --git a/test/unit/response/events.py b/test/unit/response/events.py index dddb854..8a685ff 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -18,6 +18,8 @@ from test import mocking ADDRMAP = '650 ADDRMAP www.atagar.com 75.119.206.243 "2012-11-19 00:50:13" \ EXPIRES="2012-11-19 08:50:13"' +ADDRMAP_NO_EXPIRATION = '650 ADDRMAP www.atagar.com 75.119.206.243 NEVER' + ADDRMAP_ERROR_EVENT = '650 ADDRMAP www.atagar.com <error> "2012-11-19 00:50:13" \ error=yes EXPIRES="2012-11-19 08:50:13"' @@ -380,6 +382,16 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.error) self.assertEqual(datetime.datetime(2012, 11, 19, 8, 50, 13), event.utc_expiry) + event = _get_event(ADDRMAP_NO_EXPIRATION) + + self.assertTrue(isinstance(event, stem.response.events.AddrMapEvent)) + self.assertEqual(ADDRMAP_NO_EXPIRATION.lstrip("650 "), str(event)) + self.assertEqual("www.atagar.com", event.hostname) + self.assertEqual("75.119.206.243", event.destination) + self.assertEqual(None, event.expiry) + self.assertEqual(None, event.error) + self.assertEqual(None, event.utc_expiry) + event = _get_event(ADDRMAP_ERROR_EVENT) self.assertTrue(isinstance(event, stem.response.events.AddrMapEvent))

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 09 Feb '13

09 Feb '13

commit 4150442f3c7352602fa79dc2b0de2f6ba7862828 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 9 21:45:23 2013 +0000 Update translations for vidalia_completed --- fr/vidalia_fr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index 5abf22b..0d4e47e 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -2,6 +2,7 @@ # Translators: # arpalord <arpalord(a)gmail.com>, 2012. # Jonathan Metzman <jon.metzman(a)gmail.com>, 2012. +# Maxime Courtois <onizuka.xxxx(a)gmail.com>, 2013. # mehditaileb <mehditaileb(a)liberte-info.net>, 2011. # <onizuka.xxxx(a)gmail.com>, 2013. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. @@ -11,7 +12,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-01-14 03:13+0000\n" +"PO-Revision-Date: 2013-02-09 21:39+0000\n" "Last-Translator: Onizuka <onizuka.xxxx(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -439,7 +440,7 @@ msgstr "Erreur lors de l'enregistrement des paramètres" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." -msgstr "Vidalia n'a pas réussi à sauvegarder vos paramètress de %1." +msgstr "Vidalia n'a pas réussi à sauvegarder vos paramètres de %1." msgctxt "ConfigDialog" msgid "Error Applying Settings" @@ -1917,7 +1918,7 @@ msgstr "Vidalia n'a pu s'authentifier au logiciel Tor. (%1)" msgctxt "MainWindow" msgid "Please check your control port authentication settings." -msgstr "Veuillez vérifier les paramètress d'authentification de votre port de contrôle." +msgstr "Veuillez vérifier les paramètres d'authentification de votre port de contrôle." msgctxt "MainWindow" msgid "Tor Update Available"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 09 Feb '13

09 Feb '13

commit 4a547e1aadc56fb91a44250f3c7c5973a16428a6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 9 21:45:18 2013 +0000 Update translations for vidalia --- fr/vidalia_fr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index 5abf22b..0d4e47e 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -2,6 +2,7 @@ # Translators: # arpalord <arpalord(a)gmail.com>, 2012. # Jonathan Metzman <jon.metzman(a)gmail.com>, 2012. +# Maxime Courtois <onizuka.xxxx(a)gmail.com>, 2013. # mehditaileb <mehditaileb(a)liberte-info.net>, 2011. # <onizuka.xxxx(a)gmail.com>, 2013. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. @@ -11,7 +12,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-01-14 03:13+0000\n" +"PO-Revision-Date: 2013-02-09 21:39+0000\n" "Last-Translator: Onizuka <onizuka.xxxx(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -439,7 +440,7 @@ msgstr "Erreur lors de l'enregistrement des paramètres" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." -msgstr "Vidalia n'a pas réussi à sauvegarder vos paramètress de %1." +msgstr "Vidalia n'a pas réussi à sauvegarder vos paramètres de %1." msgctxt "ConfigDialog" msgid "Error Applying Settings" @@ -1917,7 +1918,7 @@ msgstr "Vidalia n'a pu s'authentifier au logiciel Tor. (%1)" msgctxt "MainWindow" msgid "Please check your control port authentication settings." -msgstr "Veuillez vérifier les paramètress d'authentification de votre port de contrôle." +msgstr "Veuillez vérifier les paramètres d'authentification de votre port de contrôle." msgctxt "MainWindow" msgid "Tor Update Available"

1 0

[stem/master] Fixing SingleLineResponse interlinking
by atagar＠torproject.org 09 Feb '13

09 Feb '13

commit dba169f5cb3d28da29c7c2011ef5de7cc5825d37 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 9 13:07:23 2013 -0800 Fixing SingleLineResponse interlinking The SingleLineResponse class wasn't in the module's __all__, causing it to not appear in the sphinx output. --- stem/response/__init__.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index deff79c..c413530 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -22,6 +22,8 @@ Parses replies from the control socket. |- peek_key - provides the key of the next entry |- pop - removes and returns the next entry +- pop_mapping - removes and returns the next entry as a KEY=VALUE mapping + + SingleLineResponse - Simple tor response only including a single line of information. """ from __future__ import with_statement @@ -35,6 +37,7 @@ __all__ = [ "convert", "ControlMessage", "ControlLine", + "SingleLineResponse", ] import re @@ -72,7 +75,7 @@ def convert(response_type, message, **kwargs): **EVENT** :class:`stem.response.events.Event` subclass **PROTOCOLINFO** :class:`stem.response.protocolinfo.ProtocolInfoResponse` **AUTHCHALLENGE** :class:`stem.response.authchallenge.AuthChallengeResponse` - **SINGLELINE** :class:`stem.response.__init__.SingleLineResponse` + **SINGLELINE** :class:`stem.response.SingleLineResponse` =================== ===== :param str response_type: type of tor response to convert to

1 0

[stem/master] Improving stem.response.convert() pydocs
by atagar＠torproject.org 09 Feb '13

09 Feb '13

commit 74b60f7552b587ea576db0be01e31e0e5531bb7d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 9 12:53:31 2013 -0800 Improving stem.response.convert() pydocs The convert() pydocs were pretty clunky. Replacing the listing with a nice table mapping the response_type to classes, like what we do elsewhere. --- stem/response/__init__.py | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index f4c9694..deff79c 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -8,6 +8,7 @@ Parses replies from the control socket. convert - translates a ControlMessage into a particular response subclass ControlMessage - Message that's read from the control socket. + |- from_str - provides a ControlMessage for the given string |- content - provides the parsed message content |- raw_content - unparsed socket data |- __str__ - content stripped of protocol formatting @@ -62,17 +63,17 @@ def convert(response_type, message, **kwargs): :class:`~stem.response.ControlMessage` to a subclass for its response type. Recognized types include... - * **\*** GETINFO - * **\*** GETCONF - * **&** **^** MAPADDRESS - * EVENT - * PROTOCOLINFO - * AUTHCHALLENGE - * SINGLELINE - - * **\*** can raise a :class:`stem.InvalidArguments` exception - * **^** can raise a :class:`stem.InvalidRequest` exception - * **&** can raise a :class:`stem.OperationFailed` exception + =================== ===== + response_type Class + =================== ===== + **GETINFO** :class:`stem.response.getinfo.GetInfoResponse` + **GETCONF** :class:`stem.response.getconf.GetConfResponse` + **MAPADDRESS** :class:`stem.response.mapaddress.MapAddressResponse` + **EVENT** :class:`stem.response.events.Event` subclass + **PROTOCOLINFO** :class:`stem.response.protocolinfo.ProtocolInfoResponse` + **AUTHCHALLENGE** :class:`stem.response.authchallenge.AuthChallengeResponse` + **SINGLELINE** :class:`stem.response.__init__.SingleLineResponse` + =================== ===== :param str response_type: type of tor response to convert to :param stem.response.ControlMessage message: message to be converted @@ -82,9 +83,13 @@ def convert(response_type, message, **kwargs): * :class:`stem.ProtocolError` the message isn't a proper response of that type * :class:`stem.InvalidArguments` the arguments given as input are - invalid + invalid, this is can only be raised if the response_type is: **GETINFO**, + **GETCONF** * :class:`stem.InvalidRequest` the arguments given as input are - invalid + invalid, this is can only be raised if the response_type is: + **MAPADDRESS** + * :class:`stem.OperationFailed` if the action the event represents failed, + this is can only be raised if the response_type is: **MAPADDRESS** * **TypeError** if argument isn't a :class:`~stem.response.ControlMessage` or response_type isn't supported """

1 0

[stem/master] Adding a ControlMessage.from_str() function
by atagar＠torproject.org 09 Feb '13

09 Feb '13

commit 5f8b7b4231bcda7f69296821aa6417fd3e2ce5f3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 9 12:35:11 2013 -0800 Adding a ControlMessage.from_str() function In discussions with Mike about using stem for txtorcon a major use has been response parsing. Using stem for this is dead easy, but requires a hack. Adding a function to negate the need for hackery. --- stem/response/__init__.py | 14 ++++++++++++++ test/mocking.py | 6 ++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 11eed0a..f4c9694 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -37,6 +37,7 @@ __all__ = [ ] import re +import StringIO import threading import stem.socket @@ -124,6 +125,19 @@ class ControlMessage(object): never empty. """ + def from_str(content): + """ + Provides a ControlMessage for the given content. + + :param str content: message to construct the message from + + :returns: stem.response.ControlMessage instance + """ + + return stem.socket.recv_message(StringIO.StringIO(content)) + + from_str = staticmethod(from_str) + def __init__(self, parsed_content, raw_content): if not parsed_content: raise ValueError("ControlMessages can't be empty") diff --git a/test/mocking.py b/test/mocking.py index 6472659..f1e863d 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -24,7 +24,7 @@ calling :func:`test.mocking.revert_mocking`. raise_exception - raises an exception when called Instance Constructors - get_message - stem.socket.ControlMessage + get_message - stem.response.ControlMessage get_protocolinfo_response - stem.response.protocolinfo.ProtocolInfoResponse stem.descriptor.server_descriptor @@ -51,7 +51,6 @@ import base64 import hashlib import inspect import itertools -import StringIO import stem.descriptor.extrainfo_descriptor import stem.descriptor.networkstatus @@ -59,7 +58,6 @@ import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor import stem.prereq import stem.response -import stem.socket # Once we've mocked a function we can't rely on its __module__ or __name__ # attributes, so instead we associate a unique 'mock_id' attribute that maps @@ -530,7 +528,7 @@ def get_message(content, reformat = True): content = content.replace("\n", "\r\n") - return stem.socket.recv_message(StringIO.StringIO(content)) + return stem.response.ControlMessage.from_str(content) def get_protocolinfo_response(**attributes):

1 0

[tor/master] Wrap more macro definitions in (parentheses)
by nickm＠torproject.org 09 Feb '13

09 Feb '13

commit d86a45f991693cf2367a6ccb94fc29c22f5f7b45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 9 00:14:45 2013 -0500 Wrap more macro definitions in (parentheses) To avoid surprises, good coding practice suggests parenthesizing every macro definition -- or at the very least, all those involving an expression. --- src/or/onion_fast.h | 2 +- src/or/or.h | 4 ++-- src/or/rendservice.c | 2 +- src/or/rephist.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/onion_fast.h b/src/or/onion_fast.h index 0c2a475..8c07837 100644 --- a/src/or/onion_fast.h +++ b/src/or/onion_fast.h @@ -13,7 +13,7 @@ #define TOR_ONION_FAST_H #define CREATE_FAST_LEN DIGEST_LEN -#define CREATED_FAST_LEN DIGEST_LEN*2 +#define CREATED_FAST_LEN (DIGEST_LEN*2) typedef struct fast_handshake_state_t { uint8_t state[DIGEST_LEN]; diff --git a/src/or/or.h b/src/or/or.h index a0a921a..04640d0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4586,12 +4586,12 @@ typedef struct rend_encoded_v2_service_descriptor_t { * sooner.) * * XXX023 Should this be configurable? */ -#define INTRO_POINT_LIFETIME_MIN_SECONDS 18*60*60 +#define INTRO_POINT_LIFETIME_MIN_SECONDS (18*60*60) /** The maximum number of seconds that an introduction point will last * before expiring due to old age. * * XXX023 Should this be configurable? */ -#define INTRO_POINT_LIFETIME_MAX_SECONDS 24*60*60 +#define INTRO_POINT_LIFETIME_MAX_SECONDS (24*60*60) /** Introduction point information. Used both in rend_service_t (on * the service side) and in rend_service_descriptor_t (on both the diff --git a/src/or/rendservice.c b/src/or/rendservice.c index f85ac2c..10d232c 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -88,7 +88,7 @@ typedef struct rend_service_port_config_t { /** How many seconds should we wait for new HS descriptors to reach * our clients before we close an expiring intro point? */ -#define INTRO_POINT_EXPIRATION_GRACE_PERIOD 5*60 +#define INTRO_POINT_EXPIRATION_GRACE_PERIOD (5*60) /** Represents a single hidden service running at this OP. */ typedef struct rend_service_t { diff --git a/src/or/rephist.c b/src/or/rephist.c index 34caa4b..1bee645 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1549,7 +1549,7 @@ rep_hist_get_bandwidth_lines(void) /* [dirreq-](read|write)-history yyyy-mm-dd HH:MM:SS (n s) n,n,n... */ /* The n,n,n part above. Largest representation of a uint64_t is 20 chars * long, plus the comma. */ -#define MAX_HIST_VALUE_LEN 21*NUM_TOTALS +#define MAX_HIST_VALUE_LEN (21*NUM_TOTALS) len = (67+MAX_HIST_VALUE_LEN)*4; buf = tor_malloc_zero(len); cp = buf;

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Feb '13

09 Feb '13

commit c43673c5d605fa5a286f02e46551f904fe6f24e6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 9 04:45:58 2013 +0000 Update translations for liveusb-creator --- my/my.po | 404 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 404 insertions(+), 0 deletions(-) diff --git a/my/my.po b/my/my.po new file mode 100644 index 0000000..369b3d9 --- /dev/null +++ b/my/my.po @@ -0,0 +1,404 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-04-13 14:16+0200\n" +"PO-Revision-Date: 2012-10-03 17:40+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: my\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../liveusb/gui.py:80 +#, python-format +msgid "Unknown release: %s" +msgstr "" + +#: ../liveusb/gui.py:84 +#, python-format +msgid "Downloading %s..." +msgstr "" + +#: ../liveusb/gui.py:197 +#, python-format +msgid "Device is too small: it must be at least %s MiB." +msgstr "" + +#: ../liveusb/gui.py:226 +msgid "" +"Error: Cannot set the label or obtain the UUID of your device. Unable to " +"continue." +msgstr "" + +#: ../liveusb/gui.py:276 +#, python-format +msgid "Installation complete! (%s)" +msgstr "" + +#: ../liveusb/gui.py:281 +msgid "LiveUSB creation failed!" +msgstr "" + +#: ../liveusb/gui.py:388 +msgid "" +"Warning: This tool needs to be run as an Administrator. To do this, right " +"click on the icon and open the Properties. Under the Compatibility tab, " +"check the \"Run this program as an administrator\" box." +msgstr "" + +#: ../liveusb/gui.py:413 +msgid "Unable to find any USB drive" +msgstr "" + +#: ../liveusb/gui.py:521 +msgid "" +"Device is not yet mounted, so we cannot determine the amount of free space." +" Setting a maximum limit of 8G for the persistent storage." +msgstr "" + +#: ../liveusb/gui.py:528 +#, python-format +msgid "No free space on device %(device)s" +msgstr "" + +#: ../liveusb/gui.py:533 +msgid "Partition is FAT16; Restricting overlay size to 2G" +msgstr "" + +#: ../liveusb/gui.py:577 +msgid "Persistent Storage" +msgstr "" + +#: ../liveusb/gui.py:586 +msgid "Installation complete!" +msgstr "" + +#: ../liveusb/gui.py:587 +msgid "Installation was completed. Press OK to close this program." +msgstr "" + +#: ../liveusb/gui.py:610 +msgid "" +"The Master Boot Record on your device is blank. Pressing 'Create Live USB' " +"again will reset the MBR on this device." +msgstr "" + +#: ../liveusb/gui.py:624 +msgid "" +"Warning: The Master Boot Record on your device does not match your system's " +"syslinux MBR. If you have trouble booting this stick, try running the " +"liveusb-creator with the --reset-mbr option." +msgstr "" + +#: ../liveusb/gui.py:638 +msgid "Unable to mount device" +msgstr "" + +#: ../liveusb/gui.py:644 +msgid "Warning: All data on the selected drive will be lost." +msgstr "" + +#: ../liveusb/gui.py:646 ../liveusb/gui.py:663 +msgid "Press 'Next' if you wish to continue." +msgstr "" + +#: ../liveusb/gui.py:648 ../liveusb/gui.py:665 +msgid "Next" +msgstr "" + +#: ../liveusb/gui.py:658 +msgid "" +"Your device already contains a LiveOS.\n" +"If you continue, this will be overwritten." +msgstr "" + +#: ../liveusb/gui.py:661 +msgid "" +"Warning: Creating a new persistent overlay will delete your existing one." +msgstr "" + +#: ../liveusb/gui.py:717 +msgid "Download complete!" +msgstr "" + +#: ../liveusb/gui.py:721 +msgid "Download failed: " +msgstr "" + +#: ../liveusb/gui.py:722 +msgid "You can try again to resume your download" +msgstr "" + +#: ../liveusb/gui.py:728 +msgid "Select Live ISO" +msgstr "" + +#: ../liveusb/gui.py:731 +msgid "" +"The selected file is unreadable.Please fix its permissions or select another" +" file." +msgstr "" + +#: ../liveusb/gui.py:737 +msgid "" +"Unable to use the selected file. You may have better luck if you move your " +"ISO to the root of your drive (ie: C:\\)" +msgstr "" + +#: ../liveusb/gui.py:743 +#, python-format +msgid "%(filename)s selected" +msgstr "" + +#: ../liveusb/creator.py:91 +msgid "You must run this application as root" +msgstr "" + +#: ../liveusb/creator.py:130 +msgid "" +"Source type does not support verification of ISO MD5 checksum, skipping" +msgstr "" + +#: ../liveusb/creator.py:132 +msgid "Verifying ISO MD5 checksum" +msgstr "" + +#: ../liveusb/creator.py:137 +msgid "ISO MD5 checksum verification failed" +msgstr "" + +#: ../liveusb/creator.py:139 +msgid "ISO MD5 checksum passed" +msgstr "" + +#: ../liveusb/creator.py:144 +msgid "Extracting live image to USB device..." +msgstr "" + +#: ../liveusb/creator.py:151 +#, python-format +msgid "Wrote to device at %(speed)d MB/sec" +msgstr "" + +#: ../liveusb/creator.py:181 +msgid "Setting up OLPC boot file..." +msgstr "" + +#: ../liveusb/creator.py:365 +#, python-format +msgid "" +"There was a problem executing the following command: `%(command)s`.\n" +"A more detailed error log has been written to '%(filename)s'." +msgstr "" + +#: ../liveusb/creator.py:384 +msgid "Verifying SHA1 checksum of LiveCD image..." +msgstr "" + +#: ../liveusb/creator.py:388 +msgid "Verifying SHA256 checksum of LiveCD image..." +msgstr "" + +#: ../liveusb/creator.py:404 +msgid "" +"Error: The SHA1 of your Live CD is invalid. You can run this program with " +"the --noverify argument to bypass this verification check." +msgstr "" + +#: ../liveusb/creator.py:410 +msgid "Unknown ISO, skipping checksum verification" +msgstr "" + +#: ../liveusb/creator.py:421 +msgid "Not enough free space on device." +msgstr "" + +#: ../liveusb/creator.py:428 +#, python-format +msgid "Creating %sMB persistent overlay" +msgstr "" + +#: ../liveusb/creator.py:487 +#, python-format +msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:497 +msgid "Removing existing Live OS" +msgstr "" + +#: ../liveusb/creator.py:506 ../liveusb/creator.py:517 +#, python-format +msgid "Unable to chmod %(file)s: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:510 +#, python-format +msgid "Unable to remove file from previous LiveOS: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:522 +#, python-format +msgid "Unable to remove directory from previous LiveOS: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:573 +#, python-format +msgid "Cannot find device %s" +msgstr "" + +#: ../liveusb/creator.py:635 +msgid "" +"You are using an old version of syslinux-extlinux that does not support the " +"ext4 filesystem" +msgstr "" + +#: ../liveusb/creator.py:718 +#, python-format +msgid "Unable to write on %(device)s, skipping." +msgstr "" + +#: ../liveusb/creator.py:737 +#, python-format +msgid "" +"Some partitions of USB device %(device)s are mounted. They will be unmounted" +" before starting the installation process." +msgstr "" + +#: ../liveusb/creator.py:786 ../liveusb/creator.py:886 +msgid "Unknown filesystem. Your device may need to be reformatted." +msgstr "" + +#: ../liveusb/creator.py:789 +#, python-format +msgid "" +"Unsupported filesystem: %s\n" +"In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone Tails\" action instead." +msgstr "" + +#: ../liveusb/creator.py:791 ../liveusb/creator.py:889 +#, python-format +msgid "Unsupported filesystem: %s" +msgstr "" + +#: ../liveusb/creator.py:807 +#, python-format +msgid "Unknown dbus exception while trying to mount device: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:811 +#, python-format +msgid "Unable to mount device: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:823 +msgid "No mount points found" +msgstr "" + +#: ../liveusb/creator.py:834 +#, python-format +msgid "Unmounting %(device)s" +msgstr "" + +#: ../liveusb/creator.py:846 +#, python-format +msgid "Mount %s exists after unmounting" +msgstr "" + +#: ../liveusb/creator.py:883 ../liveusb/creator.py:1203 +msgid "Verifying filesystem..." +msgstr "" + +#: ../liveusb/creator.py:907 +#, python-format +msgid "Unable to change volume label: %(message)s" +msgstr "" + +#: ../liveusb/creator.py:912 ../liveusb/creator.py:1236 +msgid "Installing bootloader..." +msgstr "" + +#: ../liveusb/creator.py:935 ../liveusb/creator.py:1254 +#, python-format +msgid "Removing %(file)s" +msgstr "" + +#: ../liveusb/creator.py:1017 +#, python-format +msgid "%s already bootable" +msgstr "" + +#: ../liveusb/creator.py:1037 +msgid "Unable to find partition" +msgstr "" + +#: ../liveusb/creator.py:1060 +#, python-format +msgid "Formatting %(device)s as FAT32" +msgstr "" + +#: ../liveusb/creator.py:1109 +#, python-format +msgid "Resetting Master Boot Record of %s" +msgstr "" + +#: ../liveusb/creator.py:1112 +msgid "" +"Unable to reset MBR. You may not have the `syslinux` package installed." +msgstr "" + +#: ../liveusb/creator.py:1115 +msgid "Drive is a loopback, skipping MBR reset" +msgstr "" + +#: ../liveusb/creator.py:1119 ../liveusb/creator.py:1382 +#, python-format +msgid "Calculating the SHA1 of %s" +msgstr "" + +#: ../liveusb/creator.py:1143 +msgid "Synchronizing data on disk..." +msgstr "" + +#: ../liveusb/creator.py:1195 +msgid "Error probing device" +msgstr "" + +#: ../liveusb/creator.py:1197 +msgid "Unable to find any removable device" +msgstr "" + +#: ../liveusb/creator.py:1207 +msgid "" +"Make sure your USB key is plugged in and formatted with the FAT filesystem" +msgstr "" + +#: ../liveusb/creator.py:1210 +#, python-format +msgid "" +"Unsupported filesystem: %s\n" +"Please backup and format your USB key with the FAT filesystem." +msgstr "" + +#: ../liveusb/creator.py:1277 +msgid "" +"Unable to get Win32_LogicalDisk; win32com query did not return any results" +msgstr "" + +#: ../liveusb/creator.py:1330 +msgid "Cannot find" +msgstr "" + +#: ../liveusb/creator.py:1331 +msgid "" +"Make sure to extract the entire liveusb-creator zip file before running this" +" program." +msgstr ""

1 0

[tor/master] Merge remote-tracking branch 'public/signof_enum'
by nickm＠torproject.org 08 Feb '13

08 Feb '13

commit 561e9becbd1f896c31112ab2dfd56fe7badc9382 Merge: fd1c2a1 41200b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 16:48:50 2013 -0500 Merge remote-tracking branch 'public/signof_enum' Makefile.am | 2 + autogen.sh | 2 +- changes/signof_enum | 7 ++++++ configure.ac | 34 ++++++++++++------------------- m4/ax_check_sign.m4 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/common/compat.h | 3 +- src/win32/orconfig.h | 1 + 7 files changed, 79 insertions(+), 24 deletions(-)

1 0

[tor/master] Use a nicely written autoconf macro to determine the sign of a type
by nickm＠torproject.org 08 Feb '13

08 Feb '13

commit 0e597471aff206460f02999d6ea9e1e3243ef945 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 7 16:23:48 2013 -0500 Use a nicely written autoconf macro to determine the sign of a type This beats our old implementation, which wouldn't work when cross-compiling --- Makefile.am | 2 + autogen.sh | 2 +- changes/signof_enum | 4 +++ configure.ac | 28 ++++++------------------- m4/ax_check_sign.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2854763..4639c22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,6 +7,8 @@ # 1.9 means we require automake vesion 1.9 AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects +ACLOCAL_AMFLAGS = -I m4 + noinst_LIBRARIES= EXTRA_DIST= noinst_HEADERS= diff --git a/autogen.sh b/autogen.sh index efa2251..8c43a97 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,7 +17,7 @@ fi set -e # Run this to generate all the initial makefiles, etc. -aclocal && \ +aclocal -I m4 && \ autoheader && \ autoconf && \ automake --add-missing --copy diff --git a/changes/signof_enum b/changes/signof_enum new file mode 100644 index 0000000..fc9b9ed --- /dev/null +++ b/changes/signof_enum @@ -0,0 +1,4 @@ + o Code simplifications and refactoring: + - Use Ville Laurikari's implementation of AX_CHECK_SIGN() to determine + the signs of types during autoconf. This is better than our old + approach, which didn't work when cross-compiling. diff --git a/configure.ac b/configure.ac index c27cbd2..e80e6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,7 @@ dnl See LICENSE for licensing information AC_INIT([tor],[0.2.4.10-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) +AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([orconfig.h]) @@ -957,8 +958,9 @@ AC_CHECK_TYPES([rlim_t], , , #endif ]) -AC_CACHE_CHECK([whether time_t is signed], tor_cv_time_t_signed, [ -AC_RUN_IFELSE([AC_LANG_SOURCE([ +AX_CHECK_SIGN([time_t], + [ AC_DEFINE(TIME_T_IS_SIGNED, 1, [Define if time_t is signed]) ], + [ : ], [ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif @@ -968,32 +970,16 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([ #ifdef HAVE_TIME_H #include <time.h> #endif -int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }])], - tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes, tor_cv_time_t_signed=cross) ]) -if test "$tor_cv_time_t_signed" = cross; then - AC_MSG_NOTICE([Cross compiling: assuming that time_t is signed.]) -fi - -if test "$tor_cv_time_t_signed" != no; then - AC_DEFINE([TIME_T_IS_SIGNED], 1, - [Define to 1 iff time_t is signed]) -fi - -AC_CACHE_CHECK([whether size_t is signed], tor_cv_size_t_signed, [ -AC_RUN_IFELSE([AC_LANG_SOURCE([ +AX_CHECK_SIGN([size_t], + [ tor_cv_size_t_signed=yes ], + [ tor_cv_size_t_signed=no ], [ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -int main(int c, char**v) { if (((size_t)-1)<0) return 1; else return 0; }])], - tor_cv_size_t_signed=no, tor_cv_size_t_signed=yes, tor_cv_size_t_signed=cross) ]) -if test "$tor_cv_size_t_signed" = cross; then - AC_MSG_NOTICE([Cross compiling: assuming that size_t is not signed.]) -fi - if test "$tor_cv_size_t_signed" = yes; then AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.]) fi diff --git a/m4/ax_check_sign.m4 b/m4/ax_check_sign.m4 new file mode 100644 index 0000000..104b170 --- /dev/null +++ b/m4/ax_check_sign.m4 @@ -0,0 +1,54 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_sign.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_SIGN (TYPE, [ACTION-IF-SIGNED], [ACTION-IF-UNSIGNED], [INCLUDES]) +# +# DESCRIPTION +# +# Checks whether TYPE is signed or not. If no INCLUDES are specified, the +# default includes are used. If ACTION-IF-SIGNED is given, it is +# additional shell code to execute when the type is signed. If +# ACTION-IF-UNSIGNED is given, it is executed when the type is unsigned. +# +# This macro assumes that the type exists. Therefore the existence of the +# type should be checked before calling this macro. For example: +# +# AC_CHECK_HEADERS([wchar.h]) +# AC_CHECK_TYPE([wchar_t],,[ AC_MSG_ERROR([Type wchar_t not found.]) ]) +# AX_CHECK_SIGN([wchar_t], +# [ AC_DEFINE(WCHAR_T_SIGNED, 1, [Define if wchar_t is signed]) ], +# [ AC_DEFINE(WCHAR_T_UNSIGNED, 1, [Define if wchar_t is unsigned]) ], [ +# #ifdef HAVE_WCHAR_H +# #include <wchar.h> +# #endif +# ]) +# +# LICENSE +# +# Copyright (c) 2008 Ville Laurikari <vl(a)iki.fi> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([VL_CHECK_SIGN], [AX_CHECK_SIGN]) +AC_DEFUN([AX_CHECK_SIGN], [ + typename=`echo $1 | sed "s/@<:@^a-zA-Z0-9_@:>@/_/g"` + AC_CACHE_CHECK([whether $1 is signed], ax_cv_decl_${typename}_signed, [ + AC_TRY_COMPILE([$4], + [ int foo @<:@ 1 - 2 * !((($1) -1) < 0) @:>@ ], + [ eval "ax_cv_decl_${typename}_signed=\"yes\"" ], + [ eval "ax_cv_decl_${typename}_signed=\"no\"" ])]) + symbolname=`echo $1 | sed "s/@<:@^a-zA-Z0-9_@:>@/_/g" | tr "a-z" "A-Z"` + if eval "test \"\${ax_cv_decl_${typename}_signed}\" = \"yes\""; then + $2 + elif eval "test \"\${ax_cv_decl_${typename}_signed}\" = \"no\""; then + $3 + fi +])dnl

1 0