Please unblock shibboleth-sp2/2.0.dfsg1-4 and shibboleth/1.3.1.dfsg1-3

[Russ Allbery]

Hello folks,

These two are related.

The main problem is that libapache2-mod-shib and libapache2-mod-shib2 used
the same name for their Apache configuration fragments.  The packages do
conflict with each other (eventually, libapache2-mod-shib will go away),
but libapache2-mod-shib2 doesn't have a *.conf fragment, only a *.load
fragment.  That meant that if libapache2-mod-shib was not purged,
libapache2-mod-shib2 would link back in its *.conf fragment (the one for
the wrong version of Shibboleth), which would then break things.  This was
fixed by making the packages use different names for their config files,
with the necessary transition information in libapache2-mod-shib2 (the
easiest to change, since it wasn't in etch).

While fixing this problem, we also discovered that the prerm script for
libapache2-mod-shib was broken and didn't remove the right module name.
libapache2-mod-shib2 now works around this as well.

The init script in both packages wasn't waiting for shibd to stop, which
caused restart to complete with no shibd running, since shibd could take
more than a second to stop and then a new one wouldn't be started.  This
has been fixed by adding the --retry option and removing the useless
sleep.

libapache2-mod-shib2 tried to log things to /var/lib/shibboleth but didn't
create the directory.

Finally, a syntax error has been fixed in the POD source of the shibd man
page in both packages.

Here are the changelogs.  The new versions were just uploaded.

shibboleth-sp2 (2.0.dfsg1-4) unstable; urgency=low

  [ Ferenc Wagner ]
  * Rename debian/shib.load to debian/shib2.load to avoid clashing with the
    libapache2-mod-shib package.  Otherwise its Apache config file breaks our
    module.
  * Add directory /var/log/shibboleth to libapache2-mod-shib2 (thanks to Peter
    Schober for noticing)

  [ Russ Allbery ]
  * Add a postinst to disable the old configuration on upgrade and enable
    the module if it had been enabled under the old configuration name.
  * Wait for shibd to exit on stop or restart.  This fixes a bug in
    restart that could lead to no new shibd being started because the old
    one had not yet exited.
  * Fix a syntax error in the shibd man page.

 -- Russ Allbery <rra at debian.org>  Tue, 14 Oct 2008 21:47:36 -0700

shibboleth-sp (1.3.1.dfsg1-3) unstable; urgency=low

  * Unlink the correct Apache configuration on package removal.
  * Wait for shibd to exit on stop or restart.  This fixes a bug in
    restart that could lead to no new shibd being started because the old
    one had not yet exited.
  * Fix a syntax error in the shibd man page.

 -- Russ Allbery <rra at debian.org>  Tue, 14 Oct 2008 22:41:20 -0700

-- 
Russ Allbery (rra at debian.org)               <http://www.eyrie.org/~eagle/>