4 files changed, 28 insertions, 8 deletions
diff --git a/system/clamav/README.SLACKWARE b/system/clamav/README.SLACKWARE
index 12b4a67b24ee..53e25d423e7e 100644
--- a/system/clamav/README.SLACKWARE
+++ b/system/clamav/README.SLACKWARE
@@ -11,6 +11,10 @@ fi
 
 The start/stop script will start: clamd, freshclam and clamav-milter.
 
+Remember to run freshclam to download some virus definitions (the source
+doesn't ship any): if you are not running the daemon, ignore the error
+messages when freshclam tries to connect to it.
+
 ** ClamAV, Amavisd-new and SpamAssassin **
 You might want to use amavisd-new to act as an intermediary between Sendmail
 and ClamAV (and possible SpamAssassin too). Amavisd-new can be downloaded at
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild
index 6787a9033643..edbdd499fe36 100644
--- a/system/clamav/clamav.SlackBuild
+++ b/system/clamav/clamav.SlackBuild
@@ -27,7 +27,7 @@
 # No additional license terms added
 
 PRGNAM=clamav
-VERSION=${VERSION:-0.97.4}
+VERSION=${VERSION:-0.97.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -88,6 +88,9 @@ cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Make gcc-4.7.x happy, should be safe for older ones
+patch -p1 < $CWD/gcc47.patch
+
 # 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
@@ -130,6 +133,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-dbdir=/var/lib/clamav \
   --enable-milter \
   --enable-id-check \
+  --enable-clamdtop \
   --disable-static \
   --disable-experimental \
   --build=$ARCH-slackware-linux
@@ -146,18 +150,19 @@ done
 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
 
+# Create pid, socket, db and log directories
+mkdir -p $PKG/var/{lib,log,run}/clamav
+chmod 771 $PKG/var/{lib,log,run}/clamav
+
 # Fixup some ownership and permissions issues
 chown -R root:root $PKG
 chmod -R o-w $PKG
 chown clamav $PKG/usr/sbin/clamav-milter
 chmod 4700 $PKG/usr/sbin/clamav-milter
 chmod 0770 $PKG/var/lib/clamav
+touch $PKG/var/lib/clamav/{main,daily}.cvd
 chmod 0660 $PKG/var/lib/clamav/*
 
-# Create pid, socket and log directories
-mkdir -p $PKG/var/{log,run}/clamav
-chmod 771 $PKG/var/{log,run}/clamav
-
 # Create log files in such a way that they won't clobber existing ones
 touch $PKG/var/log/clamav/{clamd,freshclam}.log.new
 chmod 660 $PKG/var/log/clamav/{clamd,freshclam}.log.new
diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info
index 94e72f5330af..10a8c0066937 100644
--- a/system/clamav/clamav.info
+++ b/system/clamav/clamav.info
@@ -1,8 +1,8 @@
 PRGNAM="clamav"
-VERSION="0.97.4"
+VERSION="0.97.5"
 HOMEPAGE="http://www.clamav.net/"
-DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.97.4.tar.gz"
-MD5SUM="dc1e5abc093b11f120e4eac94a7f78aa"
+DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.97.5.tar.gz"
+MD5SUM="4d4b93243a5add0216acc4f24f43a895"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="ponce"
diff --git a/system/clamav/gcc47.patch b/system/clamav/gcc47.patch
new file mode 100644
index 000000000000..96c5af0a7610
--- /dev/null
+++ b/system/clamav/gcc47.patch
@@ -0,0 +1,11 @@
+diff -Naur clamav-0.97.4.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp clamav-0.97.4/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+--- clamav-0.97.4.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp	2012-03-06 17:31:31.000000000 +0100
++++ clamav-0.97.4/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp	2012-04-02 15:21:58.172989384 +0200
+@@ -15,6 +15,7 @@
+ //
+ //===----------------------------------------------------------------------===//
+ 
++#include "unistd.h"
+ #include "JIT.h"
+ #include "llvm/Support/ErrorHandling.h"
+ #include "llvm/System/DynamicLibrary.h"