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

[Scott Kitterman]

The following commit has been merged in the debian/unstable branch:
commit 5fd46ec795bbd344b5880178e1a6601a323ac236
Author: Scott Kitterman <scott at kitterman.com>
Date:   Mon Apr 12 10:39:09 2010 -0400

      * In debian/clamav-base.postinst.in and debian/clamav-freshclam.postinst.in,
        adjust debconf processing for new options to produce valid configuration
        files (closes: #577499)

diff --git a/debian/changelog b/debian/changelog
index 40d1e85..f714d41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clamav (0.96+dfsg-2) unstable; urgency=low
+
+  [ Scott Kitterman ]
+  * In debian/clamav-base.postinst.in and debian/clamav-freshclam.postinst.in,
+    adjust debconf processing for new options to produce valid configuration
+    files (closes: #577499)
+
+ -- ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>  Mon, 12 Apr 2010 10:37:58 -0400
+
 clamav (0.96+dfsg-1) unstable; urgency=low
 
   [ Scott Kitterman ]
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 68d7938..c3581ff 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -111,9 +111,9 @@ case "$1" in
       localsock="$RET"
       db_metaget clamav-base/FixStaleSocket value || true
       fixstale="$RET"
-      db_get clamav-base/LocalSocketGroup value || true
+      db_metaget clamav-base/LocalSocketGroup value || true
       localsockgrp="$RET"
-      db_get clamav-base/LocalSocketMode value || true
+      db_metaget clamav-base/LocalSocketMode value || true
       localsockmode="$RET"
     fi
     db_metaget clamav-base/ScanMail value || true
@@ -154,12 +154,10 @@ case "$1" in
     selfcheck="$RET"
     db_metaget clamav-base/Bytecode value || true
     bytecode="$RET"
-    if [ "$RET" = "true" ]; then
-      db_metaget clamav-base/BytecodeSecurity value || true
-      bytecodesec="$RET"
-      db_get clamav-base/BytecodeTimeout value || true
-      bytecodetime="$RET"
-    fi
+    db_metaget clamav-base/BytecodeSecurity value || true
+    bytecodesec="$RET"
+    db_metaget clamav-base/BytecodeTimeout value || true
+    bytecodetime="$RET"
 
     slurp_config "$CLAMAVCONF"
     
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index 0b74d8b..5247154 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -169,7 +169,6 @@ ConnectTimeout $ConnectTimeout
 ReceiveTimeout $ReceiveTimeout
 ScriptedUpdates $ScriptedUpdates
 CompressLocalDatabase $CompressLocalDatabase
-Bytecode $bytecode
 EOF
 
   if [ -n "$notify" ] ;then

-- 
Debian repository for ClamAV