[Logcheck-commits] CVS logcheck/debian

CVS User maks-guest logcheck-devel@lists.alioth.debian.org
Mon, 19 Jul 2004 03:54:54 -0600


Update of /cvsroot/logcheck/logcheck/debian
In directory haydn:/tmp/cvs-serv6694/debian

Modified Files:
	changelog logcheck.postinst 
Log Message:

remove unused /var/state/logcheck on upgrades < 1.2.24.


--- /cvsroot/logcheck/logcheck/debian/changelog	2004/07/19 09:25:15	1.162
+++ /cvsroot/logcheck/logcheck/debian/changelog	2004/07/19 09:54:54	1.163
@@ -17,7 +17,8 @@
   * Added logcheck-devel mail to logtail(8) and copyright.
   * Added userv rules. (Closes: #260105)
   * Generalize user match in spamd rule. (Closes: #260103)
-  * Do not create unused /var/state/logcheck. (Closes: #260096)
+  * Do not create unused /var/state/logcheck and really get rid of it. 
+    (Closes: #260096)
   todd:
   * Added 2 kernel rules for sparc workstations.
   * Added nearly 50 squid rules.
--- /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/07/01 06:00:32	1.16
+++ /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/07/19 09:54:54	1.17
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: logcheck.postinst,v 1.16 2004/07/01 06:00:32 ttroxell Exp $
+# $Id: logcheck.postinst,v 1.17 2004/07/19 09:54:54 maks-guest Exp $
 
 set -e
 
@@ -27,12 +27,14 @@
 
 case "$1" in
     configure)
-	# Remove old directory's
+	# Remove old directory
 	if dpkg --compare-versions "$2" lt "1.1.1-13.2"; then
-	    # Remove old directory's
 	    if [ -d /var/cache/logcheck ]; then
 		rm -fr /var/cache/logcheck
 	    fi
+	fi
+	# Remove unused old directory
+	if dpkg --compare-versions "$2" lt "1.2.24"; then
 	    if [ -d /var/state/logcheck ]; then
 		rm -fr /var/state/logcheck
 	    fi
@@ -43,7 +45,6 @@
 	if dpkg --compare-versions "$2" lt 1.2.23; then
     	  # Fix Permissions
     	  chown -R logcheck:logcheck /var/lib/logcheck  || true
-          chown -R logcheck:logcheck /var/state/logcheck > /dev/null 2>&1 \
 	      || true
           chgrp -R logcheck /etc/logcheck || true
           chmod 750 /etc/logcheck/ignore.d.paranoid || true