[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, debian, updated. upstream/2.3.1+dfsg-166-g3e8d830

[Russ Allbery]

The following commit has been merged in the debian branch:
commit 4496ca3fc42aa7e5fb47c7f4181698dbf0e2c7e3
Author: Ferenc Wagner <wferi at niif.hu>
Date:   Mon Nov 22 19:49:38 2010 +0100

    Restart Apache from the module postinst
    
    This avoids cryptic communication errors with the upgraded shibd.
    (Closes: #602328)

diff --git a/debian/changelog b/debian/changelog
index 0e495ea..2378039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-shibboleth-sp2 (2.3.1+dfsg-3) UNRELEASED; urgency=low
+shibboleth-sp2 (2.3.1+dfsg-4) unstable; urgency=low
+
+  * Restart Apache from the postinst script if the shib2 module is enabled
+    to avoid communication errors with the upgraded shibd.  (Closes: #602328)
+
+ -- Ferenc Wagner <wferi at niif.hu>  Mon, 22 Nov 2010 19:30:50 +0100
+
+shibboleth-sp2 (2.3.1+dfsg-3) unstable; urgency=low
 
   [ Ferenc Wagner ]
   * Fix watch file.  The 2.4 prerelease broke it.
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
index 9cd4ce7..7b9e45f 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/libapache2-mod-shib2.postinst
@@ -30,6 +30,12 @@ if [ "$1" = "configure" ] ; then
         adduser --system --group --quiet --home /var/log/shibboleth \
             --no-create-home --disabled-login --force-badname _shibd
     fi
+
+    # The new shibd (which is about to be started) requires the corresponding
+    # Apache module, otherwise strange, hard to debug error messages result.
+    if [ -L /etc/apache2/mods-enabled/shib2.load ] ; then
+        invoke-rc.d apache2 restart
+    fi
 fi
 
 #DEBHELPER#

-- 
Debian packaging for the 2.0 Apache Shibboleth SP