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:48:24
  Branch: HEAD                             Handle: 2003071814482301

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

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.51        +1  -1      openpkg-src/pureftpd/pureftpd.spec
    1.11        +19 -3      openpkg-src/pureftpd/rc.pureftpd
    1.5646      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/pureftpd/pureftpd.spec
  ============================================================================
  $ cvs diff -u -r1.50 -r1.51 pureftpd.spec
  --- openpkg-src/pureftpd/pureftpd.spec        17 Jul 2003 15:33:09 -0000      1.50
  +++ openpkg-src/pureftpd/pureftpd.spec        18 Jul 2003 13:48:24 -0000      1.51
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.1.0
  -Release:      20030717
  +Release:      20030718
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pureftpd/rc.pureftpd
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 rc.pureftpd
  --- openpkg-src/pureftpd/rc.pureftpd  17 Jul 2003 21:35:03 -0000      1.10
  +++ openpkg-src/pureftpd/rc.pureftpd  18 Jul 2003 13:48:24 -0000      1.11
  @@ -11,6 +11,21 @@
       pureftpd_log_minsize="1M"
       pureftpd_log_complevel="9"
   
  +%common
  +    pureftpd_pidfile="@l_prefix@/var/pureftpd/pureftpd.pid"
  +    pureftpd_signal () {
  +        [ -f $pureftpd_pidfile ] && kill -$1 `cat $pureftpd_pidfile`
  +    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    pureftpd_usable="unknown"
  +    pureftpd_active="no"
  +    opService pureftpd enable yes && \
  +        pureftpd_signal 0 && pureftpd_active="yes"
  +    echo "pureftpd_enable=\"$pureftpd_enable\""
  +    echo "pureftpd_usable=\"$pureftpd_usable\""
  +    echo "pureftpd_active=\"$pureftpd_active\""
  +
   %start -p 200 -u @l_susr@
       opService pureftpd enable yes || exit 0
       @l_prefix@/sbin/pure-ftpd </dev/null &
  @@ -18,14 +33,15 @@
   
   %stop -p 200 -u @l_susr@
       opService pureftpd enable yes || exit 0
  -    kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
  +    pureftpd_signal TERM
  +    rm -f $pureftpd_pidfile
   
   %restart -u @l_susr@
       opService pureftpd enable yes || exit 0
  -    kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
  +    pureftpd_signal TERM
       sleep 2
       @l_prefix@/sbin/pure-ftpd </dev/null &
  -    echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
  +    echo "$!" >$pureftpd_pidfile
   
   %daily -u @l_susr@
       opService pureftpd enable yes || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5645 -r1.5646 news.txt
  --- openpkg-web/news.txt      18 Jul 2003 13:42:21 -0000      1.5645
  +++ openpkg-web/news.txt      18 Jul 2003 13:48:23 -0000      1.5646
  @@ -1,3 +1,4 @@
  +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>
   18-Jul-2003: Upgraded package: P<lemon-1.0-20030718>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to