take bug #19988, improve on it, and make some things better in general

7 files changed, 141 insertions, 9 deletions

diff --git a/net-misc/dante/ChangeLog b/net-misc/dante/ChangeLog
index 0dd8322f7a8c..d765e2a0d3bd 100644
--- a/net-misc/dante/ChangeLog
+++ b/net-misc/dante/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dante
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.16 2003/12/08 22:00:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.17 2003/12/23 10:48:10 robbat2 Exp $
+
+*dante-1.1.14-r2 (23 Dec 2003)
+
+  23 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> dante-1.1.14-r1.ebuild,
+  dante-1.1.14-r2.ebuild, files/dante-sockd-conf-1.1.14-r2,
+  files/dante-sockd-init-1.1.14-r2:
+  take bug #19988, improve on it, and make some things better in general
 
 *dante-1.1.14-r1 (08 Dec 2003)
 
diff --git a/net-misc/dante/Manifest b/net-misc/dante/Manifest
index 0ca8399ab587..b1e4ff4873c4 100644
--- a/net-misc/dante/Manifest
+++ b/net-misc/dante/Manifest
@@ -1,15 +1,15 @@
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/Manifest,v 1.9 2003/12/23 10:48:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/Manifest,v 1.10 2003/12/23 10:48:16 robbat2 Exp $
 MD5 d1f1430ee0419b3e46bc012a91dedc7c dante-1.1.14.ebuild 1391
-MD5 fb0834e2ca41c9d431fac94a2ed9a66f dante-1.1.14-r2.ebuild 1701
+MD5 b85a5ada0218cb27f4b0cefb97528fa3 dante-1.1.14-r2.ebuild 1727
 MD5 6d05883f69b700200c02ba02fd8f7e9c dante-1.1.13.ebuild 1628
-MD5 0d1cb93d2ec44d3acb0eb97b5a994f91 ChangeLog 2841
-MD5 b3e860e075158c5a667173a6fa233cbf dante-1.1.14-r1.ebuild 1611
+MD5 814b7aa2313ec256f419834ca36fe1a1 ChangeLog 3119
+MD5 f456ac7c1504b159f693882fb470b706 dante-1.1.14-r1.ebuild 1610
 MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14-r1 64
 MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14-r2 64
 MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.14-bindresvport.patch 485
-MD5 dcb9718ce1934909c1e0dc531fc4adb8 files/dante-sockd-init-1.1.14-r2 1365
+MD5 b64eb70c90df80388ce5a718a89218b0 files/dante-sockd-init-1.1.14-r2 1376
 MD5 a5a2b1ca6b850658a3ff376f55276d85 files/dante-sockd-init 905
 MD5 a5e8f0769876952c68e2a06a1508fbfd files/digest-dante-1.1.13 64
 MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14 64
-MD5 81de9023f521c4f40885e9397aad4c6e files/dante-sockd-conf-1.1.14-r2 480
+MD5 ea84b8578883d6a301ffa3a27d8e04a4 files/dante-sockd-conf-1.1.14-r2 491
 MD5 18a1fa3293fe5b6272427ca60293f867 files/dante-1.1.14-socksify.patch 801
diff --git a/net-misc/dante/dante-1.1.14-r1.ebuild b/net-misc/dante/dante-1.1.14-r1.ebuild
index 81db5ae15711..c42989a1584c 100644
--- a/net-misc/dante/dante-1.1.14-r1.ebuild
+++ b/net-misc/dante/dante-1.1.14-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.14-r1.ebuild,v 1.1 2003/12/08 22:00:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.14-r1.ebuild,v 1.2 2003/12/23 10:48:10 robbat2 Exp $
 
-inherit gcc
+inherit gcc fixheadtails
 
 DESCRIPTION="A free socks4,5 and msproxy implemetation"
 HOMEPAGE="http://www.inet.no/dante/"
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}     || die "cd failed"
 	epatch ${FILESDIR}/dante-1.1.14-socksify.patch || die "epatch failed"
 	epatch ${FILESDIR}/dante-1.1.14-bindresvport.patch || die "epatch failed"
