Link tsocks-saveme dinamically (#273339). Migrate to EAPI 2.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 207 insertions, 6 deletions

diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
index 2c570312c241..c3ddddeef588 100644
--- a/net-proxy/tsocks/ChangeLog
+++ b/net-proxy/tsocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/tsocks
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.28 2009/02/18 00:01:46 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.29 2009/06/20 12:03:13 mrness Exp $
+
+*tsocks-1.8_beta5-r5 (20 Jun 2009)
+
+  20 Jun 2009; Alin Năstac <mrness@gentoo.org>
+  +files/tsocks-1.8_beta5-gentoo-r3.patch, +tsocks-1.8_beta5-r5.ebuild:
+  Link tsocks-saveme dinamically (#273339). Migrate to EAPI 2.
 
 *tsocks-1.8_beta5-r4 (18 Feb 2009)
 
diff --git a/net-proxy/tsocks/Manifest b/net-proxy/tsocks/Manifest
index b893789069c1..336fee035ddd 100644
--- a/net-proxy/tsocks/Manifest
+++ b/net-proxy/tsocks/Manifest
@@ -4,16 +4,18 @@ Hash: SHA1
 AUX tsocks-1.8_beta5-bsd.patch 932 RMD160 d17f6927c4e18b25505139a9893c59afc39775aa SHA1 98b77ce698a8a9ad072f1c7275a3aeb8e2177f86 SHA256 c49851ca7581684788945f0c5cca17536459975b966b65bccb4f0588fc85a42d
 AUX tsocks-1.8_beta5-gentoo-r1.patch 5655 RMD160 8d4908a8a3ddd60493c45f62b8498046623ed915 SHA1 def7eb78180930cefb2e85d554dd416871014dd2 SHA256 678daeb7683a8ded19bf14c665271158f452a715c92d855dee47d78838723b2a
 AUX tsocks-1.8_beta5-gentoo-r2.patch 5879 RMD160 84ac84bd59b85dddc204d9e63e4ae43a278a6ef4 SHA1 64a99abc72242a6e931337c9ef59075d018c2e8b SHA256 0c77bba8e579dc05469c4c4c336fc728085944df1f7fc6ad0d05024f6836817f
+AUX tsocks-1.8_beta5-gentoo-r3.patch 5866 RMD160 2dffa4d10f82a2fd9adacebf987064d24f23aa42 SHA1 35ac9f759102cc7089b7b83757e2942e4d2d3c4a SHA256 5bc4ec52f9d473e50948a5136fd657a26906603e97f779786b76244f026d73ca
 DIST tsocks-1.8b5-tordns1-gentoo-r1.patch.gz 20060 RMD160 5c77013987262331c9285e9d53738f9f7a3ecf45 SHA1 df0474aedd7ae9639053ec11968b10a68b4f82ed SHA256 d49f0eede6cf59a2e911ddf3ec14e880626369e94037c9ad853cf530ce5971dd
 DIST tsocks-1.8beta5.tar.gz 83928 RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e SHA1 489f88c5df999ba21b27cdaa7836d9426d062aec SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
 EBUILD tsocks-1.8_beta5-r3.ebuild 1817 RMD160 2cea89f2faf072e848b5401d6618b3d598872082 SHA1 183a97090a366bdcb49487a7d48da4ea736b8b5d SHA256 3307f7f7f4dd01e3cb8b930ecb56e6c4f04a8babe885b076104e22103be940d2
 EBUILD tsocks-1.8_beta5-r4.ebuild 1823 RMD160 0f66748e2baf55a6bdce2f900f8e007c1b32e24e SHA1 57202f9d4b2edbf57b1c0839c4c1d10e453d9d9e SHA256 e0cb315c71debf3a98d848627afdc0e7e88961ed3ba8d5cbdd3b07486a4862f9
-MISC ChangeLog 5296 RMD160 d285e81d692909991d823241c0891f58779ea702 SHA1 291b3ceb0c0e8ed46b3916b569ef87d8179b60da SHA256 5d049e46ebf592540caa4d44a91e910b62cb232d678bf70b41a5137fb9eb2069
+EBUILD tsocks-1.8_beta5-r5.ebuild 1832 RMD160 2d33fd1090c79d9008f5a5737ade4b99a9042033 SHA1 2736edec7abce0dcbb1e4d5d0e6016e664f5a6a4 SHA256 5311fa8c4e4fecccdb92b3a1673106e7ea726ec7bc1ea7cb8d610c7e5e43b211
+MISC ChangeLog 5516 RMD160 0514f08c4772b0e2b0faf950fcff5659baf5152c SHA1 1dde8598bb3e641e8b491d8cd5aa2d006e946f93 SHA256 135320e4217e21cb4b80c05f3ba51c15dab9d41e2bac9a7184277ac46ca70445
 MISC metadata.xml 593 RMD160 31a381655437e3f21b9d4bd0982356eac43b79bf SHA1 8bd4c29f69a1ca1456fbb99523e46356eca2454c SHA256 08fa435f16b6ec09e7cfb979843b309354230db8986894227436699eb588a2d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmbT/oACgkQts85UDFmaOVaGQCggdlGi0lsIMNEx2sHeLE6/0xL
-NuUAnAxLU+nt9OtAt4FLdpy81PlyuwWU
-=LLPZ
+iEYEARECAAYFAko80A8ACgkQts85UDFmaOU9TACeK7McqMIOxdwx0ctqC7aOMR7V
+tqMAn05gmf6ksrRsWITlQ95yxQcJTdvk
+=l1NJ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
new file mode 100644
index 000000000000..1c9dd18cd59d
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-gentoo-r3.patch
@@ -0,0 +1,133 @@
+diff -Nru tsocks-1.8.orig/Makefile.in tsocks-1.8/Makefile.in
+--- tsocks-1.8.orig/Makefile.in	2002-03-16 11:12:40.000000000 +0100
++++ tsocks-1.8/Makefile.in	2009-06-20 13:56:56.000000000 +0200
+@@ -28,6 +28,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ CFLAGS = @CFLAGS@
++LDFLAGS = @LDFLAGS@
+ INCLUDES = -I.
+ LIBS = @LIBS@
+ SPECIALLIBS = @SPECIALLIBS@
+@@ -41,16 +42,16 @@
+ all: ${TARGETS}
+ 
+ ${VALIDATECONF}: ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
++	${SHCC} ${LDFLAGS} ${INCLUDES} -o ${VALIDATECONF} ${VALIDATECONF}.c ${COMMON}.o ${PARSER}.o ${LIBS}
+ 
+ ${INSPECT}: ${INSPECT}.c ${COMMON}.o
+-	${SHCC} ${CFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
++	${SHCC} ${LDFLAGS} ${INCLUDES} -o ${INSPECT} ${INSPECT}.c ${COMMON}.o ${LIBS} 
+ 
+ ${SAVE}: ${SAVE}.c
+-	${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c
++	${SHCC} ${LDFLAGS} ${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}
++	${SHCC} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS}
+ 	ln -sf ${SHLIB} ${LIB_NAME}.so
+ 
+ %.so: %.c
+diff -Nru tsocks-1.8.orig/tsocks tsocks-1.8/tsocks
+--- tsocks-1.8.orig/tsocks	2002-03-16 11:27:18.000000000 +0100
++++ tsocks-1.8/tsocks	2009-06-20 13:56:38.000000000 +0200
+@@ -46,14 +46,14 @@
+ 	on)
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+-				export LD_PRELOAD="/usr/lib/libtsocks.so"
++				export LD_PRELOAD="/lib/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 "/lib/libtsocks\.so" || \
++				export LD_PRELOAD="/lib/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/\/lib\/libtsocks.so \?//'`
+ 		if [ -z "$LD_PRELOAD" ]
+ 			then
+ 				unset LD_PRELOAD
+@@ -68,10 +68,10 @@
+ 	*)
+ 		if [ -z "$LD_PRELOAD" ]
+ 		then
+-			export LD_PRELOAD="/usr/lib/libtsocks.so"
++			export LD_PRELOAD="/lib/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 "/lib/libtsocks\.so" || \
++			export LD_PRELOAD="/lib/libtsocks.so $LD_PRELOAD"
+ 		fi
+ 
+ 		if [ $# = 0 ]
+diff -Nru tsocks-1.8.orig/tsocks.8 tsocks-1.8/tsocks.8
+--- tsocks-1.8.orig/tsocks.8	2002-03-16 11:20:51.000000000 +0100
++++ tsocks-1.8/tsocks.8	2009-06-20 13:56:38.000000000 +0200
+@@ -127,8 +127,8 @@
+ libtsocks in /etc/ld.so.preload. Please make sure you correctly enter the
+ full path to the library in this file if you do this. If you get it wrong,
+ you will be UNABLE TO DO ANYTHING with the machine and will have to boot
+-it with a rescue disk and remove the file (or try the saveme program, see
+-the INSTALL file for more info).  THIS IS A ***WARNING***, please be
++it with a rescue disk and remove the file (or try the tsocks-saveme program,
++simply unlinks /etc/ld.so.preload ). THIS IS A ***WARNING***, please be
+ careful. Also be sure the library is in the root filesystem as all hell
+ will break loose if the directory it is in is not available at boot time.
+ 
+diff -Nru tsocks-1.8.orig/tsocks.conf.5 tsocks-1.8/tsocks.conf.5
+--- tsocks-1.8.orig/tsocks.conf.5	2002-05-18 04:13:08.000000000 +0200
++++ tsocks-1.8/tsocks.conf.5	2009-06-20 13:56:38.000000000 +0200
+@@ -139,21 +139,20 @@
+ the version that server supports. 
+ 
+ .TP
+-validateconf
+-validateconf can be used to verify the configuration file. It checks the format
+-of the file and also the contents for errors. Having read the file it dumps 
+-the configuration to the screen in a formatted, readable manner. This can be 
+-extremely useful in debugging problems.
+-
+-validateconf can read a configuration file from a location other than the 
+-location specified at compile time with the -f <filename> command line 
+-option.
+-
+-Normally validateconf simply dumps the configuration read to the screen (in
+-a nicely readable format), however it also has a useful 'test' mode. When
+-passed a hostname/ip on the command line like -t <hostname/ip>, validateconf 
+-determines which of the SOCKS servers specified in the configuration file 
+-would be used by tsocks to access the specified host. 
++tsocks-validateconf
++tsocks-validateconf can be used to verify the configuration file. It checks
++the format of the file and also the contents for errors. Having read the file 
++it dumps the configuration to the screen in a formatted, readable manner.
++This can be extremely useful in debugging problems.
++
++tsocks-validateconf can read a configuration file from a location other than the 
++location specified at compile time with the -f <filename> command line option.
++
++Normally tsocks-validateconf simply dumps the configuration read to the screen 
++(in a nicely readable format), however it also has a useful 'test' mode. When
++passed a hostname/ip on the command line like -t <hostname/ip>, 
++tsocks-validateconf determines which of the SOCKS servers specified in the 
++configuration file would be used by tsocks to access the specified host. 
+ 
+ .SH SEE ALSO
+ tsocks(8)
+diff -Nru tsocks-1.8.orig/validateconf.c tsocks-1.8/validateconf.c
+--- tsocks-1.8.orig/validateconf.c	2002-02-07 11:49:59.000000000 +0100
++++ tsocks-1.8/validateconf.c	2009-06-20 13:56:38.000000000 +0200
+@@ -23,7 +23,7 @@
+ */
+ 
+ /* Global configuration variables */ 
+-char *progname = "validateconf";	      /* Name for error msgs      */
++char *progname = "tsocks-validateconf";	      /* Name for error msgs      */
+ 
+ /* Header Files */
+ #include <config.h>
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild
new file mode 100644
index 000000000000..ec0cedf25e3b
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/tsocks-1.8_beta5-r5.ebuild,v 1.1 2009/06/20 12:03:13 mrness Exp $
+
+EAPI="2"
+
+inherit multilib eutils autotools toolchain-funcs
+
+DESCRIPTION="Transparent SOCKS v4 proxying library"
+HOMEPAGE="http://tsocks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tsocks/${PN}-${PV/_}.tar.gz
+	tordns? ( mirror://gentoo/${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="tordns"
+
+S="${WORKDIR}/${P%%_*}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo-r3.patch"
+	epatch "${FILESDIR}/${P}-bsd.patch"
+	use tordns && epatch "../${PN}-${PV/_beta/b}-tordns1-gentoo-r1.patch"
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	# NOTE: the docs say to install it into /lib. If you put it into
+	# /usr/lib and add it to /etc/ld.so.preload on many systems /usr isn't
+	# mounted in time :-( (Ben Lutgens) <lamer@gentoo.org>
+	econf \
+		--with-conf=/etc/socks/tsocks.conf \
+		--libdir=/$(get_libdir) || die "configure failed"
+}
+
+src_compile() {
+	# Fix QA notice lack of SONAME
+	emake DYNLIB_FLAGS=-Wl,--soname,libtsocks.so.${PV/_beta*} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	newbin validateconf tsocks-validateconf
+	newbin saveme tsocks-saveme
+	dobin inspectsocks
+	insinto /etc/socks
+	doins tsocks.conf.*.example
+	dodoc FAQ
+	use tordns && dodoc README*
+}
+
+pkg_postinst() {
+	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
+	einfo "The following executables have been renamed:"
+	einfo "    /usr/bin/saveme renamed to tsocks-saveme"
+	einfo "    /usr/bin/validateconf renamed to tsocks-validateconf"
+}