OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jul-2003 11:41:51
Branch: HEAD Handle: 2003072210415100
Modified files:
openpkg-src/openssh openssh.spec rc.openssh
Log:
PR#202 run-time check and related issues
Summary:
Revision Changes Path
1.103 +12 -4 openpkg-src/openssh/openssh.spec
1.18 +9 -23 openpkg-src/openssh/rc.openssh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.102 -r1.103 openssh.spec
--- openpkg-src/openssh/openssh.spec 22 Jul 2003 08:51:30 -0000 1.102
+++ openpkg-src/openssh/openssh.spec 22 Jul 2003 09:41:51 -0000 1.103
@@ -270,11 +270,19 @@
fi
%endif
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} openssh status 2>/dev/null`
+ [ ".$openssh_active" = .yes ] && %{l_rc} openssh restart
+ exit 0
+
%preun
- # remove PAM configuration entry
+ # before erase, stop service, remove PAM configuraten entry and remove log
files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} openssh stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/openssh/openssh.log* >/dev/null 2>&1 || true
%if "%{with_pam}" == "yes"
- if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=openssh
- fi
+ $RPM_INSTALL_PREFIX/sbin/pamtool --remove --smart --name=openssh
%endif
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/rc.openssh
============================================================================
$ cvs diff -u -r1.17 -r1.18 rc.openssh
--- openpkg-src/openssh/rc.openssh 22 Jul 2003 08:10:57 -0000 1.17
+++ openpkg-src/openssh/rc.openssh 22 Jul 2003 09:41:51 -0000 1.18
@@ -28,42 +28,28 @@
%start -u @l_susr@
rcService openssh enable yes || exit 0
+ rcService openssh active yes && exit 0
@l_prefix@/bin/sshd
%stop -u @l_susr@
rcService openssh enable yes || exit 0
+ rcService openssh active no && exit 0
openssh_signal TERM
- # sshd removes the pidfile itself
- # rm -f $openssh_pidfile 2>/dev/null || true
+ sleep 2
%restart -u @l_susr@
rcService openssh enable yes || exit 0
- openssh_signal TERM
- sleep 2
- @l_prefix@/bin/sshd
+ rcService openssh active no && exit 0
+ rc openssh stop start
%daily -u @l_susr@
rcService openssh enable yes || exit 0
- rcTmp -i -p openssh
- hintfile=`rcTmp -f -n hint`
- prolog="true"
- if [ ".$openssh_log_prolog" != . ]; then
- prolog="$prolog; $openssh_log_prolog"
- fi
- epilog="echo 'epilog' >$hintfile"
- if [ ".$openssh_log_epilog" != . ]; then
- epilog="$epilog; $openssh_log_epilog"
- fi
+
+ # rotate logfile
shtool rotate -f \
-n ${openssh_log_numfiles} -s ${openssh_log_minsize} -d \
- -z ${openssh_log_complevel} -o @l_susr@ -g @l_sgrp@ -m 644 \
+ -z ${openssh_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
-P "${openssh_log_prolog}" \
- -E "${openssh_log_epilog}" \
+ -E "${openssh_log_epilog} && rc openssh restart" \
@l_prefix@/var/openssh/openssh.log
- if [ ".`cat $hintfile`" = ".epilog" ]; then
- openssh_signal TERM
- sleep 2
- @l_prefix@/bin/sshd
- fi
- rcTmp -k
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
