[cpp-sp] 13/20: Merge branch 'upstream' into bug/gcc-4.6

Scott Cantor cantor.2 at osu.edu
Thu Dec 20 19:45:15 EST 2018


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.4.3+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=b297fc3350691de49921e652e582c9533e391387

commit b297fc3350691de49921e652e582c9533e391387
Merge: cd50f2c f2b5c8f
Author: Russ Allbery <rra at debian.org>
AuthorDate: Mon Jul 25 16:08:36 2011 -0700

    Merge branch 'upstream' into bug/gcc-4.6

 Makefile.am                                        |  20 +-
 Makefile.in                                        |  34 +-
 Portfile                                           |  81 ---
 Portfile.in                                        |  81 ---
 Shibboleth.sln                                     |   3 -
 adfs/Makefile.in                                   |   5 +-
 adfs/adfs-lite.vcxproj                             |   2 -
 adfs/adfs.cpp                                      |  41 +-
 adfs/adfs.rc                                       |  14 +-
 adfs/adfs.vcxproj                                  |   2 -
 adfs/resource.h                                    |  20 +
 apache/Makefile.in                                 |   5 +-
 apache/mod_apache.cpp                              |  59 +-
 apache/mod_shib13.vcxproj                          |   2 -
 apache/mod_shib20.vcxproj                          |   2 -
 apache/mod_shib22.vcxproj                          |   2 -
 apache/mod_shib_13.cpp                             |  28 +-
 apache/mod_shib_13.rc                              |  14 +-
 apache/mod_shib_20.cpp                             |  28 +-
 apache/mod_shib_20.rc                              |  14 +-
 apache/mod_shib_22.cpp                             |  28 +-
 apache/mod_shib_22.rc                              |  14 +-
 apache/resource.h                                  |  20 +
 config.h.in                                        |  26 +-
 config_win32.h                                     |  28 +-
 configs/Makefile.in                                |   3 +-
 configs/example-metadata.xml                       | 107 ++--
 configs/example-shibboleth2.xml                    | 540 +++++++++---------
 configs/metagen.sh                                 |   7 +-
 configs/protocols.xml                              | 114 ++--
 configs/shibd-redhat.in                            |   7 +-
 configure                                          | 169 ++++--
 configure.ac                                       |  89 ++-
 doc/CREDITS.txt                                    |  13 +-
 doc/Makefile.am                                    |   6 +-
 doc/Makefile.in                                    |   9 +-
 doc/NOTICE.txt                                     |   7 +-
 doc/README.txt                                     |   6 +-
 doc/RELEASE.txt                                    |   2 +-
 fastcgi/Makefile.in                                |   5 +-
 fastcgi/resource.h                                 |  20 +
 fastcgi/shibauthorizer.cpp                         |  26 +-
 fastcgi/shibauthorizer.rc                          |  14 +-
 fastcgi/shibauthorizer.vcxproj                     |   2 -
 fastcgi/shibresponder.cpp                          |  26 +-
 fastcgi/shibresponder.rc                           |  14 +-
 fastcgi/shibresponder.vcxproj                      |   2 -
 isapi_shib/directive_class.h                       | 233 --------
 isapi_shib/directives.h                            |  45 --
 isapi_shib/isapi_shib.cpp                          |  26 +-
 isapi_shib/isapi_shib.rc                           |  14 +-
 isapi_shib/isapi_shib.vcxproj                      |   2 -
 isapi_shib/resource.h                              |  20 +
 memcache-store/Makefile.in                         |   5 +-
 memcache-store/memcache-store.cpp                  |  28 +-
 memcache-store/memcache-store.rc                   |  14 +-
 memcache-store/memcache-store.vcxproj              |  14 +-
 memcache-store/resource.h                          |  20 +
 nsapi_shib/Makefile.in                             |   5 +-
 nsapi_shib/nsapi_shib.cpp                          |  26 +-
 nsapi_shib/nsapi_shib.rc                           |  14 +-
 nsapi_shib/nsapi_shib.vcxproj                      |   2 -
 nsapi_shib/resource.h                              |  20 +
 odbc-store/Makefile.in                             |   5 +-
 odbc-store/odbc-store.cpp                          |  30 +-
 odbc-store/odbc-store.rc                           |  14 +-
 odbc-store/odbc-store.vcxproj                      |   2 -
 odbc-store/resource.h                              |  20 +
 pkginfo                                            |  11 -
 pkginfo.in                                         |  11 -
 postinstall                                        |  35 --
 schemas/Makefile.in                                |   3 +-
 schemas/shibboleth-2.0-native-sp-protocols.xsd     | 118 ++--
 selinux/Makefile.in                                |   3 +-
 shibboleth.spec                                    |  36 +-
 shibboleth.spec.in                                 |  34 +-
 shibd/Makefile.in                                  |   5 +-
 shibd/resource.h                                   |  20 +
 shibd/shibd.cpp                                    |  26 +-
 shibd/shibd.rc                                     |  14 +-
 shibd/shibd.vcxproj                                |   2 -
 shibd/shibd_win32.cpp                              |  28 +-
 shibsp/AbstractSPRequest.cpp                       |  28 +-
 shibsp/AbstractSPRequest.h                         |  28 +-
 shibsp/AccessControl.h                             |  26 +-
 shibsp/Application.cpp                             |  26 +-
 shibsp/Application.h                               |  26 +-
 shibsp/GSSRequest.h                                |  32 +-
 shibsp/Makefile.am                                 |   7 +-
 shibsp/Makefile.in                                 |  78 ++-
 shibsp/RequestMapper.h                             |  28 +-
 shibsp/SPConfig.cpp                                | 103 +++-
 shibsp/SPConfig.h                                  |  26 +-
 shibsp/SPRequest.h                                 |  26 +-
 shibsp/ServiceProvider.cpp                         |  26 +-
 shibsp/ServiceProvider.h                           |  29 +-
 shibsp/SessionCache.h                              |  26 +-
 shibsp/SessionCacheEx.h                            |  28 +-
 shibsp/TransactionLog.h                            |  28 +-
 shibsp/attribute/Attribute.cpp                     |  26 +-
 shibsp/attribute/Attribute.h                       |  26 +-
 shibsp/attribute/AttributeDecoder.h                |  26 +-
 shibsp/attribute/Base64AttributeDecoder.cpp        |  26 +-
 shibsp/attribute/DOMAttributeDecoder.cpp           |  26 +-
 shibsp/attribute/ExtensibleAttribute.cpp           |  26 +-
 shibsp/attribute/ExtensibleAttribute.h             |  26 +-
 shibsp/attribute/KeyInfoAttributeDecoder.cpp       |  26 +-
 shibsp/attribute/NameIDAttribute.cpp               |  26 +-
 shibsp/attribute/NameIDAttribute.h                 |  28 +-
 shibsp/attribute/NameIDAttributeDecoder.cpp        |  26 +-
 .../attribute/NameIDFromScopedAttributeDecoder.cpp |  26 +-
 shibsp/attribute/ScopedAttribute.cpp               |  26 +-
 shibsp/attribute/ScopedAttribute.h                 |  28 +-
 shibsp/attribute/ScopedAttributeDecoder.cpp        |  26 +-
 shibsp/attribute/SimpleAttribute.cpp               |  26 +-
 shibsp/attribute/SimpleAttribute.h                 |  28 +-
 shibsp/attribute/StringAttributeDecoder.cpp        |  26 +-
 shibsp/attribute/XMLAttribute.cpp                  |  26 +-
 shibsp/attribute/XMLAttribute.h                    |  26 +-
 shibsp/attribute/XMLAttributeDecoder.cpp           |  26 +-
 shibsp/attribute/filtering/AttributeFilter.h       |  28 +-
 shibsp/attribute/filtering/BasicFilteringContext.h |  28 +-
 shibsp/attribute/filtering/FilterPolicyContext.h   |  28 +-
 shibsp/attribute/filtering/FilteringContext.h      |  28 +-
 shibsp/attribute/filtering/MatchFunctor.h          |  28 +-
 .../attribute/filtering/impl/AndMatchFunctor.cpp   |  28 +-
 .../attribute/filtering/impl/AnyMatchFunctor.cpp   |  28 +-
 .../attribute/filtering/impl/AttributeFilter.cpp   |  28 +-
 .../impl/AttributeIssuerInEntityGroupFunctor.cpp   |  28 +-
 .../filtering/impl/AttributeIssuerRegexFunctor.cpp |  28 +-
 .../impl/AttributeIssuerStringFunctor.cpp          |  28 +-
 .../AttributeRequesterInEntityGroupFunctor.cpp     |  28 +-
 .../impl/AttributeRequesterRegexFunctor.cpp        |  28 +-
 .../impl/AttributeRequesterStringFunctor.cpp       |  28 +-
 .../AttributeScopeMatchesShibMDScopeFunctor.cpp    |  28 +-
 .../filtering/impl/AttributeScopeRegexFunctor.cpp  |  30 +-
 .../filtering/impl/AttributeScopeStringFunctor.cpp |  28 +-
 .../filtering/impl/AttributeValueRegexFunctor.cpp  |  28 +-
 .../filtering/impl/AttributeValueStringFunctor.cpp |  32 +-
 .../impl/AuthenticationMethodRegexFunctor.cpp      |  28 +-
 .../impl/AuthenticationMethodStringFunctor.cpp     |  28 +-
 .../filtering/impl/BasicFilteringContext.cpp       |  28 +-
 .../filtering/impl/ChainingAttributeFilter.cpp     |  28 +-
 .../filtering/impl/DummyAttributeFilter.cpp        | 120 ++--
 shibsp/attribute/filtering/impl/MatchFunctor.cpp   |  28 +-
 .../impl/NameIDQualifierStringFunctor.cpp          | 342 +++++------
 .../attribute/filtering/impl/NotMatchFunctor.cpp   |  28 +-
 .../impl/NumberOfAttributeValuesFunctor.cpp        |  28 +-
 shibsp/attribute/filtering/impl/OrMatchFunctor.cpp |  28 +-
 .../filtering/impl/XMLAttributeFilter.cpp          |  26 +-
 shibsp/attribute/resolver/AttributeExtractor.h     |  26 +-
 shibsp/attribute/resolver/AttributeResolver.h      |  26 +-
 shibsp/attribute/resolver/ResolutionContext.h      |  28 +-
 .../resolver/impl/ChainingAttributeExtractor.cpp   |  26 +-
 .../resolver/impl/ChainingAttributeResolver.cpp    |  26 +-
 .../resolver/impl/DelegationAttributeExtractor.cpp |  26 +-
 .../impl/KeyDescriptorAttributeExtractor.cpp       |  26 +-
 .../resolver/impl/QueryAttributeResolver.cpp       |  26 +-
 .../impl/SimpleAggregationAttributeResolver.cpp    |  26 +-
 .../resolver/impl/XMLAttributeExtractor.cpp        |  28 +-
 shibsp/base.h                                      |  32 +-
 shibsp/binding/ArtifactResolver.h                  |  28 +-
 shibsp/binding/ProtocolProvider.h                  | 152 ++---
 shibsp/binding/SOAPClient.h                        |  28 +-
 shibsp/binding/impl/ArtifactResolver.cpp           |  28 +-
 shibsp/binding/impl/SOAPClient.cpp                 |  28 +-
 shibsp/binding/impl/XMLProtocolProvider.cpp        | 476 ++++++++--------
 shibsp/config_pub.h                                |  27 +
 shibsp/config_pub.h.in                             |  26 +
 shibsp/config_pub_win32.h                          |  51 ++
 shibsp/exceptions.h                                |  28 +-
 shibsp/handler/AbstractHandler.h                   |  28 +-
 shibsp/handler/AssertionConsumerService.h          |  28 +-
 shibsp/handler/Handler.h                           |  28 +-
 shibsp/handler/LogoutHandler.h                     |  28 +-
 shibsp/handler/LogoutInitiator.h                   |  28 +-
 shibsp/handler/RemotedHandler.h                    |  28 +-
 shibsp/handler/SessionInitiator.h                  |  28 +-
 shibsp/handler/impl/AbstractHandler.cpp            |  26 +-
 shibsp/handler/impl/AssertionConsumerService.cpp   |  26 +-
 shibsp/handler/impl/AssertionLookup.cpp            |  26 +-
 shibsp/handler/impl/ChainingLogoutInitiator.cpp    |  28 +-
 shibsp/handler/impl/ChainingSessionInitiator.cpp   |  28 +-
 shibsp/handler/impl/CookieSessionInitiator.cpp     |  28 +-
 shibsp/handler/impl/DiscoveryFeed.cpp              | 128 +++--
 shibsp/handler/impl/FormSessionInitiator.cpp       |  28 +-
 shibsp/handler/impl/LocalLogoutInitiator.cpp       |  28 +-
 shibsp/handler/impl/LogoutHandler.cpp              |  26 +-
 shibsp/handler/impl/LogoutInitiator.cpp            |  28 +-
 shibsp/handler/impl/MetadataGenerator.cpp          |  26 +-
 shibsp/handler/impl/RemotedHandler.cpp             |  42 +-
 shibsp/handler/impl/SAML1Consumer.cpp              |  47 +-
 shibsp/handler/impl/SAML2ArtifactResolution.cpp    |  28 +-
 shibsp/handler/impl/SAML2Consumer.cpp              |  41 +-
 shibsp/handler/impl/SAML2Logout.cpp                |  26 +-
 shibsp/handler/impl/SAML2LogoutInitiator.cpp       |  72 ++-
 shibsp/handler/impl/SAML2NameIDMgmt.cpp            |  26 +-
 shibsp/handler/impl/SAML2SessionInitiator.cpp      | 109 ++--
 shibsp/handler/impl/SAMLDSSessionInitiator.cpp     |  26 +-
 shibsp/handler/impl/SessionHandler.cpp             |  26 +-
 shibsp/handler/impl/SessionInitiator.cpp           |  28 +-
 shibsp/handler/impl/Shib1SessionInitiator.cpp      |  26 +-
 shibsp/handler/impl/StatusHandler.cpp              |  26 +-
 shibsp/handler/impl/TransformSessionInitiator.cpp  |  28 +-
 shibsp/handler/impl/WAYFSessionInitiator.cpp       |  28 +-
 shibsp/impl/ChainingAccessControl.cpp              |  26 +-
 shibsp/impl/StorageServiceSessionCache.cpp         |  26 +-
 shibsp/impl/XMLAccessControl.cpp                   |  26 +-
 shibsp/impl/XMLRequestMapper.cpp                   |  26 +-
 shibsp/impl/XMLSecurityPolicyProvider.cpp          | 628 +++++++++++----------
 shibsp/impl/XMLServiceProvider.cpp                 |  30 +-
 shibsp/internal.h                                  |  28 +-
 shibsp/lite/CommonDomainCookie.cpp                 |  26 +-
 shibsp/lite/CommonDomainCookie.h                   |  28 +-
 shibsp/lite/SAMLConstants.cpp                      |  26 +-
 shibsp/lite/SAMLConstants.h                        |  26 +-
 shibsp/metadata/DynamicMetadataProvider.cpp        |  26 +-
 shibsp/metadata/MetadataExt.h                      |  28 +-
 shibsp/metadata/MetadataExtImpl.cpp                |  28 +-
 shibsp/metadata/MetadataExtSchemaValidators.cpp    |  28 +-
 shibsp/metadata/MetadataProviderCriteria.cpp       |  26 +-
 shibsp/metadata/MetadataProviderCriteria.h         |  26 +-
 shibsp/paths.h                                     |  28 +-
 shibsp/paths.h.in                                  |  28 +-
 shibsp/remoting/ListenerService.h                  |  26 +-
 shibsp/remoting/ddf.h                              |  26 +-
 shibsp/remoting/impl/ListenerService.cpp           |  26 +-
 shibsp/remoting/impl/SocketListener.cpp            |  26 +-
 shibsp/remoting/impl/SocketListener.h              |  26 +-
 shibsp/remoting/impl/TCPListener.cpp               |  26 +-
 shibsp/remoting/impl/UnixListener.cpp              |  28 +-
 shibsp/remoting/impl/ddf.cpp                       |  26 +-
 shibsp/resource.h                                  |  20 +
 shibsp/security/PKIXTrustEngine.cpp                |  28 +-
 shibsp/security/PKIXTrustEngine.h                  |  28 +-
 shibsp/security/SecurityPolicy.cpp                 |  26 +-
 shibsp/security/SecurityPolicy.h                   |  26 +-
 shibsp/security/SecurityPolicyProvider.h           | 236 ++++----
 shibsp/shibsp-lite.vcxproj                         |   4 +-
 shibsp/shibsp-lite.vcxproj.filters                 |   4 +
 shibsp/shibsp.rc                                   |  14 +-
 shibsp/shibsp.vcxproj                              |   4 +-
 shibsp/shibsp.vcxproj.filters                      |   4 +
 shibsp/util/CGIParser.cpp                          |  28 +-
 shibsp/util/CGIParser.h                            |  28 +-
 shibsp/util/DOMPropertySet.cpp                     |  28 +-
 shibsp/util/DOMPropertySet.h                       |  28 +-
 shibsp/util/PropertySet.h                          |  28 +-
 shibsp/util/SPConstants.cpp                        |  28 +-
 shibsp/util/SPConstants.h                          |  28 +-
 shibsp/util/TemplateParameters.cpp                 |  28 +-
 shibsp/util/TemplateParameters.h                   |  28 +-
 shibsp/version.h                                   |  28 +-
 util/Makefile.in                                   |   5 +-
 util/mdquery.cpp                                   |  28 +-
 util/mdquery.vcxproj                               |   2 -
 util/resolvertest.cpp                              |  28 +-
 util/resolvertest.vcxproj                          |   2 -
 258 files changed, 5133 insertions(+), 4338 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list