[shibboleth-sp2] 01/05: Further refactoring of the package set

Russ Allbery rra at stanford.edu
Tue Apr 1 04:30:32 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 52d7a2ae18e4459284ff5b3e26a920ff03c3f7a9
Author: Russ Allbery <rra at debian.org>
Date:   Mon Mar 31 19:15:39 2014 -0700

    Further refactoring of the package set
    
    Merge shibboleth-sp2-schemas into shibboleth-sp2-common and turn
    the former into a transitional package.  Add a new libshibsp-plugins
    package that gets the plugins that were previously installed in the
    Apache module package.  Move the FastCGI programs to the
    shibboleth-sp2-utils package.
---
 debian/changelog                      | 15 ++++++++-----
 debian/control                        | 40 +++++++++++++++++++++++++----------
 debian/libshibsp-plugins.install      |  1 +
 debian/shibboleth-sp2-common.install  |  1 +
 debian/shibboleth-sp2-schemas.install |  1 -
 debian/shibboleth-sp2-utils.install   |  2 ++
 6 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5506871..a01d447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,16 @@ 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.  (Closes: #740603)
+  * Split libshibsp-plugins, shibboleth-sp2-common, and
+    shibboleth-sp2-utils packages off of libapache2-mod-shib2, and merge
+    shibboleth-sp2-schemas with shibboleth-sp2-common.
+    shibboleth-sp2-schemas becomes a transitional package.
+    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.  libshibsp-plugins contains the library plugins
+    (which eventually should be installed in a per-SONAME path and then be
+    merged back with the library package).  (Closes: #740603)
   * 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/control b/debian/control
index 7e5232e..7d516fc 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +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}, shibboleth-sp2-utils (>= 2.5)
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libshibsp-plugins (= ${binary:Version}), 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
@@ -37,8 +38,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, opensaml2-schemas (>= 2.5),
- shibboleth-sp2-common (>= 2.5), shibboleth-sp2-schemas (>= 2.5),
- xmltooling-schemas (>= 1.5)
+ shibboleth-sp2-common (>= 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
@@ -49,6 +49,21 @@ Description: Federated web single sign-on system (runtime)
  .
  This package contains the Shibboleth SP runtime library.
 
+Package: libshibsp-plugins
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+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
+ 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 plugins for the Shibboleth SP library.
+
 Package: libshibsp-dev
 Section: libdevel
 Architecture: any
@@ -96,27 +111,30 @@ Description: Federated web single sign-on system (common files)
  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.
+ Apache module, and daemon, primarily configuration files and schemas.
 
 Package: shibboleth-sp2-schemas
-Section: text
+Section: oldlibs
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
-Description: Federated web single sign-on system (schemas)
+Depends: ${misc:Depends}, shibboleth-sp2-common
+Description: Federated web single sign-on system (transitional package)
+ This is a transitional package to smooth upgrades from earlier Shibboleth
+ versions.  The schemas are now provided by shibboleth-sp2-common.  This
+ package can be removed once the upgrade is complete.
+ .
  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 additional schemas used by the Shibboleth SP.
 
 Package: shibboleth-sp2-utils
 Architecture: any
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
+ libshibsp-plugins (= ${binary:Version})
 Recommends: openssl
 Description: Federated web single sign-on system (daemon and utilities)
  The Shibboleth System is a standards based software package for web
@@ -130,4 +148,4 @@ Description: Federated web single sign-on system (daemon and utilities)
  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.
+ utility programs and the FastCGI authorizer and responder.
diff --git a/debian/libshibsp-plugins.install b/debian/libshibsp-plugins.install
new file mode 100644
index 0000000..00208f5
--- /dev/null
+++ b/debian/libshibsp-plugins.install
@@ -0,0 +1 @@
+usr/lib/*/shibboleth/*.so
diff --git a/debian/shibboleth-sp2-common.install b/debian/shibboleth-sp2-common.install
index ee6c1b3..0414262 100644
--- a/debian/shibboleth-sp2-common.install
+++ b/debian/shibboleth-sp2-common.install
@@ -1 +1,2 @@
 etc/shibboleth
+usr/share/xml/shibboleth
diff --git a/debian/shibboleth-sp2-schemas.install b/debian/shibboleth-sp2-schemas.install
deleted file mode 100644
index b6da724..0000000
--- a/debian/shibboleth-sp2-schemas.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/xml/shibboleth
diff --git a/debian/shibboleth-sp2-utils.install b/debian/shibboleth-sp2-utils.install
index ca882bb..af84257 100644
--- a/debian/shibboleth-sp2-utils.install
+++ b/debian/shibboleth-sp2-utils.install
@@ -1,2 +1,4 @@
 usr/bin
 usr/sbin
+usr/lib/*/shibboleth/shibauthorizer
+usr/lib/*/shibboleth/shibresponder

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