- remove support for radrelay, it's different now

- turn off default inclusion of SQL config files in radiusd.conf since SQL
    is an optional RPM install
- remove mssql config files

freeradius-radiusd-conf.patch

@@ -0,0 +1,20 @@
+--- freeradius-server-2.0.3/raddb/radiusd.conf.in.orig	2008-04-18 12:41:36.217230000 -0400
++++ freeradius-server-2.0.3/raddb/radiusd.conf.in	2008-04-18 12:44:00.735486000 -0400
+@@ -1294,7 +1294,7 @@
+ 	#  Include another file that has the SQL-related configuration.
+ 	#  This is another file only because it tends to be big.
+ 	#
+-	$INCLUDE sql.conf
++	#$INCLUDE sql.conf
+ 
+ 
+ 	#  For Cisco VoIP specific accounting with Postgresql,
+@@ -1488,7 +1488,7 @@
+ 	#  totally dependent on the SQL module to process Accounting
+ 	#  packets.
+ 	#
+-	$INCLUDE sql/mysql/counter.conf
++	#$INCLUDE sql/mysql/counter.conf
+ 	#$INCLUDE sql/postgresql/counter.conf
+ 
+ 	#

freeradius-radrelay-init

@@ -1,80 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 88 10
-# description: Start/Stop the RADIUS server daemon
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-#
-#    Copyright (C) 2001 The FreeRADIUS Project   http://www.freeradius.org
-#
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-RADIUSD=/usr/sbin/radiusd
-LOCKF=/var/lock/subsys/radiusd
-CONFIG=/etc/raddb/radiusd.conf
-
-[ -f $RADIUSD ] || exit 0
-[ -f $CONFIG ] || exit 0
-
-RETVAL=0
-
-case "$1" in
-  start)
-	echo -n $"Starting RADIUS server: "
-	daemon $RADIUSD
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && touch $LOCKF &&
-	    ln -s /var/run/radiusd/radiusd.pid /var/run/radiusd.pid 2>/dev/null
-	;;
-  stop)
-	echo -n $"Stopping RADIUS server: "
-	killproc $RADIUSD
-	RETVAL=$?
-	echo
-	[ $RETVAL -eq 0 ] && rm -f $LOCKF
-	;;
-  status)
-	status radiusd
-	RETVAL=$?
-        ;;
-  reload)
-	echo -n $"Reloading RADIUS server: "
-	killproc $RADIUSD -HUP
-	RETVAL=$?
-	echo
-	;;
-  restart)
-	$0 stop
-	sleep 3
-	$0 start
-	RETVAL=$?
-	;;
-  condrestart)
-	if [ -f $LOCKF ]; then
-		$0 stop
-		sleep 3
-		$0 start
-		RETVAL=$?
-	fi
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
-	exit 1
-esac
-
-exit $RETVAL

freeradius.spec

@@ -1,22 +1,22 @@
 # FIXME: should pki certs be moved to /etc/pki?
 # FIXME: need to run rpmlint
-# FIXME: edit radrelay init.d script, was copied from radiusd init
 # FIXME: check each former patch, do we still need any?
 Summary: High-performance and highly configurable free RADIUS server
 Name: freeradius
 Version: 2.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
 
 Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-server-%{version}.tar.bz2
 Source100: freeradius-radiusd-init
-Source101: freeradius-radrelay-init
 Source102: freeradius-logrotate
 Source103: freeradius-pam-conf
 Source104: freeradius-dialupadmin-httpd-conf
 
+Patch0: freeradius-radiusd-conf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf
@@ -190,6 +190,7 @@ This plugin provides the unixODBC support for the FreeRADIUS server project.
 
 %prep
 %setup -q -n %{name}-server-%{version}
+%patch0 -p1 -b .conf
 
 %build
 %ifarch s390 s390x
@@ -240,19 +241,15 @@ make install R=$RPM_BUILD_ROOT
 RADDB=$RPM_BUILD_ROOT%{_sysconfdir}/raddb
 perl -i -pe 's/^#user =.*$/user = radiusd/'   $RADDB/radiusd.conf
 perl -i -pe 's/^#group =.*$/group = radiusd/' $RADDB/radiusd.conf
-perl -i -pe 's/^#user =.*$/user = radiusd/'   $RADDB/radrelay.conf
-perl -i -pe 's/^#group =.*$/group = radiusd/' $RADDB/radrelay.conf
 #ldconfig -n $RPM_BUILD_ROOT/usr/lib/freeradius
 # logs
 mkdir -p $RPM_BUILD_ROOT/var/log/radius/radacct
 touch $RPM_BUILD_ROOT/var/log/radius/{radutmp,radius.log}
 
 install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/%{_initrddir}/radiusd
-install -m 755 %{SOURCE101} $RPM_BUILD_ROOT/%{_initrddir}/radrelay
 install -m 644 %{SOURCE102} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/radiusd
 install -m 644 %{SOURCE103} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/radiusd
 
-(cd $RPM_BUILD_ROOT/usr/sbin && ln -sf ./radiusd radrelay)
 # install dialup_admin
 DIALUPADMIN=$RPM_BUILD_ROOT%{_datadir}/dialup_admin
 mkdir -p $DIALUPADMIN
@@ -269,6 +266,7 @@ rm -rf doc/00-OLD
 rm -f $RPM_BUILD_ROOT/usr/sbin/rc.radiusd
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/freeradius/*.a
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/freeradius/*.la
+rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/sql/mssql
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/raddb/sql/oracle
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/sql/oracle
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/dialup_admin/lib/sql/oracle
@@ -314,7 +312,6 @@ fi
 %config(noreplace) %{_sysconfdir}/pam.d/radiusd
 %config(noreplace) %{_sysconfdir}/logrotate.d/radiusd
 %config(noreplace) %{_initrddir}/radiusd
-%config(noreplace) %{_initrddir}/radrelay
 %dir %attr(755,radiusd,radiusd) /var/lib/radiusd
 # configs
 %dir %attr(750,root,radiusd) /etc/raddb
@@ -334,10 +331,7 @@ fi
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/radiusd.conf
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/snmp.conf
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql.conf
-#%attr(640,root,radiusd) %config(noreplace) /etc/raddb/radrelay.conf
-#%attr(640,root,radiusd) %config(noreplace) /etc/raddb/vmpsd.conf
 %dir %attr(640,root,radiusd) /etc/raddb/sql
-%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/mssql/*
 #%attr(640,root,radiusd) %config(noreplace) /etc/raddb/sql/oracle/*
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/users
 %attr(640,root,radiusd) %config(noreplace) /etc/raddb/otp.conf
@@ -360,7 +354,6 @@ fi
 /usr/sbin/check-radiusd-config
 /usr/sbin/checkrad
 /usr/sbin/radiusd
-/usr/sbin/radrelay
 /usr/sbin/radwatch
 # man-pages
 %doc %{_mandir}/man1/*
@@ -555,6 +548,12 @@ fi
 %{_libdir}/freeradius/rlm_sql_unixodbc-%{version}.so
 
 %changelog
+* Fri Apr 18 2008 John Dennis <jdennis@redhat.com> - 2.0.3-2
+- remove support for radrelay, it's different now
+- turn off default inclusion of SQL config files in radiusd.conf since SQL
+  is an optional RPM install
+- remove mssql config files
+
 * Thu Apr 17 2008 John Dennis <jdennis@redhat.com> - 2.0.3-1
 - Upgrade to current upstream 2.0.3 release
 - Many thanks to Enrico Scholz for his spec file suggestions incorporated here