[shibboleth-sp2] 01/03: Revert packaging changes for Apache 2.4

Russ Allbery rra at stanford.edu
Mon Apr 7 01:51:52 UTC 2014 

This is an automated email from the git hooks/post-receive script.

rra pushed a commit to branch wheezy-backports
in repository shibboleth-sp2.

commit 666b3901f0df44915ae74f18560f49080f806510
Author: Russ Allbery <rra at debian.org>
Date:   Sun Apr 6 18:06:23 2014 -0700

    Revert packaging changes for Apache 2.4
    
    For the backport to wheezy, go back to building against Apache 2.2
    and remove the changes to the build system and package maintainer
    scripts that assume use of dh_apache2.
---
 debian/control                            |  4 +--
 debian/libapache2-mod-shib2.README.Debian | 10 +++-----
 debian/libapache2-mod-shib2.apache2       |  2 --
 debian/libapache2-mod-shib2.dirs          |  1 +
 debian/libapache2-mod-shib2.install       |  2 ++
 debian/libapache2-mod-shib2.postinst      |  8 ++++++
 debian/libapache2-mod-shib2.prerm         | 11 +++++++++
 debian/rules                              | 41 +++++++++++++++----------------
 debian/shib2.load                         |  2 +-
 9 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 114042d..662fc07 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
  Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 9), apache2-dev (>> 2.4.4), dh-apache2,
+Build-Depends: debhelper (>= 9), apache2-threaded-dev,
  dh-autoreconf, doxygen, graphviz, libboost-dev, libfcgi-dev, libkrb5-dev,
  liblog4shib-dev, libmemcached-dev (>= 1.0), libsaml2-dev (>= 2.5),
  libssl-dev, libxerces-c-dev, libxml-security-c-dev (>= 1.7),
@@ -19,7 +19,7 @@ Package: libapache2-mod-shib2
 Section: httpd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: openssl
+Recommends: apache2, openssl
 Description: Federated web single sign-on system (Apache module)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
diff --git a/debian/libapache2-mod-shib2.README.Debian b/debian/libapache2-mod-shib2.README.Debian
index 982a736..292814b 100644
--- a/debian/libapache2-mod-shib2.README.Debian
+++ b/debian/libapache2-mod-shib2.README.Debian
@@ -13,9 +13,7 @@ Introduction
 Installation and Configuration
 
   The following instructions assume use of the Apache 2.4 access
-  restriction syntax.  If you are still using the earlier Allow/Deny
-  directives, you may need to use "Allow from all" instead of or in
-  addition to "Require all granted".
+  restriction syntax.
 
   After installing this package, the module is enabled but not properly
   configured.  At least some manual configuration will be required before
@@ -34,7 +32,7 @@ Installation and Configuration
 
     <Location "/Shibboleth.sso">
         AuthType None
-        Require all granted
+        Allow from all
     </Location>
 
   The default error messages from Shibboleth are located in
@@ -48,7 +46,7 @@ Installation and Configuration
 
     <Location /shibboleth-sp>
         AuthType None
-        Require all granted
+        Allow from all
     </Location>
     Alias /shibboleth-sp/main.css /usr/share/shibboleth/main.css
 
@@ -154,4 +152,4 @@ Further Information
 
     https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration
 
- -- Russ Allbery <rra at debian.org>, Tue, 18 Jun 2013 14:50:43 -0700
+ -- Russ Allbery <rra at debian.org>, Sun,  6 Apr 2014 18:13:30 -0700
diff --git a/debian/libapache2-mod-shib2.apache2 b/debian/libapache2-mod-shib2.apache2
deleted file mode 100644
index 02954a9..0000000
--- a/debian/libapache2-mod-shib2.apache2
+++ /dev/null
@@ -1,2 +0,0 @@
-mod debian/shib2.load
-mod debian/tmp/usr/lib/apache2/modules/mod_shib2.so
diff --git a/debian/libapache2-mod-shib2.dirs b/debian/libapache2-mod-shib2.dirs
index 5c4bfc4..d4aa339 100644
--- a/debian/libapache2-mod-shib2.dirs
+++ b/debian/libapache2-mod-shib2.dirs
@@ -1,3 +1,4 @@
+usr/lib/apache2/modules
 usr/share/man/man1
 usr/share/man/man8
 var/log/shibboleth
