[Pkg-apache-commits] r1094 - in /trunk/ssl-cert/debian: changelog dirs postrm

[sf at alioth.debian.org]

Author: sf
Date: Wed Nov 11 21:37:45 2009
New Revision: 1094

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1094
Log:
Remove directories and hash symlink on purge
release 1.0.25

Modified:
    trunk/ssl-cert/debian/changelog
    trunk/ssl-cert/debian/dirs
    trunk/ssl-cert/debian/postrm

Modified: trunk/ssl-cert/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/ssl-cert/debian/changelog?rev=1094&op=diff
==============================================================================
--- trunk/ssl-cert/debian/changelog (original)
+++ trunk/ssl-cert/debian/changelog Wed Nov 11 21:37:45 2009
@@ -1,12 +1,13 @@
-ssl-cert (1.0.25) UNRELEASED; urgency=low
+ssl-cert (1.0.25) unstable; urgency=low
 
   * Fix purging in case the snakeoil ssl key has been removed manually.
     Closes: #555042
+  * Remove directories and hash symlink on purge.
   * Use dpkg-statoverride for changing the group of /etc/ssl/private.
   * Downgrade dependency on openssl-blacklist to a suggests. All vulnerable
     keys should be upgraded by now.
 
- -- Stefan Fritsch <sf at debian.org>  Sun, 08 Nov 2009 11:47:27 +0100
+ -- Stefan Fritsch <sf at debian.org>  Wed, 11 Nov 2009 22:01:21 +0100
 
 ssl-cert (1.0.24) unstable; urgency=low
 

Modified: trunk/ssl-cert/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/ssl-cert/debian/dirs?rev=1094&op=diff
==============================================================================
--- trunk/ssl-cert/debian/dirs (original)
+++ trunk/ssl-cert/debian/dirs Wed Nov 11 21:37:45 2009
@@ -2,3 +2,4 @@
 usr/share/lintian/overrides
 usr/share/ssl-cert
 etc/ssl/private
+etc/ssl/certs

Modified: trunk/ssl-cert/debian/postrm
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/ssl-cert/debian/postrm?rev=1094&op=diff
==============================================================================
--- trunk/ssl-cert/debian/postrm (original)
+++ trunk/ssl-cert/debian/postrm Wed Nov 11 21:37:45 2009
@@ -5,14 +5,24 @@
 	      /etc/ssl/certs/ssl-cert-snakeoil.pem.broken \
               /etc/ssl/private/ssl-cert-snakeoil.key \
 	      /etc/ssl/private/ssl-cert-snakeoil.key.broken
+
+	# remove hash symlink
+	find /etc/ssl/certs -maxdepth 1 -lname ssl-cert-snakeoil.pem -delete > /dev/null 2>&1 || true
+
 	if dpkg-statoverride --list /etc/ssl/private 2>&1 | grep -q "root ssl-cert 710"
 	then
 		dpkg-statoverride --remove /etc/ssl/private
 		# /etc/ssl/private is also in package openssl, change permissions back
+		# if not
 		if [ -e /etc/ssl/private ] ; then
 			chgrp root /etc/ssl/private
 			chmod 700 /etc/ssl/private
+				
 		fi
+	fi
+	# if openssl conffiles are not there (i.e purged), try to delete dirs
+	if [ ! -e /etc/ssl/openssl.cnf ] ; then
+		rmdir /etc/ssl/private /etc/ssl/certs /etc/ssl 2> /dev/null || true
 	fi
 fi