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

[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

[torsocks/master] Add verbose output before starting torified shell
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 2c6679aed5d21bafcdf30d98fabff76b566c38aa Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:18:11 2012 -0800 Add verbose output before starting torified shell --- src/torsocks.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index a3137fb..94a7b8f 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -123,6 +123,7 @@ case "$1" in if [ $# = 0 ] then + echo "torsocks: new torified shell coming right up..." ${SHELL:-/bin/sh} fi

1 0

[torsocks/master] spawn a shell with --shell and not "shell"
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit c828075df50912711686bf96de7370927dfb4c0b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:33:08 2012 -0800 spawn a shell with --shell and not "shell" This updates documentation to match the implementation This is addressed as issue 47: http://code.google.com/p/torsocks/issues/detail?id=47 --- doc/torsocks.1.in | 4 +++- src/torsocks.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/torsocks.1.in b/doc/torsocks.1.in index b383859..4ceba4c 100644 --- a/doc/torsocks.1.in +++ b/doc/torsocks.1.in @@ -10,7 +10,7 @@ transparently allow an application to use a SOCKS proxy. Basically a renamed, pa .br or .B torsocks -.RB [on|off] +.RB [on|off|--shell] .br or .B torsocks @@ -56,6 +56,8 @@ Example: show the current value of the LD_PRELOAD variable .IP \fB<without\ any\ argument> create a new shell with LD_PRELOAD including torsocks(8). +.IP \fB[--shell] +create a new shell with LD_PRELOAD including torsocks(8). .PP .SH AUTHOR This script was created by Tamas SZERB <toma(a)rulez.org> for the debian diff --git a/src/torsocks.in b/src/torsocks.in index b42364f..f1052cc 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -111,7 +111,7 @@ case "$1" in -h|-?) echo "$0: Please see torsocks(1) or read comment at top of $0" ;; - --shell|shell) + --shell) if [ -z "$@LDPRELOAD@" ] then export @LDPRELOAD@="${SHLIB}"

1 0

[torsocks/master] Only spawn a shell when called with "--shell"
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit b5dadbd0c5f36792234bd974ed970d1db54a6e1e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:38:29 2012 -0800 Only spawn a shell when called with "--shell" This effective reverts the patch by intrigeri for issue 47: http://code.google.com/p/torsocks/issues/detail?id=47 If torsocks is called with zero arguments, we will not spawn a shell we will error out and refuse to continue. If you wish to spawn a shell, we suggest calling torsocks like so: torsocks --shell --- doc/torsocks.1.in | 2 -- src/torsocks.in | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/torsocks.1.in b/doc/torsocks.1.in index 4ceba4c..555e661 100644 --- a/doc/torsocks.1.in +++ b/doc/torsocks.1.in @@ -54,8 +54,6 @@ Example: ". torsocks off" -- remove the torsocks lib from LD_PRELOAD .IP \fB[show|sh] show the current value of the LD_PRELOAD variable -.IP \fB<without\ any\ argument> -create a new shell with LD_PRELOAD including torsocks(8). .IP \fB[--shell] create a new shell with LD_PRELOAD including torsocks(8). .PP diff --git a/src/torsocks.in b/src/torsocks.in index f1052cc..1a9952a 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -4,6 +4,7 @@ # * * # * Copyright (C) 2008 by Robert Hogan * # * robert(a)roberthogan.net * +# * Copyright (C) 2012 by Jacob Appelbaum <jacob(a)torproject.org> * # * * # * 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 * @@ -68,6 +69,11 @@ 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] Document issue-47 related changes
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit 24f6411a401291e6c1a9cf162c5983fa8670ad73 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:44:36 2012 -0800 Document issue-47 related changes --- ChangeLog | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f6f0ae..2a0ccf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Torsocks 1.3 +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. + Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0

[torsocks/master] remove old shell spawning code that cannot be reached
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit eb9ccc824e43717cb38ff2fada5190e42c412cdc Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:41:34 2012 -0800 remove old shell spawning code that cannot be reached --- src/torsocks.in | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 1a9952a..7537440 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -139,12 +139,6 @@ case "$1" in fi export DYLD_FORCE_FLAT_NAMESPACE=1 - if [ $# = 0 ] - then - echo "torsocks: new torified shell coming right up..." - ${SHELL:-/bin/sh} - fi - if [ $# -gt 0 ] then if [ -u `which "$1"` ]; then

1 0

[torsocks/master] set errno for connect failures related to AF_INET6
by ioerror＠torproject.org 27 Jan '13

27 Jan '13

commit becf4bc03ea6dcb95d22106ebfe08b4d29b3610a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:56:32 2012 -0800 set errno for connect failures related to AF_INET6 --- src/torsocks.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/torsocks.c b/src/torsocks.c index 1c772be..74ead72 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -299,6 +299,7 @@ int torsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIG /* If this is an INET6, we'll refuse it. */ if ((connaddr->sin_family == AF_INET6)) { show_msg(MSGERR, "connect: Connection is IPv6: rejecting.\n"); + errno = EAFNOSUPPORT; return -1; }

1 0

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

27 Jan '13

commit 7336d5f60d59ab5699452231ac160ca142f2894f Merge: 24f6411 52330df Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 18:03:05 2012 -0800 Merge branch 'documentation' into pending-changes doc/torsocks.8.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

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

27 Jan '13

commit 2e60e8a561cdaf793c08413665ac12df5f316557 Merge: c0c8658 becf4bc Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 18:06:51 2012 -0800 Merge branch 'ipv6' into pending-changes src/torsocks.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)

1 0

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

27 Jan '13

commit 5441e526b111eb60ba6fe30d319d51a3c09f38f6 Merge: e8b9696 1699610 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 20:13:17 2012 -0800 Merge branch 'libdir' into pending-changes src/torsocks.in | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)

1 0