remove oldie & inter-block with freeradius

(Portage version: 2.0.51.19)

5 files changed, 12 insertions, 106 deletions

diff --git a/net-dialup/cistronradius/ChangeLog b/net-dialup/cistronradius/ChangeLog
index b8c1eb93cc33..052d57fa144d 100644
--- a/net-dialup/cistronradius/ChangeLog
+++ b/net-dialup/cistronradius/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/cistronradius
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/ChangeLog,v 1.8 2004/07/01 22:05:18 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/ChangeLog,v 1.9 2005/04/14 19:11:44 mrness Exp $
+
+  14 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  -files/cistronradius-1.6.6-security.patch, -cistronradius-1.6.6-r1.ebuild,
+  cistronradius-1.6.7.ebuild:
+  Remove old version and inter-block with net-dialup/freeradius package.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   cistronradius-1.6.6-r1.ebuild, cistronradius-1.6.7.ebuild:
diff --git a/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild b/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild
deleted file mode 100644
index 96ef7f1dc266..000000000000
--- a/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.6-r1.ebuild,v 1.6 2004/07/01 22:05:18 eradicator Exp $
-
-inherit eutils
-
-IUSE=""
-
-S="${WORKDIR}/radiusd-cistron-${PV}/src"
-DESCRIPTION="An authentication and accounting server for terminal servers that speak the RADIUS protocol."
-SRC_URI="ftp://ftp.radius.cistron.nl/pub/radius/radiusd-cistron-${PV}.tar.gz"
-HOMEPAGE="http://www.radius.cistron.nl/"
-KEYWORDS="x86 -*"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc
-		>=sys-apps/sed-4*"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-security.patch
-
-	sed -i -e "s:/usr/local:/usr:g" \
-	-e "s:-Wall -g:${CFLAGS}:g" \
-	Makefile || die
-	mv checkrad.pl checkrad
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/sbin
-	exeinto /usr/sbin
-	doexe ${S}/checkrad
-	doexe ${S}/radiusd
-	doexe ${S}/radrelay
-	dodir /usr/bin
-	exeinto /usr/bin
-	doexe ${S}/radclient
-	doexe ${S}/radlast
-	doexe ${S}/radtest
-	doexe ${S}/raduse
-	doexe ${S}/radwho
-	doexe ${S}/radzap
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/cistronradius.rc cistronradius
-	cd ${S}/..
-	dodir /etc/raddb
-	insinto /etc/raddb
-	doins raddb/*
-	dodoc COPYRIGHT INSTALL README doc/{ChangeLog,FAQ.txt,README*}
-	doman doc/{*.1,*.8,*.5rad,*.8rad}
-}
diff --git a/net-dialup/cistronradius/cistronradius-1.6.7.ebuild b/net-dialup/cistronradius/cistronradius-1.6.7.ebuild
index 858f5193f007..d9c370f09f3b 100644
--- a/net-dialup/cistronradius/cistronradius-1.6.7.ebuild
+++ b/net-dialup/cistronradius/cistronradius-1.6.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.7.ebuild,v 1.4 2004/07/01 22:05:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/cistronradius/cistronradius-1.6.7.ebuild,v 1.5 2005/04/14 19:11:44 mrness Exp $
 
 IUSE=""
 
@@ -12,8 +12,9 @@ KEYWORDS="x86 -*"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/libc
-		>=sys-apps/sed-4*"
+DEPEND="!net-dialup/freeradius
+	virtual/libc
+	>=sys-apps/sed-4*"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
diff --git a/net-dialup/cistronradius/files/cistronradius-1.6.6-security.patch b/net-dialup/cistronradius/files/cistronradius-1.6.6-security.patch
deleted file mode 100644
index be9e24b54d7b..000000000000
--- a/net-dialup/cistronradius/files/cistronradius-1.6.6-security.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- radiusd-cistron-1.6.6.orig/src/acct.c
-+++ radiusd-cistron-1.6.6/src/acct.c
-@@ -119,9 +119,10 @@
-  */
- static void make_wtmp(struct radutmp *ut, struct utmp *wt, int status)
- {
--	char		buf[32];
-+	char		buf[48];
- 	NAS		*cl;
- 	char		*s;
-+	int		len;
- 
- 	/*
- 	 *	Fill out the UTMP struct for the radwtmp file.
-@@ -143,11 +144,13 @@
- 		s = cl->shortname;
- 	if (s == NULL || s[0] == 0) s = uue(&(ut->nas_address));
- #if UT_LINESIZE > 9
--	sprintf(buf, "%03d:%.20s", ut->nas_port, s);
-+	sprintf(buf, "%03u:%.20s", ut->nas_port, s);
- #else
--	sprintf(buf, "%02d%.20s", ut->nas_port, s);
-+	sprintf(buf, "%02u%.20s", ut->nas_port, s);
- #endif
--	strncpy(wt->ut_line, buf, UT_LINESIZE);
-+	len = UT_LINESIZE;
-+	if (len > sizeof(buf)) len = sizeof(buf);
-+	strncpy(wt->ut_line, buf, len);
- 
- 	/*
- 	 *	We store the dynamic IP address in the hostname field.
-@@ -155,7 +158,9 @@
- #ifdef UT_HOSTSIZE
- 	if (ut->framed_address) {
- 		ipaddr2str(buf, ntohl(ut->framed_address));
--		strncpy(wt->ut_host, buf, UT_HOSTSIZE);
-+		len = UT_HOSTSIZE;
-+		if (len > sizeof(buf)) len = sizeof(buf);
-+		strncpy(wt->ut_host, buf, len);
- 	}
- #endif
- #ifdef __svr4__
diff --git a/net-dialup/cistronradius/files/digest-cistronradius-1.6.6-r1 b/net-dialup/cistronradius/files/digest-cistronradius-1.6.6-r1
deleted file mode 100644
index 894e581b50c0..000000000000
--- a/net-dialup/cistronradius/files/digest-cistronradius-1.6.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16084870890fd2ec577dbe183b51a379 radiusd-cistron-1.6.6.tar.gz 194154