Merge commit 'upstream/2.3+dfsg'

Conflicts:
	shibsp/paths.h

diff --combined configs/Makefile.am
index a12df8c,5a18b62..ee604e6
--- 1/configs/Makefile.am
--- 2/configs/Makefile.am
+++ b/configs/Makefile.am
@@@ -1,11 -1,11 +1,11 @@@
- ## $Id: Makefile.am 3088 2009-08-10 16:43:09Z cantor $ 
+ ## $Id: Makefile.am 3168 2009-10-31 20:34:11Z cantor $ 
  
  AUTOMAKE_OPTIONS = foreign
  
  pkglibdir = ${libdir}/@PACKAGE@
  pkglogdir = ${localstatedir}/log/@PACKAGE@
 -pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
 -shirelogdir = ${localstatedir}/log/httpd
 +pkgdocdir = ${datadir}/doc/@PACKAGE@
 +shirelogdir = ${localstatedir}/log/apache2
  pkgxmldir = $(datadir)/xml/@PACKAGE@
  pkgrundir = $(localstatedir)/run/@PACKAGE@
  pkgsysconfdir = $(sysconfdir)/@PACKAGE@
@@@ -46,6 -46,7 +46,7 @@@ CONFIGFILES = 
      postTemplate.html \
        localLogout.html \
        globalLogout.html \
+       partialLogout.html \
        sslError.html
  
  #

diff --combined configs/Makefile.in
index 1e86cad,e621f3c..3563195
--- 1/configs/Makefile.in
--- 2/configs/Makefile.in
+++ b/configs/Makefile.in
@@@ -65,6 -65,8 +65,8 @@@ AMDEP_TRUE = @AMDEP_TRUE
  AMTAR = @AMTAR@
  APR1_CONFIG = @APR1_CONFIG@
  APR_CONFIG = @APR_CONFIG@
+ APU1_CONFIG = @APU1_CONFIG@
+ APU_CONFIG = @APU_CONFIG@
  APXS = @APXS@
  APXS2 = @APXS2@
  APXS22 = @APXS22@
@@@ -160,7 -162,6 +162,7 @@@ FASTCGI_INCLUDE = @FASTCGI_INCLUDE
  FASTCGI_LDFLAGS = @FASTCGI_LDFLAGS@
  FASTCGI_LIBS = @FASTCGI_LIBS@
  FFLAGS = @FFLAGS@
 +GREP = @GREP@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@@ -203,9 -204,21 +205,9 @@@ VERSION = @VERSION
  WANT_SUBDIRS = @WANT_SUBDIRS@
  XMLSEC_LIBS = @XMLSEC_LIBS@
  XMLTOOLINGXMLDIR = @XMLTOOLINGXMLDIR@
 -ac_ct_AR = @ac_ct_AR@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
  ac_ct_F77 = @ac_ct_F77@
 -ac_ct_RANLIB = @ac_ct_RANLIB@
 -ac_ct_STRIP = @ac_ct_STRIP@
 -ac_pt_DX_DOT = @ac_pt_DX_DOT@
 -ac_pt_DX_DOXYGEN = @ac_pt_DX_DOXYGEN@
 -ac_pt_DX_DVIPS = @ac_pt_DX_DVIPS@
 -ac_pt_DX_EGREP = @ac_pt_DX_EGREP@
 -ac_pt_DX_HHC = @ac_pt_DX_HHC@
 -ac_pt_DX_LATEX = @ac_pt_DX_LATEX@
 -ac_pt_DX_MAKEINDEX = @ac_pt_DX_MAKEINDEX@
 -ac_pt_DX_PDFLATEX = @ac_pt_DX_PDFLATEX@
 -ac_pt_DX_PERL = @ac_pt_DX_PERL@
  acx_pthread_config = @acx_pthread_config@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@@ -223,30 -236,23 +225,30 @@@ build_cpu = @build_cpu
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
 +htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
 +localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
 +psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
@@@ -254,8 -260,8 +256,8 @@@ target_alias = @target_alias
  xs = @xs@
  AUTOMAKE_OPTIONS = foreign
  pkglogdir = ${localstatedir}/log/@PACKAGE@
 -pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
 -shirelogdir = ${localstatedir}/log/httpd
 +pkgdocdir = ${datadir}/doc/@PACKAGE@
 +shirelogdir = ${localstatedir}/log/apache2
  pkgxmldir = $(datadir)/xml/@PACKAGE@
  pkgrundir = $(localstatedir)/run/@PACKAGE@
  pkgsysconfdir = $(sysconfdir)/@PACKAGE@
