import from HEAD:

[freeradius.git] / redhat / freeradius.spec

diff --git a/redhat/freeradius.spec b/redhat/freeradius.spec
index 794e1a6..c7e899a 100644 (file)
--- a/redhat/freeradius.spec
+++ b/redhat/freeradius.spec
@@ -1,19 +1,16 @@
 Summary: High-performance and highly configurable RADIUS server
 URL: http://www.freeradius.org/
 Name: freeradius
-Version: 0.5
-Release: 1
+Version: 1.1.1
+Release: 0
 License: GPL
 Group: Networking/Daemons
 Packager: FreeRADIUS.org
 Source0: %{name}-%{version}.tar.gz
-# FIXME: won't be good to include these contrib examples?
-# Source1: http://www.ping.de/~fdc/radius/radacct-replay
-# Source2: http://www.ping.de/~fdc/radius/radlast-0.03
-# Source3: ftp://ftp.freeradius.org/pub/radius/contrib/radwho.cgi
 Prereq: /sbin/chkconfig
 BuildPreReq: libtool
 # FIXME: snmpwalk, snmpget and rusers POSSIBLY needed by checkrad
+Provides: radiusd
 Conflicts: cistron-radius
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -23,7 +20,7 @@ configurable GPL'd RADIUS server. It is somewhat similar to the
 Livingston 2.0 RADIUS server, but has many more features, and is much
 more configurable.
 
-%prep 
+%prep
 %setup
 
 %build
@@ -32,19 +29,31 @@ CFLAGS="$RPM_OPT_FLAGS" \
        --localstatedir=%{_localstatedir} \
        --sysconfdir=%{_sysconfdir} \
        --mandir=%{_mandir} \
-       --with-threads \
-       --with-thread-pool \
+       --with-system-libtool \
+       --disable-ltdl-install \
+       --with-ltdl-lib=/usr/lib \
+       --with-ltdl-include=/usr/include \
        --with-gnu-ld \
-       --disable-ltdl-install
+       --with-large-files --with-udpfromto --with-edir \
+       --with-rlm-sql_postgresql-include-dir=/usr/include/pgsql \
+       --with-rlm-krb5-include-dir=/usr/kerberos/include \
+       --with-rlm-krb5-lib-dir=/usr/kerberos/lib
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,rc.d/init.d}
 
 make install R=$RPM_BUILD_ROOT
 
+RADDB=$RPM_BUILD_ROOT/etc/raddb
+# set radiusd as default user/group
+perl -i -pe 's/^#user =.*$/user = radiusd/' $RADDB/radiusd.conf
+perl -i -pe 's/^#group =.*$/group = radiusd/' $RADDB/radiusd.conf
+# shadow password file MUST be defined on Linux
+perl -i -pe 's/#       shadow =/shadow =/' $RADDB/radiusd.conf
+
 # remove unneeded stuff
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/builddbm.8
 rm -f $RPM_BUILD_ROOT%{_prefix}/sbin/rc.radiusd
@@ -55,26 +64,38 @@ install -m 644 radiusd-logrotate $RPM_BUILD_ROOT/etc/logrotate.d/radiusd
 install -m 644 radiusd-pam       $RPM_BUILD_ROOT/etc/pam.d/radius
 cd ..
 
+%pre
+/usr/sbin/useradd -c "radiusd user" -r -s /bin/false -u 95 -d / radiusd 2>/dev/null || :
+
 %preun
 if [ "$1" = "0" ]; then
+       /sbin/service radiusd stop > /dev/null 2>&1
        /sbin/chkconfig --del radiusd
 fi
 
 %post
-if [ "$1" = "0" ]; then
-       /sbin/chkconfig --add radiusd
-fi
+/sbin/ldconfig
+/sbin/chkconfig --add radiusd
 
 # Done here to avoid messing up existing installations
-for i in radius/radutmp radius/radwtmp # radius/radius.log radius/radwatch.log radius/checkrad.log
+for i in radius/radutmp radius/radwtmp radius/radius.log # radius/radwatch.log radius/checkrad.log
 do
-  touch /var/log/$i
-  chown root:root /var/log/$i
-  chmod 600 /var/log/$i
+       touch /var/log/$i
+       chown radiusd:radiusd /var/log/$i
+       chmod 600 /var/log/$i
 done
 
+%postun
+if [ "$1" -ge "1" ]; then
+       /sbin/service radiusd condrestart >/dev/null 2>&1
+fi
+if [ $1 = 0 ]; then
+       /usr/sbin/userdel radiusd > /dev/null 2>&1 || :
+fi
+/sbin/ldconfig
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -82,16 +103,39 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/pam.d/radius
 %config /etc/logrotate.d/radiusd
 %config /etc/rc.d/init.d/radiusd
-%config /etc/raddb/*
+%config (noreplace) /etc/raddb/*
+%{_bindir}/*
+%{_datadir}/%{name}
+%{_libdir}/*
 %{_mandir}/*/*
-/usr/bin/*
-/usr/sbin/*
-/usr/lib/*
-%attr(0700,root,root) %dir /var/log/radius
-%attr(0700,root,root) %dir /var/log/radius/radacct
-%attr(0700,root,root) %dir /var/run/radiusd
+%{_sbindir}/*
+%attr(0700,radiusd,radiusd) %dir /var/log/radius
+%attr(0700,radiusd,radiusd) %dir /var/log/radius/radacct
+%attr(0700,radiusd,radiusd) %dir /var/run/radiusd
 
 %changelog
+* Thu Dec 15 2004 Alan DeKok
+- update for 1.1.0
+
+* Mon May 31 2004 Paul Hampson
+- update for 1.0.0 release
+
+* Fri May 23 2003 Marko Myllynen
+- update for 0.9
+
+* Wed Sep  4 2002 Marko Myllynen
+- fix libtool issues for good
+
+* Thu Aug 22 2002 Marko Myllynen
+- update for 0.7/0.8
+
+* Tue Jun 18 2002 Marko Myllynen
+- run as radiusd user instead of root
+- added some options for configure
+
+* Thu Jun  6 2002 Marko Myllynen
+- set noreplace for non-dictionary files in /etc/raddb
+
 * Sun May 26 2002 Frank Cusack <frank@google.com>
 - move /var dirs from %%post to %%files
 
@@ -101,8 +145,8 @@ rm -rf $RPM_BUILD_ROOT
 - misc clean ups
 
 * Wed Feb 13 2002 Marko Myllynen
-- use %{_mandir} instead of /usr/man
-- rename %postin as %post
+- use %%{_mandir} instead of /usr/man
+- rename %%postin as %%post
 - clean up name/version
 
 * Fri Jan 18 2002 Frank Cusack <frank@google.com>