mirror of
https://github.com/SlackBuildsOrg/slackbuilds
synced 2024-09-30 05:39:56 +02:00
system/clamav: Updated for version 0.97.6 and removed bashisms.
Double su in the logrotate script Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
parent
e31e91a3f3
commit
9818e85ad1
4 changed files with 16 additions and 27 deletions
|
@ -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
|
||||
|
|
|
@ -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%"
|
||||
|
|
|
@ -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"
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue