[shibboleth-sp2] 01/12: Split libapache2-mod-shib2 somewhat

Russ Allbery rra at stanford.edu
Mon Mar 17 08:20:17 UTC 2014 

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

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

commit ac406e9ff89b0474c58d6041d4c215155f5ddc1d
Author: Russ Allbery <rra at debian.org>
Date:   Sun Mar 16 15:34:24 2014 -0700

    Split libapache2-mod-shib2 somewhat
    
    * Split shibboleth-sp2-common and shibboleth-sp2-utils packages off of
      libapache2-mod-shib2.  shibboleth-sp2-common contains the
      configuration, which is also required by the shared library.
      shibboleth-sp2-utils contains the shibd daemon plus the other utility
      commands that were in libapache2-mod-shib2.
    
    This will also allow people to run shibd without the Apache module if
    desired.
---
 debian/changelog                                   |  5 +++
 debian/clean                                       |  2 +-
 debian/control                                     | 42 ++++++++++++++++++++--
 debian/libapache2-mod-shib2.dirs                   |  2 --
 debian/libapache2-mod-shib2.install                |  3 --
 debian/rules                                       | 12 +++----
 debian/shibboleth-sp2-common.install               |  1 +
 debian/shibboleth-sp2-schemas.install              |  2 +-
 ...e2-mod-shib2.dirs => shibboleth-sp2-utils.dirs} |  1 -
 debian/shibboleth-sp2-utils.install                |  2 ++
 ...hib2.postinst => shibboleth-sp2-utils.postinst} |  2 +-
 ...od-shib2.postrm => shibboleth-sp2-utils.postrm} |  0
 ....default => shibboleth-sp2-utils.shibd.default} |  0
 13 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e73025..bc0a240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ shibboleth-sp2 (2.5.3+dfsg-1) UNRELEASED; urgency=medium
     - Fix preserved POST data size limit enforcement.
     - Fix POST data replay if a submit key is present.
     - Fix support for idpHistoryProps in Sessions.
