Received: by mail.netbsd.org (Postfix, from userid 605) id E29EF84DB1; Thu, 16 Jul 2020 14:49:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 69FD684D5B for ; Thu, 16 Jul 2020 14:49:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id xNKyPqXmGHhG for ; Thu, 16 Jul 2020 14:49:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 28D7784D2A for ; Thu, 16 Jul 2020 14:49:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1EFC5FB28; Thu, 16 Jul 2020 14:49:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1594910954186800" MIME-Version: 1.0 Date: Thu, 16 Jul 2020 14:49:14 +0000 From: "Konrad Schroder" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: perseant@netbsd.org X-Mailer: log_accum Message-Id: <20200716144914.1EFC5FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1594910954186800 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: perseant Date: Thu Jul 16 14:49:13 UTC 2020 Modified Files: pkgsrc/security/opensaml: Makefile PLIST distinfo pkgsrc/textproc/xmltooling: Makefile PLIST distinfo pkgsrc/textproc/xmltooling/patches: patch-xmltooling_Makefile.in patch-xmltooling_util_XMLHelper.cpp patch-xmltooling_util_XMLHelper.h pkgsrc/www/shibboleth-sp: Makefile PLIST distinfo pkgsrc/www/shibboleth-sp/patches: patch-configs_Makefile.in patch-shibsp_SPConfig.cpp patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp patch-shibsp_base.h Added Files: pkgsrc/www/shibboleth-sp/patches: patch-configs_keygen.sh Removed Files: pkgsrc/www/shibboleth-sp/patches: patch-ab Log Message: Update to Shibboleth SP 3.1.0. Fixes PR pkg/54639. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 pkgsrc/security/opensaml/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/opensaml/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/opensaml/distinfo cvs rdiff -u -r1.40 -r1.41 pkgsrc/textproc/xmltooling/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/xmltooling/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/xmltooling/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/textproc/xmltooling/patches/patch-xmltooling_Makefile.in \ pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp \ pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/shibboleth-sp/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/shibboleth-sp/PLIST cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/shibboleth-sp/distinfo cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/www/shibboleth-sp/patches/patch-ab cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in \ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp \ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp \ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp \ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp \ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1594910954186800 Content-Disposition: inline Content-Length: 37292 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/opensaml/Makefile diff -u pkgsrc/security/opensaml/Makefile:1.38 pkgsrc/security/opensaml/Makefile:1.39 --- pkgsrc/security/opensaml/Makefile:1.38 Fri May 22 10:56:38 2020 +++ pkgsrc/security/opensaml/Makefile Thu Jul 16 14:49:13 2020 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.38 2020/05/22 10:56:38 adam Exp $ +# $NetBSD: Makefile,v 1.39 2020/07/16 14:49:13 perseant Exp $ -DISTNAME= opensaml-2.5.5 -PKGREVISION= 16 +DISTNAME= opensaml-3.1.0 +PKGREVISION= CATEGORIES= security -MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/${PKGVERSION_NOREV}/ +MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/${PKGVERSION_NOREV}/ MAINTAINER= pettai@NetBSD.org HOMEPAGE= http://www.opensaml.org/ @@ -14,6 +14,7 @@ USE_LANGUAGES= c c++11 USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-doxygen-doc +USE_TOOLS+= pkg-config .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" Index: pkgsrc/security/opensaml/PLIST diff -u pkgsrc/security/opensaml/PLIST:1.7 pkgsrc/security/opensaml/PLIST:1.8 --- pkgsrc/security/opensaml/PLIST:1.7 Sun Mar 20 10:04:14 2016 +++ pkgsrc/security/opensaml/PLIST Thu Jul 16 14:49:13 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2016/03/20 10:04:14 pettai Exp $ +@comment $NetBSD: PLIST,v 1.8 2020/07/16 14:49:13 perseant Exp $ bin/samlsign include/saml/Assertion.h include/saml/RootObject.h @@ -19,18 +19,16 @@ include/saml/saml1/binding/SAMLArtifactT include/saml/saml1/binding/SAMLArtifactType0002.h include/saml/saml1/core/Assertions.h include/saml/saml1/core/Protocols.h -include/saml/saml1/profile/AssertionValidator.h -include/saml/saml1/profile/BrowserSSOProfileValidator.h include/saml/saml2/binding/SAML2Artifact.h include/saml/saml2/binding/SAML2ArtifactType0004.h include/saml/saml2/binding/SAML2MessageDecoder.h -include/saml/saml2/binding/SAML2Redirect.h +include/saml/saml2/binding/SAML2MessageEncoder.h include/saml/saml2/binding/SAML2SOAPClient.h include/saml/saml2/core/Assertions.h include/saml/saml2/core/Protocols.h +include/saml/saml2/metadata/AbstractDynamicMetadataProvider.h include/saml/saml2/metadata/AbstractMetadataProvider.h include/saml/saml2/metadata/DiscoverableMetadataProvider.h -include/saml/saml2/metadata/DynamicMetadataProvider.h include/saml/saml2/metadata/EndpointManager.h include/saml/saml2/metadata/EntityMatcher.h include/saml/saml2/metadata/Metadata.h @@ -39,8 +37,6 @@ include/saml/saml2/metadata/MetadataCred include/saml/saml2/metadata/MetadataFilter.h include/saml/saml2/metadata/MetadataProvider.h include/saml/saml2/metadata/ObservableMetadataProvider.h -include/saml/saml2/profile/AssertionValidator.h -include/saml/saml2/profile/BrowserSSOProfileValidator.h include/saml/saml2/profile/SAML2AssertionPolicy.h include/saml/signature/ContentReference.h include/saml/signature/SignableObject.h @@ -49,9 +45,10 @@ include/saml/util/CommonDomainCookie.h include/saml/util/SAMLConstants.h include/saml/version.h lib/libsaml.a +lib/libsaml.la lib/libsaml.so -lib/libsaml.so.8 -lib/libsaml.so.8.0.5 +lib/libsaml.so.11 +lib/libsaml.so.11.0.0 lib/pkgconfig/opensaml.pc share/doc/${PKGNAME}/LICENSE.txt share/doc/${PKGNAME}/LOG4CPP.LICENSE Index: pkgsrc/security/opensaml/distinfo diff -u pkgsrc/security/opensaml/distinfo:1.6 pkgsrc/security/opensaml/distinfo:1.7 --- pkgsrc/security/opensaml/distinfo:1.6 Sun Mar 20 10:04:14 2016 +++ pkgsrc/security/opensaml/distinfo Thu Jul 16 14:49:13 2020 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2016/03/20 10:04:14 pettai Exp $ +$NetBSD: distinfo,v 1.7 2020/07/16 14:49:13 perseant Exp $ -SHA1 (opensaml-2.5.5.tar.gz) = beb3a45ff88076f31eb91f573ddf4ff57984c73a -RMD160 (opensaml-2.5.5.tar.gz) = 8048b89a7f496d0f5920e64991f69afe8b1a9698 -SHA512 (opensaml-2.5.5.tar.gz) = a590b20efa3f8f688393b8f9f0d2add8614e93e54181870736b6efd05e9c3a12d35789f6b6feab426d8a9e2604b5eae4e183c37f30aced215622bd3a7239b43f -Size (opensaml-2.5.5.tar.gz) = 739776 bytes +SHA1 (opensaml-3.1.0.tar.gz) = fbad61a3deccb93ea49b2512007b65d5e383e4bb +RMD160 (opensaml-3.1.0.tar.gz) = 2d70a7c9ede22c6b5210388a8ee2c11afcb33cf4 +SHA512 (opensaml-3.1.0.tar.gz) = 885418c0ae725dd53bc9e5b71a02a16325533eb12e86f5485c76f503056de8b813e1a4814b4d1f2fb3f79f1dbc39c17a997fae41d7d80ddae3c3a98f86df344c +Size (opensaml-3.1.0.tar.gz) = 759409 bytes Index: pkgsrc/textproc/xmltooling/Makefile diff -u pkgsrc/textproc/xmltooling/Makefile:1.40 pkgsrc/textproc/xmltooling/Makefile:1.41 --- pkgsrc/textproc/xmltooling/Makefile:1.40 Fri May 22 10:56:43 2020 +++ pkgsrc/textproc/xmltooling/Makefile Thu Jul 16 14:49:13 2020 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.40 2020/05/22 10:56:43 adam Exp $ +# $NetBSD: Makefile,v 1.41 2020/07/16 14:49:13 perseant Exp $ -DISTNAME= xmltooling-1.5.6 -PKGREVISION= 16 +DISTNAME= xmltooling-3.1.0 +PKGREVISION= CATEGORIES= textproc -MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/2.5.5/ +MASTER_SITES= http://shibboleth.net/downloads/c++-opensaml/3.1.0/ MAINTAINER= pettai@NetBSD.org HOMEPAGE= http://shibboleth.net/ @@ -14,6 +14,7 @@ USE_LANGUAGES= c c++11 USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-doxygen-doc +USE_TOOLS+= pkg-config .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/log4shib/buildlink3.mk" @@ -21,3 +22,4 @@ CONFIGURE_ARGS+= --disable-doxygen-doc .include "../../textproc/xerces-c/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" +.include "../../mk/tools/replace.mk" Index: pkgsrc/textproc/xmltooling/PLIST diff -u pkgsrc/textproc/xmltooling/PLIST:1.4 pkgsrc/textproc/xmltooling/PLIST:1.5 --- pkgsrc/textproc/xmltooling/PLIST:1.4 Fri Sep 13 21:08:19 2013 +++ pkgsrc/textproc/xmltooling/PLIST Thu Jul 16 14:49:13 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/09/13 21:08:19 pettai Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/07/16 14:49:13 perseant Exp $ include/xmltooling/AbstractAttributeExtensibleXMLObject.h include/xmltooling/AbstractComplexElement.h include/xmltooling/AbstractDOMCachingXMLObject.h @@ -24,6 +24,9 @@ include/xmltooling/encryption/Encrypter. include/xmltooling/encryption/Encryption.h include/xmltooling/exceptions.h include/xmltooling/impl/AnyElement.h +include/xmltooling/impl/ManagedResource.h +include/xmltooling/impl/OpenSSLSecurityHelper.h +include/xmltooling/impl/OpenSSLSupport.h include/xmltooling/impl/UnknownElement.h include/xmltooling/io/AbstractXMLObjectMarshaller.h include/xmltooling/io/AbstractXMLObjectUnmarshaller.h @@ -39,6 +42,7 @@ include/xmltooling/security/Credential.h include/xmltooling/security/CredentialContext.h include/xmltooling/security/CredentialCriteria.h include/xmltooling/security/CredentialResolver.h +include/xmltooling/security/DataSealer.h include/xmltooling/security/KeyInfoCredentialContext.h include/xmltooling/security/KeyInfoResolver.h include/xmltooling/security/OpenSSLCredential.h @@ -63,8 +67,9 @@ include/xmltooling/soap/SOAP.h include/xmltooling/soap/SOAPClient.h include/xmltooling/soap/SOAPTransport.h include/xmltooling/unicode.h +include/xmltooling/util/CloneInputStream.h include/xmltooling/util/CurlURLInputStream.h -include/xmltooling/util/DateTime.h +include/xmltooling/util/DirectoryWalker.h include/xmltooling/util/NDC.h include/xmltooling/util/ParserPool.h include/xmltooling/util/PathResolver.h @@ -83,6 +88,7 @@ include/xmltooling/validation/ValidatorS include/xmltooling/version.h lib/libxmltooling-lite.la lib/libxmltooling.la +lib/pkgconfig/xmltooling-lite.pc lib/pkgconfig/xmltooling.pc share/doc/${PKGNAME}/CURL.LICENSE share/doc/${PKGNAME}/LICENSE.txt Index: pkgsrc/textproc/xmltooling/distinfo diff -u pkgsrc/textproc/xmltooling/distinfo:1.10 pkgsrc/textproc/xmltooling/distinfo:1.11 --- pkgsrc/textproc/xmltooling/distinfo:1.10 Sun Mar 20 09:57:12 2016 +++ pkgsrc/textproc/xmltooling/distinfo Thu Jul 16 14:49:13 2020 @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.10 2016/03/20 09:57:12 pettai Exp $ +$NetBSD: distinfo,v 1.11 2020/07/16 14:49:13 perseant Exp $ -SHA1 (xmltooling-1.5.6.tar.gz) = 45da82345758a9871cbf1200f6b2cdd0898722f2 -RMD160 (xmltooling-1.5.6.tar.gz) = 4bffdd47c8062c352c0aa5d26fc5bc588779514b -SHA512 (xmltooling-1.5.6.tar.gz) = 4fa247fd8e8c4354cf4c6d515847b891c6de4f631198dc220063c30d48cbccf9c3a9a66e660b04a2d37950929e76e649b3857391c0691c962e5a6a25fde13652 -Size (xmltooling-1.5.6.tar.gz) = 713425 bytes -SHA1 (patch-xmltooling_Makefile.in) = 9c6764c89d0c81c46486283063e02791c22c37e2 -SHA1 (patch-xmltooling_util_XMLHelper.cpp) = 2dc0915af93e4b2aeb0a946ea14f2de89050867f -SHA1 (patch-xmltooling_util_XMLHelper.h) = 98c6c0552c81a8599c5337642bcdcaa9cdb76d80 +SHA1 (xmltooling-3.1.0.tar.gz) = 6f597b7eb3ba9e8dc7d25bf9a4c2b5e6fad1e3ea +RMD160 (xmltooling-3.1.0.tar.gz) = 67b39bec703f531a65584630631ff57891494b27 +SHA512 (xmltooling-3.1.0.tar.gz) = 64381b549f4a57e37af2c9e4358448bb432c77da4f3b370fe2524d94603223f633ce6811b2c055ca13be203ebff5c7a155e3f1ec06e2c5759fd9d485a66f609e +Size (xmltooling-3.1.0.tar.gz) = 751711 bytes Index: pkgsrc/textproc/xmltooling/patches/patch-xmltooling_Makefile.in diff -u pkgsrc/textproc/xmltooling/patches/patch-xmltooling_Makefile.in:1.1 pkgsrc/textproc/xmltooling/patches/patch-xmltooling_Makefile.in:1.2 --- pkgsrc/textproc/xmltooling/patches/patch-xmltooling_Makefile.in:1.1 Wed Feb 23 09:09:31 2011 +++ pkgsrc/textproc/xmltooling/patches/patch-xmltooling_Makefile.in Thu Jul 16 14:49:13 2020 @@ -1,14 +0,0 @@ -$NetBSD: patch-xmltooling_Makefile.in,v 1.1 2011/02/23 09:09:31 adam Exp $ - -Keep .la files installed. - ---- xmltooling/Makefile.in.orig 2011-01-31 18:45:59.000000000 +0000 -+++ xmltooling/Makefile.in -@@ -1780,7 +1780,6 @@ uninstall-am: uninstall-encincludeHEADER - - - install-exec-hook: -- for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp diff -u pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp:1.1 pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp:1.2 --- pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp:1.1 Sun Nov 18 01:53:07 2012 +++ pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp Thu Jul 16 14:49:13 2020 @@ -1,13 +0,0 @@ -$NetBSD: patch-xmltooling_util_XMLHelper.cpp,v 1.1 2012/11/18 01:53:07 joerg Exp $ - ---- xmltooling/util/XMLHelper.cpp.orig 2012-11-18 00:26:45.000000000 +0000 -+++ xmltooling/util/XMLHelper.cpp -@@ -440,7 +440,7 @@ ostream& XMLHelper::serialize(const DOMN - return out; - } - --ostream& xmltooling::operator<<(ostream& ostr, const DOMNode& node) -+ostream& xercesc_3_1::operator<<(ostream& ostr, const DOMNode& node) - { - return XMLHelper::serialize(&node, ostr); - } Index: pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h diff -u pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h:1.1 pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h:1.2 --- pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h:1.1 Sun Nov 18 01:53:07 2012 +++ pkgsrc/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h Thu Jul 16 14:49:13 2020 @@ -1,38 +0,0 @@ -$NetBSD: patch-xmltooling_util_XMLHelper.h,v 1.1 2012/11/18 01:53:07 joerg Exp $ - ---- xmltooling/util/XMLHelper.h.orig 2012-11-18 00:23:44.000000000 +0000 -+++ xmltooling/util/XMLHelper.h -@@ -352,16 +352,6 @@ namespace xmltooling { - }; - - /** -- * Serializes the DOM node provided to a stream using UTF-8 encoding and -- * the default XML serializer available. No manipulation or formatting is applied. -- * -- * @param n node to serialize -- * @param ostr stream to serialize element into -- * @return reference to output stream -- */ -- extern XMLTOOL_API std::ostream& operator<<(std::ostream& ostr, const xercesc::DOMNode& n); -- -- /** - * Marshalls and serializes the XMLObject provided to a stream using UTF-8 encoding and - * the default XML serializer available. No manipulation or formatting is applied. - * -@@ -374,4 +364,16 @@ namespace xmltooling { - extern XMLTOOL_API std::ostream& operator<<(std::ostream& ostr, const XMLObject& obj); - }; - -+namespace xercesc_3_1 { -+ /** -+ * Serializes the DOM node provided to a stream using UTF-8 encoding and -+ * the default XML serializer available. No manipulation or formatting is applied. -+ * -+ * @param n node to serialize -+ * @param ostr stream to serialize element into -+ * @return reference to output stream -+ */ -+ extern XMLTOOL_API std::ostream& operator<<(std::ostream& ostr, const xercesc::DOMNode& n); -+}; -+ - #endif /* __xmltooling_xmlhelper_h__ */ Index: pkgsrc/www/shibboleth-sp/Makefile diff -u pkgsrc/www/shibboleth-sp/Makefile:1.40 pkgsrc/www/shibboleth-sp/Makefile:1.41 --- pkgsrc/www/shibboleth-sp/Makefile:1.40 Fri May 22 10:56:46 2020 +++ pkgsrc/www/shibboleth-sp/Makefile Thu Jul 16 14:49:13 2020 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.40 2020/05/22 10:56:46 adam Exp $ +# $NetBSD: Makefile,v 1.41 2020/07/16 14:49:13 perseant Exp $ # -DISTNAME= shibboleth-sp-2.5.5 -PKGREVISION= 17 +DISTNAME= shibboleth-sp-3.1.0 +PKGREVISION= CATEGORIES= www -MASTER_SITES= http://www.shibboleth.net/downloads/service-provider/${PKGVERSION_NOREV}/ +MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PKGVERSION_NOREV}/ MAINTAINER= pettai@NetBSD.org HOMEPAGE= http://shibboleth.net/ @@ -16,6 +16,7 @@ BUILD_DEFS+= VARBASE GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-xmltooling=${PREFIX} CONFIGURE_ARGS+= --localstatedir=${VARBASE} +USE_TOOLS+= pkg-config EGDIR= ${PREFIX}/share/examples/shibboleth SHIB_CONFDIR= ${PKG_SYSCONFDIR}/shibboleth @@ -46,8 +47,6 @@ CONF_FILES+= ${EGDIR}/native.logger \ ${SHIB_CONFDIR}/native.logger CONF_FILES+= ${EGDIR}/shibd.logger \ ${SHIB_CONFDIR}/shibd.logger -CONF_FILES+= ${EGDIR}/syslog.logger \ - ${SHIB_CONFDIR}/syslog.logger CONF_FILES+= ${EGDIR}/shibboleth2.xml \ ${SHIB_CONFDIR}/shibboleth2.xml CONF_FILES+= ${EGDIR}/attribute-map.xml \ @@ -58,8 +57,6 @@ CONF_FILES+= ${EGDIR}/protocols.xml \ ${SHIB_CONFDIR}/protocols.xml CONF_FILES+= ${EGDIR}/security-policy.xml \ ${SHIB_CONFDIR}/security-policy.xml -CONF_FILES+= ${EGDIR}/accessError.html \ - ${SHIB_CONFDIR}/accessError.html CONF_FILES+= ${EGDIR}/sessionError.html \ ${SHIB_CONFDIR}/sessionError.html CONF_FILES+= ${EGDIR}/metadataError.html \ Index: pkgsrc/www/shibboleth-sp/PLIST diff -u pkgsrc/www/shibboleth-sp/PLIST:1.5 pkgsrc/www/shibboleth-sp/PLIST:1.6 --- pkgsrc/www/shibboleth-sp/PLIST:1.5 Fri Oct 23 07:35:07 2015 +++ pkgsrc/www/shibboleth-sp/PLIST Thu Jul 16 14:49:13 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/10/23 07:35:07 pettai Exp $ +@comment $NetBSD: PLIST,v 1.6 2020/07/16 14:49:13 perseant Exp $ bin/mdquery bin/resolvertest bin/shib-metagen @@ -11,7 +11,6 @@ include/shibsp/SPConfig.h include/shibsp/SPRequest.h include/shibsp/ServiceProvider.h include/shibsp/SessionCache.h -include/shibsp/SessionCacheEx.h include/shibsp/TransactionLog.h include/shibsp/attribute/Attribute.h include/shibsp/attribute/AttributeDecoder.h @@ -61,22 +60,31 @@ include/shibsp/util/SPConstants.h include/shibsp/util/TemplateParameters.h include/shibsp/version.h lib/libshibsp-lite.a +lib/libshibsp-lite.la lib/libshibsp-lite.so -lib/libshibsp-lite.so.6 -lib/libshibsp-lite.so.6.0.5 +lib/libshibsp-lite.so.8 +lib/libshibsp-lite.so.8.0.5 lib/libshibsp.a +lib/libshibsp.la lib/libshibsp.so -lib/libshibsp.so.6 -lib/libshibsp.so.6.0.5 +lib/libshibsp.so.9 +lib/libshibsp.so.9.0.0 +lib/pkgconfig/shibsp-lite.pc +lib/pkgconfig/shibsp.pc lib/shibboleth/adfs-lite.a +lib/shibboleth/adfs-lite.la lib/shibboleth/adfs-lite.so lib/shibboleth/adfs.a +lib/shibboleth/adfs.la lib/shibboleth/adfs.so lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.a lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.so +lib/shibboleth/mod_shib_24.la lib/shibboleth/plugins-lite.a +lib/shibboleth/plugins-lite.la lib/shibboleth/plugins-lite.so lib/shibboleth/plugins.a +lib/shibboleth/plugins.la lib/shibboleth/plugins.so sbin/shib-keygen sbin/shibd @@ -88,8 +96,6 @@ share/doc/shibboleth-${PKGVERSION}/NOTIC share/doc/shibboleth-${PKGVERSION}/OPENSSL.LICENSE share/doc/shibboleth-${PKGVERSION}/README.txt share/doc/shibboleth-${PKGVERSION}/RELEASE.txt -share/examples/shibboleth/accessError.html -share/examples/shibboleth/accessError.html.dist share/examples/shibboleth/apache.config share/examples/shibboleth/apache2.config share/examples/shibboleth/apache22.config @@ -124,6 +130,7 @@ share/examples/shibboleth/postTemplate.h share/examples/shibboleth/postTemplate.html.dist share/examples/shibboleth/protocols.xml share/examples/shibboleth/protocols.xml.dist +share/examples/shibboleth/seckeygen.sh share/examples/shibboleth/security-policy.xml share/examples/shibboleth/security-policy.xml.dist share/examples/shibboleth/sessionError.html @@ -134,12 +141,12 @@ share/examples/shibboleth/shibd.logger share/examples/shibboleth/shibd.logger.dist share/examples/shibboleth/sslError.html share/examples/shibboleth/sslError.html.dist -share/examples/shibboleth/syslog.logger -share/examples/shibboleth/syslog.logger.dist -share/examples/shibboleth/upgrade.xsl share/shibboleth/main.css +share/xml/shibboleth/MetadataExchange.xsd share/xml/shibboleth/WS-Trust.xsd share/xml/shibboleth/catalog.xml +share/xml/shibboleth/oasis-200401-wss-wssecurity-secext-1.0.xsd +share/xml/shibboleth/oasis-200401-wss-wssecurity-utility-1.0.xsd share/xml/shibboleth/shibboleth-2.0-afp-mf-basic.xsd share/xml/shibboleth/shibboleth-2.0-afp-mf-saml.xsd share/xml/shibboleth/shibboleth-2.0-afp.xsd @@ -147,7 +154,12 @@ share/xml/shibboleth/shibboleth-2.0-attr share/xml/shibboleth/shibboleth-2.0-native-sp-config.xsd share/xml/shibboleth/shibboleth-2.0-native-sp-protocols.xsd share/xml/shibboleth/shibboleth-2.0-sp-notify.xsd +share/xml/shibboleth/shibboleth-3.0-native-sp-config.xsd share/xml/shibboleth/shibboleth-metadata-1.0.xsd share/xml/shibboleth/shibboleth.xsd +share/xml/shibboleth/ws-addr.xsd +share/xml/shibboleth/ws-authorization.xsd +share/xml/shibboleth/ws-federation.xsd +share/xml/shibboleth/ws-securitypolicy-1.2.xsd @pkgdir share/doc/shibboleth-${PKGVERSION}/api @pkgdir etc/shibboleth Index: pkgsrc/www/shibboleth-sp/distinfo diff -u pkgsrc/www/shibboleth-sp/distinfo:1.7 pkgsrc/www/shibboleth-sp/distinfo:1.8 --- pkgsrc/www/shibboleth-sp/distinfo:1.7 Wed Nov 4 02:47:38 2015 +++ pkgsrc/www/shibboleth-sp/distinfo Thu Jul 16 14:49:13 2020 @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 02:47:38 agc Exp $ +$NetBSD: distinfo,v 1.8 2020/07/16 14:49:13 perseant Exp $ -SHA1 (shibboleth-sp-2.5.5.tar.gz) = e69f4dae585771292e6ad51d5872f14edd683f7a -RMD160 (shibboleth-sp-2.5.5.tar.gz) = f0176c78e8a85b582266bdc9845f833cf35a83a6 -SHA512 (shibboleth-sp-2.5.5.tar.gz) = 908d0ea664bd3c40fbfa97c7575509cfaf59735f3cf3ffa4bdf13c87b5cc939640030678ab43d4ead3c246dbf6f57927d9eab64db8256504f7c8908b4cebb981 -Size (shibboleth-sp-2.5.5.tar.gz) = 1003433 bytes -SHA1 (patch-ab) = f667e876e1ebd84e706433156eed2cd60e905372 -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) = 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 +SHA1 (shibboleth-sp-3.1.0.tar.gz) = 9652369b903adb969c98038a229e7e88ecfd29ae +RMD160 (shibboleth-sp-3.1.0.tar.gz) = 1da575c978c4e789ab94f0bf251e79a11e753397 +SHA512 (shibboleth-sp-3.1.0.tar.gz) = e67fbfc0183544ed580c59e541eed3f69055a5cafce248d20ab0c6a5df9bfc0dba1190a03e4cd8ff6ffacc6b7e67ed0fe6fd42b064cf025548baab68ac4df05b +Size (shibboleth-sp-3.1.0.tar.gz) = 1099076 bytes +SHA1 (patch-configs_Makefile.in) = 452741659276be98e9c0b2531b69ad1fa5c421f8 +SHA1 (patch-configs_keygen.sh) = 414467335f80da97643863fb221c152fd7139a9e +SHA1 (patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp) = 3de173b5680b71d964af7aaf50b351da7b58228a +SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 40cb02c0edeaa3423ff2ec0289c6ea50f85da42b +SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 38055a70f1d7f884a58b9452bbf44ff2005febf1 +SHA1 (patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp) = e34302974301d69d6c7c1ba40826d20a7dc6c001 +SHA1 (patch-shibsp_base.h) = 74e6936f0471014697511c267d0bcd5b63a82a01 Index: pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in diff -u pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in:1.2 pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in:1.3 --- pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in:1.2 Fri Oct 23 07:35:08 2015 +++ pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in Thu Jul 16 14:49:13 2020 @@ -1,10 +1,6 @@ -$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 2015-07-09 09:16:39.000000000 -0700 -+++ configs/Makefile.in 2015-10-20 15:27:28.000000000 -0700 -@@ -354,20 +354,13 @@ +--- configs/Makefile.in.orig 2020-03-06 09:16:20.000000000 -0800 ++++ configs/Makefile.in 2020-07-07 12:59:05.660340097 -0700 +@@ -381,20 +381,13 @@ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@ pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@ pkgsysconf_DATA = \ @@ -20,13 +16,13 @@ Install config and example pkgsrc-ish apache24.config \ - keygen.sh \ - metagen.sh \ - upgrade.xsl + seckeygen.sh +EGDIR = @EGDIR@ # The config files are installed "special". Unlike the entries in # pkgsysconf_DATA, these files are installed as "foo.dist" and only -@@ -480,16 +475,16 @@ +@@ -504,16 +497,16 @@ @$(NORMAL_INSTALL) @list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \ if test -n "$$list"; then \ @@ -47,7 +43,7 @@ Install config and example pkgsrc-ish done uninstall-pkgsysconfDATA: -@@ -538,7 +533,7 @@ +@@ -565,7 +558,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: @@ -56,7 +52,7 @@ Install config and example pkgsrc-ish test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am -@@ -594,7 +589,6 @@ +@@ -621,7 +614,6 @@ install-data-am: install-data-local install-pkgsysconfDATA @$(NORMAL_INSTALL) @@ -64,7 +60,7 @@ Install config and example pkgsrc-ish install-dvi: install-dvi-am install-dvi-am: -@@ -720,18 +714,18 @@ +@@ -742,18 +734,18 @@ $(mkinstalldirs) $(DESTDIR)$(pkgrundir) $(mkinstalldirs) $(DESTDIR)$(pkgcachedir) $(mkinstalldirs) $(DESTDIR)$(pkgxmldir) @@ -78,7 +74,7 @@ Install config and example pkgsrc-ish fi; \ - $(INSTALL_DATA) $$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \ + $(INSTALL_DATA) $$f $(DESTDIR)${EGDIR}/$$f.dist; \ - done + done for f in $(CONFIGFILES); do \ - if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}; \ @@ -87,6 +83,6 @@ Install config and example pkgsrc-ish fi; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \ + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${EGDIR}/$$f.dist; \ - done + done install-data-hook: Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp:1.2 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp:1.3 --- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp:1.2 Fri Oct 23 07:35:08 2015 +++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp Thu Jul 16 14:49:13 2020 @@ -1,13 +0,0 @@ -$NetBSD: patch-shibsp_SPConfig.cpp,v 1.2 2015/10/23 07:35:08 pettai Exp $ - ---- 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; - } -- catch (exception& ex) { -+ catch (std::exception& ex) { - if (rethrow) - throw; - Category::getInstance(SHIBSP_LOGCAT ".Config").fatal("caught exception while loading configuration: %s", ex.what()); Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp:1.2 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp:1.3 --- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp:1.2 Fri Oct 23 07:35:08 2015 +++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp Thu Jul 16 14:49:13 2020 @@ -1,13 +1,11 @@ -$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 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 @@ +--- shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp.orig 2018-07-09 18:17:23.000000000 -0700 ++++ shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp 2020-07-07 12:26:19.008490542 -0700 +@@ -139,7 +139,7 @@ m_extractors.push_back(np.get()); np.release(); } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.Chaining").error( "caught exception processing embedded AttributeExtractor element: %s", ex.what() ); Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp:1.2 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp:1.3 --- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp:1.2 Fri Oct 23 07:35:08 2015 +++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp Thu Jul 16 14:49:13 2020 @@ -1,22 +1,20 @@ -$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 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 @@ +--- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig 2018-07-09 18:17:23.000000000 -0700 ++++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp 2020-07-07 12:26:03.316192576 -0700 +@@ -197,7 +197,7 @@ m_resolvers.push_back(np.get()); np.release(); } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error( "caught exception processing embedded AttributeResolver element: %s", ex.what() ); -@@ -274,7 +274,7 @@ +@@ -231,7 +231,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) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error( "caught exception applying AttributeResolver in chain: %s", ex.what() ); Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp:1.1 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp:1.2 --- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp:1.1 Sun Sep 29 10:19:47 2013 +++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp Thu Jul 16 14:49:13 2020 @@ -1,13 +1,11 @@ -$NetBSD: patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $ - ---- shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp.orig 2013-09-29 08:53:37.000000000 +0000 -+++ shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp -@@ -249,7 +249,7 @@ MatchFunctor* XMLFilterImpl::buildFuncto +--- shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp.orig 2020-04-01 16:27:44.000000000 -0700 ++++ shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp 2020-07-07 12:23:32.612919412 -0700 +@@ -259,7 +259,7 @@ functorMap.getMatchFunctors().insert(multimap::value_type(id, func.get())); return func.release(); } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("error building %s with type (%s): %s", logname, type->toString().c_str(), ex.what()); } } Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp:1.1 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp:1.2 --- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp:1.1 Sun Sep 29 10:19:47 2013 +++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp Thu Jul 16 14:49:13 2020 @@ -1,85 +1,83 @@ -$NetBSD: patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $ - ---- shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp.orig 2013-09-29 08:58:22.000000000 +0000 -+++ shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp -@@ -277,7 +277,7 @@ QueryResolver::QueryResolver(const DOMEl +--- shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp.orig 2020-03-18 11:45:13.000000000 -0700 ++++ shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp 2020-07-07 12:26:37.773204823 -0700 +@@ -266,7 +266,7 @@ } } } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("exception loading attribute designator: %s", ex.what()); } child = XMLHelper::getNextSiblingElement(child); -@@ -347,7 +347,7 @@ void QueryResolver::SAML1Query(QueryCont +@@ -342,7 +342,7 @@ client.sendSAML(request, application.getId(), mcc, loc.get()); response.reset(client.receiveSAML()); } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("exception during SAML query to %s: %s", loc.get(), ex.what()); soaper.reset(); } -@@ -393,7 +393,7 @@ void QueryResolver::SAML1Query(QueryCont +@@ -395,7 +395,7 @@ if (!policy->isAuthenticated()) throw SecurityPolicyException("Security of SAML 1.x query result not established."); } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("assertion failed policy validation: %s", ex.what()); throw; } -@@ -435,7 +435,7 @@ void QueryResolver::SAML1Query(QueryCont +@@ -437,7 +437,7 @@ filter->filterAttributes(fc, ctx.getResolvedAttributes()); } } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("caught exception extracting/filtering attributes from query result: %s", ex.what()); for_each(ctx.getResolvedAttributes().begin(), ctx.getResolvedAttributes().end(), xmltooling::cleanup()); ctx.getResolvedAttributes().clear(); -@@ -517,7 +517,7 @@ void QueryResolver::SAML2Query(QueryCont +@@ -534,7 +534,7 @@ client.sendSAML(query, application.getId(), mcc, loc.get()); srt.reset(client.receiveSAML()); } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("exception during SAML query to %s: %s", loc.get(), ex.what()); soaper.reset(); } -@@ -581,7 +581,7 @@ void QueryResolver::SAML2Query(QueryCont +@@ -605,7 +605,7 @@ m_log.debugStream() << "decrypted assertion: " << *newtoken << logging::eol; } } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("failed to decrypt assertion: %s", ex.what()); throw; } -@@ -648,7 +648,7 @@ void QueryResolver::SAML2Query(QueryCont +@@ -672,7 +672,7 @@ } } } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("assertion failed policy validation: %s", ex.what()); throw; } -@@ -677,7 +677,7 @@ void QueryResolver::SAML2Query(QueryCont +@@ -701,7 +701,7 @@ filter->filterAttributes(fc, ctx.getResolvedAttributes()); } } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { m_log.error("caught exception extracting/filtering attributes from query result: %s", ex.what()); for_each(ctx.getResolvedAttributes().begin(), ctx.getResolvedAttributes().end(), xmltooling::cleanup()); ctx.getResolvedAttributes().clear(); -@@ -716,7 +716,7 @@ void QueryResolver::resolveAttributes(Re +@@ -742,7 +742,7 @@ m_log.warn("can't attempt attribute query, either no NameID or no metadata to use"); } } -- catch (exception& ex) { -+ catch (std::exception& ex) { +- catch (const exception& ex) { ++ catch (const std::exception& ex) { // Already logged. if (!m_exceptionId.empty()) { auto_ptr attr(new SimpleAttribute(m_exceptionId)); Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h:1.1 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h:1.2 --- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h:1.1 Fri Sep 20 23:11:01 2013 +++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h Thu Jul 16 14:49:13 2020 @@ -1,7 +1,5 @@ -$NetBSD: patch-shibsp_base.h,v 1.1 2013/09/20 23:11:01 joerg Exp $ - ---- shibsp/base.h.orig 2013-09-20 16:02:01.000000000 +0000 -+++ shibsp/base.h +--- shibsp/base.h.orig 2018-07-09 18:17:23.000000000 -0700 ++++ shibsp/base.h 2020-07-07 12:13:39.779239618 -0700 @@ -32,6 +32,7 @@ # define XMLTOOLING_LITE # include Added files: Index: pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh diff -u /dev/null pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh:1.1 --- /dev/null Thu Jul 16 14:49:14 2020 +++ pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh Thu Jul 16 14:49:13 2020 @@ -0,0 +1,11 @@ +--- configs/keygen.sh.orig 2018-07-09 18:17:23.000000000 -0700 ++++ configs/keygen.sh 2020-07-07 12:39:12.562183624 -0700 +@@ -1,5 +1,8 @@ + #! /bin/sh + ++# Dump the generated keys in @SHIB_CONFDIR@ by default ++cd @SHIB_CONFDIR@ ++ + while getopts n:h:u:g:o:e:y:bf c + do + case $c in --_----------=_1594910954186800--