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

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Jan '13

27 Jan '13

commit d9cecf70dd8cae495d5048b1a370480e95a8bd0f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 27 14:16:01 2013 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index dde35c5..36a7e4d 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -1,16 +1,16 @@ -<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.title "Om HTTPS Överallt"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Överallt"> +<!ENTITY https-everywhere.about.ext_description "Kryptera Webben! Använd HTTPS säkerhet automatiskt på många webbsidor."> <!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.created_by "Created by"> +<!ENTITY https-everywhere.about.created_by "Skapad av"> <!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> -<!ENTITY https-everywhere.about.thanks "Thanks to"> -<!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider"> -<!ENTITY https-everywhere.about.donate_tor "Donating to Tor"> +<!ENTITY https-everywhere.about.thanks "Tack till"> +<!ENTITY https-everywhere.about.contribute "Om du gillar HTTPS Överallt, överväg att"> +<!ENTITY https-everywhere.about.donate_tor "Donera till Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> +<!ENTITY https-everywhere.about.donate_eff "Donera till EFF"> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "Om HTTPS Överallt"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> <!ENTITY https-everywhere.menu.globalEnable "Aktivera HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Inaktivera HTTPS Everywhere"> @@ -19,14 +19,14 @@ <!ENTITY https-everywhere.prefs.enable_all "Aktivera alla"> <!ENTITY https-everywhere.prefs.disable_all "Inaktivera alla"> <!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standard"> -<!ENTITY https-everywhere.prefs.search "Search"> -<!ENTITY https-everywhere.prefs.site "Site"> +<!ENTITY https-everywhere.prefs.search "Sök"> +<!ENTITY https-everywhere.prefs.site "Sajt"> <!ENTITY https-everywhere.prefs.notes "Notes"> -<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> -<!ENTITY https-everywhere.prefs.enabled "Enabled"> -<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> -<!ENTITY https-everywhere.prefs.here_link "here"> -<!ENTITY https-everywhere.prefs.toggle "Toggle"> +<!ENTITY https-everywhere.prefs.list_caption "Vilka HTTPS vidarebefodrings regler ska gälla?"> +<!ENTITY https-everywhere.prefs.enabled "Aktiverad"> +<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lära dig hur du skriver dina egna regler (för att ge support för andra webbsidor)"> +<!ENTITY https-everywhere.prefs.here_link "här"> +<!ENTITY https-everywhere.prefs.toggle "Toggla"> <!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> <!ENTITY https-everywhere.prefs.view_xml_source "Visa XML Källa">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '13

27 Jan '13