+  * Split shibboleth-sp2-common and shibboleth-sp2-utils packages off of
+    libapache2-mod-shib2.  shibboleth-sp2-common contains the
+    configuration, which is also required by the shared library.
+    shibboleth-sp2-utils contains the shibd daemon plus the other utility
+    commands that were in libapache2-mod-shib2.
   * Move /usr/include/shibsp/paths.h to the architecture-specific include
     directory, since it varies by architecture.  Thanks, Andreas
     Beckmann.  (Closes: #720036)
diff --git a/debian/clean b/debian/clean
index df3cce3..1602e21 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,2 @@
-debian/libapache2-mod-shib2.shibd.init
+debian/shibboleth-sp2-utils.shibd.init
 shibsp/paths.h
diff --git a/debian/control b/debian/control
index 78d9389..4da7aa8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shibboleth/shibboleth-sp2.g
 Package: libapache2-mod-shib2
 Section: httpd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: openssl
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
+ shibboleth-sp2-utils (>= 2.5)
 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
@@ -38,7 +38,8 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, opensaml2-schemas (>= 2.5),
- shibboleth-sp2-schemas (>= 2.5), xmltooling-schemas (>= 1.5)
+ shibboleth-sp2-common (>= 2.5), shibboleth-sp2-schemas (>= 2.5),
+ xmltooling-schemas (>= 1.5)
 Description: Federated web single sign-on system (runtime)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports
@@ -82,6 +83,21 @@ Description: Federated web single sign-on system (API docs)
  .
  This package contains the Shibboleth SP library API documentation.
 
+Package: shibboleth-sp2-common
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Description: Federated web single sign-on system (common files)
+ The Shibboleth System is a standards based software package for web
+ single sign-on across or within organizational boundaries.  It supports
+ authorization and attribute exchange using the OASIS SAML 2.0 protocol.
+ Shibboleth allows sites to make informed authorization decisions for
+ individual access of protected online resources while allowing users to
+ establish their identities with their local authentication systems.
+ .
+ This package contains common files used by the Shibboleth SP library,
+ Apache module, and daemon, primarily configuration files.
+
 Package: shibboleth-sp2-schemas
 Section: text
 Architecture: all
@@ -96,3 +112,23 @@ Description: Federated web single sign-on system (schemas)
  establish their identities with their local authentication systems.
  .
  This package contains the additional schemas used by the Shibboleth SP.
+
+Package: shibboleth-sp2-utils
+Section: web
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: openssl
+Description: Federated web single sign-on system (daemon and utilities)
+ The Shibboleth System is a standards based software package for web
+ single sign-on across or within organizational boundaries.  It supports
+ authorization and attribute exchange using the OASIS SAML 2.0 protocol.
+ Shibboleth allows sites to make informed authorization decisions for
+ individual access of protected online resources while allowing users to
+ establish their identities with their local authentication systems.
+ .
+ This package contains the daemon that handles attribute requests and
+ maintains session informtion for the SP.  It is used internally by the
+ Apache module (libapache2-mod-shib2), but may be useful independently in
+ some circumstances.  It also contains some other useful Shibboleth SP
+ utility programs.
diff --git a/debian/libapache2-mod-shib2.dirs b/debian/libapache2-mod-shib2.dirs
index 5c4bfc4..0a2c9ce 100644
--- a/debian/libapache2-mod-shib2.dirs
+++ b/debian/libapache2-mod-shib2.dirs
@@ -1,3 +1 @@
-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..b9b554f 100644
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -1,5 +1,2 @@
-usr/bin
-usr/sbin
-etc/shibboleth
 usr/lib/*/shibboleth
 usr/share/shibboleth
diff --git a/debian/rules b/debian/rules
index e9695f0..dd4e068 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,7 +65,7 @@ override_dh_auto_install:
 	mv debian/tmp/etc/shibboleth/keygen.sh debian/tmp/usr/sbin/shib-keygen
 	mv debian/tmp/etc/shibboleth/metagen.sh debian/tmp/usr/bin/shib-metagen
 	mv debian/tmp/etc/shibboleth/shibd-debian \
-	    debian/libapache2-mod-shib2.shibd.init
+	    debian/shibboleth-sp2-utils.shibd.init
 	mkdir debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp
 	mv debian/tmp/usr/include/shibsp/paths.h \
 	    debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
@@ -76,19 +76,19 @@ override_dh_install:
 	    debian/tmp/usr/lib/apache2/modules/mod_shib2.so
 	pod2man debian/man-pages/mdquery.pod --section 1		\
 	    --center 'Shibboleth' --release $(VERSION)			\
-	    debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
+	    debian/shibboleth-sp2-utils/usr/share/man/man1/mdquery.1
 	pod2man debian/man-pages/resolvertest.pod --section 1		  \
 	    --center 'Shibboleth' --release $(VERSION)			  \
-	    debian/libapache2-mod-shib2/usr/share/man/man1/resolvertest.1
+	    debian/shibboleth-sp2-utils/usr/share/man/man1/resolvertest.1
 	pod2man debian/man-pages/shib-metagen.pod --section 1		  \
 	    --center 'Shibboleth' --release $(VERSION)			  \
-	    debian/libapache2-mod-shib2/usr/share/man/man1/shib-metagen.1
+	    debian/shibboleth-sp2-utils/usr/share/man/man1/shib-metagen.1
 	pod2man debian/man-pages/shib-keygen.pod --section 8		 \
 	    --center 'Shibboleth' --release $(VERSION)			 \
-	    debian/libapache2-mod-shib2/usr/share/man/man8/shib-keygen.8
+	    debian/shibboleth-sp2-utils/usr/share/man/man8/shib-keygen.8
 	pod2man debian/man-pages/shibd.pod --section 8			\
 	    --center 'Shibboleth' --release $(VERSION)			\
-	    debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
+	    debian/shibboleth-sp2-utils/usr/share/man/man8/shibd.8
 	dh_install -s -i -X mod_shib2.so --fail-missing
 
 override_dh_installchangelogs:
diff --git a/debian/shibboleth-sp2-common.install b/debian/shibboleth-sp2-common.install
new file mode 100644
index 0000000..ee6c1b3
--- /dev/null
+++ b/debian/shibboleth-sp2-common.install
@@ -0,0 +1 @@
+etc/shibboleth
diff --git a/debian/shibboleth-sp2-schemas.install b/debian/shibboleth-sp2-schemas.install
index ef73d02..b6da724 100644
--- a/debian/shibboleth-sp2-schemas.install
+++ b/debian/shibboleth-sp2-schemas.install
@@ -1 +1 @@
-debian/tmp/usr/share/xml/shibboleth
+usr/share/xml/shibboleth
diff --git a/debian/libapache2-mod-shib2.dirs b/debian/shibboleth-sp2-utils.dirs
similarity index 66%
copy from debian/libapache2-mod-shib2.dirs
copy to debian/shibboleth-sp2-utils.dirs
index 5c4bfc4..641d8bc 100644
--- a/debian/libapache2-mod-shib2.dirs
+++ b/debian/shibboleth-sp2-utils.dirs
@@ -1,3 +1,2 @@
 usr/share/man/man1
 usr/share/man/man8
-var/log/shibboleth
diff --git a/debian/shibboleth-sp2-utils.install b/debian/shibboleth-sp2-utils.install
new file mode 100644
index 0000000..ca882bb
--- /dev/null
+++ b/debian/shibboleth-sp2-utils.install
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/shibboleth-sp2-utils.postinst
similarity index 89%
rename from debian/libapache2-mod-shib2.postinst
rename to debian/shibboleth-sp2-utils.postinst
index a947f6b..41f7294 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/shibboleth-sp2-utils.postinst
@@ -5,7 +5,7 @@ set -e
 # Add a user as which to run the shibd daemon.
 if [ "$1" = "configure" ] ; then
     if ! getent passwd _shibd > /dev/null ; then
-        echo 'Adding system-user for Shibboleth daemon' 1>&2
+        echo 'Adding system user for Shibboleth daemon' 1>&2
         adduser --system --group --quiet --home /var/log/shibboleth \
             --no-create-home --disabled-login --force-badname _shibd
     fi
diff --git a/debian/libapache2-mod-shib2.postrm b/debian/shibboleth-sp2-utils.postrm
similarity index 100%
rename from debian/libapache2-mod-shib2.postrm
rename to debian/shibboleth-sp2-utils.postrm
diff --git a/debian/libapache2-mod-shib2.shibd.default b/debian/shibboleth-sp2-utils.shibd.default
similarity index 100%
rename from debian/libapache2-mod-shib2.shibd.default
rename to debian/shibboleth-sp2-utils.shibd.default

-- 
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