[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-470-g80d00c5

Michael Tautschnig mt at debian.org
Wed Mar 25 14:50:19 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 80d00c590da63c091c548e3924c42f571f15d893
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Mar 25 15:46:32 2009 +0100

    Improved debconf templates of clamav-milter
    
    - Proper colon or question mark, depending on type
    - Don't ask the user about AllowSupplementaryGroups, value will be inferred
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index b781c00..c0d12ac 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -41,9 +41,6 @@ if [ -n "$User" ]; then
     db_set clamav-milter/AddGroups "$AddGroups" || true
   fi
 fi
-if [ "$AllowSupplementaryGroups" = "true" ]; then
-  db_set clamav-milter/AllowSupplementaryGroups true || true
-fi
 if [ -n "$ReadTimeout" ]; then
   db_set clamav-milter/ReadTimeout "$ReadTimeout" || true
 fi
@@ -190,19 +187,9 @@ StateUser()
     if [ "$RET" = "" ]; then
       db_set clamav-milter/User "clamav" || true
     fi
-    STATE="AllowSupplementaryGroups"
-  else
-    STATE="FixStaleSocket"
-  fi
-}
-
-StateAllowSupplementaryGroups()
-{
-  db_input low clamav-milter/AllowSupplementaryGroups || true
-  if db_go; then
     STATE="ReadTimeout"
   else
-    STATE="User"
+    STATE="FixStaleSocket"
   fi
 }
 
@@ -211,7 +198,7 @@ StateReadTimeout()
   if inputdigit low clamav-milter/ReadTimeout ; then
     STATE="Foreground"
   else
-    STATE="AllowSupplementaryGroups"
+    STATE="User"
   fi
 }
 
@@ -463,9 +450,6 @@ while [ "$STATE" != "End" ]; do
     "User")
     StateUser
     ;;
-    "AllowSupplementaryGroups")
-    StateAllowSupplementaryGroups
-    ;;
     "ReadTimeout")
     StateReadTimeout
     ;;
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index 2cfc5b9..a226952 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -47,8 +47,6 @@ case "$1" in
     User="$RET"
     db_metaget clamav-milter/AddGroups value || true
     AddGroups="$RET"
-    db_metaget clamav-milter/AllowSupplementaryGroups value || true
-    AllowSupplementaryGroups="$RET"
     db_metaget clamav-milter/ReadTimeout value || true
     ReadTimeout="$RET"
     db_metaget clamav-milter/Foreground value || true
diff --git a/debian/clamav-milter.templates b/debian/clamav-milter.templates
index 9b2bd10..bab68d3 100644
--- a/debian/clamav-milter.templates
+++ b/debian/clamav-milter.templates
@@ -13,8 +13,8 @@ _Description: Handle the configuration file automatically?
 Template: clamav-milter/MilterSocket
 Type: string
 Default: /var/run/clamav/milter.ctl
-_Description: Define the interface through which we communicate with sendmail
- This option is mandatory! Possible formats are:
+_Description: Define the interface through to communicate with sendmail:
+ Possible formats are:
  [[unix|local]:]/path/to/file - to specify a unix domain socket
  inet:port@[hostname|ip-address] - to specify an ipv4 socket
  inet6:port@[hostname|ip-address] - to specify an ipv6 socket
@@ -22,7 +22,7 @@ _Description: Define the interface through which we communicate with sendmail
 Template: clamav-milter/FixStaleSocket
 Type: boolean
 Default: true
-_Description: Remove stale socket after unclean shutdown.
+_Description: Remove stale socket after unclean shutdown?
 
 Template: clamav-milter/User
 Type: string
@@ -36,53 +36,47 @@ _Description: User to run clamav-milter as:
 Template: clamav-milter/AddGroups
 Type: string
 _Description: Groups for clamav-milter (space-separated):
- Please enter any extra groups for clamd.
- .
- By default, clamd runs as a non-privileged user. If you need clamav-milter to
- be able to access files owned by another user (e.g., in combination with
- an MTA), then you will need to add clamav to the group for that piece of
- software. Please see README.Debian in the clamav-base package for details.
-
-Template: clamav-milter/AllowSupplementaryGroups
-Type: boolean
-Default: false
-_Description: Initialize supplementary group access.
+ By default, clamav-milter runs as a non-privileged user. If you need
+ clamav-milter to be able to access files owned by another user (e.g., in
+ combination with an MTA), then you will need to add clamav to the group for
+ that piece of software. Please see README.Debian in the clamav-base package for
+ details.
 
 Template: clamav-milter/ReadTimeout
 Type: string
 Default: 120
-_Description: Waiting for data from clamd will timeout after this time (seconds).
+_Description: Waiting for data from clamd will timeout after this time (seconds):
  Value of 0 disables the timeout.
 
 Template: clamav-milter/Foreground
 Type: boolean
 Default: false