@@@ -298,6 -304,7 +300,7 @@@ CONFIGFILES = 
      postTemplate.html \
        localLogout.html \
        globalLogout.html \
+       partialLogout.html \
        sslError.html
  
  CLEANFILES = \

diff --combined configs/keygen.sh
index 44caa2e,5ae60db..cd53c9e
--- 1/configs/keygen.sh
--- 2/configs/keygen.sh
+++ b/configs/keygen.sh
@@@ -1,10 -1,5 +1,10 @@@
  #! /bin/sh
  
 +# Added for Debian.  The upstream version is installed in /etc/shibboleth and
 +# for Debian we wanted to move it to /usr/bin, so change directories so that
 +# it puts files in the correct location.
 +cd /etc/shibboleth
 +
  while getopts h:e:y:bf c
       do
           case $c in
@@@ -31,9 -26,8 +31,9 @@@ if  [ -s sp-key.pem -o -s sp-cert.pem 
      exit 0
  fi
  
 +# --fqdn flag added for Debian to generate better names for certificates.
  if [ -z "$FQDN" ] ; then
 -    FQDN=`hostname`
 +    FQDN=`hostname --fqdn`
  fi
  
  if [ -z "$YEARS" ] ; then
@@@ -72,5 -66,8 +72,8 @@@ els
      openssl req -config sp-cert.cnf -new -x509 -days $DAYS -keyout sp-key.pem -out sp-cert.pem 2> /dev/null
  fi
  
- chmod 600 sp-key.pem
  rm sp-cert.cnf
+ 
+ if  [ -s sp-key.pem ] ; then
+     chmod 600 sp-key.pem
+ fi

diff --combined configs/shibd-debian.in
index d9e6e56,59f0995..d8d05f5
--- 1/configs/shibd-debian.in
--- 2/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -7,8 -7,8 +7,8 @@@
  # Default-Stop: 0 1 6
  # Short-Description: Shibboleth 2 Service Provider Daemon
  # Description: Starts the separate daemon used by the Shibboleth
 -# Apache module to manage sessions and to retrieve
 -# attributes from Shibboleth Identity Providers.
 +#              Apache module to manage sessions and to retrieve
 +#              attributes from Shibboleth Identity Providers.
  ### END INIT INFO
  #
  # Written by Quanah Gibson-Mount <quanah@stanford.edu>
@@@ -39,6 -39,9 +39,9 @@@ DAEMON_OPTS="$DAEMON_OPTS -c $SHIBSP_CO
  # Specify pid file to use
  DAEMON_OPTS="$DAEMON_OPTS -p $PIDFILE"
  
+ # Specify wait time to use
+ DAEMON_OPTS="$DAEMON_OPTS -w 30"
+ 
  # Exit if the package is not installed.
  [ -x "$DAEMON" ] || exit 0
  
@@@ -50,9 -53,6 +53,9 @@@
  
  case "$1" in
  start)
 +    # Ensure @-PKGRUNDIR-@ exists.  /var/run may be on a tmpfs file system.
 +    [ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
 +
      # Don't start shibd if NO_START is set.
      if [ "$NO_START" = 1 ] ; then
          echo "Not starting $DESC (see /etc/default/$NAME)"
@@@ -66,18 -66,16 +69,18 @@@
  stop)
      echo -n "Stopping $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 +        --retry TERM/30/KILL/5 --exec $DAEMON
      echo "$NAME."
      ;;
  restart|force-reload)
 +    # Ensure @-PKGRUNDIR-@ exists.  /var/run may be on a tmpfs file system.
 +    [ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
 +
      echo -n "Restarting $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 -    sleep 1
 -    start-stop-daemon --start --quiet \
 -        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 +        --retry TERM/30/KILL/5 --exec $DAEMON
 +    start-stop-daemon --start --quiet --pidfile $PIDFILE \
 +        --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  *)

diff --combined schemas/Makefile.am
index dcb9b82,561e87f..2651b14
--- 1/schemas/Makefile.am
--- 2/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@@ -1,4 -1,4 +1,4 @@@
- ## $Id: Makefile.am 2566 2007-10-24 02:19:26Z cantor $ 
+ ## $Id: Makefile.am 3168 2009-10-31 20:34:11Z cantor $ 
  
  AUTOMAKE_OPTIONS = foreign
  
