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 13:30:47
Branch: HEAD Handle: 2003071712304601
Modified files:
openpkg-src/cvs cvs.spec rc.cvs
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.62 +4 -4 openpkg-src/cvs/cvs.spec
1.10 +19 -7 openpkg-src/cvs/rc.cvs
1.5611 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 cvs.spec
--- openpkg-src/cvs/cvs.spec 14 Jul 2003 14:25:53 -0000 1.61
+++ openpkg-src/cvs/cvs.spec 17 Jul 2003 11:30:47 -0000 1.62
@@ -37,11 +37,11 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20030714
+Release: 20030717
# optional support for applying the RSE patches
%option with_fsl yes
-%option with_rse_patches no
+%option with_rse_patches yes
%option with_rse_patch_cvsuser_caller cvs
# list of sources
@@ -55,8 +55,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030710, perl, patch
-PreReq: OpenPKG, openpkg >= 20030710, perl, patch
+BuildPreReq: OpenPKG, openpkg >= 20030716, perl, patch
+PreReq: OpenPKG, openpkg >= 20030716, perl, patch
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/rc.cvs
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.cvs
--- openpkg-src/cvs/rc.cvs 10 Jul 2003 07:50:20 -0000 1.9
+++ openpkg-src/cvs/rc.cvs 17 Jul 2003 11:30:47 -0000 1.10
@@ -16,22 +16,34 @@
%common
cvs_pserverd_pidfile="@l_prefix@/var/cvs/pserverd.pid"
+ cvs_pserverd_signal () {
+ [ -f $cvs_pserverd_pidfile ] && kill -$1 `cat $cvs_pserverd_pidfile`
+ }
+
+%status -p 200 -u root -o
+ cvs_usable="unknown"
+ cvs_active="no"
+ opServiceEnabled cvs && \
+ cvs_pserverd_signal 0 && cvs_active="yes"
+ echo "cvs_enable=\"$cvs_enable\""
+ echo "cvs_usable=\"$cvs_usable\""
+ echo "cvs_active=\"$cvs_active\""
%start -p 200 -u @l_susr@
opServiceEnabled cvs || exit 0
- rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
+ @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
@l_prefix@/bin/cvs -f $cvs_gflags \
pserverd -d -p $cvs_pserverd_pidfile \
-l $cvs_listen $cvs_lflags
%stop -p 200 -u @l_susr@
opServiceEnabled cvs || exit 0
- if [ -f $cvs_pserverd_pidfile ]; then
- kill -TERM `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
- sleep 2
- kill -KILL `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
- rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
- fi
+ cvs_pserverd_signal TERM
+ rm -f $cvs_pserverd_pidfile 2>/dev/null || true
+
+%restart -p 200 -u @l_susr@
+ opServiceEnabled cvs || exit 0
+ rc cvs stop start
%daily -u @l_susr@
opServiceEnabled cvs || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5610 -r1.5611 news.txt
--- openpkg-web/news.txt 17 Jul 2003 10:26:16 -0000 1.5610
+++ openpkg-web/news.txt 17 Jul 2003 11:30:46 -0000 1.5611
@@ -1,3 +1,4 @@
+17-Jul-2003: Upgraded package: P<cvs-1.12.1-20030717>
17-Jul-2003: New package: P<icewm-1.2.9-20030717>
17-Jul-2003: Upgraded package: P<rsync-2.5.6-20030717>
17-Jul-2003: Upgraded package: P<openssh-3.6.1p2-20030717>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
