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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 7a3bd96b4adcb292ebb35cd486e44ea6df481406
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Apr 13 19:39:35 2010 +0200

    Give default log file path for milter in debconf question
    
    - Before, it was set to none in the debconf question, but postinst logic changed
      that to some useful path nevertheless, unless LogSyslog had been explicitly
      enabled by the user.
    - Enable LogTime by default, for consistency with clamav-base
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 60daba4..db9054a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ clamav (0.96+dfsg-2) unstable; urgency=low
   
   [ Michael Tautschnig ]
   * Create and maintain logrotate file (closes: #577041)
+  * Set milter's LogFile debconf option to a non-blank value; LogFile was
+    implicitly enabled by default anyway through postinst logic; make LogTime
+    default to sync with clamav-daemon (closes: #534748)
 
  -- Stephen Gran <sgran at debian.org>  Tue, 13 Apr 2010 19:21:18 +0200
 
diff --git a/debian/clamav-milter.templates b/debian/clamav-milter.templates
index a398bcc..417b5e7 100644
--- a/debian/clamav-milter.templates
+++ b/debian/clamav-milter.templates
@@ -188,7 +188,7 @@ _Description: Add headers to processed messages?
 
 Template: clamav-milter/LogFile
 Type: string
-Default: none
+Default: /var/log/clamav/clamav-milter.log
 _Description: Log file for clamav-milter:
  Specify the full path to the clamav-milter log file, which must be
  writable for the clamav daemon.
@@ -211,7 +211,7 @@ _Description: Maximum size of the log file (MB):
 
 Template: clamav-milter/LogTime
 Type: boolean
-Default: false
+Default: true
 _Description: Log time with each message?
 
 Template: clamav-milter/LogSyslog

-- 
Debian repository for ClamAV