x86; version bump

(Portage version: 2.0.51.19)

6 files changed, 116 insertions, 14 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 764e13f6253b..72cf1ae61584 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/dante
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.4 2005/06/04 12:30:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.5 2005/07/04 19:54:41 mrness Exp $
+
+*dante-1.1.16 (04 Jul 2005)
+
+  04 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  +files/dante-1.1.16-socksify.patch, dante-1.1.15-r2.ebuild,
+  +dante-1.1.16.ebuild:
+  Mark 1.1.15-r2 stable on x86. Version bumped to 1.1.16.
 
 *dante-1.1.15-r2 (04 Jun 2005)
 
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index b2b30ebc959e..d99d571bcab9 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e49aa34e96ca6caded6a17f6c9b157a9 dante-1.1.15-r2.ebuild 2460
+MD5 7e97518a857a971c483a820646f0b189 dante-1.1.15-r2.ebuild 2459
 MD5 a6a5bd8eb855005685f1e525babf1094 dante-1.1.15-r1.ebuild 2266
+MD5 4d143ed5804e6ae8999d9cdc2508fdc7 dante-1.1.16.ebuild 2322
 MD5 c56c2d5e1064afec9081d976445620f3 ChangeLog 7809
 MD5 19688263fcbda666eeb085869012f86a metadata.xml 246
 MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.15_pre1-socksify.patch 811
@@ -10,6 +8,7 @@ MD5 7573426ad7edc9ea4dd95f020205fda4 files/sockd.conf-with-pam.patch 295
 MD5 5e74662c76571e30e6a190a2d4d1193a files/dante-1.1.15-optionalpam.patch 10896
 MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r1 64
 MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r2 64
+MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.16-socksify.patch 811
 MD5 aa0bc92f8670b91aaf92f1e89b7e06c7 files/sockd.conf 7031
 MD5 cf06ad88e50a36ba1326579ab64366b8 files/socks.conf 4185
 MD5 05b76026b104b3a12fcd5d42aecc3041 files/sockd.conf-with-libwrap.patch 870
@@ -17,10 +16,4 @@ MD5 72d9add89e45e3cb921c99d79bdf31a7 files/dante-1.1.15-bindresvport.patch 485
 MD5 30064015b5702cf8059a1639167e8a3f files/dante-1.1.15-getipnodebyname.patch 789
 MD5 eb2041b3f61750335f8702515cb20b7c files/dante-sockd-conf 463
 MD5 1ff7ae828153ebdd013aa82e5c247b7f files/dante-sockd-init 1722
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCoZ8bjiC39V7gKu0RAn0rAKCXS6NacPrR3uWE/9aZi6CXCssgeACgqpRP
-eaUj+5Takiqa+9MlILhOsTE=
-=BJEP
------END PGP SIGNATURE-----
+MD5 fef7d90f2aa02a4dbd6cbc92e999faca files/digest-dante-1.1.16 64
diff --git a/net-proxy/dante/dante-1.1.15-r2.ebuild b/net-proxy/dante/dante-1.1.15-r2.ebuild
index 57fa30ca9a96..722d8c14f914 100644
--- a/net-proxy/dante/dante-1.1.15-r2.ebuild
+++ b/net-proxy/dante/dante-1.1.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.15-r2.ebuild,v 1.1 2005/06/04 12:30:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.15-r2.ebuild,v 1.2 2005/07/04 19:54:41 mrness Exp $
 
 inherit fixheadtails eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="tcpd debug selinux pam"
 
 RDEPEND="virtual/libc
diff --git a/net-proxy/dante/dante-1.1.16.ebuild b/net-proxy/dante/dante-1.1.16.ebuild
new file mode 100644
index 000000000000..7308d8c6bbdd
--- /dev/null
+++ b/net-proxy/dante/dante-1.1.16.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.16.ebuild,v 1.1 2005/07/04 19:54:41 mrness Exp $
+
+inherit fixheadtails eutils
+
+DESCRIPTION="A free socks4,5 and msproxy implementation"
+HOMEPAGE="http://www.inet.no/dante/"
+SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="tcpd debug selinux pam"
+
+RDEPEND="virtual/libc
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+	selinux? ( sec-policy/selinux-dante )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	>=sys-devel/automake-1.9"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-socksify.patch
+
+	ht_fix_file configure configure.ac
+	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() {
+	libtoolize --copy --force
+	econf \
+		`use_enable debug` \
+		`use_enable tcpd libwrap` \
+		`use_with pam` \
+		--with-socks-conf=/etc/socks/socks.conf \
+		--with-sockd-conf=/etc/socks/sockd.conf \
+		|| 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'
+
+	# default configuration files
+	insinto /etc/socks
+	doins ${FILESDIR}/sock?.conf
+	cd ${D}/etc/socks && {
+		use pam && epatch ${FILESDIR}/sockd.conf-with-pam.patch
+		use tcpd && epatch ${FILESDIR}/sockd.conf-with-libwrap.patch
+	}
+	cd ${S}
+
+	# our init script
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/dante-sockd-init dante-sockd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/dante-sockd-conf 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
+}
+
+pkg_postinst() {
+	enewuser sockd -1 /bin/false /etc/socks daemon
+}
diff --git a/net-proxy/dante/files/dante-1.1.16-socksify.patch b/net-proxy/dante/files/dante-1.1.16-socksify.patch
new file mode 100644
index 000000000000..632deb1f9b58
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.1.16-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-proxy/dante/files/digest-dante-1.1.16 b/net-proxy/dante/files/digest-dante-1.1.16
new file mode 100644
index 000000000000..faf1dc80869f
--- /dev/null
+++ b/net-proxy/dante/files/digest-dante-1.1.16
@@ -0,0 +1 @@
+MD5 a7493ac842bb83c5a307ec4ef33b938b dante-1.1.16.tar.gz 845001