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 14:21:42
  Branch: HEAD                             Handle: 2003071713214001

  Modified files:
    openpkg-src/amd         amd.spec rc.amd
    openpkg-web             news.txt

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.43        +3  -3      openpkg-src/amd/amd.spec
    1.7         +18 -7      openpkg-src/amd/rc.amd
    1.5612      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/amd/amd.spec
  ============================================================================
  $ cvs diff -u -r1.42 -r1.43 amd.spec
  --- openpkg-src/amd/amd.spec  13 Jul 2003 18:39:39 -0000      1.42
  +++ openpkg-src/amd/amd.spec  17 Jul 2003 12:21:41 -0000      1.43
  @@ -33,7 +33,7 @@
   Group:        System
   License:      BSD
   Version:      6.0.9
  -Release:      20030713
  +Release:      20030717
   
   #   list of sources
   Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
  @@ -44,8 +44,8 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030710, flex, bison
  -PreReq:       OpenPKG, openpkg >= 20030710
  +BuildPreReq:  OpenPKG, openpkg >= 20030716, flex, bison
  +PreReq:       OpenPKG, openpkg >= 20030716
   AutoReq:      no
   AutoReqProv:  no
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/amd/rc.amd
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 rc.amd
  --- openpkg-src/amd/rc.amd    10 Jul 2003 07:50:12 -0000      1.6
  +++ openpkg-src/amd/rc.amd    17 Jul 2003 12:21:41 -0000      1.7
  @@ -11,22 +11,33 @@
       amd_log_minsize="1M"
       amd_log_complevel="9"
   
  +%common
  +    amd_pidfile="@l_prefix@/var/amd/amd.pid"
  +    amd_signal () {
  +        [ -f $amd_pidfile ] && kill -$1 `cat $amd_pidfile`
  +    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    amd_usable="unknown"
  +    amd_active="no"
  +    opServiceEnabled amd && \
  +        amd_signal 0 && amd_active="yes"
  +    echo "amd_enable=\"$amd_enable\""
  +    echo "amd_usable=\"$amd_usable\""
  +    echo "amd_active=\"$amd_active\""
  +
   %start -p 200 -u @l_susr@
       opServiceEnabled amd || exit 0
       @l_prefix@/sbin/amd -F @l_prefix@/etc/amd/amd.conf >/dev/null 2>&1
   
   %stop -p 200 -u @l_susr@
       opServiceEnabled amd || exit 0
  -    if [ -f @l_prefix@/var/amd/amd.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/amd/amd.pid`
  -    fi
  +    amd_signal TERM
   
   %restart -u @l_susr@
       opServiceEnabled amd || exit 0
  -    if [ -f @l_prefix@/var/amd/amd.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/amd/amd.pid`
  -        sleep 2
  -    fi
  +    amd_signal TERM
  +    sleep 2
       @l_prefix@/sbin/amd -F @l_prefix@/etc/amd/amd.conf >/dev/null 2>&1
   
   %reload -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5611 -r1.5612 news.txt
  --- openpkg-web/news.txt      17 Jul 2003 11:30:46 -0000      1.5611
  +++ openpkg-web/news.txt      17 Jul 2003 12:21:40 -0000      1.5612
  @@ -1,3 +1,4 @@
  +17-Jul-2003: Upgraded package: P<amd-6.0.9-20030717>
   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>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to