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

r26031: {website} quotes required on windows if path has spaces (website/trunk/docs/en)
by Moritz Bartl 27 Jan '13

27 Jan '13

Author: moritz Date: 2013-01-27 22:49:07 +0000 (Sun, 27 Jan 2013) New Revision: 26031 Modified: website/trunk/docs/en/verifying-signatures.wml Log: quotes required on windows if path has spaces Modified: website/trunk/docs/en/verifying-signatures.wml =================================================================== --- website/trunk/docs/en/verifying-signatures.wml 2013-01-27 22:48:08 UTC (rev 26030) +++ website/trunk/docs/en/verifying-signatures.wml 2013-01-27 22:49:07 UTC (rev 26031) @@ -76,12 +76,12 @@ Erinn Clark signs the Tor Browser Bundles. Import her key (0x63FEE659) by starting cmd.exe and typing: - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x63FEE659</pre> + <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x63FEE659</pre> After importing the key, you can verify that the fingerprint is correct: - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --fingerprint 0x63FEE659</pre> + <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --fingerprint 0x63FEE659</pre> You should see: <pre> @@ -97,7 +97,7 @@ to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Desktop, run: - <pre>C:\Program Files\Gnu\GnuPg\gpg.exe --verify C:\Users\Alice\Desktop\<file-win32-bundle-stable>.asc C:\Users\Alice\Desktop\<file-win32-bundle-stable></pre> + <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\<file-win32-bundle-stable>.asc C:\Users\Alice\Desktop\<file-win32-bundle-stable></pre> The output should say "Good signature":

1 0

r26030: {website} link to android market orbot download (website/trunk/docs/en)
by Moritz Bartl 27 Jan '13

27 Jan '13

Author: moritz Date: 2013-01-27 22:48:08 +0000 (Sun, 27 Jan 2013) New Revision: 26030 Modified: website/trunk/docs/en/android.wml Log: link to android market orbot download Modified: website/trunk/docs/en/android.wml =================================================================== --- website/trunk/docs/en/android.wml 2013-01-25 11:02:49 UTC (rev 26029) +++ website/trunk/docs/en/android.wml 2013-01-27 22:48:08 UTC (rev 26030) @@ -44,7 +44,7 @@ <h2><a class="anchor" href="#Market">Installing Tor from the Android Market</a></h2> - Orbot is available in the Android Market. + Orbot is available <a href="https://play.google.com/store/apps/details?id=org.torproject.android">in the Android Market</a>. <a id="Manual"></a>

1 0

[torsocks/master] Partial fix for "not found in any shared library"
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit e3440cf5368b12cf28d894747e8ae8dd849f9168 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 20:36:14 2012 +0000 Partial fix for "not found in any shared library" Please see the following bug for discussion: http://code.google.com/p/torsocks/issues/detail?id=3 The current partial fix by Anthony Basile: https://bugs.gentoo.org/show_bug.cgi?id=395953#c7 --- src/torsocks.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/torsocks.c b/src/torsocks.c index f559eec..5b1c16a 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -124,9 +124,9 @@ void torsocks_init(void) #define LOAD_ERROR(s,l) { \ const 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"); \ + 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);

1 0

[torsocks/master] Second fix for the "not found in any shared library" issue.
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit c2c22d0007c340fcb517e6a434ec5bcb4321c3e6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 21:20:07 2012 +0000 Second fix for the "not found in any shared library" issue. This patch is from lunar: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=636943#74 http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=74;filename=torsocks-1.2_f… --- src/expansion_table.h | 5 ----- src/torsocks.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/expansion_table.h b/src/expansion_table.h index e981f5d..14fabe1 100644 --- a/src/expansion_table.h +++ b/src/expansion_table.h @@ -76,12 +76,7 @@ /*RES_FUNC (ERR, int, RES_INIT_, res_init, res_init, "res_init") */ RES_FUNC (ERR, int, RES_QUERY_, res_query, res_query, "res_query") RES_FUNC (ERR, int, RES_SEARCH_, res_search, res_search, "res_search") -#if defined(__APPLE__) || defined(__darwin__) RES_FUNC (ERR, int, RES_SEND_, res_send, res_send, "res_send") -#else -/* It is a bit of a mystery why this is required on Linux. See http://code.google.com/p/torsocks/issues/detail?id=3 */ -RES_FUNC (ERR, int, RES_SEND_, res_send, res_send, "__res_send") -#endif RES_FUNC (ERR, int, RES_QUERYDOMAIN_, res_querydomain, res_querydomain, "res_querydomain") DNS_FUNC (ERR, struct hostent *, GETHOSTBYNAME_, gethostbyname, gethostbyname, "gethostbyname") diff --git a/src/torsocks.c b/src/torsocks.c index 5b1c16a..294e6dc 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -150,10 +150,11 @@ void torsocks_init(void) dlerror(); #ifndef USE_OLD_DLSYM #ifdef SUPPORT_RES_API - if ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) + if (((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && + ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) LOAD_ERROR("res_init", MSGERR); #endif - #define PATCH_TABLE_EXPANSION(e,r,s,n,b,m) if ((real##n = dlsym(RTLD_NEXT, m)) == NULL) LOAD_ERROR(m, MSG##e); + #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); #include "expansion_table.h" #undef PATCH_TABLE_EXPANSION #else @@ -856,7 +857,8 @@ int res_init(void) { int rc; - if (!realres_init && ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL)) + if (!realres_init && ((realres_init = dlsym(RTLD_NEXT, "res_init")) == NULL) && + ((realres_init = dlsym(RTLD_NEXT, "__res_init")) == NULL)) LOAD_ERROR("res_init", MSGERR); show_msg(MSGTEST, "Got res_init request\n"); @@ -877,7 +879,8 @@ 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)) + 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); show_msg(MSGTEST, "Got res_query request\n"); @@ -903,7 +906,8 @@ 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) && + ((original_res_querydomain = dlsym(RTLD_NEXT, "__res_querydomain")) == NULL)) LOAD_ERROR("res_querydoimain", MSGERR); show_msg(MSGDEBUG, "Got res_querydomain request\n"); @@ -929,7 +933,8 @@ 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) && + ((original_res_search = dlsym(RTLD_NEXT, "__res_search")) == NULL)) LOAD_ERROR("res_search", MSGERR); show_msg(MSGTEST, "Got res_search request\n"); @@ -954,7 +959,8 @@ 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)) + 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); show_msg(MSGTEST, "Got res_send request\n");

