March 2011 - tor-commits - lists.torproject.org

r24395: {translation} patched howto.txt with text from kaner (translation/trunk/documentation)
by Runa Sandvik 18 Mar '11

18 Mar '11

Author: runa Date: 2011-03-18 20:37:30 +0000 (Fri, 18 Mar 2011) New Revision: 24395 Modified: translation/trunk/documentation/howto.txt Log: patched howto.txt with text from kaner Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-03-18 16:11:18 UTC (rev 24394) +++ translation/trunk/documentation/howto.txt 2011-03-18 20:37:30 UTC (rev 24395) @@ -192,14 +192,51 @@ BridgeDB: - # TODO: document the translation workflow for BridgeDB when we have - # figured it out. + 1. Updating the Translations + After pulling new translations from Transifex and checking them into + the BrideDB repository, log into the BridgeDB host and update + translations as follows in the BridgeDB source directory: + + $ python setup.py trans + $ python setup.py install_data + + This will ensure the newest translation strings can be used by BridgeDB. + + 2. Creating/Updating Translation Template Files + + To update the translation template file for BridgeDB, run the + following command inside the BridgeDB source directory: + + $ xgettext lib/bridgedb/I18n.py -dbridgedb --from-code=utf-8 \ + -oi18n/templates/bridgedb.pot + $ msgen -o i18n/en/bridgedb.po --lang=en i18n/templates/bridgedb.pot + $ for i in i18n/*/bridgedb.po; do \ + msgmerge -U $i i18n/templates/bridgedb.pot; done + GetTor: - # TODO: document the translation workflow for GetTor when we have - # figured it out. + 1. Updating the Translations + After pulling new translations from Transifex and checking them into + the GetTor repository, log into the GetTor host and update + translations as follows in the GetTor source directory: + + $ python setup.py trans + $ python setup.py install_data + + This will ensure the newest translation strings can be used by GetTor. + + 2. Creating/Updating Translation Template Files + + To update the translation template file for GetTor, run the + following command inside the BridgeDB source directory: + + $ xgettext lib/gettor/i18n.py -dgettor --from-code=utf-8 \ + -o i18n/templates/gettor.pot + $ for i in i18n/*/gettor.po; do \ + msgmerge -U $i i18n/templates/gettor.pot; done + Vidalia Help Files: The Transifex configuration file, source files and translations can

1 0

[tor/master] Fix two compile warnings when using clang
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 473ff2656355a796761e9eb5e15b30cd853c58b6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Mar 10 01:47:00 2011 +0100 Fix two compile warnings when using clang Issue found by Steven Murdoch --- src/or/geoip.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index e5694b9..f3e0b72 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,6 +278,8 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } +#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu + /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ @@ -413,12 +415,13 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); + tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); if (ent) { - ent->last_seen_in_minutes = now / 60; + ent->last_seen_in_minutes = (unsigned)(now/60); } else { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = now / 60; + ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); }

1 0

[tor/master] Fix signed/unsigned compare warning
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit fe86be61b6d84fbb442b13aa52139e6a3892dac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:42:00 2011 -0400 Fix signed/unsigned compare warning --- src/or/geoip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index a991654..654241c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -426,7 +426,7 @@ geoip_note_client_seen(geoip_client_action_t action, ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } - if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + if (now / 60 <= (int)MAX_LAST_SEEN_IN_MINUTES && now >= 0) ent->last_seen_in_minutes = (unsigned)(now/60); else ent->last_seen_in_minutes = 0;

1 0

[tor/master] Merge remote branch 'origin/maint-0.2.2'
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 8b393afa94891cb7d4d0371ff38469fbabbe61b3 Merge: 1db6eb6 fe86be6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:44:37 2011 -0400 Merge remote branch 'origin/maint-0.2.2' Trivial Conflicts: configure.in changes/bug2696 | 5 +++++ configure.in | 22 ++++++++++++++++++---- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 36 insertions(+), 9 deletions(-) diff --cc configure.in index d7cb91f,4436fe2..f5dcf44 --- a/configure.in +++ b/configure.in @@@ -1129,10 -927,11 +1135,11 @@@ if test x$enable_gcc_warnings = xyes | CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition" fi - if test x$have_gcc42 = xyes ; then + if test x$have_gcc42 = xyes ; then # These warnings break gcc 4.0.2 and work on gcc 4.2 # XXXX020 See if any of these work with earlier versions. - CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1" + CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1" + # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi

1 0

[tor/master] Merge remote branch 'sebastian/bug2696' into maint-0.2.2
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit f3d666366555226ec2ad0f647489a1d42145a2eb Merge: 9dfa244 4aac35c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:39:40 2011 -0400 Merge remote branch 'sebastian/bug2696' into maint-0.2.2 changes/bug2696 | 5 +++++ configure.in | 24 +++++++++++++++++++----- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-)

1 0

[tor/master] Remove superfluous -g -O2 compiler argument
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 3f94c4a1cb284ad177bbf2171d6d1c955d8baa85 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:04:01 2011 +0100 Remove superfluous -g -O2 compiler argument Autoconf adds -g -O2 by default, so adding it ourselves is not required. It also caused a warning with clang for every source file, so remove it here. Fixes last issue of ticket 2696. --- configure.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 9999f60..4436fe2 100644 --- a/configure.in +++ b/configure.in @@ -865,12 +865,13 @@ fi # Set CFLAGS _after_ all the above checks, since our warnings are stricter # than autoconf's macros like. if test "$GCC" = yes; then - CFLAGS="$CFLAGS -Wall -g -O2" # Disable GCC's strict aliasing checks. They are an hours-to-debug # accident waiting to happen. - CFLAGS="$CFLAGS -fno-strict-aliasing" + CFLAGS="$CFLAGS -Wall -fno-strict-aliasing" else - CFLAGS="$CFLAGS -g -O" + # Autoconf sets -g -O2 by default. Override optimization level + # for non-gcc compilers + CFLAGS="$CFLAGS -O" enable_gcc_warnings=no enable_gcc_warnings_advisory=no fi

