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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit f366a8d968b775203b4efb32e2d681d52c983837
Author: Michael Tautschnig <mt at debian.org>
Date:   Fri Jul 29 19:04:17 2011 +0200

    Upload to unstable
    
    - added support for new ExtraDatabase freshclam option
    - updated changelog entry
    - updated lintian override

diff --git a/debian/changelog b/debian/changelog
index f2497c3..40fa4b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
-clamav (0.97.1+dfsg-2) unstable; urgency=low
+clamav (0.97.2+dfsg-1) unstable; urgency=low
 
   [ Michael Tautschnig ]
+  * New upstream release
+    - Fixes off-by-one-error (closes: #635599)
+    - Fixes opcode 20 is not implemented error (closes: #635340)
+    - New option ExtraDatabase for freshclam
   * Debconf translation updates
     - Portuguese (closes: #630954)
     - French (closes: #631978)
@@ -9,7 +13,7 @@ clamav (0.97.1+dfsg-2) unstable; urgency=low
     - Spanish (closes: #633883)
     - Russian (closes: #635145)
 
- -- Michael Tautschnig <mt at debian.org>  Fri, 24 Jun 2011 20:02:35 +0100
+ -- Michael Tautschnig <mt at debian.org>  Fri, 29 Jul 2011 16:13:32 +0200
 
 clamav (0.97.1+dfsg-1) unstable; urgency=low
 
diff --git a/debian/clamav-freshclam.postinst.in b/debian/clamav-freshclam.postinst.in
index 68f7cea..1f15928 100644
--- a/debian/clamav-freshclam.postinst.in
+++ b/debian/clamav-freshclam.postinst.in
@@ -263,6 +263,11 @@ EOF
       echo "DatabaseCustomURL $i" >> $DEBCONFILE
     done
   fi
+  if [ -n "$ExtraDatabase" ]; then
+    for i in $ExtraDatabase; do
+      echo "ExtraDatabase $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 9aa756e..3dfb0be 100644
--- a/debian/common_functions
+++ b/debian/common_functions
@@ -134,6 +134,15 @@ slurp_config()
           continue
         fi
         ;;
+        ExtraDatabase)
+        if [ -z "$ExtraDatabase" ]; then
+          for i in `grep ^$variable $CLAMAVCONF | awk '{print $2}'`; do
+            value="$value $i"
+          done
+        else
+          continue
+        fi
+        ;;
         VirusEvent|OnUpdateExecute|OnErrorExecute|RejectMsg)
         value=`grep ^$variable $CLAMAVCONF | head -n1 | sed -e s/$variable\ //`
         ;;
diff --git a/debian/libclamav6.lintian-overrides b/debian/libclamav6.lintian-overrides
index 0d125b8..e044d70 100644
--- a/debian/libclamav6.lintian-overrides
+++ b/debian/libclamav6.lintian-overrides
@@ -1 +1 @@
-libclamav6 binary: embedded-library usr/lib/libclamav.so.6.1.10: zlib
+libclamav6 binary: embedded-library usr/lib/libclamav.so.6.1.11: zlib

-- 
Debian repository for ClamAV