Update to 1.1.15-pre1

5 files changed, 108 insertions, 8 deletions

diff --git a/net-misc/dante/ChangeLog b/net-misc/dante/ChangeLog
index 82dab9d713ab..9b86a2965834 100644
--- a/net-misc/dante/ChangeLog
+++ b/net-misc/dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/dante
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.31 2004/08/08 00:20:40 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.32 2004/11/02 21:43:51 agriffis Exp $
+
+*dante-1.1.15_pre1 (04 Nov 2004)
+
+  04 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/dante-1.1.15_pre1-socksify.patch, +dante-1.1.15_pre1.ebuild:
+  Update to 1.1.15-pre1
 
   08 Aug 2004; Tom Martin <slarti@gentoo.org> dante-1.1.13.ebuild,
   dante-1.1.14-r1.ebuild, dante-1.1.14-r2.ebuild:
diff --git a/net-misc/dante/Manifest b/net-misc/dante/Manifest
index 2276622f2f93..4b3e00f69aa9 100644
--- a/net-misc/dante/Manifest
+++ b/net-misc/dante/Manifest
@@ -1,12 +1,14 @@
-MD5 ba5406607f4bbbbd635559cdb0c53f6e dante-1.1.14-r2.ebuild 2029
-MD5 d8353e0876f1e13ebbd6384e33906894 dante-1.1.13.ebuild 1617
 MD5 d7645db9e6022a237703b248d7cde44f ChangeLog 4541
+MD5 d8353e0876f1e13ebbd6384e33906894 dante-1.1.13.ebuild 1617
 MD5 420470a75aee90019433b2b8a957e68b dante-1.1.14-r1.ebuild 1614
-MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14-r1 64
-MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14-r2 64
+MD5 ba5406607f4bbbbd635559cdb0c53f6e dante-1.1.14-r2.ebuild 2029
+MD5 41b4ed499591126256d056b58ef6de67 dante-1.1.15_pre1.ebuild 2056
 MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.14-bindresvport.patch 485
-MD5 0e18d6df6b8f67d3872a56dc65ee4e28 files/dante-sockd-init-1.1.14-r2 1330
+MD5 18a1fa3293fe5b6272427ca60293f867 files/dante-1.1.14-socksify.patch 801
+MD5 184812cd77df081c52d4a0c540d0ba74 files/dante-sockd-conf-1.1.14-r2 474
 MD5 9f583f8333c19ae4cdebc4daae6d7516 files/dante-sockd-init 889
+MD5 0e18d6df6b8f67d3872a56dc65ee4e28 files/dante-sockd-init-1.1.14-r2 1330
 MD5 a5e8f0769876952c68e2a06a1508fbfd files/digest-dante-1.1.13 64
-MD5 184812cd77df081c52d4a0c540d0ba74 files/dante-sockd-conf-1.1.14-r2 474
-MD5 18a1fa3293fe5b6272427ca60293f867 files/dante-1.1.14-socksify.patch 801
+MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14-r1 64
+MD5 7d257618e686db991bad06011612d805 files/digest-dante-1.1.14-r2 64
+MD5 50224590fe8129aed7c9cb47a4e123ec files/digest-dante-1.1.15_pre1 69
diff --git a/net-misc/dante/dante-1.1.15_pre1.ebuild b/net-misc/dante/dante-1.1.15_pre1.ebuild
new file mode 100644
index 000000000000..42d3dcc77fb1
--- /dev/null
+++ b/net-misc/dante/dante-1.1.15_pre1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.15_pre1.ebuild,v 1.1 2004/11/02 21:43:51 agriffis Exp $
+
+inherit gcc fixheadtails eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="http://www.inet.no/dante/"
+SRC_URI="ftp://ftp.inet.no/pub/socks/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~ppc64 ~s390 ~amd64"
+IUSE="tcpd debug"
+
+RDEPEND="virtual/libc
+	 sys-libs/pam
+	 tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/dante-1.1.15_pre1-socksify.patch
+	epatch ${FILESDIR}/dante-1.1.14-bindresvport.patch
+	ht_fix_file `find ${S} -name 'configure'`
+	sed -i \
+		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
+		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
+		doc/{faq.ps,faq.tex,sockd.8,sockd.conf.5,socks.conf.5}
+}
+
+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"
+	# the comments in the source say this is only useful for 2.0 kernels ...
+	# well it may fix 2.0 but it breaks with 2.6 :)
+	[ "${KV:0:3}" == "2.6" ] && sed -i 's:if HAVE_LINUX_ECCENTRICITIES:if 0:' include/common.h
+	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 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-1.1.15_pre1-socksify.patch b/net-misc/dante/files/dante-1.1.15_pre1-socksify.patch
new file mode 100644
index 000000000000..632deb1f9b58
--- /dev/null
+++ b/net-misc/dante/files/dante-1.1.15_pre1-socksify.patch
@@ -0,0 +1,16 @@
+--- dante-1.1.15-pre1/bin/socksify.in.agriffis	2004-11-04 16:07:04.000000000 -0500
++++ dante-1.1.15-pre1/bin/socksify.in	2004-11-04 16:07:08.977460049 -0500
+@@ -60,7 +60,11 @@
+ @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}"
+ export @PRELOAD_VARIABLE@
+ 
+-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
+-export LD_LIBRARY_PATH
++# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where
++# LD_PRELOAD can contain a full path to the library.  Setting the
++# following breaks socksify on Linux/Alpha at least with
++# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis)
++#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}"
++#export LD_LIBRARY_PATH
+ 
+ exec "$@"
diff --git a/net-misc/dante/files/digest-dante-1.1.15_pre1 b/net-misc/dante/files/digest-dante-1.1.15_pre1
new file mode 100644
index 000000000000..8829a159369c
--- /dev/null
+++ b/net-misc/dante/files/digest-dante-1.1.15_pre1
@@ -0,0 +1 @@
+MD5 1dc7cbd260c7a171cacc49d314845806 dante-1.1.15-pre1.tar.gz 812572