diff options
| -rw-r--r-- | system/clamav/clamav.SlackBuild | 25 | ||||
| -rw-r--r-- | system/clamav/clamav.info | 6 | ||||
| -rw-r--r-- | system/clamav/gcc47.patch | 11 | ||||
| -rw-r--r-- | system/clamav/logrotate.clamav | 1 |
4 files changed, 16 insertions, 27 deletions
diff --git a/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild index c58f67b906de7..3ad71234c1518 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.5} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.97.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -88,12 +88,10 @@ 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 +sed -i "s/^\#DatabaseMirror.*/DatabaseMirror db.${COUNTRY}.clamav.net/" \ + etc/freshclam.conf sed \ -e "s/^Example/#Example/" \ @@ -153,8 +151,8 @@ install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav # Create pid, socket, db, and log directories # init script must still ensure that /var/run/clamav exists # and has proper ownership and permissions though -mkdir -p $PKG/var/{lib,log,run}/clamav -chmod 771 $PKG/var/{lib,log,run}/clamav +mkdir -p $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav +chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav # Fixup some ownership and permissions issues chown -R root:root $PKG @@ -162,14 +160,17 @@ 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 +touch $PKG/var/lib/clamav/main.cvd $PKG/var/lib/clamav/daily.cvd chmod 0660 $PKG/var/lib/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 +touch $PKG/var/log/clamav/clamd.log.new \ + $PKG/var/log/clamav/freshclam.log.new +chmod 660 $PKG/var/log/clamav/clamd.log.new \ + $PKG/var/log/clamav/freshclam.log.new -chown -R clamav:clamav $PKG/var/{lib,log,run}/clamav +chown -R clamav:clamav $PKG/var/lib/clamav $PKG/var/log/clamav \ + $PKG/var/run/clamav find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/system/clamav/clamav.info b/system/clamav/clamav.info index 95b1db85abb77..89c2fc9a31d42 100644 --- a/system/clamav/clamav.info +++ b/system/clamav/clamav.info @@ -1,8 +1,8 @@ PRGNAM="clamav" -VERSION="0.97.5" +VERSION="0.97.6" HOMEPAGE="http://www.clamav.net/" -DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.97.5.tar.gz" -MD5SUM="4d4b93243a5add0216acc4f24f43a895" +DOWNLOAD="http://downloads.sourceforge.net/clamav/clamav-0.97.6.tar.gz" +MD5SUM="1dbdd803b37c0d9d222e4316049f46a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/system/clamav/gcc47.patch b/system/clamav/gcc47.patch deleted file mode 100644 index 96c5af0a7610c..0000000000000 --- a/system/clamav/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -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" diff --git a/system/clamav/logrotate.clamav b/system/clamav/logrotate.clamav index 77c96733009f4..30a122ab22d2d 100644 --- a/system/clamav/logrotate.clamav +++ b/system/clamav/logrotate.clamav @@ -6,7 +6,6 @@ delaycompress notifempty missingok - su clamav clamav postrotate /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2>/dev/null || true endscript |