Version 2.5.5

Bug:
    * [SSPCPP-656] - NameID insert logic appears wrong for ODBC Session store
    * [SSPCPP-657] - Update Windows libraries
    * [SSPCPP-663] - BOOST autoconf macros break with gcc5
    * [SSPCPP-665] - Use of systemd breaks on reboot due to disappearance of /run/shibboleth

Improvement:
    * [SSPCPP-654] - Move fork wait timeout from init script to sysconfig

Task:
    * [SSPCPP-661] - Preparation of 2.5.5 release
    * [SSPCPP-662] - Set AllowSameVersionUpgrades to 'yes'

Version 2.5.4

Bug:
    * [SSPCPP-612] - Old DiscoveryFeed cache files are not correctly removed
    * [SSPCPP-616] - SP does not build with C++11
    * [SSPCPP-621] - log4shib. RemoteSyslogAppender doesn't work in debian.
    * [SSPCPP-623] - Attribute mapper interprets attribute name with leading/trailing whitespace
    * [SSPCPP-624] - Trailing whitespace in authnContextClassRef attribute parsed incorrectly
    * [SSPCPP-627] - SyslogAppender is not working on windows
    * [SSPCPP-646] - When triggered by file size limit, native.log does not rotate correctly and logs are missing

Improvement:
    * [SSPCPP-618] - Add support for Amazon Linux 2014.3 via attached patch
    * [SSPCPP-629] - attribute-map.xml missing "uid" attribute (eduPerson)
    * [SSPCPP-645] - Adjust ownership of /var/cache/shibboleth in the init script of RPM-based Linux distributions
    * [SSPCPP-647] - consider not permitting RC4 on back channel queries

Task:
    * [SSPCPP-644] - Release log4shib 1.0.9
    * [SSPCPP-648] - Release process for 2.5.4

Version 2.5.3

Bug:
    * [SSPCPP-578] - Example Apache config uses require valid-user
    * [SSPCPP-580] - FastCGI programs use libxmltooling but don't link with it
    * [SSPCPP-584] - Limit on preserved POST data size is not enforced
    * [SSPCPP-585] - POST data replay in Firefox fails if data contains key "submit"
    * [SSPCPP-589] - Relative paths in Shibboleth XML catalogs are resolved against /usr/share/xml/opensaml
    * [SSPCPP-595] - postTemplat.html form submission bug
    * [SSPCPP-596] - Red Hat init script produces spurious restorecon warning at startup
    * [SSPCPP-603] - Directory Indexes don't work when using file-based basic auth (ShibCompatValidUser is On)

Documentation:
    * [SSPCPP-591] - Errors partialLogout attribute not documented

Improvement:
    * [SSPCPP-598] - Dynamic metadata provider in SP should avoid unmarshalling non-EntityDescriptor results
    * [SSPCPP-605] - Rephrase error log lines for AuthnFailed responses

Task:
    * [SSPCPP-609] - Release of 2.5.3

9 files changed, 59 insertions, 45 deletions

diff --git a/www/shibboleth-sp/MESSAGE b/www/shibboleth-sp/MESSAGE
index 3d3ca0b5842..02732db6e0d 100644
--- a/www/shibboleth-sp/MESSAGE
+++ b/www/shibboleth-sp/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+$NetBSD: MESSAGE,v 1.2 2015/10/23 07:35:07 pettai Exp $
 
 For latest information about configurating the Shibboleth2 SP, See:
-https://spaces.internet2.edu/display/SHIB2/Home
+https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfigurationChanges
 
 ===========================================================================
diff --git a/www/shibboleth-sp/Makefile b/www/shibboleth-sp/Makefile
index e0a571485a7..803af471ce9 100644
--- a/www/shibboleth-sp/Makefile
+++ b/www/shibboleth-sp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2015/04/17 15:53:16 adam Exp $
+# $NetBSD: Makefile,v 1.18 2015/10/23 07:35:07 pettai Exp $
 #
 
