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:   18-Jul-2003 15:56:42
  Branch: HEAD                             Handle: 2003071814564101

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

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.56        +1  -1      openpkg-src/qpopper/qpopper.spec
    1.19        +20 -9      openpkg-src/qpopper/rc.qpopper
    1.5647      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/qpopper/qpopper.spec
  ============================================================================
  $ cvs diff -u -r1.55 -r1.56 qpopper.spec
  --- openpkg-src/qpopper/qpopper.spec  17 Jul 2003 15:33:10 -0000      1.55
  +++ openpkg-src/qpopper/qpopper.spec  18 Jul 2003 13:56:42 -0000      1.56
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0.5
  -Release:      20030717
  +Release:      20030718
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/qpopper/rc.qpopper
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 rc.qpopper
  --- openpkg-src/qpopper/rc.qpopper    17 Jul 2003 21:35:04 -0000      1.18
  +++ openpkg-src/qpopper/rc.qpopper    18 Jul 2003 13:56:42 -0000      1.19
  @@ -14,24 +14,35 @@
       POP_type="qpopper"
       POP_logfile="@l_prefix@/var/qpopper/qpopper.log"
   
  +%common
  +    qpopper_pidfile="@l_prefix@/var/qpopper/qpopper.pid"
  +    qpopper_signal () {
  +        [ -f $qpopper_pidfile ] && kill -$1 `cat $qpopper_pidfile`
  +    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    qpopper_usable="unknown"
  +    qpopper_active="no"
  +    opService qpopper enable yes && \
  +        qpopper_signal 0 && qpopper_active="yes"
  +    echo "qpopper_enable=\"$qpopper_enable\""
  +    echo "qpopper_usable=\"$qpopper_usable\""
  +    echo "qpopper_active=\"$qpopper_active\""
  +
   %start -p 200 -u @l_susr@
       opService qpopper enable yes || exit 0
       @l_prefix@/sbin/qpopper ${qpopper_bind} -S -f 
@l_prefix@/etc/qpopper/qpopper.config
   
   %stop -p 200 -u @l_susr@
       opService qpopper enable yes || exit 0
  -    if [ -f @l_prefix@/var/qpopper/qpopper.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
  -        rm -f @l_prefix@/var/qpopper/qpopper.pid >/dev/null 2>&1 || true
  -    fi
  +    qpopper_signal TERM
  +    rm -f $qpopper_pidfile >/dev/null 2>&1 || true
   
   %restart -u @l_susr@
       opService qpopper enable yes || exit 0
  -    if [ -f @l_prefix@/var/qpopper/qpopper.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
  -        rm -f @l_prefix@/var/qpopper/qpopper.pid >/dev/null 2>&1 || true
  -        sleep 2
  -    fi
  +    qopper_signal TERM
  +    rm -f $qpopper_pidfile >/dev/null 2>&1 || true
  +    sleep 2
       @l_prefix@/sbin/qpopper ${qpopper_bind} -S -f 
@l_prefix@/etc/qpopper/qpopper.config
   
   %daily -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5646 -r1.5647 news.txt
  --- openpkg-web/news.txt      18 Jul 2003 13:48:23 -0000      1.5646
  +++ openpkg-web/news.txt      18 Jul 2003 13:56:41 -0000      1.5647
  @@ -1,3 +1,4 @@
  +18-Jul-2003: Upgraded package: P<qpopper-4.0.5-20030718>
   18-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030718>
   18-Jul-2003: New package: P<wine-msov-20030718-20030718>
   18-Jul-2003: Upgraded package: P<hexer-0.1.4c-20030718>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to