[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-466-ga4903a4

Michael Tautschnig mt at debian.org
Wed Mar 25 14:10:05 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1b9e8565f31b7f119ba69f0694c6d1ef6950fc65
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Mar 25 15:02:29 2009 +0100

    Added postinst logic for clamav-milter
    
    - This is supposed to work, but I haven't tested it at all
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index ba958a4..98670bc 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -34,6 +34,153 @@ case "$1" in
   DEBROTATEFILE=/var/lib/clamav/clamav-milter.rotate.debconf
   CLAMAVROTATEFILE=/etc/logrotate.d/clamav-milter
   
+  db_metaget clamav-milter/debconf value || true
+  if [ "$RET" = "true" ]; then
+    db_metaget clamav-milter/MilterSocket value || true
+    MilterSocket="$RET"
+    db_metaget clamav-milter/FixStaleSocket value || true
+    FixStaleSocket="$RET"
+    db_metaget clamav-milter/User value || true
+    User="$RET"
+    db_metaget clamav-milter/AddGroups value || true
+    AddGroups="$RET"
+    db_metaget clamav-milter/AllowSupplementaryGroups value || true
+    AllowSupplementaryGroups="$RET"
+    db_metaget clamav-milter/ReadTimeout value || true
+    ReadTimeout="$RET"
+    db_metaget clamav-milter/Foreground value || true
+    Foreground="$RET"
+    db_metaget clamav-milter/Chroot value || true
+    Chroot="$RET"
+    db_metaget clamav-milter/PidFile value || true
+    PidFile="$RET"
+    db_metaget clamav-milter/TemporaryDirectory value || true
+    TemporaryDirectory="$RET"
+    db_metaget clamav-milter/ClamdSocket value || true
+    ClamdSocket="$RET"
+    db_metaget clamav-milter/LocalNet value || true
+    LocalNet="$RET"
+    db_metaget clamav-milter/Whitelist value || true
+    Whitelist="$RET"
+    db_metaget clamav-milter/OnClean value || true
+    OnClean="$RET"
+    db_metaget clamav-milter/OnInfected value || true
+    OnInfected="$RET"
+    db_metaget clamav-milter/OnFail value || true
+    OnFail="$RET"
+    db_metaget clamav-milter/RejectMsg value || true
+    RejectMsg="$RET"
+    db_metaget clamav-milter/AddHeader value || true
+    AddHeader="$RET"
+    db_metaget clamav-milter/LogFile value || true
+    LogFile="$RET"
+    db_metaget clamav-milter/LogFileUnlock value || true
+    LogFileUnlock="$RET"
+    db_metaget clamav-milter/LogFileMaxSize value || true
+    LogFileMaxSize="${RET}M"
+    db_metaget clamav-milter/LogTime value || true
+    LogTime="$RET"
+    db_metaget clamav-milter/LogSyslog value || true
+    LogSyslog="$RET"
+    db_metaget clamav-milter/LogFacility value || true
+    LogFacility="$RET"
+    db_metaget clamav-milter/LogVerbose value || true
+    LogVerbose="$RET"
+    db_metaget clamav-milter/LogInfected value || true
+    LogInfected="$RET"
+    db_metaget clamav-milter/MaxFileSize value || true
+    MaxFileSize="${RET}M"
+
+    slurp_config "$CLAMAVMILTERCONF"
+    
+    echo "#Automatically Generated by clamav-milter postinst" > $DEBCONFFILE
+    echo "#To reconfigure clamav-milter run #dpkg-reconfigure clamav-milter" >> $DEBCONFFILE
+    echo "#Please read /usr/share/doc/clamav-base/README.Debian.gz for details" >> $DEBCONFFILE
+    [ -z "$MilterSocket" ] && MilterSocket="/var/run/clamav/milter.ctl"
+    [ -z "$FixStaleSocket" ] && FixStaleSocket="true"
+    [ -z "$User" ] && User=clamav
+    [ -z "$AllowSupplementaryGroups" -o -n "$AddGroups" ] && AllowSupplementaryGroups=true
+    [ -z "$ReadTimeout" ] && ReadTimeout="120"
+    [ -z "$Foreground" ] && Foreground="false"
+    [ -z "$Chroot" ] && Chroot=""
+    [ -z "$PidFile" ] && PidFile="/var/run/clamav/clamav-milter.pid"
+    [ -z "$ClamdSocket" ] && ClamdSocket="unix:/var/run/clamav/clamd.ctl"
+    [ -z "$LocalNet" ] && LocalNet=""
+    [ -z "$Whitelist" ] && WhiteList=""
+    [ -z "$OnClean" ] && OnClean="Accept"
+    [ -z "$OnInfected" ] && OnInfected="Quarantine"
+    [ -z "$OnFail" ] && OnFail="Defer"
+    [ -z "$RejectMsg" ] && RejectMsg=""
+    [ -z "$AddHeader" ] && AddHeader="false"
+    [ -z "$LogSyslog" ] && LogSyslog="false"
+    [ -z "$LogFacility" ] && LogFacility="LOG_LOCAL6"
+    [ -z "$LogVerbose" ] && LogVerbose="false"
+    [ -z "$LogInfected" ] && LogInfected="Off"
+    [ -z "$MaxFileSize" ] && MaxFileSize="25M"
+
+    cat >> $DEBCONFFILE << EOF
+MilterSocket $MilterSocket
+FixStaleSocket $FixStaleSocket
+User $User
+AllowSupplementaryGroups $AllowSupplementaryGroups
+ReadTimeout $ReadTimeout
+Foreground $Foreground
+Chroot $Chroot
+PidFile $PidFile
+ClamdSocket $ClamdSocket
+LocalNet $LocalNet
+Whitelist $Whitelist
+OnClean $OnClean
+OnInfected $OnInfected
+OnFail $OnFail
+RejectMsg $RejectMsg
+AddHeader $AddHeader
+LogSyslog $LogSyslog
+LogFacility $LogFacility
+LogVerbose $LogVerbose
+LogInfected $LogInfected
+MaxFileSize $MaxFileSize
+EOF
+    if [ -n "$TemporaryDirectory" ]; then
+	cat >> $DEBCONFFILE << EOF
+TemporaryDirectory $TemporaryDirectory
+EOF
+    else
+	cat >> $DEBCONFFILE << EOF
+# TemporaryDirectory is not set to its default /tmp here to make overriding
+# the default with environment variables TMPDIR/TMP/TEMP possible
+EOF
+    fi
+
+    if [ -n "$LogFile" ]; then
+      echo "LogFile $LogFile" >> $DEBCONFFILE
+      echo "LogTime $LogTime" >> $DEBCONFFILE
+      echo "LogFileUnlock $LogFileUnlock" >> $DEBCONFFILE
+      echo "LogFileMaxSize $LogFileMaxSize" >> $DEBCONFFILE
+    fi
+    
+    ucf_cleanup "$CLAMAVMILTERCONF"
+    ucf_upgrade_check "$CLAMAVMILTERCONF" "$DEBCONFFILE" /var/lib/ucf/cache/:etc:clamav:clamav-milter.conf
+    rm -f "$DEBCONFFILE"
+
+    db_stop || true
+    
+    if [ -n "$AddGroups" ]; then
+      for group in $AddGroups; do
+        id "$User" | grep -q "$group" || adduser "$User" "$group"
+      done
+    fi
+    
+  else
+    ucf_cleanup "$CLAMAVMILTERCONF"
+    ucf_upgrade_check "$CLAMAVMILTERCONF" /usr/share/doc/clamav-milter/examples/clamav-milter.conf /var/lib/ucf/cache/:etc:clamav:clamav-milter.conf
+
+    db_stop || true
+  fi
+
+  chmod 644 $CLAMAVMILTERCONF || true
+  chown root:root $CLAMAVMILTERCONF || true
+  
   slurp_config "$CLAMAVMILTERCONF"
 
   if [ -n "$LogFile" ]; then
diff --git a/debian/clamav-base.postrm b/debian/clamav-milter.postrm
similarity index 70%
copy from debian/clamav-base.postrm
copy to debian/clamav-milter.postrm
index 30a6e19..fb5bd91 100644
--- a/debian/clamav-base.postrm
+++ b/debian/clamav-milter.postrm
@@ -23,11 +23,8 @@ set -e
 case "$1" in
   purge)
   if [ -x "/usr/bin/ucf" ]; then
