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

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 4132426753b674dd9c622f1c0501703ed987a239
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Oct 21 01:13:08 2009 +0200

    Remove all files in purge (as detected by piuparts)
    
    - We will have a bug filed for this, must add proper closes: later on

diff --git a/debian/changelog b/debian/changelog
index 6705990..d16a1f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,11 @@ clamav (0.95.2+dfsg-5) UNRELEASED; urgency=low
   [ Stephen Gran ]
   * Remove clamav-milter logrotate file on purge (closes: #536669)
   * Always use clamav-milter.ctl as local socket (closes: #543309)
+  
+  [ Michael Tautschnig ]
+  * Remove all remaining files during purge
 
- -- Michael Meskes <meskes at debian.org>  Fri, 25 Sep 2009 12:32:54 +0200
+ -- Michael Meskes <meskes at debian.org>  Wed, 21 Oct 2009 01:12:55 +0200
 
 clamav (0.95.2+dfsg-4) unstable; urgency=low
 
diff --git a/debian/clamav-base.postrm b/debian/clamav-base.postrm
index 30a6e19..612dec8 100644
--- a/debian/clamav-base.postrm
+++ b/debian/clamav-base.postrm
@@ -22,19 +22,20 @@ set -e
 
 case "$1" in
   purge)
-  if [ -x "/usr/bin/ucf" ]; then
-    UCFLIST="/etc/cron.d/clamav-daemon \
-      /etc/clamav.conf \
-      /etc/clamav/clamav.conf \
-      /etc/clamav/clamd.conf \
-      /var/lib/clamav/clamav.conf.*.md5"
-    for i in $UCFLIST; do
+  DATABASEDIR=/var/lib/clamav
+  UCFLIST="/etc/cron.d/clamav-daemon \
+    /etc/clamav.conf \
+    /etc/clamav/clamav.conf \
+    /etc/clamav/clamd.conf \
+    /var/lib/clamav/clamav.conf.*.md5"
+  for i in $UCFLIST; do
+    if [ -x "/usr/bin/ucf" ]; then
       ucf -p $i || true
-      if [ -e $i ]; then
-        rm -f $i || true
-      fi
-    done
-  fi
+    fi
+    if [ -e $i ]; then
+      rm -f $i || true
+    fi
+  done
   rm -f /var/log/clamav/clamav.log* /etc/clamav/clamav.conf.dpkg-old /etc/clamav/clamd.conf.dpkg-old /etc/clamav/clamd.conf.ucf-old
   if [ -x "/usr/sbin/userdel" ]; then
     userdel clamav || true
@@ -43,6 +44,7 @@ case "$1" in
     groupdel clamav || true
   fi
   rm -f /var/lib/clamav/*.md5sum || true
+  rm -f $DATABASEDIR/{main,daily}.cvd
   for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/; do
     if [ -d "$dir" ]; then
       rmdir "$dir" --ignore-fail-on-non-empty || true

-- 
Debian repository for ClamAV