[pkg-lighttpd] r555 - lighttpd/trunk/debian

[Arno Töll]

Author: atoell-guest
Date: 2011-09-23 12:50:24 +0000 (Fri, 23 Sep 2011)
New Revision: 555

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.postrm
   lighttpd/trunk/debian/rules
Log:
Fix #642494, make lighttpd ready for dpkg 1.16.1

Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2011-07-11 15:20:26 UTC (rev 554)
+++ lighttpd/trunk/debian/changelog	2011-09-23 12:50:24 UTC (rev 555)
@@ -1,3 +1,15 @@
+lighttpd (1.4.29-2) UNRELEASED; urgency=low
+
+  * Adapt to dpkg 1.16.1 API changes regarding build flags. This enables
+    hardening build flags. This means, lighttpd is now being built with
+    -fstack-protector and other security related build flags.
+  * Fix "Doesn't remove /etc/lighttpd on purge" by removing dangling symlinks
+    /only/. This does not entirely fix the problem of the maintainer, but we can
+    not simply remove all files in /etc/lighttpd as other packages or the user
+    himself might have left configuration files back (Closes: #642494)
+
+ -- Arno Töll <debian at toell.net>  Fri, 23 Sep 2011 14:23:57 +0200
+
 lighttpd (1.4.29-1) unstable; urgency=low
 
   * New upstream release

Modified: lighttpd/trunk/debian/lighttpd.postrm
===================================================================
--- lighttpd/trunk/debian/lighttpd.postrm	2011-07-11 15:20:26 UTC (rev 554)
+++ lighttpd/trunk/debian/lighttpd.postrm	2011-09-23 12:50:24 UTC (rev 555)
@@ -5,6 +5,15 @@
 
 if [ "$1" = "purge" ]; then
     rm -rf /var/log/lighttpd /var/run/lighttpd /var/cache/lighttpd
+
+    # The loop below fixes #642494 (mostly)
+    for link in /etc/lighttpd/conf-enabled/*.conf ; do
+        target=$(readlink "$link")
+        if [ ! -e "/etc/lighttpd/conf-enabled/$target" ] ; then
+            echo "removing dangling symlink $link ..."
+            rm -f $link
+        fi
+    done
 fi
 
 #DEBHELPER#

Modified: lighttpd/trunk/debian/rules
===================================================================
--- lighttpd/trunk/debian/rules	2011-07-11 15:20:26 UTC (rev 554)
+++ lighttpd/trunk/debian/rules	2011-09-23 12:50:24 UTC (rev 555)
@@ -19,7 +19,8 @@
                 --with-openssl \
                 --with-pcre \
                 --with-webdav-locks \
-                --with-webdav-props
+                --with-webdav-props \
+		$(shell dpkg-buildflags --export=configure)
 
 override_dh_fixperms:
 	dh_fixperms