@@@ -12,7 -12,8 +12,7 @@@ schemafiles = 
      shibboleth-2.0-afp-mf-basic.xsd \
      shibboleth-2.0-afp-mf-saml.xsd \
      shibboleth-2.0-attribute-map.xsd \
 -    shibboleth-2.0-sp-notify.xsd \
 -    WS-Trust.xsd
 +    shibboleth-2.0-sp-notify.xsd
  
  pkgxml_DATA = \
        catalog.xml \

diff --combined shibsp/paths.h
index 6ad2036,2f9ac99..c319ac6
--- 1/shibsp/paths.h
--- 2/shibsp/paths.h
+++ b/shibsp/paths.h
@@@ -1,53 -1,53 +1,53 @@@
- /*\r
-  *  Copyright 2001-2009 Internet2\r
-  * \r
-  * Licensed under the Apache License, Version 2.0 (the "License");\r
-  * you may not use this file except in compliance with the License.\r
-  * You may obtain a copy of the License at\r
-  *\r
-  *     http://www.apache.org/licenses/LICENSE-2.0\r
-  *\r
-  * Unless required by applicable law or agreed to in writing, software\r
-  * distributed under the License is distributed on an "AS IS" BASIS,\r
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  * See the License for the specific language governing permissions and\r
-  * limitations under the License.\r
-  */\r
- \r
- /**\r
-  * @file shibsp/paths.h\r
-  * \r
-  * Default configuration paths.\r
-  */\r
- \r
- #ifndef __shibsp_paths_h__\r
- #define __shibsp_paths_h__\r
- \r
- /** Default schema catalogs. */\r
- #define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"\r
- \r
- /** Default name of SP configuration file. */\r
- #define SHIBSP_CONFIG "shibboleth2.xml"\r
- \r
- /** Default name of SP console tool logging file. */\r
- #define SHIBSP_LOGGING "console.logger"\r
- \r
- /** Default prefix for installation (used to resolve relative paths). */\r
- #define SHIBSP_PREFIX  "/usr"\r
- \r
- /** Library directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_LIBDIR  "/usr/lib"\r
- \r
- /** Log directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_LOGDIR  "/var/log/shibboleth"\r
- \r
- /** Configuration directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_CFGDIR  "/etc/shibboleth"\r
- \r
- /** Runtime state directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_RUNDIR  "/var/run/shibboleth"\r
- \r
- /** XML directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_XMLDIR  "/usr/share/xml/shibboleth"\r
- \r
- #endif /* __shibsp_paths_h__ */\r
+ /*
+  *  Copyright 2001-2009 Internet2
+  * 
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ /**
+  * @file shibsp/paths.h
+  * 
+  * Default configuration paths.
+  */
+ 
+ #ifndef __shibsp_paths_h__
+ #define __shibsp_paths_h__
+ 
+ /** Default schema catalogs. */
 -#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml20-catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
++#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
+ 
+ /** Default name of SP configuration file. */
+ #define SHIBSP_CONFIG "shibboleth2.xml"
+ 
+ /** Default name of SP console tool logging file. */
+ #define SHIBSP_LOGGING "console.logger"
+ 
+ /** Default prefix for installation (used to resolve relative paths). */
 -#define SHIBSP_PREFIX  "/opt/shibboleth-sp"
++#define SHIBSP_PREFIX  "/usr"
+ 
+ /** Library directory for installation (used to resolve relative paths). */
 -#define SHIBSP_LIBDIR  "/opt/shibboleth-sp/lib"
++#define SHIBSP_LIBDIR  "/usr/lib"
+ 
+ /** Log directory for installation (used to resolve relative paths). */
 -#define SHIBSP_LOGDIR  "/opt/shibboleth-sp/var/log"
++#define SHIBSP_LOGDIR  "/var/log/shibboleth"
+ 
+ /** Configuration directory for installation (used to resolve relative paths). */
 -#define SHIBSP_CFGDIR  "/opt/shibboleth-sp/etc"
++#define SHIBSP_CFGDIR  "/etc/shibboleth"
+ 
+ /** Runtime state directory for installation (used to resolve relative paths). */
 -#define SHIBSP_RUNDIR  "/opt/shibboleth-sp/var/run"
++#define SHIBSP_RUNDIR  "/var/run/shibboleth"
+ 
+ /** XML directory for installation (used to resolve relative paths). */
 -#define SHIBSP_XMLDIR  "/opt/shibboleth-sp/share/xml"
++#define SHIBSP_XMLDIR  "/usr/share/xml/shibboleth"
+ 
+ #endif /* __shibsp_paths_h__ */