Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update to Shibboleth SP 3.1.0. Fixes PR pkg/54639.
details: https://anonhg.NetBSD.org/pkgsrc/rev/5f1d244330f8
branches: trunk
changeset: 435834:5f1d244330f8
user: perseant <perseant%pkgsrc.org@localhost>
date: Thu Jul 16 14:49:13 2020 +0000
description:
Update to Shibboleth SP 3.1.0. Fixes PR pkg/54639.
diffstat:
security/opensaml/Makefile | 9 +-
security/opensaml/PLIST | 15 +-
security/opensaml/distinfo | 10 +-
textproc/xmltooling/Makefile | 10 +-
textproc/xmltooling/PLIST | 10 +-
textproc/xmltooling/distinfo | 13 +-
textproc/xmltooling/patches/patch-xmltooling_Makefile.in | 14 --
textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp | 13 --
textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h | 38 ------
www/shibboleth-sp/Makefile | 13 +-
www/shibboleth-sp/PLIST | 34 +++-
www/shibboleth-sp/distinfo | 25 ++--
www/shibboleth-sp/patches/patch-ab | 15 --
www/shibboleth-sp/patches/patch-configs_Makefile.in | 24 +--
www/shibboleth-sp/patches/patch-configs_keygen.sh | 11 +
www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp | 13 --
www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp | 12 +-
www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp | 12 +-
www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp | 18 +-
www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp | 60 ++++-----
www/shibboleth-sp/patches/patch-shibsp_base.h | 6 +-
21 files changed, 145 insertions(+), 230 deletions(-)
diffs (truncated from 773 to 300 lines):
diff -r de947d6c4f57 -r 5f1d244330f8 security/opensaml/Makefile
--- a/security/opensaml/Makefile Thu Jul 16 14:47:50 2020 +0000
+++ b/security/opensaml/Makefile Thu Jul 16 14:49:13 2020 +0000
@@ -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@localhost
HOMEPAGE= http://www.opensaml.org/
@@ -14,6 +14,7 @@
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"
diff -r de947d6c4f57 -r 5f1d244330f8 security/opensaml/PLIST
--- a/security/opensaml/PLIST Thu Jul 16 14:47:50 2020 +0000
+++ b/security/opensaml/PLIST Thu Jul 16 14:49:13 2020 +0000
@@ -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/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/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/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
diff -r de947d6c4f57 -r 5f1d244330f8 security/opensaml/distinfo
--- a/security/opensaml/distinfo Thu Jul 16 14:47:50 2020 +0000
+++ b/security/opensaml/distinfo Thu Jul 16 14:49:13 2020 +0000
@@ -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
diff -r de947d6c4f57 -r 5f1d244330f8 textproc/xmltooling/Makefile
--- a/textproc/xmltooling/Makefile Thu Jul 16 14:47:50 2020 +0000
+++ b/textproc/xmltooling/Makefile Thu Jul 16 14:49:13 2020 +0000
@@ -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@localhost
HOMEPAGE= http://shibboleth.net/
@@ -14,6 +14,7 @@
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 @@
.include "../../textproc/xerces-c/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+.include "../../mk/tools/replace.mk"
diff -r de947d6c4f57 -r 5f1d244330f8 textproc/xmltooling/PLIST
--- a/textproc/xmltooling/PLIST Thu Jul 16 14:47:50 2020 +0000
+++ b/textproc/xmltooling/PLIST Thu Jul 16 14:49:13 2020 +0000
@@ -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/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/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/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/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 -r de947d6c4f57 -r 5f1d244330f8 textproc/xmltooling/distinfo
--- a/textproc/xmltooling/distinfo Thu Jul 16 14:47:50 2020 +0000
+++ b/textproc/xmltooling/distinfo Thu Jul 16 14:49:13 2020 +0000
@@ -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 -r de947d6c4f57 -r 5f1d244330f8 textproc/xmltooling/patches/patch-xmltooling_Makefile.in
--- a/textproc/xmltooling/patches/patch-xmltooling_Makefile.in Thu Jul 16 14:47:50 2020 +0000
+++ b/textproc/xmltooling/patches/patch-xmltooling_Makefile.in Thu Jul 16 14:49:13 2020 +0000
@@ -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 -r de947d6c4f57 -r 5f1d244330f8 textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp
--- a/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp Thu Jul 16 14:47:50 2020 +0000
+++ b/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.cpp Thu Jul 16 14:49:13 2020 +0000
@@ -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 -r de947d6c4f57 -r 5f1d244330f8 textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h
--- a/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h Thu Jul 16 14:47:50 2020 +0000
+++ b/textproc/xmltooling/patches/patch-xmltooling_util_XMLHelper.h Thu Jul 16 14:49:13 2020 +0000
@@ -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__ */
diff -r de947d6c4f57 -r 5f1d244330f8 www/shibboleth-sp/Makefile
--- a/www/shibboleth-sp/Makefile Thu Jul 16 14:47:50 2020 +0000
+++ b/www/shibboleth-sp/Makefile Thu Jul 16 14:49:13 2020 +0000
@@ -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@localhost
HOMEPAGE= http://shibboleth.net/
@@ -16,6 +16,7 @@
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 @@
${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 @@
${SHIB_CONFDIR}/protocols.xml
Home |
Main Index |
Thread Index |
Old Index