+	ht_fix_file `find ${S} -name 'configure'`
 }
 
 src_compile() {
diff --git a/net-misc/dante/dante-1.1.14-r2.ebuild b/net-misc/dante/dante-1.1.14-r2.ebuild
new file mode 100644
index 000000000000..894fef2600bc
--- /dev/null
+++ b/net-misc/dante/dante-1.1.14-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.14-r2.ebuild,v 1.1 2003/12/23 10:48:10 robbat2 Exp $
+
+inherit gcc fixheadtails
+
+DESCRIPTION="A free socks4,5 and msproxy implemetation"
+HOMEPAGE="http://www.inet.no/dante/"
+SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ia64"
+IUSE="tcpd debug"
+
+RDEPEND="virtual/glibc
+		 sys-libs/pam
+		 tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+		>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S}     || die "cd failed"
+	epatch ${FILESDIR}/dante-1.1.14-socksify.patch || die "epatch failed"
+	epatch ${FILESDIR}/dante-1.1.14-bindresvport.patch || die "epatch failed"
+	ht_fix_file `find ${S} -name 'configure'`
+}
+
+src_compile() {
+	econf \
+		`use_enable debug` \
+		`use_enable tcpd libwrap` \
+		--with-socks-conf=/etc/socks/socks.conf \
+		--with-sockd-conf=/etc/socks/sockd.conf \
+		${myconf} \
+		|| die "bad ./configure"
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# bor: comment libdl.so out it seems to work just fine without it
+	sed -i -e 's:libdl\.so::' ${D}/usr/bin/socksify || die 'sed failed'
+
+	# no configuration file by default
+	dodir /etc/socks
+
+	# our init script
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dante-sockd-init-1.1.14-r2 dante-sockd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/dante-sockd-conf-1.1.14-r2 dante-sockd
+
+	# install documentation
+	dodoc BUGS CREDITS LICENSE NEWS README SUPPORT TODO VERSION
+	docinto txt
+	cd doc
+	dodoc README* *.txt SOCKS4.*
+	docinto example
+	cd ../example
+	dodoc *.conf
+}
diff --git a/net-misc/dante/files/dante-sockd-conf-1.1.14-r2 b/net-misc/dante/files/dante-sockd-conf-1.1.14-r2
new file mode 100644
index 000000000000..cc86d49abe67
--- /dev/null
+++ b/net-misc/dante/files/dante-sockd-conf-1.1.14-r2
@@ -0,0 +1,14 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-conf-1.1.14-r2,v 1.1 2003/12/23 10:48:10 robbat2 Exp $
+
+# Number of processes to fork off
+# 1 is plenty for most users
+# increment SLOWLY for bigger demand
+SOCKD_FORKDEPTH=1
+
+# set this to 1 to enable debug
+SOCKD_DEBUG=0
+
+# disable TCP keepalive for better resource usage
+SOCKD_DISABLE_KEEPALIVE=1
diff --git a/net-misc/dante/files/dante-sockd-init-1.1.14-r2 b/net-misc/dante/files/dante-sockd-init-1.1.14-r2
new file mode 100644
index 000000000000..161479a25c02
--- /dev/null
+++ b/net-misc/dante/files/dante-sockd-init-1.1.14-r2
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/files/dante-sockd-init-1.1.14-r2,v 1.1 2003/12/23 10:48:10 robbat2 Exp $
+
+SOCKD_OPT="-D"
+[ "${SOCKD_FORKDEPTH}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
+[ "${SOCKD_DEBUG}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d"
+[ "${SOCKD_DISABLE_KEEPALIVE}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	# firstly check that it exists
+    if [ ! -f /etc/socks/sockd.conf ] ; then
+		eerror "You need to setup /etc/socks/sockd.conf first"
+		eerror "Examples are in /usr/share/doc/dante[version]/example"
+		eerror "for info: info sockd.conf"
+		return 1
+	fi
+    /usr/sbin/sockd -V
+    ret=$?
+    if [ $ret -ne 0 ]; then
+        eerror "Something is wrong with your configuration file"
+        return 1
+    fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting dante sockd"
+	start-stop-daemon --start --quiet --pidfile /var/run/sockd.pid \
+		--make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT}
+	eend $? "Failed to start sockd"
+}
+
+stop() {
+	ebegin "Stopping dante sockd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/sockd.pid
+	eend $? "Failed to stop sockd"
+	# clean stale pidfile
+	[ -f /var/run/sockd.pid ] && rm -f /var/run/sockd.pid
+}
diff --git a/net-misc/dante/files/digest-dante-1.1.14-r2 b/net-misc/dante/files/digest-dante-1.1.14-r2
new file mode 100644
index 000000000000..67e51bafd3c6
--- /dev/null
+++ b/net-misc/dante/files/digest-dante-1.1.14-r2
@@ -0,0 +1 @@
+MD5 465c2c615c1aa64afd328feee97ba007 dante-1.1.14.tar.gz 804081