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:   13-Aug-2003 18:03:57
  Branch: HEAD                             Handle: 2003081317035502

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

  Log:
    Complete changes to comply with #202 features

  Summary:
    Revision    Changes     Path
    1.15        +23 -1      openpkg-src/clamav/clamav.spec
    1.8         +18 -0      openpkg-src/clamav/rc.clamav
    1.6154      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/clamav/clamav.spec
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 clamav.spec
  --- openpkg-src/clamav/clamav.spec    10 Aug 2003 07:42:30 -0000      1.14
  +++ openpkg-src/clamav/clamav.spec    13 Aug 2003 16:03:57 -0000      1.15
  @@ -33,7 +33,7 @@
   Group:        Filesystem
   License:      GPL
   Version:      0.60
  -Release:      20030810
  +Release:      20030813
   
   #   list of sources
   Source0:      http://osdn.dl.sourceforge.net/clamav/clamav-%{version}.tar.gz
  @@ -129,4 +129,26 @@
   
   %clean
       rm -rf $RPM_BUILD_ROOT
  +
  +%pre
  +    #   before upgrade, save status and stop service
  +    [ $1 -eq 2 ] || exit 0
  +    eval `%{l_rc} clamav status 2>/dev/null | tee %{l_tmpfile}`
  +    %{l_rc} clamav stop 2>/dev/null
  +    exit 0
  +
  +%post
  +    if [ $1 -eq 2 ]; then
  +        #   after upgrade, restore status
  +        eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
  +        [ ".$clamav_active" = .yes ] && %{l_rc} clamav start
  +    fi
  +    exit 0
  +
  +%preun
  +    #   before erase, stop service and remove log files
  +    [ $1 -eq 0 ] || exit 0
  +    %{l_rc} clamav stop 2>/dev/null
  +    rm -f $RPM_INSTALL_PREFIX/var/clamav/*.log* >/dev/null 2>&1 || true
  +    exit 0
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/clamav/rc.clamav
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rc.clamav
  --- openpkg-src/clamav/rc.clamav      22 Jul 2003 08:10:42 -0000      1.7
  +++ openpkg-src/clamav/rc.clamav      13 Aug 2003 16:03:57 -0000      1.8
  @@ -5,6 +5,11 @@
   
   %config
       clamav_enable="$openpkg_rc_def"
  +    clamav_log_prolog="true"
  +    clamav_log_epilog="true"
  +    clamav_log_numfiles="10"
  +    clamav_log_minsize="1M"
  +    clamav_log_complevel="9"
   
   %common
       clamav_cfgfile="@l_prefix@/etc/clamav/clamav.conf"
  @@ -24,20 +29,33 @@
   
   %start -u @l_rusr@
       rcService clamav enable yes || exit 0
  +    rcService clamav active yes && exit 0
       @l_prefix@/sbin/clamd --config-file=$clamav_cfgfile
   
   %stop -u @l_rusr@
       rcService clamav enable yes || exit 0
  +    rcService clamav active no && exit 0
       clamav_signal TERM
       rm -f $clamav_pidfile 2>/dev/null || true
   
   %restart -u @l_rusr@
       rcService clamav enable yes || exit 0
  +    rcService clamav active no && exit 0
       rc clamav stop
       sleep 2
       rc clamav start
   
   %daily -u @l_rusr@
       rcService clamav enable yes || exit 0
  +
  +    #   update virus database
       @l_prefix@/bin/freshclam
  +
  +    #   rotate logfiles
  +    shtool rotate -f \
  +        -n ${clamav_log_numfiles} -s ${clamav_log_minsize} -d \
  +        -z ${clamav_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
  +        -P "${clamav_log_prolog}" \
  +        -E "${clamav_log_epilog} && rc clamav restart" \
  +        @l_prefix@/var/clamav/clamd.log
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6153 -r1.6154 news.txt
  --- openpkg-web/news.txt      13 Aug 2003 12:26:09 -0000      1.6153
  +++ openpkg-web/news.txt      13 Aug 2003 16:03:55 -0000      1.6154
  @@ -1,3 +1,4 @@
  +13-Aug-2003: Upgraded package: P<clamav-0.60-20030813>
   13-Aug-2003: Upgraded package: P<uucp-1.07-20030813>
   13-Aug-2003: Upgraded package: P<smtpfeed-1.18-20030813>
   13-Aug-2003: Upgraded package: P<squid-2.5.3-20030813>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to