rpms/freeradius/devel freeradius-1.1.7-lsb.patch, NONE, 1.1 freeradius.spec, 1.44, 1.45

[Thomas Woerner (twoerner)]

Author: twoerner

Update of /cvs/pkgs/rpms/freeradius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24066

Modified Files:
	freeradius.spec 
Added Files:
	freeradius-1.1.7-lsb.patch 
Log Message:
- fixed initscript for LSB (rhbz#243671, rhbz#243928)
- fixed license tag



freeradius-1.1.7-lsb.patch:

--- NEW FILE freeradius-1.1.7-lsb.patch ---
diff -up freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb freeradius-1.1.7/redhat/rc.radiusd-redhat
--- freeradius-1.1.7/redhat/rc.radiusd-redhat.lsb	2002-09-14 01:13:58.000000000 +0200
+++ freeradius-1.1.7/redhat/rc.radiusd-redhat	2007-08-28 15:21:59.000000000 +0200
@@ -20,6 +20,14 @@
 #    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
 #
 
+### BEGIN INIT INFO
+# Provides: RADIUS server daemon
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Short-Description: start and stop RADIUS server daemon
+# Description: radiusd - Authentication, Authorization and Accounting server
+### END INIT INFO
+
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -27,13 +35,17 @@ RADIUSD=/usr/sbin/radiusd
 LOCKF=/var/lock/subsys/radiusd
 CONFIG=/etc/raddb/radiusd.conf
 
-[ -f $RADIUSD ] || exit 0
-[ -f $CONFIG ] || exit 0
+[ -f $RADIUSD ] || exit 5
+[ -f $CONFIG ] || exit 6
 
 RETVAL=0
 
+status radiusd
+running=$?
+
 case "$1" in
   start)
+	[ $running -eq 0 ] && exit 0
 	echo -n $"Starting RADIUS server: "
 	daemon $RADIUSD -y
 	RETVAL=$?
@@ -42,6 +54,7 @@ case "$1" in
 	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
 	;;
   stop)
+	[ $running -ne 0 ] || exit 0
 	echo -n $"Stopping RADIUS server: "
 	killproc $RADIUSD
 	RETVAL=$?
@@ -53,28 +66,28 @@ case "$1" in
 	RETVAL=$?
         ;;
   reload)
+	[ $running -ne 0 ] && exit 7
 	echo -n $"Reloading RADIUS server: "
 	killproc $RADIUSD -HUP
 	RETVAL=$?
 	echo
 	;;
-  restart)
+  restart|force-reload)
 	$0 stop
 	sleep 3
 	$0 start
 	RETVAL=$?
 	;;
-  condrestart)
-	if [ -f $LOCKF ]; then
-		$0 stop
-		sleep 3
-		$0 start
-		RETVAL=$?
-	fi
+  condrestart|try-restart)
+	[ ! -f $LOCKF ] && exit 7
+	$0 stop
+	sleep 3
+	$0 start
+	RETVAL=$?
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
-	exit 1
+	RETVAL=3
 esac
 
 exit $RETVAL


Index: freeradius.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freeradius/devel/freeradius.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- freeradius.spec	7 Aug 2007 16:18:24 -0000	1.44
+++ freeradius.spec	28 Aug 2007 14:18:45 -0000	1.45
@@ -2,7 +2,7 @@
 Name: freeradius
 Version: 1.1.7
 Release: 1%{?dist}
-License: GPL
+License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
 Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2
@@ -25,6 +25,7 @@
 Patch11: freeradius-1.1.2-no_sql_inc.patch
 Patch12: freeradius-1.1.7-ldap.patch
 Patch13: freeradius-1.1.7-db_dir.patch
+Patch14: freeradius-1.1.7-lsb.patch
 
 %description
 The FreeRADIUS Server Project is a high performance and highly configurable 
@@ -82,6 +83,7 @@
 %patch11 -p1 -b .no_sql_inc
 %patch12 -p1 -b .ldap
 %patch13 -p1 -b .db_dir
+%patch14 -p1 -b .lsb
 
 
 %build
@@ -299,6 +301,10 @@
 
 
 %changelog
+* Tue Aug 28 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-2
+- fixed initscript for LSB (rhbz#243671, rhbz#243928)
+- fixed license tag
+
 * Tue Aug  7 2007 Thomas Woerner <twoerner at redhat.com> 1.1.7-1
 - new versin 1.1.7
 - install snmp MIB files