diff options
6 files changed, 152 insertions, 1 deletions
diff --git a/www/shibboleth-sp/distinfo b/www/shibboleth-sp/distinfo index 0973082ef5a..f01f653487e 100644 --- a/www/shibboleth-sp/distinfo +++ b/www/shibboleth-sp/distinfo @@ -1,8 +1,13 @@ -$NetBSD: distinfo,v 1.4 2013/09/21 22:16:41 pettai Exp $ +$NetBSD: distinfo,v 1.5 2013/09/29 10:19:47 joerg 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 (patch-ab) = f667e876e1ebd84e706433156eed2cd60e905372 SHA1 (patch-configs_Makefile.in) = 9601da9a6aadc2bbc8abef7b1008782d4dcda2e8 +SHA1 (patch-shibsp_SPConfig.cpp) = 3befe1fba7f8f02d53a41c09fc50f7cf39bd447d +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_QueryAttributeResolver.cpp) = 8ce5f3dbdb0b77864401c03335637cc2b2d4f400 SHA1 (patch-shibsp_base.h) = c1b6d2598afdff067990224d1202c5e10ae0259a diff --git a/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp b/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp new file mode 100644 index 00000000000..6c8a640830e --- /dev/null +++ b/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-shibsp_SPConfig.cpp,v 1.1 2013/09/29 10:19:47 joerg 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 + 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()); diff --git a/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp b/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp new file mode 100644 index 00000000000..d36a54aa628 --- /dev/null +++ b/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp @@ -0,0 +1,13 @@ +$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 + functorMap.getMatchFunctors().insert(multimap<string,MatchFunctor*>::value_type(id, func.get())); + return func.release(); + } +- catch (exception& ex) { ++ catch (std::exception& ex) { + m_log.error("error building %s with type (%s): %s", logname, type->toString().c_str(), 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 new file mode 100644 index 00000000000..7a70e412a2f --- /dev/null +++ b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp,v 1.1 2013/09/29 10:19:47 joerg 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 + m_extractors.push_back(np.get()); + np.release(); + } +- catch (exception& ex) { ++ catch (std::exception& ex) { + 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 new file mode 100644 index 00000000000..733f78a865e --- /dev/null +++ b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.1 2013/09/29 10:19:47 joerg 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 + m_resolvers.push_back(np.get()); + np.release(); + } +- catch (exception& ex) { ++ catch (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 @@ void ChainingAttributeResolver::resolveA + 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( + "caught exception applying AttributeResolver in chain: %s", ex.what() + ); diff --git a/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp new file mode 100644 index 00000000000..29ae2c63892 --- /dev/null +++ b/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp @@ -0,0 +1,85 @@ +$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 + } + } + } +- catch (exception& ex) { ++ catch (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 + client.sendSAML(request, application.getId(), mcc, loc.get()); + response.reset(client.receiveSAML()); + } +- catch (exception& ex) { ++ catch (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 + if (!policy->isAuthenticated()) + throw SecurityPolicyException("Security of SAML 1.x query result not established."); + } +- catch (exception& ex) { ++ catch (std::exception& ex) { + m_log.error("assertion failed policy validation: %s", ex.what()); + throw; + } +@@ -435,7 +435,7 @@ void QueryResolver::SAML1Query(QueryCont + filter->filterAttributes(fc, ctx.getResolvedAttributes()); + } + } +- catch (exception& ex) { ++ catch (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<shibsp::Attribute>()); + ctx.getResolvedAttributes().clear(); +@@ -517,7 +517,7 @@ void QueryResolver::SAML2Query(QueryCont + client.sendSAML(query, application.getId(), mcc, loc.get()); + srt.reset(client.receiveSAML()); + } +- catch (exception& ex) { ++ catch (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 + m_log.debugStream() << "decrypted assertion: " << *newtoken << logging::eol; + } + } +- catch (exception& ex) { ++ catch (std::exception& ex) { + m_log.error("failed to decrypt assertion: %s", ex.what()); + throw; + } +@@ -648,7 +648,7 @@ void QueryResolver::SAML2Query(QueryCont + } + } + } +- catch (exception& ex) { ++ catch (std::exception& ex) { + m_log.error("assertion failed policy validation: %s", ex.what()); + throw; + } +@@ -677,7 +677,7 @@ void QueryResolver::SAML2Query(QueryCont + filter->filterAttributes(fc, ctx.getResolvedAttributes()); + } + } +- catch (exception& ex) { ++ catch (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<shibsp::Attribute>()); + ctx.getResolvedAttributes().clear(); +@@ -716,7 +716,7 @@ void QueryResolver::resolveAttributes(Re + m_log.warn("can't attempt attribute query, either no NameID or no metadata to use"); + } + } +- catch (exception& ex) { ++ catch (std::exception& ex) { + // Already logged. + if (!m_exceptionId.empty()) { + auto_ptr<SimpleAttribute> attr(new SimpleAttribute(m_exceptionId)); |