[torsocks] Update to upstream release 1.3
Jamie Nguyen
jamielinux at fedoraproject.org
Sat Feb 23 16:11:21 UTC 2013
commit 74f006c6f08d9c9a64609cf98ed9ecf7486ef3d0
Author: Jamie Nguyen <j at jamielinux.com>
Date: Sat Feb 23 16:11:10 2013 +0000
Update to upstream release 1.3
.gitignore | 3 +-
sources | 3 +-
torsocks-1.2-display-correct-error-message.patch | 65 ---------
torsocks-1.2-symbol-not-found-try-prefix.patch | 102 --------------
torsocks-1.2.tar.gz.sig | Bin 72 -> 0 bytes
torsocks-1.3.tar.gz.asc | 14 ++
torsocks.spec | 29 ++---
uwt | 160 ++++++++++-----------
8 files changed, 105 insertions(+), 271 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c130554..0869ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/torsocks-1.2.tar.gz
+/torsocks-1.3.tar.gz
+/torsocks-1.3.tar.gz.asc
diff --git a/sources b/sources
index 50e8fbf..0b5bb7b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-9bdc8786951e7eec6915433f324f22a4 torsocks-1.2.tar.gz
+5abc1c128c4e4df955e040a822a99e00 torsocks-1.3.tar.gz
+e7e804d8741e2cfd579ef7b8389d5e80 torsocks-1.3.tar.gz.asc
diff --git a/torsocks-1.3.tar.gz.asc b/torsocks-1.3.tar.gz.asc
new file mode 100644
index 0000000..cc55ad2
--- /dev/null
+++ b/torsocks-1.3.tar.gz.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iQGVAwUAUSeugJEDl9iNKTGaAQL4mgv/ckawKW5iEtenNqMR9JybXKB50OkpOtb4
+MxtD/7VjBTIYHy9veQftDX4V2d5+rbI/QCRuhDUqbdPjApNRPKIpBTYbBQVDvfBU
+mQYFEIi2knoTqwOEoCl5tXwkz06Tr0sC3QyBAPSc2o3rBmHhVQ+Qr1cwS7+zToZw
+tf9AhqunRHy0xAGAy1DQ5vbmLlrlzOlhQ0cnZ6ZwxFY1ZwLDnYoGvHdTk/ej3dgN
+QGQH73I5xiZQ+rrTWduY+rL1aEPFgXDXA+BTstnhNKVLeHin5wlulxaaHx3MdcLT
+Tz60sLtePAlbNkvZilRt/+xLK/M4DbiIIWgwPNbqDA9mv/8y50HqdsNE5SlsPO4n
+ySXC9EOqy13+tXwPk8VDzXIBN9T/SMldA0FHzgek1pdFJGJjX1f78OoX43oHfumM
+LEy9xMoNeniatMeQ+2axAiI7U2TzqTcWp1IcurNjT0M+dt9g2NlZ9lngso7RY8Cb
+4waa4eVb61lFeXq75kny8lvAM+OfQNBC
+=5hdy
+-----END PGP SIGNATURE-----
diff --git a/torsocks.spec b/torsocks.spec
index cf3cb36..1c8ab3a 100644
--- a/torsocks.spec
+++ b/torsocks.spec
@@ -1,22 +1,18 @@
Name: torsocks
-Version: 1.2
-Release: 3%{?dist}
+Version: 1.3
+Release: 1%{?dist}
Summary: Use SOCKS-friendly applications with Tor
Group: Applications/Internet
-# COPYING file has incorrect FSF address
-# https://code.google.com/p/torsocks/issues/detail?id=51
License: GPLv2+
URL: https://code.google.com/p/torsocks
-Source0: https://torsocks.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1: https://torsocks.googlecode.com/files/%{name}-%{version}.tar.gz.sig
-Source2: https://raw.github.com/adrelanos/Whonix/master/whonix_shared/usr/local/bin/uwt
+# Source0 is generated by running Source10, which pulls from the upstream
+# version control repository.
+Source0: http://www.wangafu.net/~nickm/torsocks-1.3.tar.gz
+Source1: http://www.wangafu.net/~nickm/torsocks-1.3.tar.gz.asc
+Source2: https://raw.github.com/adrelanos/Whonix/stable/whonix_shared/usr/local/bin/uwt
Source3: torsocks.bash_completion
-# https://code.google.com/p/torsocks/issues/detail?id=50
-Patch0: torsocks-1.2-display-correct-error-message.patch
-# https://code.google.com/p/torsocks/issues/detail?id=3
-Patch1: torsocks-1.2-symbol-not-found-try-prefix.patch
%description
Torsocks allows you to use most SOCKS-friendly applications in a safe way
@@ -26,15 +22,13 @@ rejects UDP traffic from the application you're using.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%configure --libdir=%{_libdir}
make %{?_smp_mflags}
-
+
%install
make install DESTDIR=%{buildroot}
@@ -47,10 +41,6 @@ rm -f %{buildroot}%{_datadir}/*.sh
rm -f %{buildroot}%{_datadir}/*.txt
rm -f %{buildroot}%{_datadir}/*.patch
-# Fix hardcoded library path.
-sed -i -e 's|^LIBDIR=.*|LIBDIR="%{_libdir}/torsocks"|g' \
- %{buildroot}%{_bindir}/torsocks
-
# Include modified usewithtor to support setting proxy type, ip and port using
# cli parameters to prevent identity correlation through circuit sharing.
install -p -D -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/uwt
@@ -78,6 +68,9 @@ install -p -D -m 0644 %{SOURCE3} \
%changelog
+* Sat Feb 23 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 1.3-1
+- update to upstream release 1.3
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/uwt b/uwt
index 9233bb3..3516351 100644
--- a/uwt
+++ b/uwt
@@ -1,74 +1,74 @@
#!/bin/bash
-## Update 18
-
-## https://trac.torproject.org/projects/tor/wiki/doc/torsocks
-
-## ***************************************************************************
-## * *
-## * Copyright (C) 2008-2011 Robert Hogan <robert at roberthogan.net> *
-## * *
-## * 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 *
-## * the Free Software Foundation; either version 2 of the License, or *
-## * (at your option) any later version. *
-## * *
-## * This program is distributed in the hope that it will be useful, *
-## * but WITHOUT ANY WARRANTY; without even the implied warranty of *
-## * 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., *
-## * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
-## ***************************************************************************
-## * *
-## * This is a modified version of a source file from the Tor project. *
-## * Original copyright notice from tsocks source file follows: *
-## ***************************************************************************
-
-## Wrapper script for use of the tsocks(8) transparent socksification library
-## See the tsocks(1) and torify(1) manpages.
-
-## Copyright (c) 2004, 2006 Peter Palfrader
-## Modified by Jacob Appelbaum <jacob at appelbaum.net> April 16th 2006
-## Modified by Marcus Griep <marcus at griep.us> June 16 2009
-## May be distributed under the same terms as Tor itself
-## Modified by adrelanos (aka proper)
-## Modifications copyright (c) 2012
-## Whonix license: See LICENSE in root of Whonix source for copyright, license and authors.
-
-## Note:
-## -v (verbose) and the UWT_VERBOSE environment variable set to 1
-## will break many graphical applications, which use applications,
-## which will call applications, which we wrapped to use uwt.
-
-## You can also type in shell:
-## export UWT_VERBOSE="1"
-## to enable verbose output.
-
-## UWT_DEV_PASSTHROUGH is only supported in Whonix.
-## Only supposed to be used by developers.
-## Torsocks will not be used.
-## Traffic will be send in the clear.
-## Thus, if behind a transparent proxy, traffic will go through that transparent proxy.
-## Just as uwt would not be used.
-## This is useful for development and building Whonix.
+# Update 17
+
+# https://trac.torproject.org/projects/tor/wiki/doc/torsocks
+
+# ***************************************************************************
+# * *
+# * Copyright (C) 2008-2011 Robert Hogan <robert at roberthogan.net> *
+# * *
+# * 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 *
+# * the Free Software Foundation; either version 2 of the License, or *
+# * (at your option) any later version. *
+# * *
+# * This program is distributed in the hope that it will be useful, *
+# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+# * 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., *
+# * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+# ***************************************************************************
+# * *
+# * This is a modified version of a source file from the Tor project. *
+# * Original copyright notice from tsocks source file follows: *
+# ***************************************************************************
+
+# Wrapper script for use of the tsocks(8) transparent socksification library
+# See the tsocks(1) and torify(1) manpages.
+
+# Copyright (c) 2004, 2006 Peter Palfrader
+# Modified by Jacob Appelbaum <jacob at appelbaum.net> April 16th 2006
+# Modified by Marcus Griep <marcus at griep.us> June 16 2009
+# May be distributed under the same terms as Tor itself
+# Modified by adrelanos (aka proper)
+# Modifications copyright (c) 2012
+# Whonix license: See LICENSE in root of Whonix source for copyright, license and authors.
+
+# Note:
+# -v (verbose) and the UWT_VERBOSE environment variable set to 1
+# will break many graphical applications, which use applications,
+# which will call applications, which we wrapped to use uwt.
+
+# You can also type in shell:
+# export UWT_VERBOSE="1"
+# to enable verbose output.
+
+# UWT_DEV_PASSTHROUGH is only supported in Whonix.
+# Only supposed to be used by developers.
+# Torsocks will not be used.
+# Traffic will be send in the clear.
+# Thus, if behind a transparent proxy, traffic will go through that transparent proxy.
+# Just as uwt would not be used.
+# This is useful for development and building Whonix.
# export UWT_DEV_PASSTHROUGH="1"
-## Note:
-## When running applications as root, you also have to set and
-## export that variable as root.
+# Note:
+# When running applications as root, you also have to set and
+# export that variable as root.
NAME=$(basename $0)
-## Define and ensure we have tsocks
-## XXX: what if we do not have which?
+# Define and ensure we have tsocks
+# XXX: what if we do not have which?
TORSOCKS="`which torsocks`"
if [ -z "$UWT_VERBOSE" ]; then
- #echo "UWT_VERBOSE: did not exist."
+ # echo "UWT_VERBOSE: did not exist."
UWT_VERBOSE="0"
else
if [ "$UWT_VERBOSE" = "1" ]; then
@@ -78,7 +78,7 @@ fi
#echo "UWT_VERBOSE: $UWT_VERBOSE"
if [ -z "$UWT_DEV_PASSTHROUGH" ]; then
- #echo "UWT_DEV_PASSTHROUGH: did not exist."
+ # echo "UWT_DEV_PASSTHROUGH: did not exist."
UWT_DEV_PASSTHROUGH="0"
fi
@@ -93,7 +93,7 @@ set_id () {
exit 1
}
-## Check for any argument list
+# Check for any argument list
if [ "$#" = 0 ]; then
usage >&2
exit 1
@@ -123,9 +123,9 @@ while [ -n "$1" ]; do
;;
*)
command="`which $1`"
- ## From now on the complete to-be wrapped command + its args
- ## are stored in $@, which will expand like we want it for
- ## handling quoted arguments with whitespaces in it, etc.
+ # From now on the complete to-be wrapped command + its args
+ # are stored in $@, which will expand like we want it for
+ # handling quoted arguments with whitespaces in it, etc.
break
esac
shift
@@ -174,22 +174,14 @@ if [ "$UWT_VERBOSE" = "1" ]; then
echo "We are armed with the following torsocks: $TORSOCKS"
fi
-## Define our torsocks config file.
+# Define our torsocks config file.
TORSOCKS_CONF_FILE="`mktemp`"
export TORSOCKS_CONF_FILE
#echo "TORSOCKS_CONF_FILE: $TORSOCKS_CONF_FILE"
-## Fix permissions.
-## This fixes a bug.
-## Unpacking flashplugin-nonfree (from .../flashplugin-nonfree_1%3a2.8.5_i386.deb) ...
-## Processing triggers for man-db ...
-## libtorsocks(18790): Could not open socks configuration file (/tmp/tmp.pKSaitLYTN) errno (13), assuming sensible defaults for Tor.
-chmod g+r "$TORSOCKS_CONF_FILE"
-chmod o+r "$TORSOCKS_CONF_FILE"
-
echo "
- ## Temporary torsocks configuration file created by uwt.
- ## Safe to delete.
+ # Temporary torsocks configuration file created by uwt.
+ # Safe to delete.
local = 127.0.0.0/255.128.0.0
local = 127.128.0.0/255.192.0.0
local = 169.254.0.0/255.255.0.0
@@ -200,10 +192,10 @@ echo "
server_port = $port
" > "$TORSOCKS_CONF_FILE"
-## Check that we have got a torsocks config file
+# Check that we have got a torsocks config file
if [ ! -r "$TORSOCKS_CONF_FILE" ]; then
- ## Since identity corelation through circuit sharing is at risk,
- ## we should no longer let torsocks default to 9050.
+ # Since identity corelation through circuit sharing is at risk,
+ # we should no longer let torsocks default to 9050.
echo "$NAME: Missing torsocks configuration file \"$TORSOCKS_CONF_FILE\."
exit 1
fi
@@ -224,7 +216,7 @@ case "$*" in
UWT_LOCALHOST="1"
;;
*)
- ## do nothing
+ # do nothing
true
;;
esac
@@ -242,7 +234,7 @@ if [ "$UWT_DEV_PASSTHROUGH" = "1" ]; then
exit 1
fi
- ## Safe in Whonix.
+ # Safe in Whonix.
exec "$@"
exitcode="$?"
@@ -262,7 +254,7 @@ if [ "$UWT_LOCALHOST" = "1" ]; then
exit 1
fi
- ## Safe in Whonix.
+ # Safe in Whonix.
exec "$@"
else
@@ -277,4 +269,4 @@ else
fi
-## End of uwt script.
+# End of uwt script.
More information about the scm-commits
mailing list