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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 7249332adce3fae54571d125334f2abee314abdc
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Apr 13 17:20:05 2010 +0200

    Continued Stephen's work on debconf handling of new options
    
    - clamav-milter: MilterSocketMode, AddGroups were still missing
    - clamav-base: LocalSocketGroup, LocalSocketMode, Bytecode, BytecodeSecurity,
      BytecodeTimeout
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index b642969..7c0c4dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ clamav (0.96+dfsg-2) unstable; urgency=low
 
   [ Stephen Gran ]
   * Note that this series (closes: #577462)
+  * Added debconf handling of new config options
 
  -- Stephen Gran <sgran at debian.org>  Mon, 12 Apr 2010 23:01:54 +0100
 
diff --git a/debian/clamav-base.config.in b/debian/clamav-base.config.in
index 4b795ab..e8e34b1 100644
--- a/debian/clamav-base.config.in
+++ b/debian/clamav-base.config.in
@@ -34,6 +34,12 @@ fi
 if [ -n "$LocalSocket" ]; then
   db_set clamav-base/LocalSocket "$LocalSocket" || true
 fi
+if [ -n "$LocalSocketGroup" ]; then
+  db_set clamav-base/LocalSocketGroup "$LocalSocketGroup" || true
+fi
+if [ -n "$LocalSocketMode" ]; then
+  db_set clamav-base/LocalSocketMode "$LocalSocketMode" || true
+fi
 if [ "$FixStaleSocket" = "true" ]; then
   db_set clamav-base/FixStaleSocket true || true
 fi
@@ -86,8 +92,14 @@ fi
 if [ "$LogTime" = "true" ]; then
   db_set clamav-base/LogTime true || true
 fi
-if [ "$SelfCheck" = "true" ]; then
-  db_set clamav-base/SelfCheck true || true
+if [ "$Bytecode" = "true" ]; then
+  db_set clamav-base/Bytecode true || true
+fi
+if [ -n "$BytecodeSecurity" ]; then
+  db_set clamav-base/BytecodeSecurity "$BytecodeSecurity" || true
+fi
+if [ -n "$BytecodeTimeout" ]; then
+  db_set clamav-base/BytecodeTimeout "$BytecodeTimeout" || true
 fi
 
 # Functions
@@ -154,12 +166,34 @@ StateUNIX()
 {
   db_input low clamav-base/LocalSocket || true
   if db_go; then
-    STATE="FixStale"
+    STATE="LocalSocketGroup"
   else
     STATE="Socket"
   fi
 }
 
+StateLocalSocketGroup()
+{
+  db_input low clamav-base/LocalSocketGroup || true
+  if db_go; then
+    db_metaget clamav-milter/LocalSocketGroup value
+    if [ "$RET" = "" ]; then
+      db_set clamav-milter/LocalSocketGroup "clamav" || true
+    fi
+    STATE="LocalSocketMode"
+  else
+    STATE="UNIX"
+  fi
+}
+
+StateLocalSocketMode()
+{
+  if inputdigit low clamav-base/LocalSocketMode ; then
+    STATE="FixStale"
+  else
+    STATE="LocalSocketGroup"
+  fi
+}
 
 StateFixStale()
 {
@@ -167,7 +201,7 @@ StateFixStale()
   if db_go; then
     STATE="ScanMail"
   else
-    STATE="UNIX"
+    STATE="LocalSocketMode"
   fi
 }
 
@@ -360,12 +394,46 @@ StateAddGroups()
 {
   db_input medium clamav-base/AddGroups || true
   if db_go; then
-    STATE="End"
+    STATE="Bytecode"
   else
     STATE="User"
   fi
 }
 
+StateBytecode()
+{
+  db_input low clamav-base/Bytecode || true
+  if db_go; then
+    db_metaget clamav-base/Bytecode value
+    if [ "$RET" = "true" ]; then
+      STATE="BytecodeSecurity"
+    else
+      STATE="End"
+    fi
+  else
+    STATE="AddGroups"
+  fi
+}
+
+StateBytecodeSecurity()
+{
+  db_input low clamav-base/BytecodeSecurity || true
+  if db_go; then
+    STATE="BytecodeTimeout"
+  else
+    STATE="Bytecode"
+  fi
+}
+
+StateBytecodeTimeout()
+{
+  if inputdigit low clamav-base/BytecodeTimeout ; then
+    STATE="End"
+  else
+    STATE="BytecodeSecurity"
+  fi
+}
+
 # To many options to configure at configure
 if [ "$1" = "reconfigure" ]; then
   STATE="Init"
@@ -402,6 +470,12 @@ while [ "$STATE" != "End" ]; do
     "UNIX")
     StateUNIX
     ;;
