net-misc/dante -> net-proxy/dante

Package-Manager: portage-2.0.51.19

11 files changed, 722 insertions, 0 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
new file mode 100644
index 000000000000..143a801063e4
--- /dev/null
+++ b/net-proxy/dante/ChangeLog
@@ -0,0 +1,192 @@
+# ChangeLog for net-misc/dante
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.1 2005/04/22 20:47:27 mrness Exp $
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> :
+  Move from net-misc/dante to net-proxy/dante
+
+  21 Mar 2005; Alin Nastac <mrness@gentoo.org> dante-1.1.15-r1.ebuild:
+  Fix broken build on systems with other version of libtool than 1.5.10 (#86053).
+
+*dante-1.1.15-r1 (22 Feb 2005)
+
+  22 Feb 2005; Alin Nastac <mrness@gentoo.org> +metadata.xml,
+  -files/dante-1.1.14-bindresvport.patch,
+  +files/dante-1.1.15-bindresvport.patch,
+  +files/dante-1.1.15-getipnodebyname.patch, +files/dante-sockd-conf,
+  -files/dante-sockd-conf-1.1.14-r2, +files/dante-sockd-init,
+  -files/dante-sockd-init-1.1.14-r2, +dante-1.1.15-r1.ebuild,
+  -dante-1.1.15.ebuild:
+  Fix broken socks.h and add metadata (#82540).
+
+  19 Feb 2005; Daniel Black <dragonheart@gentoo.org> dante-1.1.15.ebuild:
+  pam missing from IUSE. Thanks to Chetan Reddy <chetan13@gmail.com> for telling
+  me
+
+  18 Feb 2005; Daniel Black <dragonheart@gentoo.org> dante-1.1.15.ebuild:
+  missed dependancy on automake-1.9. Thanks Hardave
+
+  17 Feb 2005; Hardave Riar <hardave@gentoo.org> dante-1.1.15.ebuild:
+  Stable on mips.
+
+  15 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/dante-1.1.14-socksify.patch, -files/dante-sockd-conf-1.1.14-r2,
+  -files/dante-sockd-init, -dante-1.1.13.ebuild, -dante-1.1.14-r1.ebuild,
+  -dante-1.1.14-r2.ebuild, dante-1.1.15.ebuild, -dante-1.1.15_pre1.ebuild,
+  +files/dante-1.1.15-optionalpam.patch:
+  Pam now optional as per bug #81002. Prior version removed as they were
+  vulnerable. Thanks to Chetan Reddy <chetan13@gmail.com> for bug report
+
+  05 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> dante-1.1.15.ebuild:
+  stable on amd64, also see #80267
+
+  04 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> dante-1.1.15.ebuild:
+  Stable on ppc.
+
+  04 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> dante-1.1.15.ebuild:
+  Stable on alpha, bug 80267.
+
+  03 Feb 2005; Olivier Crete <tester@gentoo.org> dante-1.1.15.ebuild:
+  Stable on x86 wrt security bug 80267
+
+  03 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> dante-1.1.15.ebuild:
+  Stable on sparc wrt #80267
+
+  03 Feb 2005; Markus Rothe <corsair@gentoo.org> dante-1.1.15.ebuild:
+  Stable on ppc64; bug #80267
+
+*dante-1.1.15 (03 Feb 2005)
+
+  03 Feb 2005; petre rodan <kaiowas@gentoo.org> +dante-1.1.15.ebuild:
+  Security related version bump - bug #80267
+
+  26 Jan 2005; petre rodan <kaiowas@gentoo.org> dante-1.1.13.ebuild,
+  dante-1.1.14-r1.ebuild, dante-1.1.14-r2.ebuild, dante-1.1.15_pre1.ebuild:
+  added selinux RDEPEND
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*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:
+  Typo in DESCRIPTION: implemetation -> implementation. Bug 59717.
+
+  07 Jul 2004; Travis Tilley <lv@gentoo.org> dante-1.1.14-r2.ebuild:
+  stable on amd64
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> dante-1.1.13.ebuild,
+  dante-1.1.14-r1.ebuild, dante-1.1.14-r2.ebuild:
+  change virtual/glibc to virtual/libc
+
+  13 Jun 2004; Aron Griffis <agriffis@gentoo.org> dante-1.1.13.ebuild:
+  Fix use invocation
+
+  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> dante-1.1.14-r2.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> dante-1.1.14-r1.ebuild,
+  dante-1.1.14-r2.ebuild:
+  Add inherit eutils
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> dante-1.1.14-r2.ebuild:
+  adding s390 keywords
+
+  05 Mar 2004; Tom Gall <tgall@gentoo.org> dante-1.1.14-r2.ebuild:
+  Marked stable on ppc64
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org> dante-1.1.14-r2.ebuild:
+  Marked stable on sparc.
+
+  21 Feb 2004; Seemant Kulleen <seemant@gentoo.org> dante-1.1.13.ebuild,
+  dante-1.1.14-r1.ebuild, dante-1.1.14-r2.ebuild:
+  add mips, for irssi repoman violation
+
+*dante-1.1.14-r2 (23 Dec 2003)
+
+  21 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Make sure the manpages point to the right files #42150 by Bob Bell.
+
+  29 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add a little ninja sed to fix compilation with 2.6 headers.
+
+  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)
+
+  08 Dec 2003; Aron Griffis <agriffis@gentoo.org> dante-1.1.14-r1.ebuild,
+  files/dante-1.1.14-bindresvport.patch, files/dante-1.1.14-socksify.patch:
+  Patch socksify to prevent setting of LD_LIBRARY_PATH which breaks operation on
+  alpha (and possibly other platforms). Patch socks.h to prevent conflict with
+  netinet/in.h (better solution than was previously in the ebuild)
+
+*dante-1.1.14 (03 Aug 2003)
+
+  03 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
+
+*dante-1.1.13 (15 Jul 2002)
+
+  13 Mar 2003; Guy Martin <gmsoft@gentoo.org> dante-1.1.13.ebuild :
+  Added hppa to keywords.
+
+  04 Mar 2003; Aron Griffis <agriffis@gentoo.org> dante-1.1.13.ebuild:
+  Mark stable on alpha (I don't know when x86, sparc, ppc were marked stable)
+
+  03 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added CFLAGS fix for gcc-3.2.1 ... you should use 3.2.2 anyways ...
+
+  26 Jan 2002; Jon Nall <nall@gentoo.org> dante-1.1.13.ebuild :
+  added ~ppc
+
+  15 Jul 2002; Ben Lutgens <lamer@gentoo.org> ChangeLog dante-1.1.19.ebuild:
+  Upgraded to 1.1.13, removed entire src_unpack stuff as none of the patches
+  applied cleanly. Also I comment out line 99 of the socks.h before it's
+  installed as it conflicts with a line in /usr/include/netinet/in.h
+
+*dante-1.1.12 (6 Jul 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> dante-1.1.12.ebuild,
+  Added KEYWORDS.
+
+*dante-1.1.9* (6 Jul 2002)
+
+  6 Jul 2002; phoen][x <phoenix@gentoo.org> dante-1.1.9*.ebuild,
+
+  Removing from CVS - source not available anymore.
+
+*dante-1.1.12 (7 Jun 2002)
+
+  7 Jun 2002; Donny Davies <woodchip@gentoo.org> dante-1.1.12.ebuild,
+  dante-1.1.12-exit-code.patch, dante-1.1.12-gcc-3.1.patch,
+  dante-1.1.12-percent-in-log.patch, dante-1.1.12-pre1-pam-syslog.patch :
+
+  Updato to latest release, closing #3250 with some patches to fix
+  build issues.
+
+*dante-1.1.9-r1 (1 May 2002)
+
+  1 May 2002; Donny Davies <woodchip@gentoo.org> dante-1.1.9-r1.ebuild,
+  files/dante-sockd-init :
+
+  Added tcp-wrappers to DEPEND.  Syntax cleanup.  Added initscript for sockd,
+  closing #2223.  Thanks to Per Wigren <wigren@home.se> for writing and
+  contributing the rc-script.
+
+*dante-1.1.9 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
new file mode 100644
index 000000000000..ec37c64a5add
--- /dev/null
+++ b/net-proxy/dante/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cc4394aba6cf81a8749930f2b92e5054 dante-1.1.15-r1.ebuild 2267
+MD5 5f5de6e53363e7df2344b84c2f015ca7 ChangeLog 7299
+MD5 19688263fcbda666eeb085869012f86a metadata.xml 246
+MD5 e1b94493b162bbdb56acba97cec7349a files/dante-1.1.15_pre1-socksify.patch 811
+MD5 5e74662c76571e30e6a190a2d4d1193a files/dante-1.1.15-optionalpam.patch 10896
+MD5 0a5831b02f1ee3c0b9810c4354839906 files/digest-dante-1.1.15-r1 64
+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 4b441393f14c9a13b7f4cb22242f659c files/dante-sockd-init 1319
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCaWL6jiC39V7gKu0RAmaBAKC3QT1tvaUH8bjNMf9YiYpKYWyltQCgo6Lc
+Z/34N6UKE7ZaRKo+/i++sZM=
+=WntB
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.1.15-r1.ebuild b/net-proxy/dante/dante-1.1.15-r1.ebuild
new file mode 100644
index 000000000000..5560042c81b3
--- /dev/null
+++ b/net-proxy/dante/dante-1.1.15-r1.ebuild
@@ -0,0 +1,82 @@
+# 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-r1.ebuild,v 1.1 2005/04/22 20:47:27 mrness 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="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 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"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}_pre1-socksify.patch
+	epatch ${FILESDIR}/${P}-bindresvport.patch
+	epatch ${FILESDIR}/${P}-optionalpam.patch
+	epatch ${FILESDIR}/${P}-getipnodebyname.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 \
+		${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 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
+}
diff --git a/net-proxy/dante/files/dante-1.1.15-bindresvport.patch b/net-proxy/dante/files/dante-1.1.15-bindresvport.patch
new file mode 100644
index 000000000000..58535ae31037
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.1.15-bindresvport.patch
@@ -0,0 +1,17 @@
+--- dante-1.1.14/capi/socks.h.agriffis	2003-07-02 08:13:28.000000000 -0400
++++ dante-1.1.14/capi/socks.h	2003-12-08 15:29:13.000000000 -0500
+@@ -47,6 +47,14 @@
+ #include <sys/socket.h>
+ 
+ 
++/*
++ * The definition of bindresvport below conflicts with line 336 of
++ * <netinet/in.h> ... best workaround seems to be to make sure the
++ * file is included prior to the #define
++ */
++#include <netinet/in.h>
++
++
+ #define accept Raccept
+ #define bind Rbind
+ #define bindresvport Rbindresvport
diff --git a/net-proxy/dante/files/dante-1.1.15-getipnodebyname.patch b/net-proxy/dante/files/dante-1.1.15-getipnodebyname.patch
new file mode 100644
index 000000000000..59db54bb9858
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.1.15-getipnodebyname.patch
@@ -0,0 +1,12 @@
+diff -Nru dante-1.1.15.orig/capi/socks.h dante-1.1.15/capi/socks.h
+--- dante-1.1.15.orig/capi/socks.h	2005-02-22 20:25:04.000000000 +0200
++++ dante-1.1.15/capi/socks.h	2005-02-22 20:25:33.368695168 +0200
+@@ -112,7 +112,7 @@
+ struct hostent *Rgethostbyname2 __P((const char *, int af));
+ int Rgetaddrinfo __P((const char *nodename, const char *servname,
+ 					      const struct addrinfo *hints, struct addrinfo **res));
+-struct hostent *Rgetipnodebyname __P((const char *name, int af, int flags,
++struct hostent *Rgetipnodebyname __P((const char *name, int af, int flags, int *error_num));
+ ssize_t Rwrite __P((int d, const void *buf, size_t nbytes));
+ ssize_t Rwritev __P((int d, const struct iovec *iov, int iovcnt));
+ ssize_t Rsend __P((int s, const void *msg, size_t len, int flags));
diff --git a/net-proxy/dante/files/dante-1.1.15-optionalpam.patch b/net-proxy/dante/files/dante-1.1.15-optionalpam.patch
new file mode 100644
index 000000000000..deef84a2096e
--- /dev/null
+++ b/net-proxy/dante/files/dante-1.1.15-optionalpam.patch
@@ -0,0 +1,317 @@
+--- configure.ac.orig	2005-02-15 18:50:05.978366304 +0930
++++ configure.ac	2005-02-15 19:22:42.360580312 +0930
+@@ -1255,12 +1255,24 @@
+ #(programs which don't use it probably won't enjoy being linked with it)
+ AM_CONDITIONAL(WANT_LIBWRAP, test "x${want_libwrap}" != "x")
+ 
+-#look for PAM header and lib
+-AC_CHECK_HEADERS(security/pam_appl.h, [have_pam_header=t])
+-AC_SEARCH_LIBS(pam_start, pam, [have_libpam=t])
+ 
+-if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then
+-	AC_DEFINE(HAVE_PAM, 1, [PAM support])
++AC_ARG_WITH(pam,
++ [  --without-pam           disable pam support(default=detect)],
++ [PAM=$withval])
++
++if test "${PAM}" != no; then
++	#look for PAM header and lib
++	AC_CHECK_HEADERS(security/pam_appl.h, [have_pam_header=t])
++	AC_SEARCH_LIBS(pam_start, pam, [have_libpam=t])
++
++	if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then
++		AC_DEFINE(HAVE_PAM, 1, [PAM support])
++		PAM=OK
++	else
++		PAM="not found"
++	fi
++else
++	PAM="disabled"
+ fi
+ 
+ 
+@@ -1484,6 +1496,7 @@
+ else
+ 	echo "Routeinfo:         OK"
+ fi
++echo "PAM support:       ${PAM}"
+ echo ""
+ echo "This software should perform optimally when all the lines above report 'OK'."
+ echo "This is not possible on all platforms."
+--- configure.orig	2005-02-15 19:34:04.005808456 +0930
++++ configure	2005-02-15 19:31:44.538156792 +0930
+@@ -1059,6 +1059,7 @@
+   --with-sockd-conf=FILE  change location of socks server configuration file
+   --with-pidfile=FILE     change location of server pidfile
+   --with-libc=NAME        manually set name of c library if necessary
++  --without-pam           disable pam support(default=detect)
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -3945,7 +3946,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 3948 "configure"' > conftest.$ac_ext
++  echo '#line 3949 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -5289,7 +5290,7 @@
+ 
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:5292:" \
++echo "$as_me:5293:" \
+      "checking for Fortran 77 compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+@@ -6346,11 +6347,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:6349: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:6350: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:6353: \$? = $ac_status" >&5
++   echo "$as_me:6354: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -6589,11 +6590,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:6592: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:6593: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:6596: \$? = $ac_status" >&5
++   echo "$as_me:6597: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -6649,11 +6650,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:6652: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:6653: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:6656: \$? = $ac_status" >&5
++   echo "$as_me:6657: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -8834,7 +8835,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 8837 "configure"
++#line 8838 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -8932,7 +8933,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 8935 "configure"
++#line 8936 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11125,11 +11126,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11128: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11129: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11132: \$? = $ac_status" >&5
++   echo "$as_me:11133: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -11185,11 +11186,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11188: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11189: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11192: \$? = $ac_status" >&5
++   echo "$as_me:11193: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -12546,7 +12547,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12549 "configure"
++#line 12550 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12644,7 +12645,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12647 "configure"
++#line 12648 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13481,11 +13482,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13484: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13485: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:13488: \$? = $ac_status" >&5
++   echo "$as_me:13489: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -13541,11 +13542,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:13544: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13545: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:13548: \$? = $ac_status" >&5
++   echo "$as_me:13549: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -15576,11 +15577,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15579: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15580: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15583: \$? = $ac_status" >&5
++   echo "$as_me:15584: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -15819,11 +15820,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15822: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15823: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:15826: \$? = $ac_status" >&5
++   echo "$as_me:15827: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -15879,11 +15880,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:15882: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15883: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15886: \$? = $ac_status" >&5
++   echo "$as_me:15887: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -18064,7 +18065,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 18067 "configure"
++#line 18068 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -18162,7 +18163,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 18165 "configure"
++#line 18166 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -29971,7 +29972,16 @@
+ fi
+ 
+ 
+-#look for PAM header and lib
++
++
++# Check whether --with-pam or --without-pam was given.
++if test "${with_pam+set}" = set; then
++  withval="$with_pam"
++  PAM=$withval
++fi;
++
++if test "${PAM}" != no; then
++	#look for PAM header and lib
+ 
+ for ac_header in security/pam_appl.h
+ do
+@@ -30122,7 +30132,7 @@
+ 
+ done
+ 
+-echo "$as_me:$LINENO: checking for library containing pam_start" >&5
++	echo "$as_me:$LINENO: checking for library containing pam_start" >&5
+ echo $ECHO_N "checking for library containing pam_start... $ECHO_C" >&6
+ if test "${ac_cv_search_pam_start+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -30249,12 +30259,18 @@
+ fi
+ 
+ 
+-if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then
++	if test x"${have_pam_header}" != x -a x"${have_libpam}" != x; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_PAM 1
+ _ACEOF
+ 
++		PAM=OK
++	else
++		PAM="not found"
++	fi
++else
++	PAM="disabled"
+ fi
+ 
+ 
+@@ -35024,6 +35040,7 @@
+ else
+ 	echo "Routeinfo:         OK"
+ fi
++echo "PAM support:       ${PAM}"
+ echo ""
+ echo "This software should perform optimally when all the lines above report 'OK'."
+ echo "This is not possible on all platforms."
diff --git a/net-proxy/dante/files/dante-1.1.15_pre1-socksify.patch b/net-proxy/dante/files/dante-1.1.15_pre1-socksify.patch
new file mode 100644
index 000000000000..632deb1f9b58
--- /dev/null
+++ b/net-proxy/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-proxy/dante/files/dante-sockd-conf b/net-proxy/dante/files/dante-sockd-conf
new file mode 100644
index 000000000000..c810c2ed11bc
--- /dev/null
+++ b/net-proxy/dante/files/dante-sockd-conf
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-conf,v 1.1 2005/04/22 20:47:27 mrness 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-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init
new file mode 100644
index 000000000000..b2f641142046
--- /dev/null
+++ b/net-proxy/dante/files/dante-sockd-init
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.1 2005/04/22 20:47:27 mrness 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() {
+	# first 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-proxy/dante/files/digest-dante-1.1.15-r1 b/net-proxy/dante/files/digest-dante-1.1.15-r1
new file mode 100644
index 000000000000..88330bda9942
--- /dev/null
+++ b/net-proxy/dante/files/digest-dante-1.1.15-r1
@@ -0,0 +1 @@
+MD5 c737faf4ba6282777070d8c0580c3832 dante-1.1.15.tar.gz 839660
diff --git a/net-proxy/dante/metadata.xml b/net-proxy/dante/metadata.xml
new file mode 100644
index 000000000000..c65f9d6801e4
--- /dev/null
+++ b/net-proxy/dante/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-proxy</herd>
+<longdescription>A free socks4, socks5 and msproxy implementation</longdescription>
+</pkgmetadata>