rpms/tsocks/F-11 import.log, NONE, 1.1 tsocks.spec, NONE, 1.1 tsocks_documentation_update.patch, NONE, 1.1 tsocks_fix_lib_path.patch, NONE, 1.1 tsocks_remove_static_lib.patch, NONE, 1.1 tsocks_script_validation_error.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jean-Francois Saucier]

Author: jfsaucier

Update of /cvs/pkgs/rpms/tsocks/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20751/F-11

Modified Files:
	.cvsignore sources 
Added Files:
	import.log tsocks.spec tsocks_documentation_update.patch 
	tsocks_fix_lib_path.patch tsocks_remove_static_lib.patch 
	tsocks_script_validation_error.patch 
Log Message:
- Initial import for Fedora 11



--- NEW FILE import.log ---
tsocks-1_8-0_5_beta5_fc12:F-11:tsocks-1.8-0.5.beta5.fc12.src.rpm:1263344743


--- NEW FILE tsocks.spec ---
%define		real_version	1.8beta5
Name:		tsocks
Version:	1.8
Release:	0.5.beta5%{?dist}
Summary:	Library for catching network connections, redirecting them on a SOCKS server
Group:		System Environment/Libraries
License:	GPLv2+
URL:		http://tsocks.sourceforge.net/
Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{real_version}.tar.gz
Patch0:		tsocks_remove_static_lib.patch
Patch1:		tsocks_fix_lib_path.patch
Patch2:		tsocks_script_validation_error.patch
Patch3:		tsocks_documentation_update.patch
BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

%description
tsocks 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.

tsocks is a library to allow transparent SOCKS proxying. It wraps the
normal connect() function. When a connection is attempted, it consults
the configuration file (which is defined at configure time but defaults
to /etc/tsocks.conf) and determines if the IP address specified is local.
If it is not, the library redirects the connection to a SOCKS server
specified in the configuration file. It then negotiates that connection
with the SOCKS server and passes the connection back to the calling
program.

%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING FAQ TODO tsocks.conf.simple.example tsocks.conf.complex.example
%{_mandir}/man?/*
%{_bindir}/*
%{_libdir}/libtsocks*

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%changelog
* Wed Jan  6 2010 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 1.8-0.5.beta5
- Fix the library path problem more cleanly
- Fix bash script validation to handle the no argument case
- Change patch name to reflect guidelines
- Fix documentation to reflect patch modifications
- Remove INSTALL from packaged files

* Mon Dec 14 2009 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 1.8-0.4.beta5
- Fix the library path problem on x86_64 and ppc64
- Elaborate the summary and description fields

* Sat Dec  5 2009 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 1.8-0.3.beta5
- Fix as per the recommendations on bug #543566

* Thu Dec  3 2009 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 1.8-0.2.beta5
- Fix Source0 URL as per the guidelines

* Tue Dec  1 2009 Jean-Francois Saucier <jfsaucier at infoglobe.ca> - 1.8-0.1.beta5
- Initial build for Fedora

tsocks_documentation_update.patch:
 tsocks.8 |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE tsocks_documentation_update.patch ---
diff -up tsocks-1.8/tsocks.8.orig tsocks-1.8/tsocks.8
--- tsocks-1.8/tsocks.8.orig	2010-01-06 15:21:30.943839291 -0500
+++ tsocks-1.8/tsocks.8	2010-01-06 15:22:25.271556160 -0500
@@ -15,11 +15,11 @@ specified below:
  
 Bash, Ksh and Bourne shell -
 
-export LD_PRELOAD=/lib/libtsocks.so
+export LD_PRELOAD=libtsocks.so
 
 C Shell - 
 
-setenv LD_PRELOAD=/lib/libtsocks.so
+setenv LD_PRELOAD=libtsocks.so
 
 This process can be automated (for Bash, Bourne and Korn shell 
 users) for a single command or for all commands in a shell session

tsocks_fix_lib_path.patch:
 tsocks |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE tsocks_fix_lib_path.patch ---
diff -up tsocks-1.8/tsocks.orig tsocks-1.8/tsocks
--- tsocks-1.8/tsocks.orig	2010-01-06 15:05:03.168841738 -0500
+++ tsocks-1.8/tsocks	2010-01-06 15:06:51.047555817 -0500
@@ -46,14 +46,14 @@ case "$1" in
 	on)
 		if [ -z "$LD_PRELOAD" ]
 			then
-				export LD_PRELOAD="/usr/lib/libtsocks.so"
+				export LD_PRELOAD="libtsocks.so"
 			else
-				echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
-				export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
+				echo $LD_PRELOAD | grep -q "libtsocks\.so" || \
+				export LD_PRELOAD="libtsocks.so $LD_PRELOAD"
 		fi
 	;;
 	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'`
+		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/libtsocks.so \?//'`
 		if [ -z "$LD_PRELOAD" ]
 			then
 				unset LD_PRELOAD
@@ -68,10 +68,10 @@ case "$1" in
 	*)
 		if [ -z "$LD_PRELOAD" ]
 		then
-			export LD_PRELOAD="/usr/lib/libtsocks.so"
+			export LD_PRELOAD="libtsocks.so"
 		else
-			echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
-			export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
+			echo $LD_PRELOAD | grep -q "libtsocks\.so" || \
+			export LD_PRELOAD="libtsocks.so $LD_PRELOAD"
 		fi
 
 		if [ $# = 0 ]

tsocks_remove_static_lib.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE tsocks_remove_static_lib.patch ---
diff -up tsocks-1.8/Makefile.in.orig tsocks-1.8/Makefile.in
--- tsocks-1.8/Makefile.in.orig	2009-12-05 10:49:44.033729745 -0500
+++ tsocks-1.8/Makefile.in	2009-12-05 10:49:54.429979972 -0500
@@ -47,7 +47,7 @@ ${INSPECT}: ${INSPECT}.c ${COMMON}.o
 	${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
 
 ${SAVE}: ${SAVE}.c
-	${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
+	${SHCC} ${CFLAGS} ${INCLUDES} -o ${SAVE} ${SAVE}.c
 
 ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o
 	${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}

tsocks_script_validation_error.patch:
 tsocks |    5 -----
 1 file changed, 5 deletions(-)

--- NEW FILE tsocks_script_validation_error.patch ---
diff -up tsocks-1.8/tsocks.orig tsocks-1.8/tsocks
--- tsocks-1.8/tsocks.orig	2010-01-06 15:10:23.151847455 -0500
+++ tsocks-1.8/tsocks	2010-01-06 15:13:27.436555813 -0500
@@ -37,11 +37,6 @@
 # This script is originally from the debian tsocks package by 
 # Tamas Szerb <toma at rulez.org>
 
-if [ $# = 0 ] ; then
-   echo "$0: insufficient arguments"
-   exit
-fi
-
 case "$1" in
 	on)
 		if [ -z "$LD_PRELOAD" ]


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tsocks/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Jan 2010 06:18:34 -0000	1.1
+++ .cvsignore	13 Jan 2010 01:08:29 -0000	1.2
@@ -0,0 +1 @@
+tsocks-1.8beta5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tsocks/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Jan 2010 06:18:34 -0000	1.1
+++ sources	13 Jan 2010 01:08:29 -0000	1.2
@@ -0,0 +1 @@
+51caefd77e5d440d0bbd6443db4fc0f8  tsocks-1.8beta5.tar.gz