[cpp-sp] 17/42: Merge branch 'upstream' into bug/unlink-pidfile

Scott Cantor cantor.2 at osu.edu
Thu Dec 20 19:44:34 EST 2018


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

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

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

commit f5b6e96cf5f36686e8fd7c3959e4889de2e9f432
Merge: b4c0bfc dcdaebe
Author: Russ Allbery <rra at debian.org>
AuthorDate: Wed Apr 6 17:57:04 2011 -0700

    Merge branch 'upstream' into bug/unlink-pidfile

 Makefile.am                                        |    10 +-
 Makefile.in                                        |   414 +-
 Portfile                                           |     2 +-
 Shibboleth.sln                                     |   163 +-
 acinclude.m4                                       |    90 -
 aclocal.m4                                         |   453 +-
 adfs/Makefile.am                                   |    10 +-
 adfs/Makefile.in                                   |   348 +-
 adfs/adfs-lite.vcproj                              |   360 -
 adfs/adfs-lite.vcxproj                             |   213 +
 adfs/adfs.cpp                                      |   175 +-
 adfs/adfs.rc                                       |    12 +-
 adfs/adfs.vcproj                                   |   358 -
 adfs/adfs.vcxproj                                  |   207 +
 apache/Makefile.am                                 |    14 +-
 apache/Makefile.in                                 |   417 +-
 apache/mod_apache.cpp                              |   384 +-
 apache/mod_shib13.vcproj                           |   434 -
 apache/mod_shib13.vcxproj                          |   252 +
 apache/mod_shib20.vcproj                           |   438 -
 apache/mod_shib20.vcxproj                          |   256 +
 apache/mod_shib22.vcproj                           |   439 -
 apache/mod_shib22.vcxproj                          |   264 +
 apache/mod_shib_13.rc                              |    12 +-
 apache/mod_shib_20.cpp                             |     3 +-
 apache/mod_shib_20.rc                              |    12 +-
 apache/mod_shib_22.cpp                             |     3 +-
 apache/mod_shib_22.rc                              |    12 +-
 config.guess => build-aux/config.guess             |    26 +-
 config.sub => build-aux/config.sub                 |    28 +-
 depcomp => build-aux/depcomp                       |   172 +-
 build-aux/install-sh                               |   520 +
 build-aux/ltmain.sh                                |  9687 +++++
 missing => build-aux/missing                       |   104 +-
 config.h.in                                        |    51 +-
 config_win32.h                                     |    25 +-
 configs/Makefile.am                                |     5 +-
 configs/Makefile.in                                |   248 +-
 configs/attribute-map.xml                          |    19 +-
 configs/attribute-policy.xml                       |    10 +-
 .../{shibboleth2.xml => example-shibboleth2.xml}   |   532 +-
 configs/keygen.sh                                  |    34 +-
 configs/metagen.sh                                 |   272 +-
 configs/native.logger.in                           |    11 +-
 configs/protocols.xml                              |    57 +
 configs/security-policy.xml                        |    36 +
 configs/shibboleth2.xml                            |   264 +-
 configs/shibd-redhat.in                            |     4 +
 configs/shibd-suse.in                              |     3 +-
 configs/shibd.logger.in                            |    20 +-
 configs/upgrade.xsl                                |    31 +-
 configs/xsltproc.js                                |     2 +-
 configure                                          | 40553 ++++++++-----------
 configure.ac                                       |   608 +-
 depend                                             |    12 -
 doc/CREDITS.txt                                    |     4 +-
 doc/Makefile.in                                    |   245 +-
 doc/NOTICE.txt                                     |     2 +
 doc/README.txt                                     |     2 -
 doc/RELEASE.txt                                    |    30 +-
 fastcgi/Makefile.am                                |    12 +-
 fastcgi/Makefile.in                                |   374 +-
 fastcgi/shibauthorizer.cpp                         |     7 +-
 fastcgi/shibauthorizer.rc                          |    12 +-
 fastcgi/shibauthorizer.vcproj                      |   414 -
 fastcgi/shibauthorizer.vcxproj                     |   231 +
 fastcgi/shibresponder.cpp                          |     7 +-
 fastcgi/shibresponder.rc                           |    12 +-
 fastcgi/shibresponder.vcproj                       |   415 -
 fastcgi/shibresponder.vcxproj                      |   232 +
 install-sh                                         |   323 -
 isapi_shib/isapi_shib.cpp                          |    89 +-
 isapi_shib/isapi_shib.rc                           |    12 +-
 isapi_shib/isapi_shib.vcxproj                      |   242 +
 libtool.m4                                         |  5960 ---
 ltmain.sh                                          |  6911 ----
 m4/acinclude.m4                                    |    71 +
 acx_pthread.m4 => m4/acx_pthread.m4                |    14 +-
 doxygen.m4 => m4/doxygen.m4                        |     0
 m4/libtool.m4                                      |  7831 ++++
 m4/ltoptions.m4                                    |   369 +
 m4/ltsugar.m4                                      |   123 +
 m4/ltversion.m4                                    |    23 +
 m4/lt~obsolete.m4                                  |    98 +
 memcache-store/Makefile.am                         |     7 +-
 memcache-store/Makefile.in                         |   331 +-
 memcache-store/memcache-store.cpp                  |    51 +-
 memcache-store/memcache-store.rc                   |    12 +-
 memcache-store/memcache-store.vcproj               |   354 -
 memcache-store/memcache-store.vcxproj              |   199 +
 nsapi_shib/Makefile.am                             |     6 +-
 nsapi_shib/Makefile.in                             |   330 +-
 nsapi_shib/nsapi_shib.cpp                          |    60 +-
 nsapi_shib/nsapi_shib.rc                           |    12 +-
 nsapi_shib/nsapi_shib.vcproj                       |   394 -
 nsapi_shib/nsapi_shib.vcxproj                      |   241 +
 odbc-store/Makefile.am                             |     7 +-
 odbc-store/Makefile.in                             |   331 +-
 odbc-store/odbc-store.cpp                          |    60 +-
 odbc-store/odbc-store.rc                           |    12 +-
 odbc-store/odbc-store.vcproj                       |   354 -
 odbc-store/odbc-store.vcxproj                      |   193 +
 pkginfo                                            |     2 +-
 schemas/Makefile.am                                |     7 +-
 schemas/Makefile.in                                |   248 +-
 schemas/catalog.xml.in                             |     3 +-
 schemas/shibboleth-2.0-afp-mf-saml.xsd             |    35 +
 schemas/shibboleth-2.0-attribute-map.xsd           |    25 +
 schemas/shibboleth-2.0-native-sp-config.xsd        |  1453 +-
 schemas/shibboleth-2.0-native-sp-protocols.xsd     |    59 +
 selinux/Makefile.in                                |   268 +-
 shibboleth.spec                                    |    57 +-
 shibboleth.spec.in                                 |    57 +-
 shibd/Makefile.am                                  |     8 +-
 shibd/Makefile.in                                  |   336 +-
 shibd/shibd.cpp                                    |    30 +-
 shibd/shibd.rc                                     |    12 +-
 shibd/shibd.vcproj                                 |   384 -
 shibd/shibd.vcxproj                                |   225 +
 shibd/shibd_win32.cpp                              |    54 +-
 shibsp/AbstractSPRequest.cpp                       |    51 +-
 shibsp/AbstractSPRequest.h                         |     4 +-
 shibsp/Application.cpp                             |    12 +-
 shibsp/Application.h                               |    39 +-
 shibsp/GSSRequest.h                                |    60 +
 shibsp/Makefile.am                                 |    32 +-
 shibsp/Makefile.in                                 |  1598 +-
 shibsp/SPConfig.cpp                                |    80 +-
 shibsp/SPConfig.h                                  |    34 +-
 shibsp/SPRequest.h                                 |    10 +-
 shibsp/ServiceProvider.cpp                         |   183 +-
 shibsp/ServiceProvider.h                           |    70 +-
 shibsp/SessionCache.h                              |    40 +-
 shibsp/SessionCacheEx.h                            |    10 +-
 shibsp/attribute/Attribute.cpp                     |    36 +-
 shibsp/attribute/Attribute.h                       |     6 +-
 shibsp/attribute/AttributeDecoder.h                |    13 +-
 ...ibuteDecoder.cpp => Base64AttributeDecoder.cpp} |   105 +-
 shibsp/attribute/DOMAttributeDecoder.cpp           |    28 +-
 shibsp/attribute/ExtensibleAttribute.cpp           |     4 +-
 shibsp/attribute/KeyInfoAttributeDecoder.cpp       |    36 +-
 shibsp/attribute/NameIDAttributeDecoder.cpp        |    49 +-
 .../attribute/NameIDFromScopedAttributeDecoder.cpp |    35 +-
 shibsp/attribute/ScopedAttributeDecoder.cpp        |    20 +-
 shibsp/attribute/SimpleAttribute.cpp               |     4 +-
 shibsp/attribute/StringAttributeDecoder.cpp        |    14 +-
 shibsp/attribute/XMLAttribute.cpp                  |     4 +-
 shibsp/attribute/XMLAttributeDecoder.cpp           |    12 +-
 shibsp/attribute/filtering/AttributeFilter.h       |     5 +-
 shibsp/attribute/filtering/BasicFilteringContext.h |    11 +-
 shibsp/attribute/filtering/FilteringContext.h      |    10 +-
 shibsp/attribute/filtering/MatchFunctor.h          |     5 +-
 .../attribute/filtering/impl/AndMatchFunctor.cpp   |    19 +-
 .../attribute/filtering/impl/AttributeFilter.cpp   |     4 +-
 .../impl/AttributeIssuerInEntityGroupFunctor.cpp   |     4 +-
 .../filtering/impl/AttributeIssuerRegexFunctor.cpp |     8 +-
 .../impl/AttributeIssuerStringFunctor.cpp          |    11 +-
 .../AttributeRequesterInEntityGroupFunctor.cpp     |     4 +-
 .../impl/AttributeRequesterRegexFunctor.cpp        |     8 +-
 .../impl/AttributeRequesterStringFunctor.cpp       |    11 +-
 .../AttributeScopeMatchesShibMDScopeFunctor.cpp    |     7 +-
 .../filtering/impl/AttributeScopeRegexFunctor.cpp  |    22 +-
 .../filtering/impl/AttributeScopeStringFunctor.cpp |    22 +-
 .../filtering/impl/AttributeValueRegexFunctor.cpp  |    22 +-
 .../filtering/impl/AttributeValueStringFunctor.cpp |    21 +-
 .../impl/AuthenticationMethodRegexFunctor.cpp      |    12 +-
 .../impl/AuthenticationMethodStringFunctor.cpp     |    14 +-
 .../filtering/impl/BasicFilteringContext.cpp       |    13 +-
 .../filtering/impl/ChainingAttributeFilter.cpp     |    31 +-
 .../filtering/impl/DummyAttributeFilter.cpp        |    58 +
 shibsp/attribute/filtering/impl/MatchFunctor.cpp   |     6 +-
 .../impl/NameIDQualifierStringFunctor.cpp          |   169 +
 .../attribute/filtering/impl/NotMatchFunctor.cpp   |    19 +-
 .../impl/NumberOfAttributeValuesFunctor.cpp        |    21 +-
 shibsp/attribute/filtering/impl/OrMatchFunctor.cpp |    19 +-
 .../filtering/impl/XMLAttributeFilter.cpp          |   121 +-
 shibsp/attribute/resolver/AttributeExtractor.h     |    13 +-
 shibsp/attribute/resolver/AttributeResolver.h      |    15 +-
 .../resolver/impl/ChainingAttributeExtractor.cpp   |    24 +-
 .../resolver/impl/ChainingAttributeResolver.cpp    |    25 +-
 .../resolver/impl/DelegationAttributeExtractor.cpp |    24 +-
 .../impl/KeyDescriptorAttributeExtractor.cpp       |    35 +-
 .../resolver/impl/QueryAttributeResolver.cpp       |   214 +-
 .../impl/SimpleAggregationAttributeResolver.cpp    |   241 +-
 .../resolver/impl/XMLAttributeExtractor.cpp        |   227 +-
 shibsp/binding/ProtocolProvider.h                  |    74 +
 shibsp/binding/impl/ArtifactResolver.cpp           |     8 +-
 shibsp/binding/impl/SOAPClient.cpp                 |    42 +-
 shibsp/binding/impl/XMLProtocolProvider.cpp        |   236 +
 shibsp/handler/AbstractHandler.h                   |   112 +-
 shibsp/handler/AssertionConsumerService.h          |    27 +-
 shibsp/handler/Handler.h                           |    83 +-
 shibsp/handler/LogoutHandler.h                     |    16 +-
 shibsp/handler/LogoutInitiator.h                   |    58 +
 shibsp/handler/RemotedHandler.h                    |    17 +-
 shibsp/handler/SessionInitiator.h                  |    35 +-
 shibsp/handler/impl/AbstractHandler.cpp            |   570 +-
 shibsp/handler/impl/AssertionConsumerService.cpp   |    52 +-
 shibsp/handler/impl/AssertionLookup.cpp            |    10 +-
 shibsp/handler/impl/ChainingLogoutInitiator.cpp    |    18 +-
 shibsp/handler/impl/ChainingSessionInitiator.cpp   |    12 +-
 shibsp/handler/impl/CookieSessionInitiator.cpp     |     9 +-
 shibsp/handler/impl/DiscoveryFeed.cpp              |   351 +
 shibsp/handler/impl/FormSessionInitiator.cpp       |    36 +-
 shibsp/handler/impl/LocalLogoutInitiator.cpp       |    16 +-
 shibsp/handler/impl/LogoutHandler.cpp              |    12 +-
 shibsp/handler/impl/LogoutInitiator.cpp            |    57 +
 shibsp/handler/impl/MetadataGenerator.cpp          |   198 +-
 shibsp/handler/impl/RemotedHandler.cpp             |   127 +-
 shibsp/handler/impl/SAML1Consumer.cpp              |    34 +-
 shibsp/handler/impl/SAML2ArtifactResolution.cpp    |    47 +-
 shibsp/handler/impl/SAML2Consumer.cpp              |    46 +-
 shibsp/handler/impl/SAML2Logout.cpp                |    89 +-
 shibsp/handler/impl/SAML2LogoutInitiator.cpp       |    55 +-
 shibsp/handler/impl/SAML2NameIDMgmt.cpp            |    80 +-
 shibsp/handler/impl/SAML2SessionInitiator.cpp      |   318 +-
 shibsp/handler/impl/SAMLDSSessionInitiator.cpp     |   179 +-
 shibsp/handler/impl/SessionHandler.cpp             |     6 +-
 shibsp/handler/impl/SessionInitiator.cpp           |   120 +-
 shibsp/handler/impl/Shib1SessionInitiator.cpp      |   101 +-
 shibsp/handler/impl/StatusHandler.cpp              |   132 +-
 shibsp/handler/impl/TransformSessionInitiator.cpp  |    22 +-
 shibsp/handler/impl/WAYFSessionInitiator.cpp       |   102 +-
 shibsp/impl/ChainingAccessControl.cpp              |    19 +-
 shibsp/impl/StorageServiceSessionCache.cpp         |   507 +-
 shibsp/impl/XMLAccessControl.cpp                   |    52 +-
 shibsp/impl/XMLRequestMapper.cpp                   |   189 +-
 shibsp/impl/XMLSecurityPolicyProvider.cpp          |   312 +
 shibsp/impl/XMLServiceProvider.cpp                 |  1829 +-
 shibsp/internal.h                                  |    13 +-
 shibsp/lite/SAMLConstants.cpp                      |    24 +-
 shibsp/lite/SAMLConstants.h                        |    16 +-
 shibsp/metadata/DynamicMetadataProvider.cpp        |   120 +-
 shibsp/metadata/MetadataExtImpl.cpp                |    12 +-
 shibsp/metadata/MetadataProviderCriteria.h         |     8 +-
 shibsp/paths.h                                     |    14 +-
 shibsp/remoting/ListenerService.h                  |     6 +-
 shibsp/remoting/ddf.h                              |     4 +-
 shibsp/remoting/impl/ListenerService.cpp           |    21 +-
 shibsp/remoting/impl/SocketListener.cpp            |    24 +-
 shibsp/remoting/impl/SocketListener.h              |     6 +-
 shibsp/remoting/impl/TCPListener.cpp               |    61 +-
 shibsp/remoting/impl/UnixListener.cpp              |    23 +-
 shibsp/remoting/impl/ddf.cpp                       |    68 +-
 shibsp/security/PKIXTrustEngine.cpp                |    14 +-
 shibsp/security/SecurityPolicy.h                   |     4 +-
 shibsp/security/SecurityPolicyProvider.h           |   116 +
 shibsp/shibsp-lite.vcproj                          |   770 -
 shibsp/shibsp-lite.vcxproj                         |   294 +
 shibsp/shibsp-lite.vcxproj.filters                 |   354 +
 shibsp/shibsp.rc                                   |    28 +-
 shibsp/shibsp.vcproj                               |  1036 -
 shibsp/shibsp.vcxproj                              |   350 +
 shibsp/shibsp.vcxproj.filters                      |   564 +
 shibsp/util/CGIParser.cpp                          |     6 +-
 shibsp/util/CGIParser.h                            |     6 +-
 shibsp/util/DOMPropertySet.cpp                     |    32 +-
 shibsp/util/DOMPropertySet.h                       |    30 +-
 shibsp/util/PropertySet.h                          |    40 +-
 shibsp/util/SPConstants.cpp                        |    11 +-
 shibsp/util/SPConstants.h                          |     7 +-
 shibsp/util/TemplateParameters.cpp                 |     6 +-
 shibsp/util/TemplateParameters.h                   |     6 +-
 shibsp/version.h                                   |     4 +-
 util/Makefile.am                                   |    10 +-
 util/Makefile.in                                   |   343 +-
 util/mdquery.cpp                                   |    26 +-
 util/mdquery.vcproj                                |   372 -
 util/mdquery.vcxproj                               |   215 +
 util/resolvertest.cpp                              |    40 +-
 util/resolvertest.vcproj                           |   374 -
 util/resolvertest.vcxproj                          |   217 +
 272 files changed, 54514 insertions(+), 51051 deletions(-)

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


More information about the commits mailing list