1 0

[tor/master] Add 2696 changes file
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 4aac35cafa9843d10b05921da51dcc42bc3e9176 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:13:43 2011 +0100 Add 2696 changes file --- changes/bug2696 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2696 b/changes/bug2696 new file mode 100644 index 0000000..6ea41d4 --- /dev/null +++ b/changes/bug2696 @@ -0,0 +1,5 @@ + o Minor features: + - Make compilation with clang possible when using + --enable-gcc-warnings by removing two warnings that clang hasn't + implemented yet and by fixing a few warnings. Implements ticket + 2696.

1 0

[tor/master] Futz with the clang patch a bit and tidy some geoip.c stuff
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 547635c0049ec92e929e0f360f729b5dd308a215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 17 14:06:04 2011 -0400 Futz with the clang patch a bit and tidy some geoip.c stuff --- src/or/geoip.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index f3e0b72..a991654 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,19 +278,24 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } -#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu - /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; uint32_t ipaddr; + /** Time when we last saw this IP address, in MINUTES since the epoch. + * + * (This will run out of space around 4011 CE. If Tor is still in use around + * 4000 CE, please remember to add more bits to last_seen_in_minutes.) */ unsigned int last_seen_in_minutes:30; unsigned int action:2; } clientmap_entry_t; -#define ACTION_MASK 3 +/** Largest allowable value for last_seen_in_minutes. (It's a 30-bit field, + * so it can hold up to (1u<<30)-1, or 0x3fffffffu. + */ +#define MAX_LAST_SEEN_IN_MINUTES 0X3FFFFFFFu /** Map from client IP address to last time seen. */ static HT_HEAD(clientmap, clientmap_entry_t) client_history = @@ -415,16 +420,16 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); - tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); - if (ent) { - ent->last_seen_in_minutes = (unsigned)(now/60); - } else { + if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } + if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + ent->last_seen_in_minutes = (unsigned)(now/60); + else + ent->last_seen_in_minutes = 0; if (action == GEOIP_CLIENT_NETWORKSTATUS || action == GEOIP_CLIENT_NETWORKSTATUS_V2) {

1 0

[tor/master] Fix compilation under LLVM/clang with --enable-gcc-warnings
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 56bdc844ba68ac0911efc7ad3398f1eafeaaac76 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Wed Mar 9 19:05:51 2011 +0000 Fix compilation under LLVM/clang with --enable-gcc-warnings - When compiling using clang (2.9 or lower) do not enable -Wnormalized=id or -Woverride-init when --enable-gcc-warnings or --enable-gcc-warnings-advisory is set as these options are unsupported. --- configure.in | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f30402d..9999f60 100644 --- a/configure.in +++ b/configure.in @@ -894,6 +894,11 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy #error #endif])], have_gcc43=yes, have_gcc43=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9) +#error +#endif])], have_clang29orlower=yes, have_clang29orlower=no) + save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], have_shorten64_flag=yes, @@ -924,11 +929,19 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy if test x$have_gcc42 = xyes ; then # These warnings break gcc 4.0.2 and work on gcc 4.2 # XXXX020 See if any of these work with earlier versions. - CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1" + CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1" + # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi - if test x$have_gcc43 = xyes ; then + if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then + # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2 + # We only disable these for clang 2.9 and lower, in case they are + # supported in later versions. + CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init" + fi + + if test x$have_gcc43 = xyes ; then # These warnings break gcc 4.2 and work on gcc 4.3 # XXXX020 See if any of these work with earlier versions. CFLAGS="$CFLAGS -Wextra -Warray-bounds"

1 0

[tor/maint-0.2.2] Futz with the clang patch a bit and tidy some geoip.c stuff
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 547635c0049ec92e929e0f360f729b5dd308a215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 17 14:06:04 2011 -0400 Futz with the clang patch a bit and tidy some geoip.c stuff --- src/or/geoip.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index f3e0b72..a991654 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,19 +278,24 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } -#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu - /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; uint32_t ipaddr; + /** Time when we last saw this IP address, in MINUTES since the epoch. + * + * (This will run out of space around 4011 CE. If Tor is still in use around + * 4000 CE, please remember to add more bits to last_seen_in_minutes.) */ unsigned int last_seen_in_minutes:30; unsigned int action:2; } clientmap_entry_t; -#define ACTION_MASK 3 +/** Largest allowable value for last_seen_in_minutes. (It's a 30-bit field, + * so it can hold up to (1u<<30)-1, or 0x3fffffffu. + */ +#define MAX_LAST_SEEN_IN_MINUTES 0X3FFFFFFFu /** Map from client IP address to last time seen. */ static HT_HEAD(clientmap, clientmap_entry_t) client_history = @@ -415,16 +420,16 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); - tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); - if (ent) { - ent->last_seen_in_minutes = (unsigned)(now/60); - } else { + if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } + if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + ent->last_seen_in_minutes = (unsigned)(now/60); + else + ent->last_seen_in_minutes = 0; if (action == GEOIP_CLIENT_NETWORKSTATUS || action == GEOIP_CLIENT_NETWORKSTATUS_V2) {

1 0