commit 1255deb2a0cfc2d9974095adb2b26ffa3eb2eef1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 27 14:15:56 2013 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index dde35c5..36a7e4d 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -1,16 +1,16 @@ -<!ENTITY https-everywhere.about.title "About HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.title "Om HTTPS Överallt"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Överallt"> +<!ENTITY https-everywhere.about.ext_description "Kryptera Webben! Använd HTTPS säkerhet automatiskt på många webbsidor."> <!ENTITY https-everywhere.about.version "Version"> -<!ENTITY https-everywhere.about.created_by "Created by"> +<!ENTITY https-everywhere.about.created_by "Skapad av"> <!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> -<!ENTITY https-everywhere.about.thanks "Thanks to"> -<!ENTITY https-everywhere.about.contribute "If you like HTTPS Everywhere, you might consider"> -<!ENTITY https-everywhere.about.donate_tor "Donating to Tor"> +<!ENTITY https-everywhere.about.thanks "Tack till"> +<!ENTITY https-everywhere.about.contribute "Om du gillar HTTPS Överallt, överväg att"> +<!ENTITY https-everywhere.about.donate_tor "Donera till Tor"> <!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.donate_eff "Donating to EFF"> +<!ENTITY https-everywhere.about.donate_eff "Donera till EFF"> -<!ENTITY https-everywhere.menu.about "About HTTPS Everywhere"> +<!ENTITY https-everywhere.menu.about "Om HTTPS Överallt"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> <!ENTITY https-everywhere.menu.globalEnable "Aktivera HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Inaktivera HTTPS Everywhere"> @@ -19,14 +19,14 @@ <!ENTITY https-everywhere.prefs.enable_all "Aktivera alla"> <!ENTITY https-everywhere.prefs.disable_all "Inaktivera alla"> <!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standard"> -<!ENTITY https-everywhere.prefs.search "Search"> -<!ENTITY https-everywhere.prefs.site "Site"> +<!ENTITY https-everywhere.prefs.search "Sök"> +<!ENTITY https-everywhere.prefs.site "Sajt"> <!ENTITY https-everywhere.prefs.notes "Notes"> -<!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> -<!ENTITY https-everywhere.prefs.enabled "Enabled"> -<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> -<!ENTITY https-everywhere.prefs.here_link "here"> -<!ENTITY https-everywhere.prefs.toggle "Toggle"> +<!ENTITY https-everywhere.prefs.list_caption "Vilka HTTPS vidarebefodrings regler ska gälla?"> +<!ENTITY https-everywhere.prefs.enabled "Aktiverad"> +<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lära dig hur du skriver dina egna regler (för att ge support för andra webbsidor)"> +<!ENTITY https-everywhere.prefs.here_link "här"> +<!ENTITY https-everywhere.prefs.toggle "Toggla"> <!ENTITY https-everywhere.prefs.reset_default "Reset to Default"> <!ENTITY https-everywhere.prefs.view_xml_source "Visa XML Källa">

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 27 Jan '13

27 Jan '13

