OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Sep-2003 18:59:48
Branch: HEAD Handle: 2003090417594601
Modified files:
openpkg-src/radius radius.spec rc.radius
openpkg-web news.txt
Log:
repair config installation logic, correct pid file, fix logging,
implement features in #202
Summary:
Revision Changes Path
1.33 +24 -2 openpkg-src/radius/radius.spec
1.10 +82 -1 openpkg-src/radius/rc.radius
1.6399 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/radius/radius.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 radius.spec
--- openpkg-src/radius/radius.spec 28 Jul 2003 11:54:22 -0000 1.32
+++ openpkg-src/radius/radius.spec 4 Sep 2003 16:59:47 -0000 1.33
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 1.1
-Release: 20030728
+Release: 20030904
# list of sources
Source0: ftp://ftp.gnu.org/gnu/radius/radius-%{version}.tar.gz
@@ -97,7 +97,7 @@
-e "s;%{l_prefix}/etc;$RPM_BUILD_ROOT%{l_prefix}/etc;g" \
-e "s;%{l_prefix}/var;$RPM_BUILD_ROOT%{l_prefix}/var;g" \
`find . -name Makefile -print`
- %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT
raddbdir=%{l_prefix}/etc/radius/raddb/"
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.radius} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ -110,4 +110,26 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%pre
+ # before upgrade, save status and stop service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} radius status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} radius stop 2>/dev/null
+ exit 0
+
+%post
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$radius_active" = .yes ] && %{l_rc} radius start
+ fi
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} radius stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/radius/log/radius.* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/radius/rc.radius
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.radius
--- openpkg-src/radius/rc.radius 22 Jul 2003 15:22:26 -0000 1.9
+++ openpkg-src/radius/rc.radius 4 Sep 2003 16:59:47 -0000 1.10
@@ -5,9 +5,39 @@
%config
radius_enable="$openpkg_rc_def"
+ radius_debug_file="@l_prefix@/var/radius/log/radius.debug"
+ radius_debug_prolog="true"
+ radius_debug_epilog="true"
+ radius_debug_numfiles="10"
+ radius_debug_minsize="1M"
+ radius_debug_complevel="9"
+ radius_info_file="@l_prefix@/var/radius/log/radius.info"
+ radius_info_prolog="true"
+ radius_info_epilog="true"
+ radius_info_numfiles="10"
+ radius_info_minsize="1M"
+ radius_info_complevel="9"
+ radius_main_file="@l_prefix@/var/radius/log/radius.log"
+ radius_main_prolog="true"
+ radius_main_epilog="true"
+ radius_main_numfiles="10"
+ radius_main_minsize="1M"
+ radius_main_complevel="9"
+ radius_stat_file="@l_prefix@/var/radius/log/radius.stat"
+ radius_stat_prolog="true"
+ radius_stat_epilog="true"
+ radius_stat_numfiles="10"
+ radius_stat_minsize="1M"
+ radius_stat_complevel="9"
+ radius_stderr_file="@l_prefix@/var/radius/log/radius.stderr"
+ radius_stderr_prolog="true"
+ radius_stderr_epilog="true"
+ radius_stderr_numfiles="10"
+ radius_stderr_minsize="1M"
+ radius_stderr_complevel="9"
%common
- radius_pidfile="@l_prefix@/var/radius/run/radius.pid"
+ radius_pidfile="@l_prefix@/var/radius/run/radiusd.pid"
radius_signal () {
[ -f $radius_pidfile ] && kill -$1 `cat $radius_pidfile`
}
@@ -23,13 +53,64 @@
%start -u @l_susr@
rcService radius enable yes || exit 0
+ rcService radius active yes && exit 0
@l_prefix@/sbin/radctl start
%stop -u @l_susr@
rcService radius enable yes || exit 0
+ rcService radius active no && exit 0
@l_prefix@/sbin/radctl stop
+%restart -u @l_susr@
+ rcService radius enable yes || exit 0
+ rcService radius active no && exit 0
+ rc radius stop
+ sleep 2
+ rc radius start
+
%reload -u @l_susr@
rcService radius enable yes || exit 0
+ rcService radius active no && exit 0
@l_prefix@/sbin/radctl reload
+
+%daily -u @l_susr@
+ rcService radius enable yes || exit 0
+
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
+ shtool rotate -f \
+ -n ${radius_debug_numfiles} -s ${radius_debug_minsize} -d \
+ -z ${radius_debug_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${radius_debug_prolog}" \
+ -E "${radius_debug_epilog} && echo 1 >$hintfile" \
+ ${radius_debug_file}
+ shtool rotate -f \
+ -n ${radius_info_numfiles} -s ${radius_info_minsize} -d \
+ -z ${radius_info_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${radius_info_prolog}" \
+ -E "${radius_info_epilog} && echo 1 >$hintfile" \
+ ${radius_info_file}
+ shtool rotate -f \
+ -n ${radius_main_numfiles} -s ${radius_main_minsize} -d \
+ -z ${radius_main_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${radius_main_prolog}" \
+ -E "${radius_main_epilog} && echo 1 >$hintfile" \
+ ${radius_main_file}
+ shtool rotate -f \
+ -n ${radius_stat_numfiles} -s ${radius_stat_minsize} -d \
+ -z ${radius_stat_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${radius_stat_prolog}" \
+ -E "${radius_stat_epilog} && echo 1 >$hintfile" \
+ ${radius_stat_file}
+ shtool rotate -f \
+ -n ${radius_stderr_numfiles} -s ${radius_stderr_minsize} -d \
+ -z ${radius_stderr_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
+ -P "${radius_stderr_prolog}" \
+ -E "${radius_stderr_epilog} && echo 1 >$hintfile" \
+ ${radius_stderr_file}
+ if [ -s $hintfile ]; then
+ rc radius restart
+ fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6398 -r1.6399 news.txt
--- openpkg-web/news.txt 4 Sep 2003 15:26:00 -0000 1.6398
+++ openpkg-web/news.txt 4 Sep 2003 16:59:46 -0000 1.6399
@@ -1,3 +1,4 @@
+04-Sep-2003: Upgraded package: P<radius-1.1-20030904>
04-Sep-2003: New package: P<p0f-2.0.1-20030904>
04-Sep-2003: Upgraded package: P<rt-3.0.4-20030904>
04-Sep-2003: Upgraded package: P<ntp-4.1.2-1.3.1>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
