stop radiusd in pkg_prerm for fixing removal of pid files problem (#93152); remove old version

Package-Manager: portage-2.0.51.19

7 files changed, 34 insertions, 161 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index cc61d6005db7..028e6926d3b6 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2005/05/19 05:58:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.35 2005/05/22 14:00:28 mrness Exp $
+
+  22 May 2005; Alin Nastac <mrness@gentoo.org>
+  -files/freeradius-1.0.1-gcc34.patch, files/radius.init,
+  -freeradius-1.0.1.ebuild, freeradius-1.0.2-r5.ebuild:
+  Stop radius daemon on upgrade/removal (#93152). Remove obsolete version.
 
 *freeradius-1.0.2-r5 (19 May 2005)
 
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index d7fb9fbf0111..daa141ea2989 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d075f94b574fba2c813ded7d415ef0b3 freeradius-1.0.1.ebuild 2890
-MD5 59490cbe9d945d495198da3293abd6bb freeradius-1.0.2-r5.ebuild 3327
-MD5 cda94fee4b01791a5b435d7ae1ea9c55 ChangeLog 5212
+MD5 6c54b5a372290cb51600596042d35177 freeradius-1.0.2-r5.ebuild 3798
+MD5 e813948eaa16c9e4633f78bee2b0f686 ChangeLog 5449
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
-MD5 6d2c203ac5401a8e3c895ab4ee42c788 files/radius.init 1015
+MD5 6b5637b103a04e8edfede3cfd59f3ec5 files/radius.init 1009
 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)
 
-iD8DBQFCjCspjiC39V7gKu0RAnLtAKDE8Yt4WCPZC0kQ24UmkDr23ZdBrwCgyB0T
-dio0gfMcwNQCaA8uutZswPg=
-=gxfC
+iD8DBQFCkJCSjiC39V7gKu0RAl1eAJ9tDt17HSLSwaMKvVvf3tfAwhLJvgCgmhYJ
+eS71dntEj74H9wh6iZyL/3Q=
+=hKK6
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.1 b/net-dialup/freeradius/files/digest-freeradius-1.0.1
deleted file mode 100644
index 5bff555ec49e..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abc30cb71367f859ceed4de6477cd59f freeradius-1.0.1.tar.gz 2237745
diff --git a/net-dialup/freeradius/files/freeradius-1.0.1-gcc34.patch b/net-dialup/freeradius/files/freeradius-1.0.1-gcc34.patch
deleted file mode 100644
index 1381411e638a..000000000000
--- a/net-dialup/freeradius/files/freeradius-1.0.1-gcc34.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN src/modules/rlm_x99_token/x99_rlm.c src.mod/modules/rlm_x99_token/x99_rlm.c
---- src/modules/rlm_x99_token/x99_rlm.c	2004-02-27 04:04:37.000000000 +0900
-+++ src.mod/modules/rlm_x99_token/x99_rlm.c	2004-09-22 03:32:09.292337984 +0900
-@@ -544,8 +544,6 @@
- 			"auth: bad state for [%s]: expired", username);
- 		return RLM_MODULE_REJECT;
- 	    }
--good_state:
--	    /* State is good! */
- 
- 	} else {
- 	    /* This should only happen if the authorize code didn't run. */
-@@ -556,6 +554,8 @@
- 	}
-     } /* if (!fast_sync) */
- 
-+    /* State is good! */
-+good_state:
-     /* Get the time of the last authentication. */
-     if (x99_get_last_auth(inst->syncdir, username, &last_auth) != 0) {
- 	x99_log(X99_LOG_ERR,
diff --git a/net-dialup/freeradius/files/radius.init b/net-dialup/freeradius/files/radius.init
index 3b2e9c90df74..94d67f5e4bb8 100644
--- a/net-dialup/freeradius/files/radius.init
+++ b/net-dialup/freeradius/files/radius.init
@@ -11,7 +11,6 @@ checkconfig() {
 		return 1
 	fi
 
-	cd /var/log/radius #set the location of startup.log
 	if [ "`/usr/sbin/check-radiusd-config >/dev/null 2>&1; echo $?`" != "0" ] ; then
 		eerror "Config not ok! (try /usr/sbin/check-radiusd-config )"
 		return 1
@@ -31,6 +30,7 @@ checkconfig() {
 }
 
 start() {
+	cd /var/log/radius #set the location of log files
 	# Comment out the following line to get faster startups
 	checkconfig || return 1
 
@@ -41,7 +41,6 @@ start() {
 
 stop () {
 	ebegin "Stopping radiusd"
-	start-stop-daemon --stop --quiet \
-		--pidfile=/var/run/radiusd/radwatch.pid
+	start-stop-daemon --stop --quiet --pidfile=/var/run/radiusd/radwatch.pid
 	eend $?
 }
diff --git a/net-dialup/freeradius/freeradius-1.0.1.ebuild b/net-dialup/freeradius/freeradius-1.0.1.ebuild
deleted file mode 100644
index f78e74276d12..000000000000
--- a/net-dialup/freeradius/freeradius-1.0.1.ebuild
+++ /dev/null
@@ -1,124 +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.1.ebuild,v 1.9 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"
-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}
-
-	# gcc-3.4 fix
-	epatch ${FILESDIR}/${P}-gcc34.patch
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if ! use snmp; then
-		myconf="--without-snmp"
-	fi
-	if use frascend; then
-		myconf="${myconf} --with-ascend-binary"
-	fi
-	if use frnothreads; then
-		myconf="${myconf} --without-threads"
-	fi
-	if use frxp; then
-		myconf="${myconf} --with-experimental-modules"
-	fi
-
-	# kill modules we don't use
-	if ! use 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 ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-
-	# experimental modules are
-	# rlm_cram rlm_example rlm_perl
-	# rlm_python rlm_sim_files rlm_smb rlm_sqlcounter 
-
-	./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
-
-	dodoc COPYRIGHT CREDITS INSTALL LICENSE README
-
-	rm ${D}/usr/sbin/rc.radiusd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/radius.init radiusd
-
-	dodir /etc/conf.d
-	cp ${FILESDIR}/radius.conf ${D}/etc/conf.d/radiusd
-}
-
-pkg_preinst() {
-	enewgroup radiusd
-	enewuser radiusd -1 /bin/false /var/log/radius radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild
index 14c7a30d548c..a21d25fb922d 100644
--- a/net-dialup/freeradius/freeradius-1.0.2-r5.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-r5.ebuild,v 1.1 2005/05/19 05:58:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2-r5.ebuild,v 1.2 2005/05/22 14:00:28 mrness Exp $
 
 inherit eutils
 
@@ -52,7 +52,7 @@ src_unpack() {
 src_compile() {
 	local myconf=" \
 		`use_with snmp` \
-		`use_with frascent ascend-binary` \
+		`use_with frascend ascend-binary` \
 		`use_with frxp experimental-modules` \
 		`use_with udpfromto` \
 		`use_with edirectory edir` "
@@ -128,3 +128,21 @@ pkg_preinst() {
 	enewgroup radiusd
 	enewuser radiusd -1 /bin/false /var/log/radius radiusd
 }
+
+pkg_prerm() {
+	if [ -n "`${ROOT}/etc/init.d/radiusd status | grep start`" ]; then
+		${ROOT}/etc/init.d/radiusd stop
+	fi
+}
+
+pkg_postrm() {
+	if has_version ">${CATEGORY}/${PF}" || has_version "<${CATEGORY}/${PF}" ; then
+		ewarn "If radiusd service was running, it had been stopped!"
+		echo
+		ewarn "You should update the configuration files using etc-update"
+		ewarn "and start the radiusd service again by running:"
+		einfo "    /etc/init.d/radiusd start"
+
+		ebeep
+	fi
+}