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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 047c228167f0f43272a0b372a5aaf9dcb4228b86
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Mar 15 13:47:45 2011 +0000

    Proper handling of LogClean, more verbose debconf text
    
    - closes: #617890, #617889
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 67dd42d..37146cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clamav (0.97+dfsg-3) unstable; urgency=low
+
+  [ Michael Tautschnig ]
+  * Added debconf question for clamav-milter/LogClean (closes: #617890).
+  * Clarified text about clamav-milter's temporary directory in debconf
+    question (closes: #617889).
+
+ -- Michael Tautschnig <mt at debian.org>  Tue, 15 Mar 2011 13:47:00 +0000
+
 clamav (0.97+dfsg-2) unstable; urgency=low
 
   [ Michael Tautschnig ]
diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index af03e51..bfab699 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -132,6 +132,9 @@ fi
 if [ -n "$LogInfected" ]; then
   db_set clamav-milter/LogInfected "$LogInfected" || true
 fi
+if [ -n "$LogClean" ]; then
+  db_set clamav-milter/LogClean "$LogClean" || true
+fi
 if [ -n "$MaxFileSize" ]; then
   MaxFileSize="`echo $MaxFileSize | sed -e s/M//g`"
 else
@@ -300,10 +303,13 @@ while [ "$STATE" != "End" ]; do
     StateGeneric low clamav-milter/LogVerbose LogInfected LogFacility
     ;;
     "LogInfected")
-    StateGeneric low clamav-milter/LogInfected MaxFileSize LogVerbose
+    StateGeneric low clamav-milter/LogInfected LogClean LogVerbose
+    ;;
+    "LogInfected")
+    StateGeneric low clamav-milter/LogClean MaxFileSize LogInfected
     ;;
     "MaxFileSize")
-    StateGenericDigit low clamav-milter/MaxFileSize End LogInfected
+    StateGenericDigit low clamav-milter/MaxFileSize End LogClean
     ;;
   esac
 done
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 6e638c1..89f8ae6 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -90,6 +90,8 @@ case "$1" in
     logverbose="$RET"
     db_metaget clamav-milter/LogInfected value || true
     loginfected="$RET"
+    db_metaget clamav-milter/LogClean value || true
+    logclean="$RET"
     db_metaget clamav-milter/MaxFileSize value || true
     maxfilesize="`echo $RET | sed -e s/M//g`"
     MaxFSize="${maxfilesize}M"
diff --git a/debian/clamav-milter.templates b/debian/clamav-milter.templates
index 25a2659..6290579 100644
--- a/debian/clamav-milter.templates
+++ b/debian/clamav-milter.templates
@@ -97,8 +97,8 @@ Template: clamav-milter/TemporaryDirectory
 Type: string
 Default: /tmp
 _Description: Temporary directory path:
- Please specify the directory for clamav-milter's temporary files.
- If unset, $TMPDIR and $TEMP will be honored.
+ Please specify the directory for clamav-milter's files that are temporarily
+ buffered for scanning.  If unset, $TMPDIR and $TEMP will be honored.
 
 Template: clamav-milter/ClamdSocket
 Type: string
@@ -244,6 +244,18 @@ _Description: Information to log on infected messages:
   - Basic: minimal information;
   - Full : verbose information.
 
+Template: clamav-milter/LogClean
+Type: select
+__Choices: Off, Basic, Full
+Default: Off
+_Description: Information to log if no threat is found:
+ Please choose the level of information that will be logged when no threat is
+ found in a scanned message (this is useful in debugging but drastically
+ increases the log size):
+  - Off  : no logging;
+  - Basic: minimal information;
+  - Full : verbose information.
+
 Template: clamav-milter/MaxFileSize
 Type: string
 Default: 25M

-- 
Debian repository for ClamAV