[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-99-g2a3d5b9

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 2a3d5b9b5a9b5b6a0de4154ac00da273fee4f49c
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Apr 20 08:29:18 2009 +0200

    Fixed handling of logrotation for clamav-milter
    
    - wrong call of clamav-milter init script
    - missing handling of default "none" value for LogFile (causes problems if
      debconf questions were not displayed)

diff --git a/debian/changelog b/debian/changelog
index 28c36b5..908a595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clamav (0.95.1+dfsg-2) unstable; urgency=low
+
+  [ Michael Tautschnig ]
+  * Fixed LogFile handling in clamav-milter.postinst (logrotation was broken) 
+
+ -- Stephen Gran <sgran at debian.org>  Mon, 20 Apr 2009 08:17:29 +0200
+
 clamav (0.95.1+dfsg-1) unstable; urgency=low
 
   [ Michael Tautschnig ]
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 0fa11d7..0747faa 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -206,7 +206,7 @@ EOF
   
   slurp_config "$CLAMAVMILTERCONF"
 
-  if [ -n "$LogFile" ]; then
+  if [ -n "$LogFile" ] && [ "$LogFile" != 'none' ]; then
     if echo "$LogFile" | grep -q '^/dev/'; then
       make_logrotate=false
     else
@@ -221,7 +221,7 @@ EOF
       echo "     delaycompress" >> $DEBROTATEFILE
       echo "     create 640  $User adm" >> $DEBROTATEFILE
       echo "     postrotate" >> $DEBROTATEFILE
-      echo "     /etc/init.d/clamav-milter reload-log > /dev/null" >> $DEBROTATEFILE
+      echo "     /etc/init.d/clamav-milter restart > /dev/null" >> $DEBROTATEFILE
       echo "     endscript" >> $DEBROTATEFILE
       echo "     }" >> $DEBROTATEFILE
       touch "$LogFile"

-- 
Debian repository for ClamAV