1 0

[torsocks/master] Add ChangeLog entry for issue 3
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 655e673ad4fbffb29b83c4e249085353b0e1bfec Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 21:39:19 2012 +0000 Add ChangeLog entry for issue 3 --- ChangeLog | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6f0ae..84a75b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Torsocks 1.3 +2012-xx-xx Unknown + 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 and Anthony Basile. + Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0

[torsocks/master] First stab at ensuring IPv6 connections are dropped on the floor.
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 95528585c1d13b0e17e9d35387c45adec9774457 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Nov 4 22:58:40 2012 +0000 First stab at ensuring IPv6 connections are dropped on the floor. This almost certainly does not solve all cases and this is a work in progress. --- src/torsocks.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/torsocks.c b/src/torsocks.c index f559eec..1c772be 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -296,6 +296,12 @@ int torsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIG return -1; } + /* If this is an INET6, we'll refuse it. */ + if ((connaddr->sin_family == AF_INET6)) { + show_msg(MSGERR, "connect: Connection is IPv6: rejecting.\n"); + return -1; + } + /* If this isn't an INET socket we can't */ /* handle it, just call the real connect now */ if ((connaddr->sin_family != AF_INET)) {

1 0

[torsocks/master] Fix typos in manpage
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 52330df60bbacffbb64b14447a96b94659da3050 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Nov 5 15:38:29 2012 -0500 Fix typos in manpage Addresses issue 48 - opened by intrigeri Author: A. Costa <agcosta(a)gis.net> Bug-Debian: http://bugs.debian.org/683358 --- doc/torsocks.8.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/torsocks.8.in b/doc/torsocks.8.in index 0cda513..58672e5 100644 --- a/doc/torsocks.8.in +++ b/doc/torsocks.8.in @@ -43,9 +43,9 @@ with the SOCKS server and passes the connection back to the calling program. .BR torsocks -is designed for use in machines which are firewalled from then -internet. It avoids the need to recompile applications like lynx or -telnet so they can use SOCKS to reach the internet. It behaves much like +is designed for use in machines which are firewalled from the +Internet. It avoids the need to recompile applications like lynx or +telnet so they can use SOCKS to reach the Internet. It behaves much like the SOCKSified TCP/IP stacks seen on other platforms. .SS ARGUMENTS

1 0

[torsocks/master] Fix invocation without arguments.
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit f955a496040217c38a777a4589b9433c2365f0fd Author: intrigeri <intrigeri(a)boum.org> Date: Sat Aug 11 14:19:59 2012 +0200 Fix invocation without arguments. Bugs-Debian: http://bugs.debian.org/684577 --- src/torsocks.in | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 53db2fc..a3137fb 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -68,11 +68,6 @@ set_id () { exit 1 } -if [ $# = 0 ] ; then - echo "$0: insufficient arguments" - exit -fi - LIBDIR="@prefix@/lib/torsocks" LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@"

1 0

[torsocks/master] torsocks will run --shell by default; add --shell
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 4e5f35b15bcf0a28b65a480892e8ca84d5c60946 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:28:31 2012 -0800 torsocks will run --shell by default; add --shell --- src/torsocks.in | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 94a7b8f..b42364f 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -111,6 +111,18 @@ case "$1" in -h|-?) echo "$0: Please see torsocks(1) or read comment at top of $0" ;; + --shell|shell) + if [ -z "$@LDPRELOAD@" ] + then + export @LDPRELOAD@="${SHLIB}" + else + echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ + export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" + fi + export DYLD_FORCE_FLAT_NAMESPACE=1 + echo "torsocks: new torified shell coming right up..." + ${SHELL:-/bin/sh} + ;; *) if [ -z "$@LDPRELOAD@" ] then

1 0

[torsocks/master] Update lib dir check
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 1699610ecc6fd64f85c6fa3cee56d24ba2010d87 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Nov 5 16:29:52 2012 -0500 Update lib dir check Address issue 33 where /usr/lib64 is the proper lib dir but /usr/lib is still set in torsocks.in --- src/torsocks.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 53db2fc..606d3d4 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -78,6 +78,12 @@ LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@" SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +# Check for libtorsocks and if set the 64bit variant +if [ ! -f $SHLIB ]; then + LIBDIR="@prefix@/lib64/torsocks" + SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" +fi + # Ensure libtorsocks exists, if [ ! -f $SHLIB ]; then echo "$0: $SHLIB does not exist! Try re-installing torsocks."

1 0