Control: tags -1 + patch Attached is a series of patches against the packaging VCS that addresses the two issues reported against the sitesummary maintainer patches. -nik
From 97c4859157c458ee5aed5755d27a7b1a96ee6624 Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Wed, 13 May 2015 16:28:54 +0200
Subject: [PATCH 1/3] Call db_stop before apache restart
---
debian/sitesummary.postinst | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/debian/sitesummary.postinst b/debian/sitesummary.postinst
index 031b9f4..910d81a 100644
--- a/debian/sitesummary.postinst
+++ b/debian/sitesummary.postinst
@@ -41,21 +41,6 @@ EOF
case "$1" in
configure)
- # Enable it on fresh installations as before Apache 2.4. Check for
- # cgi.load existence to avoid trying to configure when installed after
- # apache2 is unpacked but not yet configured (bug #760084).
- if [ -z "$2" ] && \
- [ -e /etc/apache2/mods-available/cgi.load ] && \
- [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
- . /usr/share/apache2/apache2-maintscript-helper
- apache2_invoke enmod cgi.load
- apache2_invoke enconf sitesummary.conf
- fi
-
- # Make sure the cgi script can write to the storage area
- chown www-data /var/lib/sitesummary/tmpstorage \
- /var/lib/sitesummary/entries
-
# If the config file is missing, check debconf to see if the
# munin configuration feature should be enabled. This hidden
# debconf question allow preseeding during installation.
@@ -82,6 +67,24 @@ case "$1" in
update-rc.d -f sitesummary-client remove >/dev/null 2>&1 || :
fi
+ # Close debconf file handles before restarting Apache
+ db_stop
+
+ # Enable it on fresh installations as before Apache 2.4. Check for
+ # cgi.load existence to avoid trying to configure when installed after
+ # apache2 is unpacked but not yet configured (bug #760084).
+ if [ -z "$2" ] && \
+ [ -e /etc/apache2/mods-available/cgi.load ] && \
+ [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enmod cgi.load
+ apache2_invoke enconf sitesummary.conf
+ fi
+
+ # Make sure the cgi script can write to the storage area
+ chown www-data /var/lib/sitesummary/tmpstorage \
+ /var/lib/sitesummary/entries
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
--
2.1.4
From 5cd89c117a62ce232aa1ed254fedccb5b17aabb3 Mon Sep 17 00:00:00 2001 From: Dominik George <nik@naturalnet.de> Date: Wed, 13 May 2015 16:36:03 +0200 Subject: [PATCH 2/3] Add prerm script to disable apache config before removal. --- debian/sitesummary.prerm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 debian/sitesummary.prerm diff --git a/debian/sitesummary.prerm b/debian/sitesummary.prerm new file mode 100644 index 0000000..62eb441 --- /dev/null +++ b/debian/sitesummary.prerm @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +case "$1" in + remove) + # Enable it on fresh installations as before Apache 2.4. Check for + # cgi.load existence to avoid trying to configure when installed after + # apache2 is unpacked but not yet configured (bug #760084). + if [ -z "$2" ] && \ + [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke disconf sitesummary.conf + fi + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 -- 2.1.4
From dbbb6c235621677e0dc28a55fba757f12c7ed9be Mon Sep 17 00:00:00 2001 From: Dominik George <nik@naturalnet.de> Date: Wed, 13 May 2015 16:38:02 +0200 Subject: [PATCH 3/3] Changelog for two bugfixes --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 231a412..a1a720d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sitesummary (0.1.17+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix hanging postinst script (Closes: #785214). + * Fix dangling symlink in apache config after removal (Closes: #785215). + + -- Dominik George <nik@naturalnet.de> Wed, 13 May 2015 16:36:20 +0200 + sitesummary (0.1.17) unstable; urgency=high * Fix installation problem when sitesummary is preseeded to update -- 2.1.4
Attachment:
signature.asc
Description: OpenPGP digital signature