I'm not managing to be able to push, so here's a patch ....

Scott K


From d66d8ff1385508c7fea5e40dc7fbae55288934ba Mon Sep 17 00:00:00 2001
From: Scott Kitterman <[email protected]>
Date: Sat, 11 Apr 2009 16:51:44 -0400
Subject: [PATCH] Update for new options in 0.95.1

---
 debian/changelog                 |    8 ++++++++
 debian/clamav-base.postinst.in   |    8 ++++++--
 debian/clamav-milter.postinst.in |    8 ++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d05c2c1..b52381c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,14 @@ clamav (0.95.1+dfsg-1) unstable; urgency=low
   * Don't suggest unrar, lha anymore as external unpackers aren't supported
     anyway since 0.94.
 
+  [ Scott Kitterman ]
+  * Update for new options in 0.95.1
+    - Drop ArchiveLimitMemoryUsage option from clamav-base.postinst.in (option
+      removed upstream)
+    - Add CommandReadTimeout, SendBufTimeout, and MaxQueue to
+      clamav-base.postinst.in
+    - Add SkipAuthenticated to clamav-milter.postinst.in
+
  -- Michael Tautschnig <[email protected]>  Fri, 10 Apr 2009 18:08:20 +0200
 
 clamav (0.95+dfsg-2) unstable; urgency=low
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 361fe14..460c270 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -177,11 +177,13 @@ case "$1" in
     fi
     [ -z "$user" ] && user=clamav
     [ -z "$AllowSupplementaryGroups" ] && AllowSupplementaryGroups=false
-    [ -z "$ArchiveLimitMemoryUsage" ] && ArchiveLimitMemoryUsage=false
     [ -z "$ArchiveBlockEncrypted" ] && ArchiveBlockEncrypted="$ArchiveDetectEncrypted"
     [ -z "$ArchiveBlockEncrypted" ] && ArchiveBlockEncrypted=false
     [ -z "$maxdirrec" ] && maxdirrec=15
     [ -z "$readtimeout" ] && readtimeout=120
+    [ -z "$commandreadtimeout" ] && commandreadtimeout=5
+    [ -z "$sendbuftimeout" ] && sendbuftimeout=500
+    [ -z "$maxqueue" ] && maxqueue=200
     [ -z "$maxthreads" ] && maxthreads=10
     [ -z "$maxconnQleng" ] && maxconnQleng=15
     [ -z "$streamsavelength" ] && streamsavelength=10
@@ -243,12 +245,14 @@ User $user
 AllowSupplementaryGroups $AllowSupplementaryGroups
 ScanMail $scanmail
 ScanArchive $scanarchive
-ArchiveLimitMemoryUsage $ArchiveLimitMemoryUsage
 ArchiveBlockEncrypted $ArchiveBlockEncrypted
 MaxDirectoryRecursion $maxdirrec
 FollowDirectorySymlinks $followdirsyms
 FollowFileSymlinks $followfilesyms
 ReadTimeout $readtimeout
+CommandReadTimeout $commandreadtimeout
+SendBufTimeout $sendbuftimeout
+MaxQueue $maxqueue
 MaxThreads $maxthreads
 MaxConnectionQueueLength $maxconnQleng
 StreamMaxLength ${streamsavelength}M
diff --git a/debian/clamav-milter.postinst.in b/debian/clamav-milter.postinst.in
index eb1a860..3e0962c 100644
--- a/debian/clamav-milter.postinst.in
+++ b/debian/clamav-milter.postinst.in
@@ -62,6 +62,8 @@ case "$1" in
     LocalNet="$RET"
     db_metaget clamav-milter/Whitelist value || true
     Whitelist="$RET"
+    db_metaget clamav-milter/SkipAuthenticated value || true
+    SkipAuthenticated="$RET"
     db_metaget clamav-milter/OnClean value || true
     OnClean="$RET"
     db_metaget clamav-milter/OnInfected value || true
@@ -156,6 +158,12 @@ Whitelist $Whitelist
 EOF
     fi
 
+    if [ -n "$SkipAuthenticated" ]; then
+      cat >> $DEBCONFFILE << EOF
+SkipAuthenticated $SkipAuthenticated
+EOF
+    fi
+
     if [ -n "$RejectMsg" ]; then
       cat >> $DEBCONFFILE << EOF
 RejectMsg $RejectMsg
-- 
1.6.0.4

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Pkg-clamav-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-clamav-devel

Reply via email to