[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/etch-volatile, updated. debian/0.95+dfsg-1-264-gde37ff2

[Stephen Gran]

The following commit has been merged in the debian/etch-volatile branch:
commit de37ff2cfec886afaeb45ba740742a6b4f4038aa
Author: Stephen Gran <steve at lobefin.net>
Date:   Mon Jul 6 23:17:29 2009 +0100

    Hopefully the milter postinst now actually works
    Signed-off-by: Stephen Gran <steve at lobefin.net>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index bf8c4e7..3851e91 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -127,7 +127,7 @@ if [ -n "$LogInfected" ]; then
   db_set clamav-milter/LogInfected "$LogInfected" || true
 fi
 if [ -n "$MaxFileSize" ]; then
-  MaxFileSize="`echo $RET | sed -e s/M//g`"
+  MaxFileSize="`echo $MaxFileSize | sed -e s/M//g`"
 else
   MaxFileSize=25
 fi
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index dc69a2f..3293767 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -94,7 +94,7 @@ case "$1" in
       logsyslog=true
     fi
 
-    if ! is_true $addheader; then
+    if is_false $addheader; then
       addheader=no
     elif is_true $addheader; then
       addheader=Replace
@@ -105,26 +105,34 @@ case "$1" in
     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 "$MilterSocket" ] || [ "$MilterSocket" = 'true' ] && 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 "$PidFile" ] && PidFile="/var/run/clamav/clamav-milter.pid"
-    [ -z "$ClamdSocket" ] && ClamdSocket="unix:/var/run/clamav/clamd.ctl"
-    [ -z "$OnClean" ] && OnClean="Accept"
-    [ -z "$OnInfected" ] && OnInfected="Quarantine"
-    [ -z "$OnFail" ] && OnFail="Defer"
-    [ -z "$AddHeader" ] && AddHeader="Replace"
-    [ -z "$LogSyslog" ] && LogSyslog="false"
-    [ -z "$LogFacility" ] && LogFacility="LOG_LOCAL6"
-    [ -z "$LogVerbose" ] && LogVerbose="false"
-    [ -z "$LogInfected" ] && LogInfected="Off"
-    [ -z "$MaxFileSize" ] && MaxFileSize="25M"
+    [ -z "$ReadTimeout" ] && readtimeout="120"
+    [ -z "$Foreground" ] && foreground="false"
+    [ -z "$PidFile" ] && pidfile="/var/run/clamav/clamav-milter.pid"
+    [ -z "$ClamdSocket" ] && clamdsocket="unix:/var/run/clamav/clamd.ctl"
+    [ -z "$OnClean" ] || [ "$OnClean" = 'true' ] && onclean="Accept"
+    [ -z "$OnInfected" ] && oninfected="Quarantine"
+    [ -z "$OnFail" ] && onfail="Defer"
+    [ -z "$AddHeader" ] && addheader="Replace"
+    [ -z "$LogSyslog" ] && logsyslog="false"
+    [ -z "$LogFacility" ] && logfacility="LOG_LOCAL6"
+    [ -z "$LogVerbose" ] && logverbose="false"
+    [ -z "$LogInfected" ] && loginfected="Off"
+    [ -z "$MaxFileSize" ] && MaxFSize="25M"
+
+    if [ -z "$allowsupplementarygroups" ] && [ -n "$AllowSupplementaryGroups" ]; then
+      allowsupplementarygroups="$AllowSupplementaryGroups"
+    fi
+
+    if [ -z "$onclean" ] && [ -n "$OnClean" ]; then
+      onclean="$OnClean"
+    fi
 
     cat >> $DEBCONFFILE << EOF
-MilterSocket $milterSocket
+MilterSocket $miltersocket
 FixStaleSocket $fixstalesocket
 User $user
 AllowSupplementaryGroups $allowsupplementarygroups
@@ -214,7 +222,7 @@ EOF
     else
       make_logrotate=true
     fi
-    [ -n "$User" ] || User=clamav
+    [ -n "$user" ] || user=clamav
     if [ "$make_logrotate" = 'true' ]; then
       echo "$logfile {" > $DEBROTATEFILE
       echo "     rotate 12" >> $DEBROTATEFILE

-- 
Debian repository for ClamAV