-_Description: Don't fork into background.
+_Description: Stay in foreground (don't fork)?
 
 Template: clamav-milter/Chroot
 Type: string
-_Description: Chroot to the specified directory.
+_Description: Chroot to directory:
  Chrooting is performed just after reading the config file and before dropping
  privileges. An empty values means don't chroot.
 
 Template: clamav-milter/PidFile
 Type: string
 Default: /var/run/clamav/clamav-milter.pid
-_Description: PID file
+_Description: PID file:
  This option allows you to save a process identifier of the listening daemon
  (main thread).
 
 Template: clamav-milter/TemporaryDirectory
 Type: string
 Default: /tmp
-_Description: Optional path to the global temporary directory.
+_Description: Optional path to the global temporary directory:
   Default: system specific (usually /tmp or /var/tmp).
 
 Template: clamav-milter/ClamdSocket
 Type: string
 Default: unix:/var/run/clamav/clamd.ctl
-_Description: Define the clamd socket to connect to for scanning.
- This option is mandatory! Syntax:
+_Description: Define the clamd socket to connect to for scanning:
+ Syntax:
  unix:path
  tcp:host:port
  The first syntax specifies a local unix socket (needs an bsolute path) e.g.:
@@ -98,17 +92,17 @@ _Description: Define the clamd socket to connect to for scanning.
 
 Template: clamav-milter/LocalNet
 Type: string
-_Description: Exclusions - IP ranges
+_Description: Exclusions - IP ranges:
  Messages originating from these hosts/networks will not be scanned.  This
  option takes a host(name)/mask pair in CIRD notation and can be repeated
  several times. If "/mask" is omitted, a host is assumed.  To specify a locally
  orignated, non-smtp, email use the keyword "local".
  .
- If unset,  everything regardless of the origin is scanned.
+ If unset, everything regardless of the origin is scanned.
 
 Template: clamav-milter/Whitelist
 Type: string
-_Description: Exclusions - Regular expressions
+_Description: Exclusions - Regular expressions:
  This option specifies a file which contains a list of POSIX regular
  expressions. Addresses (sent to or from - see below) matching these regexes
  will not be scanned.  Optionally each line can start with the string "From:" or
@@ -121,7 +115,7 @@ Template: clamav-milter/OnClean
 Type: select
 Choices: Accept, Reject, Defer, Blackhole, Quarantine
 Default: Accept
-_Description: Action to be performed on clean messages (mostly useful for testing)
+_Description: Action to be performed on clean messages (mostly useful for testing):
  The following group of options controls the delievery process under
  different circumstances.
  The following actions are available:
@@ -142,26 +136,26 @@ Template: clamav-milter/OnInfected
 Type: select
 Choices: Accept, Reject, Defer, Blackhole, Quarantine
 Default: Quarantine
-_Description: Action to be performed on infected messages
+_Description: Action to be performed on infected messages:
 
 Template: clamav-milter/OnFail
 Type: select
 Choices: Accept, Reject, Defer, Blackhole, Quarantine
 Default: Defer
-_Description: Action to be performed on error conditions
+_Description: Action to be performed on error conditions:
  This includes failure to allocate data structures, no scanners available,
  network timeouts, unknown scanner replies and the like)
 
 Template: clamav-milter/RejectMsg
 Type: string
-_Description: This option allows to set a specific rejection reason for infected messages
+_Description: Specific rejection reason for infected messages:
  It is therefore only useful together with "OnInfected Reject".
  The string "%v", if present, will be replaced with the virus name.
 
 Template: clamav-milter/AddHeader
 Type: boolean
 Default: false
-_Description: Add headers to processed messages
+_Description: Add headers to processed messages?
  If this option is set to Yes, an "X-Virus-Scanned" and an "X-Virus-Status"
  headers will be attached to each processed message, possibly replacing existing
  headers. 
@@ -169,7 +163,7 @@ _Description: Add headers to processed messages
 Template: clamav-milter/LogFile
 Type: string
 Default: none
-_Description: Set to a proper path to enable logging.
+_Description: Log to file:
  LogFile must be writable for the user running daemon.
  A full path is required.
  .
@@ -178,48 +172,48 @@ _Description: Set to a proper path to enable logging.
 Template: clamav-milter/LogFileUnlock
 Type: boolean
 Default: false
-_Description: By default the log file is locked for writing.
- The lock protects against running clamav-milter multiple times.  This option
- disables log file locking.
+_Description: Disable log file locking?
+ By default the log file is locked for writing.  The lock protects against
+ running clamav-milter multiple times.  This option disables log file locking.
 
 Template: clamav-milter/LogFileMaxSize
 Type: string
 Default: 1M
-_Description: Maximum size of the log file (unit Mb).
+_Description: Maximum size of the log file (unit Mb):
  Value of 0 disables the limit.
 
 Template: clamav-milter/LogTime
 Type: boolean
 Default: false
-_Description: Log time with each message.
+_Description: Log time with each message?
 
 Template: clamav-milter/LogSyslog
 Type: boolean
 Default: false
-_Description: Use system logger (can work together with LogFile).
+_Description: Use system logger (can work together with LogFile)?
 
 Template: clamav-milter/LogFacility
 Type: string
 Default: LOG_LOCAL6
-_Description: Specify the type of syslog messages.
+_Description: Specify the type of syslog messages:
  Please refer to 'man syslog' for facility names.
 
 Template: clamav-milter/LogVerbose
 Type: boolean
 Default: false
-_Description: Enable verbose logging.
+_Description: Enable verbose logging?
 
 Template: clamav-milter/LogInfected
 Type: select
 Choices: Off, Basic, Full
 Default: Off
-_Description: This option allows to tune what is logged when a message is infected.
+_Description: What should be logged when a message is infected:
  Possible values are Off (the default - nothing is logged), Basic (minimal info
  logged), Full (verbose info logged)
 
 Template: clamav-milter/MaxFileSize
 Type: string
 Default: 25M
-_Description: Messages larger than this value won't be scanned (unit Mb).
+_Description: Messages larger than this value won't be scanned (unit Mb):
  Make sure this value is lower than StreamMaxLength in clamd.conf
 

-- 
Debian repository for ClamAV

More information about the Pkg-clamav-commits mailing list