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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit a018902292a142d4f872ecf5fc5630fc743248bc
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Dec 1 16:58:47 2010 +0100

    Handle new config options
    
    - option DatabaseCustomURL for freshclam
    - option OLE2BlockMacros for clamd
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/changelog b/debian/changelog
index d4e619b..f1ba7ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ clamav (0.96.5+dfsg-1) unstable; urgency=low
   [ Alberto WU ]
   * New upstream release
     - Fix JIT-related crashes on VIA (closes: #604621).
+    - New option DatabaseCustomURL for freshclam
+    - New option OLE2BlockMacros for clamd
 
   [ Michael Tautschnig ]
   * Forcibly remove files in purge even if ucf is not available (anymore) -
diff --git a/debian/clamav-base.postinst.in b/debian/clamav-base.postinst.in
index 0b99dc7..ce08a44 100644
--- a/debian/clamav-base.postinst.in
+++ b/debian/clamav-base.postinst.in
@@ -246,6 +246,7 @@ case "$1" in
     [ -z "$SendBufTimeout" ] && SendBufTimeout=200
     [ -z "$MaxQueue" ] && MaxQueue=100
     [ -z "$ExtendedDetectionInfo" ] && ExtendedDetectionInfo=true
+    [ -z "$OLE2BlockMacros" ] && OLE2BlockMacros=false
 
     if [ -n "$TemporaryDirectory" ]; then
 	cat >> $DEBCONFFILE << EOF
@@ -300,6 +301,7 @@ CommandReadTimeout $CommandReadTimeout
 SendBufTimeout $SendBufTimeout
 MaxQueue $MaxQueue
 ExtendedDetectionInfo $ExtendedDetectionInfo
+OLE2BlockMacros $OLE2BlockMacros
 EOF
 
     if is_true "$StructuredDataDetection"; then
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index 7a9f3f6..47815e7 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -255,6 +255,11 @@ EOF
   [ -n "$DetectionStatsCountry" ] && echo "DetectionStatsCountry $DetectionStatsCountry" >> $DEBCONFILE
   [ -n "$DetectionStatsHostID" ] && echo "DetectionStatsHostID $DetectionStatsHostID" >> $DEBCONFILE
   [ -n "$SafeBrowsing" ] && echo "SafeBrowsing $SafeBrowsing" >> $DEBCONFILE
+  if [ -n "$DatabaseCustomURL" ]; then
+    for i in $DatabaseCustomURL; do
+      echo "DatabaseCustomURL $i" >> $DEBCONFILE
+    done
+  fi
   
   ucf_cleanup "$FRESHCLAMCONFFILE"
   ucf_upgrade_check "$FRESHCLAMCONFFILE" "$DEBCONFILE" /var/lib/ucf/cache/:etc:clamav:freshclam.conf
diff --git a/debian/common_functions b/debian/common_functions
index df5e9cc..9aa756e 100644
--- a/debian/common_functions
+++ b/debian/common_functions
@@ -107,6 +107,15 @@ slurp_config()
           continue
         fi
         ;;
+        DatabaseCustomURL)
+        if [ -z "$DatabaseCustomURL" ]; then
+          for i in `grep ^$variable $CLAMAVCONF | awk '{print $2}'`; do
+            value="$value $i"
+          done
+        else
+          continue
+        fi
+        ;;
         IncludePUA)
         if [ -z "$IncludePUA" ]; then
           for i in `grep ^$variable $CLAMAVCONF | awk '{print $2}'`; do

-- 
Debian repository for ClamAV