Bug#682039: unblock: clamav/0.97.5+dfsg-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package clamav
Fixes RC bug #681960.
unblock clamav/0.97.5+dfsg-4
diff -u clamav-0.97.5+dfsg/debian/changelog clamav-0.97.5+dfsg/debian/changelog
--- clamav-0.97.5+dfsg/debian/changelog
+++ clamav-0.97.5+dfsg/debian/changelog
@@ -1,3 +1,15 @@
+clamav (0.97.5+dfsg-4) unstable; urgency=low
+
+ * Drop postrm snippets from clamav-base, clamav-freshclam, clamav-daemon,
+ and clamav-milter that remove /var/log/clamav, /var/lib/clamav,
+ /var/run/clamav, and /etc/clamav and and let dpkg remove the directories
+ once they are empty in order to fix problems with directory removal by a
+ package that did not own the directory (Closes: #681960)
+ * Add /var/run/clamav to directories shipped by clamav-base so dpkg cleanup
+ will work for it too.
+
+ -- Scott Kitterman <scott@kitterman.com> Wed, 18 Jul 2012 09:29:50 -0400
+
clamav (0.97.5+dfsg-3) unstable; urgency=low
* Fix proxy port configuration handling in clamav-freshclam.postinst so that
diff -u clamav-0.97.5+dfsg/debian/clamav-base.postrm clamav-0.97.5+dfsg/debian/clamav-base.postrm
--- clamav-0.97.5+dfsg/debian/clamav-base.postrm
+++ clamav-0.97.5+dfsg/debian/clamav-base.postrm
@@ -45,11 +45,6 @@
fi
rm -f /var/lib/clamav/*.md5sum || true
rm -f $DATABASEDIR/main.cvd $DATABASEDIR/daily.cvd $DATABASEDIR/bytecode.cvd
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
- if [ -d "$dir" ]; then
- rmdir "$dir" --ignore-fail-on-non-empty || true
- fi
- done
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
diff -u clamav-0.97.5+dfsg/debian/clamav-freshclam.postrm clamav-0.97.5+dfsg/debian/clamav-freshclam.postrm
--- clamav-0.97.5+dfsg/debian/clamav-freshclam.postrm
+++ clamav-0.97.5+dfsg/debian/clamav-freshclam.postrm
@@ -52,11 +52,6 @@
[ ! -d "${workdir}/main.inc/" ] || rmdir --ignore-fail-on-non-empty ${workdir}/main.inc/
[ ! -d "${workdir}/daily.inc/" ] || rmdir --ignore-fail-on-non-empty ${workdir}/daily.inc/
update-rc.d clamav-freshclam remove >/dev/null
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
- if [ -d "$dir" ]; then
- rmdir "$dir" --ignore-fail-on-non-empty || true
- fi
- done
;;
remove)
rm -f /var/lib/clamav/main.cvd /var/lib/clamav/main.cld
diff -u clamav-0.97.5+dfsg/debian/clamav-milter.postrm clamav-0.97.5+dfsg/debian/clamav-milter.postrm
--- clamav-0.97.5+dfsg/debian/clamav-milter.postrm
+++ clamav-0.97.5+dfsg/debian/clamav-milter.postrm
@@ -35,11 +35,6 @@
fi
done
rm -f /var/log/clamav/clamav-milter.log* /etc/clamav/clamav-milter.conf.dpkg-old /etc/clamav/clamav-milter.conf.ucf-old
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
- if [ -d "$dir" ]; then
- rmdir "$dir" --ignore-fail-on-non-empty || true
- fi
- done
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
diff -u clamav-0.97.5+dfsg/debian/clamav-base.dirs clamav-0.97.5+dfsg/debian/clamav-base.dirs
--- clamav-0.97.5+dfsg/debian/clamav-base.dirs
+++ clamav-0.97.5+dfsg/debian/clamav-base.dirs
@@ -8,0 +9,2 @@
+var/run/
+var/run/clamav/
diff -u clamav-0.97.5+dfsg/debian/clamav-daemon.postrm clamav-0.97.5+dfsg/debian/clamav-daemon.postrm
--- clamav-0.97.5+dfsg/debian/clamav-daemon.postrm
+++ clamav-0.97.5+dfsg/debian/clamav-daemon.postrm
@@ -29,11 +29,6 @@
if [ -e "$LOGROTATE_FILE" ]; then
rm -f $LOGROTATE_FILE
fi
- for dir in /etc/clamav/ /var/log/clamav /var/lib/clamav/ /var/run/clamav/; do
- if [ -d "$dir" ]; then
- rmdir "$dir" --ignore-fail-on-non-empty || true
- fi
- done
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
Reply to: