remove old ebuilds; use radwatch in init script (#91736)

(Portage version: 2.0.51.19)

7 files changed, 14 insertions, 148 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 6087a6e8d6e0..cc61d6005db7 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.33 2005/05/19 04:54:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.34 2005/05/19 05:58:48 mrness Exp $
+
+*freeradius-1.0.2-r5 (19 May 2005)
+
+  19 May 2005; Alin Nastac <mrness@gentoo.org> files/radius.init,
+  -freeradius-1.0.2-r2.ebuild, -freeradius-1.0.2-r4.ebuild,
+  +freeradius-1.0.2-r5.ebuild:
+  Use radwatch in init script for preventing potential DoS (#91736).
 
 *freeradius-1.0.2-r4 (19 May 2005)
 
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 14f3b09e9409..1178ff5f8873 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d075f94b574fba2c813ded7d415ef0b3 freeradius-1.0.1.ebuild 2890
-MD5 9b37bc88688cb942777da79117459988 freeradius-1.0.2-r2.ebuild 3106
-MD5 ec265dfc71efb8a8c4da9a90a84845ea freeradius-1.0.2-r4.ebuild 3327
+MD5 ec265dfc71efb8a8c4da9a90a84845ea freeradius-1.0.2-r5.ebuild 3327
 MD5 53304f8018c3bf70eef42632755452d3 ChangeLog 4949
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
-MD5 50b0d44ee0e5313901606e2749dfdd34 files/radius.init 1006
-MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r2 69
-MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r4 69
+MD5 6d2c203ac5401a8e3c895ab4ee42c788 files/radius.init 1015
+MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-1.0.2-r5 69
 MD5 9f0188ba482e825cf2a89584f8caa813 files/digest-freeradius-1.0.1 69
 MD5 3c2119ec1d8d807fe5ed14944747f0f8 files/freeradius-1.0.1-gcc34.patch 715
 MD5 6b0efd384f551fab6b82794e91dbb4d5 files/freeradius-1.0.2-whole-archive-gentoo.patch 1728
 MD5 8aad37163f389564f402f677cd270c3c files/freeradius-1.0.2-sql-escape.patch 2851
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCjCVsjiC39V7gKu0RAvslAKCF6YSDy4/AYrXmhS4lRmLJYr10XACeND/t
-+E+/oAZlM/cWb+4/Q7Q/C6I=
-=Ds6t
------END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r4 b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r4
deleted file mode 100644
index 54745a2d6470..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5dfce4efbb03bbc47ceae08270a875e freeradius-1.0.2.tar.gz 2208884
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r2 b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r5
index 54745a2d6470..54745a2d6470 100644
--- a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r2
+++ b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r5
diff --git a/net-dialup/freeradius/files/radius.init b/net-dialup/freeradius/files/radius.init
index 4ac13055a139..3b2e9c90df74 100644
--- a/net-dialup/freeradius/files/radius.init
+++ b/net-dialup/freeradius/files/radius.init
@@ -35,13 +35,13 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting radiusd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/radiusd -- ${RADIUSD_OPTS} >/dev/null
+	start-stop-daemon --start --quiet --exec /usr/sbin/radwatch -- /usr/sbin/radiusd ${RADIUSD_OPTS} >/dev/null
 	eend $?
 }
 
 stop () {
 	ebegin "Stopping radiusd"
 	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/radiusd/radiusd.pid --retry 20
+		--pidfile=/var/run/radiusd/radwatch.pid
 	eend $?
 }
diff --git a/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild
deleted file mode 100644
index 44f927db87c1..000000000000
--- a/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild,v 1.5 2005/05/17 19:00:34 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl"
-
-DEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	virtual/libc
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python
-		dev-lang/perl )"
-
-pkg_setup() {
-	enewgroup radiusd
-	enewuser radiusd -1 /bin/false /var/log/radius radiusd
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if ! useq snmp; then
-		myconf="--without-snmp"
-	fi
-	if useq frascend; then
-		myconf="${myconf} --with-ascend-binary"
-	fi
-	if useq frnothreads; then
-		myconf="${myconf} --without-threads"
-	fi
-	if useq frxp; then
-		myconf="${myconf} --with-experimental-modules"
-	fi
-	#fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	# kill modules we don't use
-	if ! useq ssl; then
-		einfo "removing rlm_eap_tls and rlm_x99_token (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_tls src/modules/rlm_x99_token
-	fi
-	if ! useq ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! useq kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! useq pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--mandir=/usr/share/man \
-		--with-large-files --disable-ltdl-install --disable-static \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	pkg_preinst
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	dodir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R=${D} install || die
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-
-	[ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*}
-	dodoc COPYRIGHT CREDITS INSTALL LICENSE
-	#Copy SQL schemas to doc dir
-	docinto sql.schemas
-	dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql
-
-	rm ${D}/usr/sbin/rc.radiusd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/radius.init radiusd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/radius.conf radiusd
-}
-
-pkg_preinst() {
-	enewgroup radiusd
-	enewuser radiusd -1 /bin/false /var/log/radius radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-1.0.2-r4.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild
index 3800a9c149a0..14c7a30d548c 100644
--- a/net-dialup/freeradius/freeradius-1.0.2-r4.ebuild
+++ b/net-dialup/freeradius/freeradius-1.0.2-r5.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-dialup/freeradius/freeradius-1.0.2-r4.ebuild,v 1.1 2005/05/19 04:54:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild,v 1.1 2005/05/19 05:58:48 mrness Exp $
 
 inherit eutils