Update to Shibboleth SP 3.1.0. Fixes PR pkg/54639.

6 files changed, 19 insertions, 79 deletions

diff --git a/textproc/xmltooling/Makefile b/textproc/xmltooling/Makefile
index b04d0ccecb9..163ddc508a7 100644
--- a/textproc/xmltooling/Makefile
+++ b/textproc/xmltooling/Makefile
@@ -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"
diff --git a/textproc/xmltooling/PLIST b/textproc/xmltooling/PLIST
index 193397e7fd4..100555eb9e8 100644
--- a/textproc/xmltooling/PLIST
+++ b/textproc/xmltooling/PLIST
@@ -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.h
 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/ValidatorSuite.h
 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
diff --git a/textproc/xmltooling/distinfo b/textproc/xmltooling/distinfo
index e7b1d5d45f5..9cba6d76cfc 100644
--- a/textproc/xmltooling/distinfo
+++ b/textproc/xmltooling/distinfo
@@ -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
diff --git a/textproc/xmltooling/patches/patch-xmltooling_Makefile.in b/textproc/xmltooling/patches/patch-xmltooling_Makefile.in
index da052c14e4e..e69de29bb2d 100644
--- a/textproc/xmltooling/patches/patch-xmltooling_Makefile.in
+++ b/textproc/xmltooling/patches/patch-xmltooling_Makefile.in
@@ -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.
diff --git a/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp b/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp
index 2771a67589e..e69de29bb2d 100644
--- a/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp
+++ b/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp
@@ -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);
- }
diff --git a/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h b/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h
index 19cfdf2868b..e69de29bb2d 100644
--- a/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h
+++ b/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h
@@ -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__ */