OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Jul-2003 12:14:05
Branch: HEAD Handle: 2003071711140301
Modified files:
openpkg-src/openssh openssh.spec rc.openssh
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.96 +3 -3 openpkg-src/openssh/openssh.spec
1.13 +13 -3 openpkg-src/openssh/rc.openssh
1.5608 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.95 -r1.96 openssh.spec
--- openpkg-src/openssh/openssh.spec 15 Jul 2003 10:01:24 -0000 1.95
+++ openpkg-src/openssh/openssh.spec 17 Jul 2003 10:14:04 -0000 1.96
@@ -38,7 +38,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20030715
+Release: 20030717
# package options
%option with_fsl yes
@@ -63,8 +63,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030710, perl
-PreReq: OpenPKG, openpkg >= 20030710
+BuildPreReq: OpenPKG, openpkg >= 20030716, perl
+PreReq: OpenPKG, openpkg >= 20030716
BuildPreReq: openssl, zlib
PreReq: openssl, zlib
%if "%{with_pam}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/rc.openssh
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.openssh
--- openpkg-src/openssh/rc.openssh 15 Jul 2003 10:01:24 -0000 1.12
+++ openpkg-src/openssh/rc.openssh 17 Jul 2003 10:14:04 -0000 1.13
@@ -13,11 +13,19 @@
%common
openssh_signal () {
- if [ -f "@l_prefix@/var/openssh/sshd.pid" ]; then
- kill -$1 `cat @l_prefix@/var/openssh/sshd.pid`
- fi
+ openssh_pidfile="@l_prefix@/var/openssh/sshd.pid"
+ [ -f $openssh_pidfile ] && kill -$1 `cat $openssh_pidfile`
}
+%status -p 200 -u @l_susr@ -o
+ openssh_usable="unknown"
+ openssh_active="no"
+ opServiceEnabled openssh && \
+ openssh_signal 0 && openssh_active="yes"
+ echo "openssh_enable=\"$openssh_enable\""
+ echo "openssh_usable=\"$openssh_usable\""
+ echo "openssh_active=\"$openssh_active\""
+
%start -p 200 -u @l_susr@
opServiceEnabled openssh || exit 0
@l_prefix@/bin/sshd
@@ -25,6 +33,8 @@
%stop -p 200 -u @l_susr@
opServiceEnabled openssh || exit 0
openssh_signal TERM
+ # sshd removes the pidfile itself
+ # rm -f $openssh_pidfile 2>/dev/null || true
%restart -u @l_susr@
opServiceEnabled openssh || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5607 -r1.5608 news.txt
--- openpkg-web/news.txt 17 Jul 2003 09:49:09 -0000 1.5607
+++ openpkg-web/news.txt 17 Jul 2003 10:14:03 -0000 1.5608
@@ -1,3 +1,4 @@
+17-Jul-2003: Upgraded package: P<openssh-3.6.1p2-20030717>
17-Jul-2003: Upgraded package: P<ntp-4.1.1c-20030717>
17-Jul-2003: Upgraded package: P<openpkg-20030717-20030717>
17-Jul-2003: Upgraded package: P<uvscan-4.1.6.4277-20030717>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
