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:   21-Jul-2003 12:07:55
  Branch: HEAD                             Handle: 2003072111075302

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

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.9         +16 -8      openpkg-src/uucp/rc.uucp
    1.33        +1  -1      openpkg-src/uucp/uucp.spec
    1.5682      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/uucp/rc.uucp
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 rc.uucp
  --- openpkg-src/uucp/rc.uucp  19 Jul 2003 17:06:40 -0000      1.8
  +++ openpkg-src/uucp/rc.uucp  21 Jul 2003 10:07:55 -0000      1.9
  @@ -8,18 +8,24 @@
   
   %common
       uucp_pidfile="@l_prefix@/var/uucp/run/uucpd.pid"
  +    uucp_signal () {
  +        [ -f $uucp_pidfile ] && kill -$1 `cat $uucp_pidfile`
  +    }
       uucp_start () {
           ( @l_prefix@/sbin/uucpd uucp @l_prefix@/sbin/uucico -l \
             </dev/null >/dev/null 2>&1 &
             echo "$!" >$uucp_pidfile
           ) </dev/null >/dev/null 2>&1
       }
  -    uucp_stop () {
  -        if [ -f $uucp_pidfile ]; then
  -            kill -TERM `cat $uucp_pidfile`
  -            sleep 1
  -        fi
  -    }
  +
  +%status -p 200 -u @l_susr@ -o
  +    uucp_usable="unknown"
  +    uucp_active="no"
  +    rcService uucp enable yes && \
  +        uucp_signal 0 && uucp_active="yes"
  +    echo "uucp_enable=\"$uucp_enable\""
  +    echo "uucp_usable=\"$uucp_usable\""
  +    echo "uucp_active=\"$uucp_active\""
   
   %start -p 200 -u @l_susr@
       rcService uucp enable yes || exit 0
  @@ -27,10 +33,12 @@
   
   %stop -p 200 -u @l_susr@
       rcService uucp enable yes || exit 0
  -    uucp_stop
  +    uucp_signal TERM
  +    rm -f $uucp_pidfile 2>/dev/null || true
   
   %restart -u @l_susr@
       rcService uucp enable yes || exit 0
  -    uucp_stop
  +    uucp_signal TERM
  +    sleep 2
       uucp_start
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/uucp/uucp.spec
  ============================================================================
  $ cvs diff -u -r1.32 -r1.33 uucp.spec
  --- openpkg-src/uucp/uucp.spec        19 Jul 2003 17:06:40 -0000      1.32
  +++ openpkg-src/uucp/uucp.spec        21 Jul 2003 10:07:55 -0000      1.33
  @@ -33,7 +33,7 @@
   Group:        Communication
   License:      GPL
   Version:      1.07
  -Release:      20030719
  +Release:      20030721
   
   #   list of sources
   Source0:      ftp://ftp.gnu.org/gnu/uucp/uucp-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5681 -r1.5682 news.txt
  --- openpkg-web/news.txt      21 Jul 2003 09:56:52 -0000      1.5681
  +++ openpkg-web/news.txt      21 Jul 2003 10:07:53 -0000      1.5682
  @@ -1,3 +1,4 @@
  +21-Jul-2003: Upgraded package: P<uucp-1.07-20030721>
   21-Jul-2003: Upgraded package: P<lyx-1.3.2-20030721>
   21-Jul-2003: Upgraded package: P<jitterbug-1.6.2.3-20030721>
   21-Jul-2003: Upgraded package: P<dss-4.1.3-20030721>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to