+    "LocalSocketGroup")
+    StateLocalSocketGroup
+    ;;
+    "LocalSocketMode")
+    StateLocalSocketMode
+    ;;
     "ScanMail")
     StateScanMail
     ;;
@@ -441,6 +515,15 @@ while [ "$STATE" != "End" ]; do
     "SelfCheck")
     StateSelfCheck
     ;;
+    "Bytecode")
+    StateBytecode
+    ;;
+    "BytecodeSecurity")
+    StateBytecodeSecurity
+    ;;
+    "BytecodeTimeout")
+    StateBytecodeTimeout
+    ;;
     "User")
     StateUser
     ;;
diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index 4ddb631..6b0c561 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -44,6 +44,9 @@ fi
 if [ -n "$MilterSocketGroup" ]; then
   db_set clamav-milter/MilterSocketGroup "$MilterSocketGroup" || true
 fi
+if [ -n "$MilterSocketMode" ]; then
+  db_set clamav-milter/MilterSocketMode "$MilterSocketMode" || true
+fi
 if [ "$FixStaleSocket" = "true" ]; then
   db_set clamav-milter/FixStaleSocket true || true
 fi
@@ -161,7 +164,7 @@ inputdigit ()
     db_get $2 || true
     isdigit $RET
     if [ "$ISDIGIT" = '0' ]; then
-      db_input critical clamav-milter/numinfo || true
+      db_input critical clamav-base/numinfo || true
       db_go
     fi
   done
@@ -180,56 +183,75 @@ StateDebconf()
     if [ "$RET" = "false" ]; then
       STATE="End"
     else
-      STATE="MilterSocket"
+      STATE="User"
     fi
   fi
 }
 
-StateMilterSocket()
+StateUser()
 {
-  db_input low clamav-milter/MilterSocket || true
+  db_input medium clamav-milter/User || true
   if db_go; then
-    STATE="FixStaleSocket"
+    db_metaget clamav-milter/User value
+    if [ "$RET" = "" ]; then
+      db_set clamav-milter/User "clamav" || true
+    fi
+    STATE="AddGroups"
   else
     STATE="Debconf"
   fi
 }
 
-StateFixStaleSocket()
+StateAddGroups()
 {
-  db_input low clamav-milter/FixStaleSocket || true
+  db_input medium clamav-milter/AddGroups || true
   if db_go; then
-    STATE="User"
-  else
     STATE="MilterSocket"
+  else
+    STATE="User"
   fi
 }
 
-StateUser()
+StateMilterSocket()
 {
-  db_input medium clamav-milter/User || true
+  db_input low clamav-milter/MilterSocket || true
   if db_go; then
-    db_metaget clamav-milter/User value
-    if [ "$RET" = "" ]; then
-      db_set clamav-milter/User "clamav" || true
-    fi
     STATE="MilterSocketGroup"
   else
-    STATE="FixStaleSocket"
+    STATE="AddGroups"
   fi
 }
 
 StateMilterSocketGroup()
 {
-  db_input medium clamav-milter/MilterSocketGroup || true
+  db_input low clamav-milter/MilterSocketGroup || true
   if db_go; then
     db_metaget clamav-milter/MilterSocketGroup value
     if [ "$RET" = "" ]; then
       db_set clamav-milter/MilterSocketGroup "clamav" || true
     fi
+    STATE="MilterSocketMode"
+  else
+    STATE="MilterSocket"
+  fi
+}
+
+StateMilterSocketMode()
+{
+  if inputdigit low clamav-milter/MilterSocketMode ; then
+    STATE="FixStaleSocket"
+  else
+    STATE="MilterSocketGroup"
+  fi
+}
+
+StateFixStaleSocket()
+{
+  db_input low clamav-milter/FixStaleSocket || true
+  if db_go; then
     STATE="ReadTimeout"
   else
-    STATE="User"
+    STATE="MilterSocketMode"
   fi
 }
 
@@ -480,12 +502,18 @@ while [ "$STATE" != "End" ]; do
     "User")
     StateUser
     ;;
+    "AddGroups")
+    StateAddGroups
+    ;;
     "ReadTimeout")
     StateReadTimeout
     ;;
     "MilterSocketGroup")
     StateMilterSocketGroup
     ;;
+    "MilterSocketMode")
+    StateMilterSocketMode
+    ;;
     "Foreground")
     StateForeground
     ;;

-- 
Debian repository for ClamAV