-    UCFLIST="/etc/cron.d/clamav-daemon \
-      /etc/clamav.conf \
-      /etc/clamav/clamav.conf \
-      /etc/clamav/clamd.conf \
-      /var/lib/clamav/clamav.conf.*.md5"
+    UCFLIST="/etc/clamav/clamav-milter.conf \
+      /var/lib/clamav/clamav-milter.conf.*.md5"
     for i in $UCFLIST; do
       ucf -p $i || true
       if [ -e $i ]; then
@@ -35,14 +32,7 @@ case "$1" in
       fi
     done
   fi
-  rm -f /var/log/clamav/clamav.log* /etc/clamav/clamav.conf.dpkg-old /etc/clamav/clamd.conf.dpkg-old /etc/clamav/clamd.conf.ucf-old
-  if [ -x "/usr/sbin/userdel" ]; then
-    userdel clamav || true
-  fi
-  if [ -x "/usr/sbin/groupdel" ]; then 
-    groupdel clamav || true
-  fi
-  rm -f /var/lib/clamav/*.md5sum || true
+  rm -f /var/log/clamav/clamav-milter.log* /etc/clamav/clamav-milter.conf.dpkg-old /etc/clamav/clamav-milter.conf.ucf-old
   for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
     if [ -d "$dir" ]; then
       rmdir "$dir" --ignore-fail-on-non-empty || true

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list