fix for #10589

8 files changed, 11 insertions, 212 deletions

diff --git a/net-misc/dante/ChangeLog b/net-misc/dante/ChangeLog
index 5e957f55d282..86c9a174b333 100644
--- a/net-misc/dante/ChangeLog
+++ b/net-misc/dante/ChangeLog
@@ -1,24 +1,23 @@
 # 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.11 2003/02/12 08:20:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/ChangeLog,v 1.12 2003/03/04 07:02:11 vapier Exp $
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *dante-1.1.13 (15 Jul 2002)
+
+  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)
diff --git a/net-misc/dante/dante-1.1.12.ebuild b/net-misc/dante/dante-1.1.12.ebuild
deleted file mode 100644
index f7d718ed563b..000000000000
--- a/net-misc/dante/dante-1.1.12.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
-
-IUSE="tcpd"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A free socks4,5 and msproxy implemetation"
-SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
-HOMEPAGE="http://www.inet.no/dante/"
-RDEPEND="virtual/glibc sys-libs/pam tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND} sys-devel/perl"
-LICENSE="BSD"
-KEYWORDS="x86 sparc "
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	patch -p1 <${FILESDIR}/${P}-exit-code.patch || die
-	patch -p1 <${FILESDIR}/${P}-pre1-pam-syslog.patch || die
-	patch -p0 <${FILESDIR}/${P}-percent-in-log.patch || die
-	patch -p1 <${FILESDIR}/${P}-gcc-3.1.patch || die
-}
-
-src_compile() {
-	local myconf
-	use tcpd || myconf="--disable-libwrap"
-	[ -n "$DEBUGBUILD" ] || myconf="${myconf} --disable-debug"
-	einfo "myconf is $myconf"
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-socks-conf=/etc/socks/socks.conf \
-		--with-sockd-conf=/etc/socks/sockd.conf \
-		--host=${CHOST} ${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
-	perl -pe 's/(libdl\.so)//' -i ${D}/usr/bin/socksify
-	dodir /etc/socks
-	dodoc BUGS CREDITS LICENSE NEWS README SUPPORT TODO VERSION 
-	docinto txt
-	cd doc
-	dodoc README* *.txt SOCKS4.*
-	docinto example
-	cd ../example
-	dodoc *.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/dante-sockd-init dante-sockd
-}
diff --git a/net-misc/dante/dante-1.1.13.ebuild b/net-misc/dante/dante-1.1.13.ebuild
index 23238bff4a41..35405cc830ed 100644
--- a/net-misc/dante/dante-1.1.13.ebuild
+++ b/net-misc/dante/dante-1.1.13.ebuild
@@ -1,29 +1,27 @@
 # 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.13.ebuild,v 1.9 2003/02/13 14:47:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dante/dante-1.1.13.ebuild,v 1.10 2003/03/04 07:02:11 vapier Exp $
 
-IUSE="tcpd"
+inherit gcc
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A free socks4,5 and msproxy implemetation"
 SRC_URI="ftp://ftp.inet.no/pub/socks/${P}.tar.gz"
 HOMEPAGE="http://www.inet.no/dante/"
 
 LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ppc sparc"
 SLOT="0"
+IUSE="tcpd"
 
 RDEPEND="virtual/glibc
 	sys-libs/pam
 	tcpd? ( sys-apps/tcp-wrappers )"
-
 DEPEND="${RDEPEND}
 	sys-devel/perl"
 
-# removed the src_unpack() since it doesn't appear to need any of those
-# patches (they all barfed when I tried to apply them by hand)
-
 src_compile() {
+	[ "`gcc-fullversion`" == "3.2.1" ] && export CFLAGS=""
+
 	local myconf
 	use tcpd || myconf="--disable-libwrap"
 	[ -n "$DEBUGBUILD" ] || myconf="${myconf} --disable-debug"
diff --git a/net-misc/dante/files/dante-1.1.12-exit-code.patch b/net-misc/dante/files/dante-1.1.12-exit-code.patch
deleted file mode 100644
index 4ac00f85203d..000000000000
--- a/net-misc/dante/files/dante-1.1.12-exit-code.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- dante-1.1.12/sockd/sockd.c.orig	Mon Apr 15 13:33:09 2002
-+++ dante-1.1.12/sockd/sockd.c	Mon Apr 15 13:36:51 2002
-@@ -208,7 +208,6 @@
- 
- 		close(p);
- 	}
--	newprocinit();
- 
- 	/*
- 	 * Check system limits against what we need.
-@@ -293,6 +292,22 @@
- 		return EXIT_FAILURE;
- 	}
- 
-+	time(&sockscf.stat.boot);
-+
-+	if ((sockscf.state.motherpidv = (pid_t *)malloc(
-+	sizeof(*sockscf.state.motherpidv) * sockscf.option.serverc)) == NULL)
-+		serrx(EXIT_FAILURE, "%s", NOMEM);
-+
-+	/*
-+	 * Would have liked to move the daemon() call to after the "running"
-+	 * message below, but we want to know who our children are.
-+	 */
-+	if (sockscf.option.daemon)
-+		if (daemon(1, 0) != 0)
-+			serr(EXIT_FAILURE, "daemon()");
-+
-+	newprocinit();
-+
- #if !HAVE_DISABLED_PIDFILE
- 	socks_seteuid(NULL, sockscf.uid.privileged);
- 	if ((fp = fopen(SOCKD_PIDFILE, "w")) == NULL) {
-@@ -308,7 +323,7 @@
- 	}
- #endif /* !HAVE_DISABLED_PIDFILE */
- 
--	time(&sockscf.stat.boot);
-+	*sockscf.state.motherpidv = sockscf.state.pid;	/* main server. */
- 
- 	/* fork of requested number of servers.  Start at one 'cause we are "it".  */
- 	for (p = 1; p < sockscf.option.serverc; ++p) {
-@@ -809,22 +824,13 @@
- 	if (argc > 0)
- 		serrx(EXIT_FAILURE, "%s: unknown argument %s", function, *argv);
- 
--	if (sockscf.option.daemon)
--		if (daemon(1, 0) != 0)
--			serr(EXIT_FAILURE, "%s: daemon()", function);
--
- 	if (sockscf.option.configfile == NULL)
- 		sockscf.option.configfile = SOCKD_CONFIGFILE;
- 
- 	optioninit();
- 
- 	genericinit();
--
--	if ((sockscf.state.motherpidv = (pid_t *)malloc(
--	sizeof(*sockscf.state.motherpidv) * sockscf.option.serverc)) == NULL)
--		serrx(EXIT_FAILURE, "%s: %s", function, NOMEM);
--	*sockscf.state.motherpidv = sockscf.state.pid;	/* main server. */
--
-+	
- 	fixsettings();
- 
- 	if (verifyonly) {
diff --git a/net-misc/dante/files/dante-1.1.12-gcc-3.1.patch b/net-misc/dante/files/dante-1.1.12-gcc-3.1.patch
deleted file mode 100644
index b313639afd78..000000000000
--- a/net-misc/dante/files/dante-1.1.12-gcc-3.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dante-1.1.12/sockd/accesscheck.c~	Fri Apr 12 13:31:05 2002
-+++ dante-1.1.12/sockd/accesscheck.c	Wed May 15 10:14:55 2002
-@@ -153,7 +153,7 @@
- 				serrx(EXIT_FAILURE,
- 				"the PAM library/module code on your system seems to be messing "
- 				"with our descriptors, can't cope with that.  Get the PAM code "
--				"on your system fixed")
-+				"on your system fixed");
- #endif /* DIAGNOSTIC */
- 			break;
- 		}
diff --git a/net-misc/dante/files/dante-1.1.12-percent-in-log.patch b/net-misc/dante/files/dante-1.1.12-percent-in-log.patch
deleted file mode 100644
index 97b38d5e7ec8..000000000000
--- a/net-misc/dante/files/dante-1.1.12-percent-in-log.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: lib/serr.c

-===================================================================

-RCS file: /share/inferno/src/socks/lib/serr.c,v

-retrieving revision 1.5

-diff -u -r1.5 serr.c

---- lib/serr.c	12 Dec 2001 14:42:13 -0000	1.5

-+++ lib/serr.c	18 Apr 2002 09:20:30 -0000

-@@ -74,7 +74,7 @@

- 		bufused += snprintfn(&buf[bufused], sizeof(buf) - bufused,

- 		": %s (errno = %d)", strerror(errno), errno);

- 

--		slog(LOG_ERR, buf);

-+		slog(LOG_ERR, "%s", buf);

- 

- 		/* LINTED expression has null effect */

- 		va_end(ap);

-@@ -147,7 +147,7 @@

- 		bufused += snprintfn(&buf[bufused], sizeof(buf) - bufused,

- 		": %s (errno = %d)", strerror(errno), errno);

- 

--		slog(LOG_ERR, buf);

-+		slog(LOG_ERR, "%s", buf);

- 

- 		/* LINTED expression has null effect */

- 		va_end(ap);

diff --git a/net-misc/dante/files/dante-1.1.12-pre1-pam-syslog.patch b/net-misc/dante/files/dante-1.1.12-pre1-pam-syslog.patch
deleted file mode 100644
index b158d8828109..000000000000
--- a/net-misc/dante/files/dante-1.1.12-pre1-pam-syslog.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- dante-1.1.12/sockd/auth_pam.c.orig	Tue Feb  5 11:40:52 2002
-+++ dante-1.1.12/sockd/auth_pam.c	Fri Mar  8 23:15:31 2002
-@@ -58,6 +58,10 @@
- static int
- _pam_conversation(int num_msg, const struct pam_message **msgs,
- struct pam_response **rsps, void *priv_data);
-+static int
-+_real_pam_passwordcheck( int s, const struct sockaddr *src,
-+const struct sockaddr *dst, const struct authmethod_pam_t *auth,
-+char *emsg, size_t emsgsize);
- 
- typedef struct
- {
-@@ -72,8 +76,28 @@
- 
- __END_DECLS
- 
-+/*
-+ * At least one known PAM implementation reopens syslog internally
-+ * that messes up logging inside of dante
-+ * Very simple workaround is to reopen syslog after calling PAM
-+ */
- int
- pam_passwordcheck(s, src, dst, auth, emsg, emsgsize)
-+	int s;
-+	const struct sockaddr *src, *dst;
-+	const struct authmethod_pam_t *auth;
-+	char *emsg;
-+	size_t emsgsize;
-+{
-+	int ret;
-+
-+	ret = _real_pam_passwordcheck(s,src,dst,auth,emsg,emsgsize);
-+	newprocinit();
-+	return ret;
-+}
-+
-+static int
-+_real_pam_passwordcheck(s, src, dst, auth, emsg, emsgsize)
- 	int s;
- 	const struct sockaddr *src, *dst;
- 	const struct authmethod_pam_t *auth;
diff --git a/net-misc/dante/files/digest-dante-1.1.12 b/net-misc/dante/files/digest-dante-1.1.12
deleted file mode 100644
index 766e29de63ea..000000000000
--- a/net-misc/dante/files/digest-dante-1.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1be7318e0197522c9301066708ac1482 dante-1.1.12.tar.gz 804725