OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   27-Nov-2003 14:37:58
  Branch: HEAD                             Handle: 2003112713375602

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

  Log:
    Better handle removal of pid files

  Summary:
    Revision    Changes     Path
    1.100       +1  -1      openpkg-src/imapd/imapd.spec
    1.20        +3  -4      openpkg-src/imapd/rc.imapd
    1.7562      +2  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/imapd/imapd.spec
  ============================================================================
  $ cvs diff -u -r1.99 -r1.100 imapd.spec
  --- openpkg-src/imapd/imapd.spec      20 Nov 2003 19:08:06 -0000      1.99
  +++ openpkg-src/imapd/imapd.spec      27 Nov 2003 13:37:58 -0000      1.100
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      BSD
   Version:      2.1.16
  -Release:      20031120
  +Release:      20031127
   
   #   package options
   %option       with_fsl    yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/imapd/rc.imapd
  ============================================================================
  $ cvs diff -u -r1.19 -r1.20 rc.imapd
  --- openpkg-src/imapd/rc.imapd        6 Aug 2003 16:05:17 -0000       1.19
  +++ openpkg-src/imapd/rc.imapd        27 Nov 2003 13:37:58 -0000      1.20
  @@ -63,16 +63,15 @@
       rcService imapd enable yes || exit 0
       rcService imapd active no && exit 0
       imapd_signal TERM
  -    rm $imapd_pidfile
  +    rm -f $imapd_pidfile >/dev/null 2>&1 || true
   
   %restart -u @l_susr@
       rcService imapd enable yes || exit 0
       rcService imapd active no && exit 0
       imapd_signal TERM
  -    rm $imapd_pidfile
  +    rc imapd stop
       sleep 2
  -    @l_prefix@/bin/cyrmaster &
  -    echo $! >$imapd_pidfile
  +    rc imapd start
   
   %reload -u @l_susr@
       rcService imapd enable yes || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7561 -r1.7562 news.txt
  --- openpkg-web/news.txt      27 Nov 2003 13:23:09 -0000      1.7561
  +++ openpkg-web/news.txt      27 Nov 2003 13:37:56 -0000      1.7562
  @@ -1,3 +1,5 @@
  +27-Nov-2003: Upgraded package: P<imapd-2.1.16-20031127>
  +27-Nov-2003: Upgraded package: P<openpkg-20031127-20031127>
   27-Nov-2003: Upgraded package: P<php3-3.0.18-20031127>
   27-Nov-2003: New package: P<php3-3.0.18-20031127>
   27-Nov-2003: Upgraded package: P<php-4.3.4-20031127>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to