-DISTNAME=	shibboleth-sp-2.5.2
-PKGREVISION=	6
+DISTNAME=	shibboleth-sp-2.5.5
 CATEGORIES=	www
 MASTER_SITES=	http://www.shibboleth.net/downloads/service-provider/${PKGVERSION_NOREV}/
 
@@ -27,6 +26,8 @@ RCD_SCRIPTS=	shibd
 
 APACHE_MODULE=	YES
 
+PLIST_SUBST+=	PKG_APACHE_NUM=${PKG_APACHE:S/apache//}
+
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/configs/Makefile.in
 SUBST_FILES.paths+=	${WRKSRC}/configs/keygen.sh
diff --git a/www/shibboleth-sp/PLIST b/www/shibboleth-sp/PLIST
index b4e02aba8c0..f9b0c3b8b95 100644
--- a/www/shibboleth-sp/PLIST
+++ b/www/shibboleth-sp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/10/23 07:35:07 pettai Exp $
 bin/mdquery
 bin/resolvertest
 bin/shib-metagen
@@ -63,17 +63,17 @@ include/shibsp/version.h
 lib/libshibsp-lite.a
 lib/libshibsp-lite.so
 lib/libshibsp-lite.so.6
-lib/libshibsp-lite.so.6.0.2
+lib/libshibsp-lite.so.6.0.5
 lib/libshibsp.a
 lib/libshibsp.so
 lib/libshibsp.so.6
-lib/libshibsp.so.6.0.2
+lib/libshibsp.so.6.0.5
 lib/shibboleth/adfs-lite.a
 lib/shibboleth/adfs-lite.so
 lib/shibboleth/adfs.a
 lib/shibboleth/adfs.so
-lib/shibboleth/mod_shib_22.a
-lib/shibboleth/mod_shib_22.so
+lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.a
+lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.so
 lib/shibboleth/plugins-lite.a
 lib/shibboleth/plugins-lite.so
 lib/shibboleth/plugins.a
diff --git a/www/shibboleth-sp/distinfo b/www/shibboleth-sp/distinfo
index f01f653487e..5a15887de66 100644
--- a/www/shibboleth-sp/distinfo
+++ b/www/shibboleth-sp/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2013/09/29 10:19:47 joerg Exp $
+$NetBSD: distinfo,v 1.6 2015/10/23 07:35:07 pettai Exp $
 
-SHA1 (shibboleth-sp-2.5.2.tar.gz) = a9b42cc7c1d401bb217c94c11aef06ce7d21265c
-RMD160 (shibboleth-sp-2.5.2.tar.gz) = 8b37921bf16488dc4f3890abf09e7cb44c16367f
-Size (shibboleth-sp-2.5.2.tar.gz) = 949163 bytes
+SHA1 (shibboleth-sp-2.5.5.tar.gz) = e69f4dae585771292e6ad51d5872f14edd683f7a
+RMD160 (shibboleth-sp-2.5.5.tar.gz) = f0176c78e8a85b582266bdc9845f833cf35a83a6
+Size (shibboleth-sp-2.5.5.tar.gz) = 1003433 bytes
 SHA1 (patch-ab) = f667e876e1ebd84e706433156eed2cd60e905372
-SHA1 (patch-configs_Makefile.in) = 9601da9a6aadc2bbc8abef7b1008782d4dcda2e8
-SHA1 (patch-shibsp_SPConfig.cpp) = 3befe1fba7f8f02d53a41c09fc50f7cf39bd447d
+SHA1 (patch-configs_Makefile.in) = 00235f36dc529da21cdc55fd833d561ace153d22
+SHA1 (patch-shibsp_SPConfig.cpp) = 2fd64032705f56de3c1a9c32a9916ce5e91b2964
 SHA1 (patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp) = 1ec2c98134d1bfc50e7571a26b5992c8ac47ef46
-SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 058d65ab9481a3894a8156386a6f7416e524be82
-SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 4bf251804def14395b11dc178f699e4c21b712be
+SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 6ca0844486031880919bb52a9b72829e2f48fe79
+SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 37a7d6d7d03c27489db2b6e198a4b85233f57e34
 SHA1 (patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp) = 8ce5f3dbdb0b77864401c03335637cc2b2d4f400
 SHA1 (patch-shibsp_base.h) = c1b6d2598afdff067990224d1202c5e10ae0259a
diff --git a/www/shibboleth-sp/files/shibd.sh b/www/shibboleth-sp/files/shibd.sh
index fb615d2666c..1569636b6a5 100644
--- a/www/shibboleth-sp/files/shibd.sh
+++ b/www/shibboleth-sp/files/shibd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: shibd.sh,v 1.1.1.1 2011/03/15 13:15:37 pettai Exp $
+# $NetBSD: shibd.sh,v 1.2 2015/10/23 07:35:07 pettai Exp $
 #
 # PROVIDE: shibd
 # REQUIRE: DAEMON
@@ -13,7 +13,18 @@ name="shibd"
 rcvar=$name
 command="@PREFIX@/sbin/shibd"
 pidfile="/var/run/shibboleth/shibd.pid"
-command_args=""
+start_precmd="shibd_precmd"
+command_args="-p $pidfile"
+
+shibd_precmd()
+{
+    if [ ! -d /var/run/shibboleth ]; then
+        mkdir -p -m 755 /var/run/shibboleth
+    fi
+    if [ -f /var/run/shibboleth/shibd.sock ]; then
+        rm -f /var/run/shibboleth/shibd.sock
+    fi
+}
 
 if [ -f /etc/rc.subr ]; then
         load_rc_config $name
diff --git a/www/shibboleth-sp/patches/patch-configs_Makefile.in b/www/shibboleth-sp/patches/patch-configs_Makefile.in
index c0e21c3a580..9bd1f7083ff 100644
--- a/www/shibboleth-sp/patches/patch-configs_Makefile.in
+++ b/www/shibboleth-sp/patches/patch-configs_Makefile.in
@@ -1,14 +1,16 @@
-$NetBSD: patch-configs_Makefile.in,v 1.1 2013/09/21 22:16:41 pettai Exp $
+$NetBSD: patch-configs_Makefile.in,v 1.2 2015/10/23 07:35:08 pettai Exp $
 
 Install config and example pkgsrc-ish
 
---- configs/Makefile.in.orig	2013-06-16 22:06:20.000000000 +0000
-+++ configs/Makefile.in
-@@ -296,18 +296,13 @@ pkgrundir = $(localstatedir)/run/@PACKAG
+--- configs/Makefile.in.orig	2015-07-09 09:16:39.000000000 -0700
++++ configs/Makefile.in	2015-10-20 15:27:28.000000000 -0700
+@@ -354,20 +354,13 @@
  pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
  pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
  pkgsysconf_DATA = \
+-	shibd-systemd \
 -	shibd-redhat \
+-	shibd-amazon \
 -	shibd-suse \
 -	shibd-debian \
 -	shibd-osx.plist \
@@ -24,7 +26,7 @@ Install config and example pkgsrc-ish
  
  # The config files are installed "special".  Unlike the entries in
  # pkgsysconf_DATA, these files are installed as "foo.dist" and only
-@@ -417,16 +412,16 @@ install-pkgsysconfDATA: $(pkgsysconf_DAT
+@@ -480,16 +475,16 @@
  	@$(NORMAL_INSTALL)
  	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
  	if test -n "$$list"; then \
@@ -45,7 +47,7 @@ Install config and example pkgsrc-ish
  	done
  
  uninstall-pkgsysconfDATA:
-@@ -477,7 +472,7 @@ check-am: all-am
+@@ -538,7 +533,7 @@
  check: check-am
  all-am: Makefile $(DATA)
  installdirs:
@@ -54,7 +56,7 @@ Install config and example pkgsrc-ish
  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
-@@ -533,7 +528,6 @@ info-am:
+@@ -594,7 +589,6 @@
  
  install-data-am: install-data-local install-pkgsysconfDATA
  	@$(NORMAL_INSTALL)
@@ -62,7 +64,7 @@ Install config and example pkgsrc-ish
  install-dvi: install-dvi-am
  
  install-dvi-am:
-@@ -649,18 +643,18 @@ install-data-local:	all-data-local
+@@ -720,18 +714,18 @@
  	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
  	$(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
  	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
diff --git a/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp b/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp
index 6c8a640830e..d184c9c7adc 100644
--- a/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp
+++ b/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-shibsp_SPConfig.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
+$NetBSD: patch-shibsp_SPConfig.cpp,v 1.2 2015/10/23 07:35:08 pettai Exp $
 
---- shibsp/SPConfig.cpp.orig	2013-09-29 08:49:36.000000000 +0000
-+++ shibsp/SPConfig.cpp
-@@ -446,7 +446,7 @@ bool SPConfig::instantiate(const char* c
+--- shibsp/SPConfig.cpp.orig	2015-10-19 17:25:56.000000000 -0700
++++ shibsp/SPConfig.cpp	2015-10-19 17:26:43.000000000 -0700
+@@ -447,7 +447,7 @@
          getServiceProvider()->init();
          return true;
      }
@@ -10,4 +10,4 @@ $NetBSD: patch-shibsp_SPConfig.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
 +    catch (std::exception& ex) {
          if (rethrow)
              throw;
-         Category::getInstance(SHIBSP_LOGCAT".Config").fatal("caught exception while loading configuration: %s", ex.what());
+         Category::getInstance(SHIBSP_LOGCAT ".Config").fatal("caught exception while loading configuration: %s", ex.what());
diff --git a/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
index 7a70e412a2f..29ca9dbd32d 100644
--- a/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
+++ b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
+$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp,v 1.2 2015/10/23 07:35:08 pettai Exp $
 
---- shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp.orig	2013-09-29 09:10:24.000000000 +0000
-+++ shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp
-@@ -170,7 +170,7 @@ ChainingAttributeExtractor::ChainingAttr
+--- shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp.orig	2015-10-19 17:27:55.000000000 -0700
++++ shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp	2015-10-19 17:28:27.000000000 -0700
+@@ -170,7 +170,7 @@
                  m_extractors.push_back(np.get());
                  np.release();
              }
 -            catch (exception& ex) {
 +            catch (std::exception& ex) {
-                 Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.Chaining").error(
+                 Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.Chaining").error(
                      "caught exception processing embedded AttributeExtractor element: %s", ex.what()
                      );
diff --git a/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
index 733f78a865e..15a18230f4e 100644
--- a/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
+++ b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
@@ -1,22 +1,22 @@
-$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
+$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.2 2015/10/23 07:35:08 pettai Exp $
 
---- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig	2013-09-29 08:55:53.000000000 +0000
-+++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp
-@@ -240,7 +240,7 @@ ChainingAttributeResolver::ChainingAttri
+--- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig	2015-10-19 17:29:03.000000000 -0700
++++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp	2015-10-19 17:29:32.000000000 -0700
+@@ -240,7 +240,7 @@
                  m_resolvers.push_back(np.get());
                  np.release();
              }
 -            catch (exception& ex) {
 +            catch (std::exception& ex) {
-                 Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error(
+                 Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error(
                      "caught exception processing embedded AttributeResolver element: %s", ex.what()
                      );
-@@ -274,7 +274,7 @@ void ChainingAttributeResolver::resolveA
+@@ -274,7 +274,7 @@
              chain.m_ownedAssertions.insert(chain.m_ownedAssertions.end(), context->getResolvedAssertions().begin(), context->getResolvedAssertions().end());
              context->getResolvedAssertions().clear();
          }
 -        catch (exception& ex) {
 +        catch (std::exception& ex) {
-             Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error(
+             Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error(
                  "caught exception applying AttributeResolver in chain: %s", ex.what()
                  );