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:   23-Jul-2003 11:56:55
  Branch: HEAD                             Handle: 2003072310565302

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

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.24        +1  -1      openpkg-src/pb4sd/pb4sd.spec
    1.13        +16 -4      openpkg-src/pb4sd/rc.pb4sd
    1.5743      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/pb4sd/pb4sd.spec
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 pb4sd.spec
  --- openpkg-src/pb4sd/pb4sd.spec      22 Jul 2003 08:10:57 -0000      1.23
  +++ openpkg-src/pb4sd/pb4sd.spec      23 Jul 2003 09:56:55 -0000      1.24
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      PD
   Version:      1.2
  -Release:      20030722
  +Release:      20030723
   
   #   list of sources
   Source0:      pb4sd
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pb4sd/rc.pb4sd
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 rc.pb4sd
  --- openpkg-src/pb4sd/rc.pb4sd        22 Jul 2003 08:10:57 -0000      1.12
  +++ openpkg-src/pb4sd/rc.pb4sd        23 Jul 2003 09:56:55 -0000      1.13
  @@ -7,7 +7,6 @@
       pb4sd_enable="$openpkg_rc_def"
       pb4sd_dbfile="@l_prefix@/var/pb4sd/pb4sd.db"
       pb4sd_logfile="@l_prefix@/var/pb4sd/pb4sd.log"
  -    pb4sd_pidfile="@l_prefix@/var/pb4sd/pb4sd.pid"
       pb4sd_grace="3600"
       pb4sd_exclude="127.0.0.0/8"
       pb4sd_log_prolog="true"
  @@ -16,6 +15,21 @@
       pb4sd_log_minsize="1M"
       pb4sd_log_complevel="9"
   
  +%common
  +    pb4sd_pidfile="@l_prefix@/var/pb4sd/pb4sd.pid"
  +    pb4sd_signal () {
  +        [ -f $pb4sd_pidfile ] && kill -$1 `cat $pb4sd_pidfile`
  +    }
  +
  +%status -u @l_susr@ -o
  +    pb4sd_usable="unknown"
  +    pb4sd_active="no"
  +    rcService pb4sd enable yes && \
  +        pb4sd_signal 0 && pb4sd_active="yes"
  +    echo "pb4sd_enable=\"$pb4sd_enable\""
  +    echo "pb4sd_usable=\"$pb4sd_usable\""
  +    echo "pb4sd_active=\"$pb4sd_active\""
  +
   %start -u @l_susr@
       rcService pb4sd enable yes || exit 0
       pb4sd_popserver="${POP_type:-qpopper}"
  @@ -32,9 +46,7 @@
   
   %stop -u @l_susr@
       rcService pb4sd enable yes || exit 0
  -    if [ -f ${pb4sd_pidfile} ]; then
  -        kill -TERM `cat ${pb4sd_pidfile}`
  -    fi
  +    pb4sd_signal TERM
   
   %daily -u @l_susr@
       rcService pb4sd enable yes || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5742 -r1.5743 news.txt
  --- openpkg-web/news.txt      23 Jul 2003 09:38:53 -0000      1.5742
  +++ openpkg-web/news.txt      23 Jul 2003 09:56:53 -0000      1.5743
  @@ -1,3 +1,4 @@
  +23-Jul-2003: Upgraded package: P<pb4sd-1.2-20030723>
   23-Jul-2003: Upgraded package: P<monit-3.2-20030723>
   23-Jul-2003: Upgraded package: P<bogofilter-0.14.0-20030723>
   23-Jul-2003: Upgraded package: P<sendmail-8.12.9-20030723>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to