diff --git a/debian/libapache2-mod-shib2.install b/debian/libapache2-mod-shib2.install
index ae5392d..a5153f8 100644
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -3,3 +3,5 @@ usr/sbin
 etc/shibboleth
 usr/lib/*/shibboleth
 usr/share/shibboleth
+
+debian/shib2.load	etc/apache2/mods-available
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
index a947f6b..fa74521 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/libapache2-mod-shib2.postinst
@@ -9,6 +9,14 @@ 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 [ -f /etc/apache2/mods-enabled/shib2.load ] ; then
+        if invoke-rc.d apache2 status >/dev/null 2>&1 ; then
+            invoke-rc.d apache2 restart
+        fi
+    fi
 fi
 
 # Create the cache directory owned by the shibd user.
diff --git a/debian/libapache2-mod-shib2.prerm b/debian/libapache2-mod-shib2.prerm
new file mode 100755
index 0000000..5b086be
--- /dev/null
+++ b/debian/libapache2-mod-shib2.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+    a2dismod shib2 || true
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index b707728..f8e1a66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ get-orig-source:
 	xz shibboleth-sp2_$(DEBVERS).orig.tar
 
 %:
-	dh $@ --with apache2,autoreconf
+	dh $@ --with autoreconf
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
@@ -44,8 +44,8 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure --						\
 	    --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/shibboleth	\
-	    --localstatedir=/var --enable-apache-24			\
-	    --with-apxs24=/usr/bin/apxs2 --disable-dependency-tracking	\
+	    --localstatedir=/var --enable-apache-22			\
+	    --with-apxs2=/usr/bin/apxs2 --disable-dependency-tracking	\
 	    --with-memcached --with-fastcgi --with-gssapi $(SYSTEM)
 
 override_dh_auto_install:
@@ -64,35 +64,34 @@ override_dh_auto_install:
 	    debian/libapache2-mod-shib2.shibd.init
 
 override_dh_install:
-	mkdir -p debian/tmp/usr/lib/apache2/modules
-	mv debian/tmp/usr/lib/*/shibboleth/mod_shib_24.so \
-	    debian/tmp/usr/lib/apache2/modules/mod_shib2.so
-	pod2man debian/man-pages/mdquery.pod --section 1		\
-	    --center 'Shibboleth' --release $(VERSION)			\
+	mv debian/tmp/usr/lib/*/shibboleth/mod_shib_22.so \
+	    debian/libapache2-mod-shib2/usr/lib/apache2/modules
+	pod2man debian/man-pages/mdquery.pod --section 1 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
-	pod2man debian/man-pages/resolvertest.pod --section 1		  \
-	    --center 'Shibboleth' --release $(VERSION)			  \
+	pod2man debian/man-pages/resolvertest.pod --section 1 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    debian/libapache2-mod-shib2/usr/share/man/man1/resolvertest.1
-	pod2man debian/man-pages/shib-metagen.pod --section 1		  \
-	    --center 'Shibboleth' --release $(VERSION)			  \
+	pod2man debian/man-pages/shib-metagen.pod --section 1 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    debian/libapache2-mod-shib2/usr/share/man/man1/shib-metagen.1
-	pod2man debian/man-pages/shib-keygen.pod --section 8		 \
-	    --center 'Shibboleth' --release $(VERSION)			 \
+	pod2man debian/man-pages/shib-keygen.pod --section 8 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    debian/libapache2-mod-shib2/usr/share/man/man8/shib-keygen.8
-	pod2man debian/man-pages/shibd.pod --section 8			\
-	    --center 'Shibboleth' --release $(VERSION)			\
+	pod2man debian/man-pages/shibd.pod --section 8 \
+	    --center 'Shibboleth' --release $(VERSION) \
 	    debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
-	dh_install -s -i -X mod_shib2.so --fail-missing
+	dh_install -s -i --fail-missing
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/RELEASE.txt
 
 override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt
-	set -e; if [ -d "$(DOCS)" ] ; then			\
-	    rm $(DOCS)/html/jquery.js ;				\
-	    ln -s /usr/share/javascript/jquery/jquery.min.js	\
-		$(DOCS)/html/jquery.js ;			\
+	set -e; if [ -d "$(DOCS)" ] ; then \
+	    rm $(DOCS)/html/jquery.js ; \
+	    ln -s /usr/share/javascript/jquery/jquery.min.js \
+		$(DOCS)/html/jquery.js ; \
 	fi
 
 override_dh_installinit:
diff --git a/debian/shib2.load b/debian/shib2.load
index 9138b72..ae274ea 100644
--- a/debian/shib2.load
+++ b/debian/shib2.load
@@ -1 +1 @@
-LoadModule mod_shib /usr/lib/apache2/modules/mod_shib2.so
+LoadModule mod_shib /usr/lib/apache2/modules/mod_shib_22.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git

More information about the Pkg-shibboleth-devel mailing list