Version bump.

Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64

4 files changed, 118 insertions, 9 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 3cb1872fd5d4..883d8d727b5f 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.55 2011/06/07 06:04:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.56 2011/06/15 22:15:27 radhermit Exp $
+
+*dante-1.3.0 (15 Jun 2011)
+
+  15 Jun 2011; Tim Harder <radhermit@gentoo.org> +dante-1.3.0.ebuild,
+  +files/dante-1.3.0-socksify.patch:
+  Version bump.
 
 *dante-1.2.3 (07 Jun 2011)
 
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 6dee9f666532..9536d2b8597a 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX dante-1.1.19-libpam.patch 2688 RMD160 120d53814c7d9b51cad038ffd08e8794eb50b8dc SHA1 11f4807397c0e8a32ac3c55253f481f66e2344d5 SHA256 e78503cc9ece8347cfe0f11d77e0952bec9e2286dd1bea0916540f489d86ab54
 AUX dante-1.1.19-socksify.patch 811 RMD160 4edaad9e92f2ab689cf10b3decd2aa02d24d1f62 SHA1 d6e7ff6699691de9ee2ff836203e5628146ede06 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5
 AUX dante-1.2.3-socksify.patch 993 RMD160 4d9fa2256b15a58cb2b11fb86d044ddf5661095d SHA1 3f434ee41152263b5df9e6d418efc01be2e0e074 SHA256 f71c07df0765c600a9509faa7c6fcc3a2617a98897a234f457925980883d6351
+AUX dante-1.3.0-socksify.patch 987 RMD160 479f3418c600a5ef9d0f327d804490fae7d0ce9d SHA1 c0b55bdaac92b8122c5bd9f8c5daad98b772c566 SHA256 d5482aba9f049c879d646e8831e31ed9af0d69be9eada742323b2be05d66b7a1
 AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5fd6b002b33ddec46f6d94550d3c7ea26a26f115 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74
 AUX dante-sockd-init 1660 RMD160 8fe9aed45d614a691709ead7e72542cfa76417f5 SHA1 1143e90a30d470e3d91146c9ac588d82eaa2e263 SHA256 3297ab1d5a5b1d3324fdac27a626f34ca281aa2664ee9a779aa161dfa41fc2fa
 AUX sockd.conf 7031 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 SHA1 ef6f69870af7167d8b5c73577c0de5a41501d653 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7
@@ -12,18 +13,20 @@ AUX sockd.conf-with-pam.patch 295 RMD160 67950c8d3fca41399540644ea47f54963186879
 AUX socks.conf 4185 RMD160 1eaacd974befc24a22fa5f157528fffbfc54992c SHA1 f0f598706e44532f9884dbcadd54942b7acca45e SHA256 3dc8c06ca5a8309015c495ea50f62097ee6a605ac262665ffa5f19e0e8a5a9d8
 DIST dante-1.1.19.tar.gz 895713 RMD160 3649207b061b95fdd5b0950ea1ece9219eb8af4c SHA1 e366a60a880ceff6205f7cd87249c7322b844d3c SHA256 b49f0936282a14c41a03cd70158d1a11e6af3564a18d4b3337f291fb6dae0936
 DIST dante-1.2.3.tar.gz 978836 RMD160 8bfbd70b5729df14c35d5560b2dd7148c14d1759 SHA1 a2077b0ec061b247d95d15d77af5aa49a1c7d3e8 SHA256 c980a6e7192b38a77af016bc7c5112af7a3459f428c32cbe2920a2163553028d
+DIST dante-1.3.0.tar.gz 942083 RMD160 915bd18b1715cc399276f78ecc8b28e22c3854b6 SHA1 18628362d7c93b01c4289a0245fcd456194891b7 SHA256 75aea0b3b5abe96412b5c5ef78c9a2fe810029d015ac9136020bec1f3df5a776
 EBUILD dante-1.1.19-r4.ebuild 2308 RMD160 3ccc61d4d022e00eab72dcd7572f37fd2d27056d SHA1 dd89d0cae1d51ef61314a5f94efb896ec16ec803 SHA256 78717342b7fdff78b26a30e0e33a5767dfc8dad0a5fa52b9765b83947454f6f5
 EBUILD dante-1.2.3.ebuild 1981 RMD160 da3e464f3e759a157600b4a6a6eb0a6e31d7a3f6 SHA1 282cbc0af30ca09e355244e6c1aec485d492dddf SHA256 9fe0934a30046363b64b9ad884b6a78aeb7b57dfa84c8e7cd6dfc2500076fbd6
-MISC ChangeLog 14742 RMD160 68613f8e64c41b3a29e45b9c4e1a25e47f2216b3 SHA1 d429bb391c212e6dc60b69dc4cc251702513e407 SHA256 065a33da5d975a7ccdc60abd7bd64227024060764ca692774adda9efeebd7801
+EBUILD dante-1.3.0.ebuild 1976 RMD160 e2630d324dfc0318f77b7e5100732992de372c3d SHA1 ca75cb8c36cd7a20669a9504db6d5259b1b3a483 SHA256 b5f0aed87d4948f2d0b02ad1df1c639b1a4c09f15bd0766b98399c69165e9be3
+MISC ChangeLog 14894 RMD160 fc378da994b1b97376605437809a01183960ff23 SHA1 59c43e5af819f8931754622d8147562f11177930 SHA256 31fb0eabf76d7888561a12b79e7b8ac4dc7cf42023725023336b9f1249c5cb55
 MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJN7b9bAAoJEEqz6FtPBkyjrVwH/Av8JCkZVcLf+e5O7y2+KSjf
