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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 3a8ba2a171da48dacdb51f5f20247668a0fc268a
Author: Michael Tautschnig <mt at debian.org>
Date:   Sat Nov 13 12:08:24 2010 +0100

    Migrate users from StreamMaxLength 0 to StreamMaxLength 25
    
    - closes: #602840
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 6783ab4..4bd2104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ clamav (0.96.4+dfsg-2) UNRELEASED; urgency=low
     fix CPU detection for LLVM JIT - JIT will now be correctly enabled on
     Pentium IV - fixes FTBFS due to test failures. Thanks Scott for pointing
     this out.
+  * Change StreamMaxLength default to 25Mb, also update user configurations
+    still using 0 as value (closes: #602840).
   
  -- Michael Tautschnig <mt at debian.org>  Mon, 01 Nov 2010 21:03:41 +0100
 
diff --git a/debian/clamav-base.config.in b/debian/clamav-base.config.in
index 4dde4ac..9390f95 100644
--- a/debian/clamav-base.config.in
+++ b/debian/clamav-base.config.in
@@ -57,6 +57,9 @@ if [ "$ScanArchive" = "true" ]; then
 fi
 if [ -n "$StreamMaxLength" ]; then
   StreamMaxLength="`echo $StreamMaxLength | sed -e s/M//`"
+  if [ "$StreamMaxLength" = "0" ]; then
+    StreamMaxLength="25"
+  fi
   db_set clamav-base/StreamMaxLength "$StreamMaxLength" || true
 fi
 if [ -n "$MaxDirectoryRecursion" ]; then
diff --git a/debian/clamav-base.templates b/debian/clamav-base.templates
index e3d3c16..beadf07 100644
--- a/debian/clamav-base.templates
+++ b/debian/clamav-base.templates
@@ -87,11 +87,9 @@ _Description: Do you want to enable archive scanning?
 
 Template: clamav-base/StreamMaxLength
 Type: string
-Default: 0
+Default: 25
 _Description: Maximum stream length (unit Mb) allowed:
  You can set a limit on the stream length that can be scanned.
- .
- Entering '0' will disable this limit.
 
 Template: clamav-base/MaxDirectoryRecursion
 Type: string

-- 
Debian repository for ClamAV