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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit c8d40e4a5310ee537913ea467d7a0c78caeaaf71
Author: Michael Tautschnig <mt at debian.org>
Date:   Mon Apr 19 11:43:02 2010 +0200

    More bugfixes in debconf handling
    
    - Fixed copy&paste errors
    - Fixed template text
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-base.config.in b/debian/clamav-base.config.in
index 11963e5..4dde4ac 100644
--- a/debian/clamav-base.config.in
+++ b/debian/clamav-base.config.in
@@ -134,9 +134,9 @@ StateLocalSocketGroup()
 {
   db_input low clamav-base/LocalSocketGroup || true
   if db_go; then
-    db_metaget clamav-milter/LocalSocketGroup value
+    db_metaget clamav-base/LocalSocketGroup value
     if [ "$RET" = "" ]; then
-      db_set clamav-milter/LocalSocketGroup "clamav" || true
+      db_set clamav-base/LocalSocketGroup "clamav" || true
     fi
     STATE="LocalSocketMode"
   else
@@ -210,10 +210,13 @@ StateLogFile()
     db_metaget clamav-base/LogFile value
     if [ "$RET" = "" ]; then
       db_set clamav-base/LogFile "/var/log/clamav/clamav.log" || true
+      STATE="LogTime"
     elif [ "$RET" = 'none' ]; then
       db_set clamav-base/LogFile "" || true
+      STATE="SelfCheck"
+    else
+      STATE="LogTime"
     fi
-    STATE="LogTime"
   else
     STATE="LogSyslog"
   fi
@@ -327,7 +330,7 @@ while [ "$STATE" != "End" ]; do
     StateGeneric low clamav-base/LogTime SelfCheck LogFile
     ;;
     "SelfCheck")
-    StateGeneric low clamav-base/SelfCheck User LogTime
+    StateGeneric low clamav-base/SelfCheck User LogFile
     ;;
     "User")
     StateUser
diff --git a/debian/clamav-base.templates b/debian/clamav-base.templates
index 365a677..e3d3c16 100644
--- a/debian/clamav-base.templates
+++ b/debian/clamav-base.templates
@@ -175,7 +175,7 @@ _Description: Groups for clamav-daemon (space-separated):
 Template: clamav-base/Bytecode
 Type: boolean
 Default: true
-_Description: Do you want load bytecode from the database?
+_Description: Do you want to load bytecode from the database?
 
 Template: clamav-base/BytecodeSecurity
 Type: select
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index df12900..b2d0061 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -44,7 +44,7 @@ case "$1" in
     fixstalesocket="$RET"
     db_metaget clamav-milter/MilterSocketGroup value || true
     miltersocketgrp="$RET"
-    db_metaget clamav-milter/MilterSocket value || true
+    db_metaget clamav-milter/MilterSocketMode value || true
     miltersocketmode="$RET"
     db_metaget clamav-milter/User value || true
     user="$RET"
diff --git a/debian/clamav-milter.templates b/debian/clamav-milter.templates
index 417b5e7..25a2659 100644
--- a/debian/clamav-milter.templates
+++ b/debian/clamav-milter.templates
@@ -191,7 +191,7 @@ Type: string
 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.
+ writable for the clamav daemon. Enter none to disable.
  .
  Logging via syslog is configured independently of this setting.
 

-- 
Debian repository for ClamAV