-B5Fk51vqKPeq9e2FRqRpzIDyLzb5tJC0uh8BFJiUC+keGFzSWPj0Mi5AtjN73hdn
-WPqWX5I2dhXZ1P0g4g30K4qRzKSjlNInGOoXFdEwxYryFLWgenwzt4+Fnd/RWpmh
-Hwx1BQw1k8VgHNlfZ3DF4Kw2qau1kgHwv1Eo/9Pze3lLIIoN7RX9jRDGhticZmLZ
-5zub70iUwXxrHiduLeHo7ay4lM8kTwLjeuqaNc3MBi8u7qypEtsgl9NV/zrvL1VF
-NwjVT3PlZV8v4sqepIz/vE1Lu/YWbM8GUQb9V69kb3S/ndASAgqppdfIonjs67o=
-=b03W
+iQEcBAEBAgAGBQJN+S8IAAoJEEqz6FtPBkyjgUQH/A5vHwOL/OHHZdclkQLJHBfR
+ZX67iP1ysBAY8vudiqeLDL/LPDdO1YVZcbWTt/Er0ISI+PEccdCxiSx4POARWqcW
+9/yWIXKhWtb0DZnM3tXztpy9f9t22gi6HsOQUPOKIr0QyX/5RHxCQli1XdD4MR7e
++QaEMFx7KAtlKAkb0NVF5MxwdlQhIOWLTzSy7GeuILFjlpmShSRcyWE+iMzsDQvR
+zFZE18CL11IVL7NX/uEYzX1m0HaapmTTmnQgFLHn//M7HGAY8xfObYwzzNbmfHOX
+8oNL4w7h63sa0WYJEylsCNUhynZeaNtTxVG0/uCrzcyqD3OJp6GtjkrUJv3Lzkc=
+=YCm/
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.3.0.ebuild b/net-proxy/dante/dante-1.3.0.ebuild
new file mode 100644
index 000000000000..cd8b6745c3ca
--- /dev/null
+++ b/net-proxy/dante/dante-1.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.3.0.ebuild,v 1.1 2011/06/15 22:15:27 radhermit Exp $
+
+EAPI=4
+
+inherit 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug kerberos pam selinux static-libs tcpd"
+
+RDEPEND="pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	selinux? ( sec-policy/selinux-dante )
+	tcpd? ( sys-apps/tcp-wrappers )
+	userland_GNU? ( sys-apps/shadow )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison"
+
+DOCS="BUGS CREDITS NEWS README SUPPORT doc/README* doc/*.txt doc/SOCKS4.protocol"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-socksify.patch"
+
+	sed -i \
+		-e 's:/etc/socks\.conf:/etc/socks/socks.conf:' \
+		-e 's:/etc/sockd\.conf:/etc/socks/sockd.conf:' \
+		doc/{socksify.1,socks.conf.5,sockd.conf.5,sockd.8}
+}
+
+src_configure() {
+	econf \
+		--with-socks-conf=/etc/socks/socks.conf \
+		--with-sockd-conf=/etc/socks/sockd.conf \
+		--without-upnp \
+		$(use_enable debug) \
+		$(use_with kerberos gssapi) \
+		$(use_with pam) \
+		$(use_enable static-libs static) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	# default configuration files
+	insinto /etc/socks
+	doins "${FILESDIR}"/sock?.conf
+	pushd "${D}/etc/socks" > /dev/null
+	use pam && epatch "${FILESDIR}/sockd.conf-with-pam.patch"
+	use tcpd && epatch "${FILESDIR}/sockd.conf-with-libwrap.patch"
+	popd > /dev/null
+
+	# init script
+	newinitd "${FILESDIR}/dante-sockd-init" dante-sockd
+	newconfd "${FILESDIR}/dante-sockd-conf" dante-sockd
+
+	# example configuration files
+	docinto examples
+	dodoc example/*.conf
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm '{}' +
+}
+
+pkg_postinst() {
+	enewuser sockd -1 -1 /etc/socks daemon
+}
diff --git a/net-proxy/dante/files/dante-1.3.0-socksify.patch b/net-proxy/dante/files/dante-1.3.0-socksify.patch
new file mode 100644
index 000000000000..45fd0fd2ed54
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.3.0-socksify.patch
@@ -0,0 +1,26 @@
+--- dante-1.3.0/bin/socksify.in.orig
++++ dante-1.3.0/bin/socksify.in
+@@ -53,8 +53,6 @@
+     exit 1
+ fi
+ 
+-SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@"
+-
+ SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}"
+ 
+ if test x`uname` = xDarwin; then
+@@ -80,8 +78,12 @@
+ @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:+:}${SOCKS_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
+ 
+ if test x"@ISA64DIR@" != x; then
+     SOCKS_LIB64DIR="${LIB64DIR:-${SOCKS_LIBDIR}/@ISA64DIR@}"