system/clamav: Updated for version 0.95.2

1 files changed, 2 insertions, 62 deletions

diff --git a/system/clamav/doinst.sh b/system/clamav/doinst.sh
index 0764576fed..16dadeafc3 100644
--- a/system/clamav/doinst.sh
+++ b/system/clamav/doinst.sh
@@ -1,12 +1,3 @@
-# Read "README.slackware" for compatibility with amavisd-new
-
-# These values are set in the build script and sed'ed into this
-CLAMUSR=_SUB_CLAMUSR
-CLAMGRP=_SUB_CLAMGRP
-CLAMUID=_SUB_CLAMUID
-CLAMGID=_SUB_CLAMGID
-
-# Handle the incoming configuration files:
 config() {
   for infile in $1; do
     NEW="$infile"
@@ -25,57 +16,6 @@ config() {
 config etc/freshclam.conf.new
 config etc/clamd.conf.new
 config etc/rc.d/rc.clamav.new
-
-# Create log files
-# We don't do this inside the package because we don't want the package 
-# to remove them if clamav is uninstalled
-touch var/log/clamd.log
-touch var/log/freshclam.log
-
-# Check for presence of $CLAMUSR and $CLAMGRP on target system
-DO_EXIT=0
-if ! grep ^${CLAMGRP}: etc/group 2>&1 > /dev/null; then
-  cat << EOF
-
-  You must have a ${CLAMGRP} group present for this post-installation
-  script to complete.  First, do this:
-
-  # groupadd -g ${CLAMGID} ${CLAMGRP}
-
-  Then, do *one* of the following:
-  (1) Run "upgradepkg --reinstall clamav-*tgz" or
-  (2) Change to the directory '/' (using "cd /") and run the script /var/log/scripts/clamav-* manually.
-EOF
-  DO_EXIT=1
-elif ! grep ^${CLAMUSR}: etc/passwd 2>&1 > /dev/null; then
-  cat << EOF
-
-  You must have a ${CLAMUSR} user present for this post-installation
-  script to complete.  First, do this:
-
-  # useradd -u ${CLAMUID} -d /dev/null -s /bin/false -g ${CLAMGRP} ${CLAMUSR}
-
-  Then, do *one* of the following:
-  (1) Run "upgradepkg --reinstall clamav-*tgz" or
-  (2) Change to the directory '/' (using "cd /") and run the script /var/log/scripts/clamav-* manually.
-EOF
-  DO_EXIT=1
-fi
-[ $DO_EXIT -eq 1 ] && exit
-# Only way to create and use the correct uid and gid on the target system,
-# is to use chroot:
-chroot . <<EOR 2>/dev/null
-
-# Restore the correct permissions
-chown ${CLAMUSR} usr/sbin/clamav-milter
-chmod 4700 usr/sbin/clamav-milter
-chown -R ${CLAMUSR}:${CLAMGRP} var/run/clamav
-chmod 771 var/run/clamav
-chown ${CLAMUSR}:${CLAMGRP} var/log/clamd.log
-chmod 660 var/log/clamd.log
-chown ${CLAMUSR}:${CLAMGRP} var/log/freshclam.log
-chmod 660 var/log/freshclam.log
-chown -R ${CLAMUSR}:${CLAMGRP} usr/share/clamav
-chmod -R 770 usr/share/clamav
-EOR
+config var/log/clamd.log.new ; rm -f var/log/clamd.log.new
+config var/log/freshclam.log.new ; rm -f var/log/freshclam.log.new