Add tsocks with a little cleanup and patch for BSD compatibility (bug #140612).

(Portage version: 2.1.1_pre3)

5 files changed, 86 insertions, 2 deletions

diff --git a/net-proxy/tsocks/ChangeLog b/net-proxy/tsocks/ChangeLog
index ff46ce74e39d..e485c8f21436 100644
--- a/net-proxy/tsocks/ChangeLog
+++ b/net-proxy/tsocks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/tsocks
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.8 2005/10/04 21:29:51 mrness Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/tsocks/ChangeLog,v 1.9 2006/07/16 17:51:21 flameeyes Exp $
+
+*tsocks-1.8_beta5-r1 (16 Jul 2006)
+
+  16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tsocks-1.8_beta5-bsd.patch, +tsocks-1.8_beta5-r1.ebuild:
+  Add tsocks with a little cleanup and patch for BSD compatibility (bug #140612).
 
   04 Oct 2005; Alin Nastac <mrness@gentoo.org> -tsocks-1.8_beta4.ebuild,
   tsocks-1.8_beta5.ebuild:
diff --git a/net-proxy/tsocks/files/digest-tsocks-1.8_beta5 b/net-proxy/tsocks/files/digest-tsocks-1.8_beta5
index 26e48b620a82..9fa43c4ee82c 100644
--- a/net-proxy/tsocks/files/digest-tsocks-1.8_beta5
+++ b/net-proxy/tsocks/files/digest-tsocks-1.8_beta5
@@ -1 +1,3 @@
 MD5 51caefd77e5d440d0bbd6443db4fc0f8 tsocks-1.8beta5.tar.gz 83928
+RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e tsocks-1.8beta5.tar.gz 83928
+SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 tsocks-1.8beta5.tar.gz 83928
diff --git a/net-proxy/tsocks/files/digest-tsocks-1.8_beta5-r1 b/net-proxy/tsocks/files/digest-tsocks-1.8_beta5-r1
new file mode 100644
index 000000000000..9fa43c4ee82c
--- /dev/null
+++ b/net-proxy/tsocks/files/digest-tsocks-1.8_beta5-r1
@@ -0,0 +1,3 @@
+MD5 51caefd77e5d440d0bbd6443db4fc0f8 tsocks-1.8beta5.tar.gz 83928
+RMD160 12e3eeeafaf7f3be21dd8901da38d5890659b09e tsocks-1.8beta5.tar.gz 83928
+SHA256 849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 tsocks-1.8beta5.tar.gz 83928
diff --git a/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch b/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch
new file mode 100644
index 000000000000..e003475da5a3
--- /dev/null
+++ b/net-proxy/tsocks/files/tsocks-1.8_beta5-bsd.patch
@@ -0,0 +1,22 @@
+Index: tsocks-1.8/configure.in
+===================================================================
+--- tsocks-1.8.orig/configure.in
++++ tsocks-1.8/configure.in
+@@ -122,7 +122,7 @@ LIBS=
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -ldl:
+-AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))
++AC_CHECK_FUNC([dlsym], [], [AC_CHECK_LIB(dl, dlsym,,AC_MSG_ERROR("libdl is required"))])
+ 
+ dnl If we're using gcc here define _GNU_SOURCE
+ AC_MSG_CHECKING("for RTLD_NEXT from dlfcn.h")
+@@ -312,7 +312,7 @@ AC_DEFINE_UNQUOTED(CLOSE_SIGNATURE, [${P
+ dnl Find the correct poll prototype on this machine 
+ AC_MSG_CHECKING(for correct poll prototype)
+ PROTO=
+-for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 
++for testproto in 'struct pollfd *ufds, unsigned long nfds, int timeout' 'struct pollfd ufds[[]], nfds_t nfds, int timeout'
+ do
+   if test "${PROTO}" = ""; then
+     AC_TRY_COMPILE([
diff --git a/net-proxy/tsocks/tsocks-1.8_beta5-r1.ebuild b/net-proxy/tsocks/tsocks-1.8_beta5-r1.ebuild
new file mode 100644
index 000000000000..ecb0f13660ef
--- /dev/null
+++ b/net-proxy/tsocks/tsocks-1.8_beta5-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/16 17:51:21 flameeyes Exp $
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/${P%%_*}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-bsd.patch"
+	eautoconf
+}
+
+src_compile() {
+	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"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dobin validateconf inspectsocks saveme
+	insinto /etc/socks
+	doins tsocks.conf.*.example
+	# tsocks script is buggy so we need this symlink
+	dodir /usr/$(get_libdir)
+	dosym /$(get_libdir)/libtsocks.so /usr/$(get_libdir)/libtsocks.so
+}
+
+pkg_postinst() {
+	einfo "Make sure you create /etc/socks/tsocks.conf from one of the examples in that directory"
+}