Bug#611850: unblock: shibboleth-sp2/2.3.1+dfsg-5

[Russ Allbery <rra@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Sorry about the last-minuteness of this.  We just discovered that an
important bug fix was accidentally dropped from the version of the
shibboleth-sp2 package currently in squeeze.

Please unblock package shibboleth-sp2 version 2.3.1+dfsg-5 (just
uploaded), which fixes an RC bug where the init script can lose track
of an already running shibd daemon.  Changelog:

shibboleth-sp2 (2.3.1+dfsg-5) unstable; urgency=high

  * Merge the forgotten pidfile fix from branch bug/unlink-pidfile after
    merging upstream/2.3.1+dfsg into that.  Original changlog entry:

    Apply upstream fix for shibd removing the PID file when called with
    the -F option.  This prevents the check of certificate permissions in
    the init script from removing the PID file of a running shibd.

    (Closes: 611614)

debdiff:

--- shibboleth-sp2-2.3.1+dfsg.orig/shibd/shibd.cpp
+++ shibboleth-sp2-2.3.1+dfsg/shibd/shibd.cpp
@@ -387,7 +387,7 @@
             fprintf(stderr, "listener failure during service\n");
             listener->term();
             conf.term();
-            if (pidfile)
+            if (daemonize && pidfile)
                 unlink(pidfile);
             return -3;
         }
@@ -395,7 +395,7 @@
     }
 
     conf.term();
-    if (pidfile)
+    if (daemonize && pidfile)
         unlink(pidfile);
     return 0;
 }

unblock shibboleth-sp2/2.3.1+dfsg-5

-- System Information:
Debian Release: 6.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686-bigmem (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash