From e462e0a44aca13ebd0c38beade67bb6955ab6f32 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini
Date: Sun, 27 Oct 2013 01:17:27 -0500
Subject: system/clamav: Updated for version 0.98.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/clamav/clamav.SlackBuild | 14 +++++++-------
 system/clamav/clamav.info       |  6 +++---
 system/clamav/doinst.sh         |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'system/clamav')

diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index c72373f432..48f52d0363 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -27,8 +27,8 @@
 # No additional license terms added
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.97.6}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.98}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -91,7 +91,7 @@ chmod -R u+w,go+r-w,a-s .
 # Specify the desired mirror in the update config file
 # http://www.iana.org/cctld/cctld-whois.htm
 sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${COUNTRY}.clamav.net/" \
-  etc/freshclam.conf
+  etc/freshclam.conf.sample
 
 sed \
   -e "s/^Example/#Example/" \
@@ -102,7 +102,7 @@ sed \
   -e "s/^\#AllowSupplementaryGroups.*/AllowSupplementaryGroups yes/" \
   -e "s/^\#DatabaseOwner.*/DatabaseOwner clamav/" \
   -e "s/^\#NotifyClamd.*/NotifyClamd \/etc\/clamd.conf/" \
-  -i etc/freshclam.conf
+  -i etc/freshclam.conf.sample
 sed \
   -e "s/^Example/#Example/" \
   -e "s/^\#LogSyslog/LogSyslog/" \
@@ -116,7 +116,7 @@ sed \
   -e "s/^\#User.*/User clamav/" \
   -e "s/^\#AllowSupplementaryGroups.*/AllowSupplementaryGroups yes/" \
   -e "s/^\#ExitOnOOM/ExitOnOOM/" \
-  -i etc/clamd.conf
+  -i etc/clamd.conf.sample
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -141,12 +141,12 @@ make install DESTDIR=$PKG
 
 # Prepare the config files:
 for cf in clamd freshclam clamav-milter; do
-  mv $PKG/etc/$cf.conf $PKG/etc/$cf.conf.new
+  mv $PKG/etc/$cf.conf.sample $PKG/etc/$cf.conf.new
 done
 
 # Our rc script and logrotate entry:
 install -D -m 0755 $CWD/rc.clamav $PKG/etc/rc.d/rc.clamav.new
-install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav
+install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav.new
 
 # Create pid, socket, db, and log directories
 # init script must still ensure that /var/run/clamav exists 
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index 89c2fc9a31..a44920bf53 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,8 +1,8 @@
 PRGNAM="clamav"
-VERSION="0.97.6"
+VERSION="0.98"
 HOMEPAGE="http://www.clamav.net/"
-DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.97.6.tar.gz"
-MD5SUM="1dbdd803b37c0d9d222e4316049f46a2"
+DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.98.tar.gz"
+MD5SUM="ca0b8c930efcb8be1d47592d268006c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="%README%"
diff --git a/system/clamav/doinst.sh b/system/clamav/doinst.sh
index 13c919b36b..4d177d91b4 100644
--- a/system/clamav/doinst.sh
+++ b/system/clamav/doinst.sh
@@ -28,6 +28,7 @@ preserve_perms etc/rc.d/rc.clamav.new
 config etc/freshclam.conf.new
 config etc/clamd.conf.new
 config etc/clamav-milter.conf.new
+config etc/logrotate.d/clamav.new
 # Remove new log if one is already present
 config var/log/clamav/clamd.log.new ; rm -f var/log/clamav/clamd.log.new
 config var/log/clamav/freshclam.log.new ; rm -f var/log/clamav/freshclam.log.new
-- 
cgit v1.2.3