commit 750b4d27198f150ac559174f7ee1f536af386ba9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 27 14:15:22 2013 +0000 Update translations for vidalia_completed --- sv/vidalia_sv.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sv/vidalia_sv.po b/sv/vidalia_sv.po index 8e146ab..62278ea 100644 --- a/sv/vidalia_sv.po +++ b/sv/vidalia_sv.po @@ -11,7 +11,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-25 21:11+0000\n" +"PO-Revision-Date: 2013-01-27 14:08+0000\n" "Last-Translator: Dan West <danwesthq(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2114,7 +2114,7 @@ msgctxt "MainWindow" msgid "" "Your relay is shutting down.\n" "Click 'Stop' again to stop your relay now." -msgstr "Ditt Tor-relä stänger nu ner.⏎\nTryck 'Stopp' igen för att stänga det omgående." +msgstr "Ditt Tor-relä stänger nu ner.\nTryck 'Stopp' igen för att stänga det omgående." msgctxt "MainWindow" msgid "" @@ -2122,21 +2122,21 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "Vidalia vet inte hur det ska prata med Tor eftersom det inte kan komma åt den här filen: %1⏎ ⏎ Här är det senaste felmeddelandet:⏎ %2" +msgstr "Vidalia vet inte hur det ska prata med Tor eftersom det inte kan komma åt den här filen: %1\n\nHär är det senaste felmeddelandet:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "Det verkar som om Tor har slutat köra sedan Vidalia starteade det.⏎ ⏎ Kolla den Avancerade Meddelande Loggen för mer information." +msgstr "Det verkar som om Tor har slutat köra sedan Vidalia starteade det.\n\nKolla den Avancerade Meddelande Loggen för mer information." msgctxt "MainWindow" msgid "" "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" -msgstr "Du kör just nu en relä. Stänger du din relä kommer det att avbryta öppna anslutningar från klienter.⏎ ⏎ Skulle du vilja avsluta på ett fint sätt och ge klienter tid att hitta en ny relä?" +msgstr "Du kör just nu en relä. Stänger du din relä kommer det att avbryta öppna anslutningar från klienter.\n\nSkulle du vilja avsluta på ett fint sätt och ge klienter tid att hitta en ny relä?" msgctxt "MainWindow" msgid "" @@ -2417,13 +2417,13 @@ msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." -msgstr "Meddelanden som visas när något har gått väldigt fel och Tor kan inte fortsätta." +msgstr "Meddelanden som visas när något har\ngått väldigt fel och Tor kan inte fortsätta." msgctxt "MessageLog" msgid "" "Messages that only appear when \n" "something has gone wrong with Tor." -msgstr "Meddelanden som bara visas när något har gått fel med Tor." +msgstr "Meddelanden som bara visas när\nnågot har gått fel med Tor." msgctxt "MessageLog" msgid "" @@ -2431,19 +2431,19 @@ msgid "" "during normal Tor operation and are \n" "not considered errors, but you may \n" "care about." -msgstr "Meddelanden som sällan visas under normal Tor-drift och som inte anses vara fel, men som du kanske bryr dig om." +msgstr "Meddelanden som sällan visas\nunder normal Tor-drift och som\ninte anses vara fel, men som du\nkanske bryr dig om." msgctxt "MessageLog" msgid "" "Messages that appear frequently \n" "during normal Tor operation." -msgstr "Meddelanden som ofta visas under normal Tor drift." +msgstr "Meddelanden som ofta visas\nunder normal Tor drift." msgctxt "MessageLog" msgid "" "Hyper-verbose messages primarily of \n" "interest to Tor developers." -msgstr "Övermångordiga meddelanden främst av intresse för Tor- utvecklarna." +msgstr "Övermångordiga meddelanden främst av\nintresse för Tor- utvecklarna." msgctxt "MessageLog" msgid "" @@ -3132,7 +3132,7 @@ msgctxt "ServerPage" msgid "" "Email address at which you may be reached if there is a\n" "problem with your relay. You might also include your PGP or GPG fingerprint." -msgstr "E-postadress där du kan nås om det finns ett problem med din router. Du kan också inkludera ditt PGP eller GPG-fingeravtryck." +msgstr "E-postadress där du kan nås om det finns ett\nproblem med din router. Du kan också inkludera ditt PGP eller GPG-fingeravtryck." msgctxt "ServicePage" msgid "Error while trying to unpublish all services"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Jan '13

27 Jan '13

commit d664932e48a2ec79db1af9c450ad96208cdf513d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 27 14:15:18 2013 +0000 Update translations for vidalia --- sv/vidalia_sv.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sv/vidalia_sv.po b/sv/vidalia_sv.po index 8e146ab..62278ea 100644 --- a/sv/vidalia_sv.po +++ b/sv/vidalia_sv.po @@ -11,7 +11,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-25 21:11+0000\n" +"PO-Revision-Date: 2013-01-27 14:08+0000\n" "Last-Translator: Dan West <danwesthq(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2114,7 +2114,7 @@ msgctxt "MainWindow" msgid "" "Your relay is shutting down.\n" "Click 'Stop' again to stop your relay now." -msgstr "Ditt Tor-relä stänger nu ner.⏎\nTryck 'Stopp' igen för att stänga det omgående." +msgstr "Ditt Tor-relä stänger nu ner.\nTryck 'Stopp' igen för att stänga det omgående." msgctxt "MainWindow" msgid "" @@ -2122,21 +2122,21 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "Vidalia vet inte hur det ska prata med Tor eftersom det inte kan komma åt den här filen: %1⏎ ⏎ Här är det senaste felmeddelandet:⏎ %2" +msgstr "Vidalia vet inte hur det ska prata med Tor eftersom det inte kan komma åt den här filen: %1\n\nHär är det senaste felmeddelandet:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "Det verkar som om Tor har slutat köra sedan Vidalia starteade det.⏎ ⏎ Kolla den Avancerade Meddelande Loggen för mer information." +msgstr "Det verkar som om Tor har slutat köra sedan Vidalia starteade det.\n\nKolla den Avancerade Meddelande Loggen för mer information." msgctxt "MainWindow" msgid "" "You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" -msgstr "Du kör just nu en relä. Stänger du din relä kommer det att avbryta öppna anslutningar från klienter.⏎ ⏎ Skulle du vilja avsluta på ett fint sätt och ge klienter tid att hitta en ny relä?" +msgstr "Du kör just nu en relä. Stänger du din relä kommer det att avbryta öppna anslutningar från klienter.\n\nSkulle du vilja avsluta på ett fint sätt och ge klienter tid att hitta en ny relä?" msgctxt "MainWindow" msgid "" @@ -2417,13 +2417,13 @@ msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." -msgstr "Meddelanden som visas när något har gått väldigt fel och Tor kan inte fortsätta." +msgstr "Meddelanden som visas när något har\ngått väldigt fel och Tor kan inte fortsätta." msgctxt "MessageLog" msgid "" "Messages that only appear when \n" "something has gone wrong with Tor." -msgstr "Meddelanden som bara visas när något har gått fel med Tor." +msgstr "Meddelanden som bara visas när\nnågot har gått fel med Tor." msgctxt "MessageLog" msgid "" @@ -2431,19 +2431,19 @@ msgid "" "during normal Tor operation and are \n" "not considered errors, but you may \n" "care about." -msgstr "Meddelanden som sällan visas under normal Tor-drift och som inte anses vara fel, men som du kanske bryr dig om." +msgstr "Meddelanden som sällan visas\nunder normal Tor-drift och som\ninte anses vara fel, men som du\nkanske bryr dig om." msgctxt "MessageLog" msgid "" "Messages that appear frequently \n" "during normal Tor operation." -msgstr "Meddelanden som ofta visas under normal Tor drift." +msgstr "Meddelanden som ofta visas\nunder normal Tor drift." msgctxt "MessageLog" msgid "" "Hyper-verbose messages primarily of \n" "interest to Tor developers." -msgstr "Övermångordiga meddelanden främst av intresse för Tor- utvecklarna." +msgstr "Övermångordiga meddelanden främst av\nintresse för Tor- utvecklarna." msgctxt "MessageLog" msgid "" @@ -3132,7 +3132,7 @@ msgctxt "ServerPage" msgid "" "Email address at which you may be reached if there is a\n" "problem with your relay. You might also include your PGP or GPG fingerprint." -msgstr "E-postadress där du kan nås om det finns ett problem med din router. Du kan också inkludera ditt PGP eller GPG-fingeravtryck." +msgstr "E-postadress där du kan nås om det finns ett\nproblem med din router. Du kan också inkludera ditt PGP eller GPG-fingeravtryck." msgctxt "ServicePage" msgid "Error while trying to unpublish all services"

1 0

[torsocks/pending-changes] Try both symbol names before showing library error
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 3f575e848eb77860215ba7ff39a6f629acfefc11 Author: Matthew Finkel <matthew.finkel(a)gmail.com> Date: Sat Nov 10 23:24:19 2012 -0500 Try both symbol names before showing library error The correct library we need to find may be the symbol sym or __sym or something else entirely that we can't handle yet. We want to try to find the library using both naming conventions, because they are the most common, before we display a (very repetitive) warning. Adjust macro name, check if dlerror returns null. strdup dlerror after sym not found. Give the macro a more descriptive name and add it to torsocks namespace. Also use a default "Not Found" reason if both dysym and dlerror return null. Factor out common macro --- src/common.h | 28 ++++++++++++++++++++++++++++ src/darwin_warts.c | 16 ++++------------ src/torsocks.c | 51 ++++++++++++++++++--------------------------------- 3 files changed, 50 insertions(+), 45 deletions(-) diff --git a/src/common.h b/src/common.h index 1fc4589..f84a2f7 100644 --- a/src/common.h +++ b/src/common.h @@ -47,6 +47,34 @@ #define PREDICT_UNLIKELY(exp) (exp) #endif +/** Try to find the symbol that is either m or __m. + * If one of them exists, in that order, then save its address in r, + * otherwise we want to print a message at log level l stating that + * we could not find it. + */ +#define torsocks_find_library(m,l,r) \ + do { \ + char * dl_error_msg = ""; \ + char * dl_error_msg2 = ""; \ + dlerror(); \ + if ((r = dlsym(RTLD_NEXT, m)) == NULL) { \ + dl_error_msg = dlerror(); \ + if (dl_error_msg != NULL) { \ + dl_error_msg = strdup(dl_error_msg); \ + } \ + if ((r = dlsym(RTLD_NEXT, "__" m)) == NULL) { \ + dl_error_msg2 = dlerror(); \ + show_msg(l, "WARNING: The symbol %s() was not found in any shared " \ + "library with the reported error: %s!\n" \ + " Also, we failed to find the symbol %s() with the reported error:" \ + " %s\n", m, (dl_error_msg ? dl_error_msg : "Not Found"), \ + "__"m, (dl_error_msg2 ? dl_error_msg2 : "Not Found")); \ + } \ + if (dl_error_msg) \ + free(dl_error_msg); \ + } \ + } while (0) + uint16_t get_uint16(const char *cp) ATTR_PURE ATTR_NONNULL((1)); uint32_t get_uint32(const char *cp) ATTR_PURE ATTR_NONNULL((1)); void set_uint16(char *cp, uint16_t v) ATTR_NONNULL((1)); diff --git a/src/darwin_warts.c b/src/darwin_warts.c index 4cb86f0..65bdd04 100644 --- a/src/darwin_warts.c +++ b/src/darwin_warts.c @@ -32,18 +32,12 @@ #include <stddef.h> #include <stdint.h> +#include <stdlib.h> #include <dlfcn.h> +#include <string.h> +#include <errno.h> #include "common.h" -#define LOAD_ERROR(s,l) { \ - char *error; \ - error = dlerror(); \ - show_msg(l, "The symbol %s() was not found in any shared " \ - "library. The error reported was: %s!\n", s, \ - (error)?error:"not found"); \ - dlerror(); \ - } - #define SELECT_SIGNATURE int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout #define SELECT_ARGNAMES n, readfds, writefds, exceptfds, timeout @@ -56,9 +50,7 @@ int torsocks_select_guts(SELECT_SIGNATURE, int (*original_select)(SELECT_SIGNATU int select(SELECT_SIGNATURE) { if (!realselect) { - dlerror(); - if ((realselect = dlsym(RTLD_NEXT, "select")) == NULL) - LOAD_ERROR("select", MSGERR); + torsocks_find_library("select", MSGERR, realselect); } return torsocks_select_guts(SELECT_ARGNAMES, realselect); } diff --git a/src/torsocks.c b/src/torsocks.c index 294e6dc..09d7bea 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -112,7 +112,6 @@ int res_init(void); #include "expansion_table.h" #undef PATCH_TABLE_EXPANSION - static int get_config(); static int get_environment(); static int deadpool_init(void); @@ -121,14 +120,6 @@ static pthread_mutex_t torsocks_init_mutex = PTHREAD_MUTEX_INITIALIZER; void torsocks_init(void) { -#define LOAD_ERROR(s,l) { \ - const char *error; \ - error = dlerror(); \ - if (error) \ - show_msg(l, "The symbol %s() was not found in any shared " \ - "library. The error reported was: %s!\n", s, error); \ - dlerror(); \ - } pthread_mutex_lock(&torsocks_init_mutex); show_msg(MSGDEBUG, "In torsocks_init \n"); @@ -150,11 +141,9 @@ void torsocks_init(void) dlerror(); #ifndef USE_OLD_DLSYM #ifdef SUPPORT_RES_API - if (((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && - ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) - LOAD_ERROR("res_init", MSGERR); + torsocks_find_library("res_init", MSGERR, realres_init); #endif - #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) if (((real##n = dlsym(RTLD_NEXT, m)) == NULL) && ((real##n = dlsym(RTLD_NEXT, "__" m)) == NULL)) LOAD_ERROR(m, MSG##e); + #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) torsocks_find_library(m, MSG##e, real##n); #include "expansion_table.h" #undef PATCH_TABLE_EXPANSION #else @@ -244,9 +233,7 @@ static int get_config () #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) \ r n(s##SIGNATURE) { \ if (!real##n) { \ - dlerror(); \ - if ((real##n = dlsym(RTLD_NEXT, m)) == NULL) \ - LOAD_ERROR(m, MSG##e); \ + torsocks_find_library(m, MSG##e, real##n);\ } \ return torsocks_##b##_guts(s##ARGNAMES, real##n); \ } @@ -857,9 +844,9 @@ int res_init(void) { int rc; - if (!realres_init && ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && - ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) - LOAD_ERROR("res_init", MSGERR); + if (!realres_init) { + torsocks_find_library("res_init", MSGERR, realres_init); + } show_msg(MSGTEST, "Got res_init request\n"); @@ -879,9 +866,9 @@ int EXPAND_GUTS_NAME(res_query)(RES_QUERY_SIGNATURE, int (*original_res_query)(R { int rc; - if (!original_res_query && ((original_res_query = dlsym(RTLD_NEXT, "res_query")) == NULL) && - ((original_res_query = dlsym(RTLD_NEXT, "__res_query")) == NULL)) - LOAD_ERROR("res_query", MSGERR); + if (!original_res_query) { + torsocks_find_library("res_query", MSGERR, original_res_query); + } show_msg(MSGTEST, "Got res_query request\n"); @@ -905,10 +892,9 @@ int EXPAND_GUTS_NAME(res_querydomain)(RES_QUERYDOMAIN_SIGNATURE, int (*original_ { int rc; - if (!original_res_querydomain && - ((original_res_querydomain = dlsym(RTLD_NEXT, "res_querydomain")) == NULL) && - ((original_res_querydomain = dlsym(RTLD_NEXT, "__res_querydomain")) == NULL)) - LOAD_ERROR("res_querydoimain", MSGERR); + if (!original_res_querydomain) { + torsocks_find_library("res_querydomain", MSGERR, original_res_querydomain); + } show_msg(MSGDEBUG, "Got res_querydomain request\n"); @@ -932,10 +918,9 @@ int EXPAND_GUTS_NAME(res_search)(RES_SEARCH_SIGNATURE, int (*original_res_search { int rc; - if (!original_res_search && - ((original_res_search = dlsym(RTLD_NEXT, "res_search")) == NULL) && - ((original_res_search = dlsym(RTLD_NEXT, "__res_search")) == NULL)) - LOAD_ERROR("res_search", MSGERR); + if (!original_res_search) { + torsocks_find_library("res_search", MSGERR, original_res_search); + } show_msg(MSGTEST, "Got res_search request\n"); @@ -959,9 +944,9 @@ int EXPAND_GUTS_NAME(res_send)(RES_SEND_SIGNATURE, int (*original_res_send)(RES_ { int rc; - if (!original_res_send && ((original_res_send = dlsym(RTLD_NEXT, "res_send")) == NULL) - && ((original_res_send = dlsym(RTLD_NEXT, "__res_send")) == NULL)) - LOAD_ERROR("res_send", MSGERR); + if (!original_res_send) { + torsocks_find_library("res_send", MSGERR, original_res_send); + } show_msg(MSGTEST, "Got res_send request\n");

1 0

[torsocks/pending-changes] Add patch from matthew.finkel
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 2e112bfa0452aa410c6a09f10c7b9b3e98498828 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jan 26 19:30:04 2013 -0800 Add patch from matthew.finkel --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84a75b6..6578a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ Torsocks 1.3 This issue is extensively covered in the following bug report: http://code.google.com/p/torsocks/issues/detail?id=3 - Fixes provided by Lunar and Anthony Basile. + Fixes provided by Lunar, Anthony Basile and Matthew Finkel Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0

[torsocks/pending-changes] Merge branch 'license-update' into pending-changes
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 6f73cd7d0197e73c519dfc56c4dae605777bd157 Merge: e39ac68 014e854 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jan 26 19:37:41 2013 -0800 Merge branch 'license-update' into pending-changes COPYING | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-)

1 0

[torsocks/pending-changes] Updated GPL provided in COPYING
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 014e854f28c7152c9a2f45ebde13bacee1ce02f2 Author: Matthew Finkel <matthew.finkel(a)gmail.com> Date: Wed Dec 12 19:04:13 2012 -0500 Updated GPL provided in COPYING Some details of the license have changed since the license was first introduced. We should provide the most current version of the license. --- COPYING | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index e77696a..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -335,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License.

1 0

[torsocks/pending-changes] Display correct error message when the wrapped program cannot be found in $PATH.
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 5c9a88dfc62c85b49ca7f023af4c03d7d61fb3c8 Author: intrigeri <intrigeri(a)boum.org> Date: Mon Jan 30 17:55:42 2012 +0100 Display correct error message when the wrapped program cannot be found in $PATH. --- src/torsocks.in | 9 ++++++++- src/usewithtor.in | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 53db2fc..678f854 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -63,6 +63,11 @@ # Tamas Szerb <toma(a)rulez.org> # Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 +not_found () { + echo "ERROR: $1 cannot be found in PATH." >&2 + exit 1 +} + set_id () { echo "ERROR: $1 is set${2}id. torsocks will not work on a set${2}id executable." >&2 exit 1 @@ -133,7 +138,9 @@ case "$1" in if [ $# -gt 0 ] then - if [ -u `which "$1"` ]; then + if ! which "$1" >/dev/null 2>&1; then + not_found $1 + elif [ -u `which "$1"` ]; then set_id $1 u elif [ -g `which "$1"` ]; then set_id $1 g diff --git a/src/usewithtor.in b/src/usewithtor.in index 0a1e42d..e606760 100644 --- a/src/usewithtor.in +++ b/src/usewithtor.in @@ -42,6 +42,11 @@ usage () { echo "Usage: $0 [-hv] <command> [<options>...]" } +not_found () { + echo "ERROR: $1 cannot be found in PATH." >&2 + exit 1 +} + set_id () { echo "ERROR: $1 is set${2}id. usewithtor will not work on a set${2}id executable." >&2 exit 1 @@ -68,7 +73,9 @@ while [ "$1" ]; do esac done -if [ -u `which "$1"` ]; then +if ! which "$1" >/dev/null 2>&1; then + not_found $1 +elif [ -u `which "$1"` ]; then set_id $1 u elif [ -g `which "$1"` ]; then set_id $1 g

1 0

[torsocks/pending-changes] fixup merge conflict
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 1ca52167375bb241db1c76dff882976d23c04009 Merge: 6f73cd7 2e112bf Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jan 26 20:01:07 2013 -0800 fixup merge conflict ChangeLog | 7 +++++++ src/common.h | 28 ++++++++++++++++++++++++++++ src/darwin_warts.c | 16 ++++------------ src/expansion_table.h | 5 ----- src/torsocks.c | 45 ++++++++++++++++++--------------------------- 5 files changed, 57 insertions(+), 44 deletions(-) diff --cc ChangeLog index 79150c5,6578a4a..e64d10f --- a/ChangeLog +++ b/ChangeLog @@@ -1,26 -1,12 +1,33 @@@ Torsocks 1.3 -2012-xx-xx Unknown +XXX XXX + + o Issue 47: Invocation without argument is broken + + Added '--shell' as the documented way to spawn a shell with torsocks + This removes the never working documented case where torsocks without + arguments was supposed to spawn a shell. + + o Issue 48: Typos in manpage + + Updated man page to fix typos. + + o Issue 37: Torsocks lets through tcp6 connections to tcp4 hosts + + Explicitly fail closed on connect() calls of AF_INET6 type + Set errno to EAFNOSUPPORT in the IPv6 case. + + o Issue 33: LIBDIR hardcoded to /usr/lib, s/b/ /usr/lib64 on x86_64 + + We now look for torsocks in /usr/lib and then /usr/lib64 + We assume that the first found is the correct one. + + o Issue 3: "... not found in any shared library. ..." + + This issue is extensively covered in the following bug report: + http://code.google.com/p/torsocks/issues/detail?id=3 + + Fixes provided by Lunar, Anthony Basile and Matthew Finkel + Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0