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 13:57:04
  Branch: HEAD                             Handle: 2003071812570202

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

  Log:
    %status

  Summary:
    Revision    Changes     Path
    1.63        +1  -1      openpkg-src/proftpd/proftpd.spec
    1.10        +19 -10     openpkg-src/proftpd/rc.proftpd
    1.5641      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/proftpd.spec
  ============================================================================
  $ cvs diff -u -r1.62 -r1.63 proftpd.spec
  --- openpkg-src/proftpd/proftpd.spec  17 Jul 2003 15:33:09 -0000      1.62
  +++ openpkg-src/proftpd/proftpd.spec  18 Jul 2003 11:57:04 -0000      1.63
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.2.8
  -Release:      20030717
  +Release:      20030718
   
   #   package options
   %option       with_mysql  no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/rc.proftpd
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 rc.proftpd
  --- openpkg-src/proftpd/rc.proftpd    17 Jul 2003 21:35:03 -0000      1.9
  +++ openpkg-src/proftpd/rc.proftpd    18 Jul 2003 11:57:04 -0000      1.10
  @@ -30,29 +30,38 @@
       proftpd_xfer_minsize="1M"
       proftpd_xfer_complevel="9"
   
  +%common
  +    proftpd_pidfile="@l_prefix@/var/proftpd/proftpd.pid"
  +    proftpd_signal () {
  +        [ -f $proftpd_pidfile ] && kill -$1 `cat $proftpd_pidfile`
  +    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    proftpd_usable="unknown"
  +    proftpd_active="no"
  +    opService proftpd enable yes && \
  +        proftpd_signal 0 && proftpd_active="yes"
  +    echo "proftpd_enable=\"$proftpd_enable\""
  +    echo "proftpd_usable=\"$proftpd_usable\""
  +    echo "proftpd_active=\"$proftpd_active\""
  +
   %start -p 200 -u @l_susr@
       opService proftpd enable yes || exit 0
       @l_prefix@/sbin/proftpd
   
   %stop -p 200 -u @l_susr@
       opService proftpd enable yes || exit 0
  -    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
  -    fi
  +    proftpd_signal TERM
   
   %restart -u @l_susr@
       opService proftpd enable yes || exit 0
  -    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  -        kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
  -        sleep 2
  -    fi
  +    proftpd_signal TERM
  +    sleep 2
       @l_prefix@/sbin/proftpd
   
   %reload -u @l_susr@
       opService proftpd enable yes || exit 0
  -    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  -        kill -HUP `cat @l_prefix@/var/proftpd/proftpd.pid`
  -    fi
  +    proftpd_signal HUP
   
   %daily -u @l_susr@
       opService proftpd enable yes || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5640 -r1.5641 news.txt
  --- openpkg-web/news.txt      18 Jul 2003 11:49:24 -0000      1.5640
  +++ openpkg-web/news.txt      18 Jul 2003 11:57:02 -0000      1.5641
  @@ -1,3 +1,4 @@
  +18-Jul-2003: Upgraded package: P<proftpd-1.2.8-20030718>
   18-Jul-2003: Upgraded package: P<prngd-0.9.27-20030718>
   18-Jul-2003: Upgraded package: P<postgresql-7.3.3-20030718>
   18-Jul-2003: Upgraded package: P<openldap-2.1.22-20030718>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to