[cpp-sp] 05/36: Merge tag 'upstream/2.5.1+dfsg'
Scott Cantor
cantor.2 at osu.edu
Thu Dec 20 19:45:57 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/2.5.1+dfsg-1
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=4f6280863f20bd8a2feee266beb6e1523fa9ba5f
commit 4f6280863f20bd8a2feee266beb6e1523fa9ba5f
Merge: 77a063f 2c4682a
Author: Russ Allbery <rra at debian.org>
AuthorDate: Thu May 30 16:39:26 2013 -0700
Merge tag 'upstream/2.5.1+dfsg'
Upstream version 2.5.1+dfsg
Conflicts:
configs/Makefile.am
configs/metagen.sh
memcache-store/memcache-store.cpp
Makefile.am | 19 +-
Makefile.in | 313 ++--
Shibboleth.sln | 100 +-
aclocal.m4 | 346 ++--
adfs/Makefile.am | 4 +-
adfs/Makefile.in | 143 +-
adfs/adfs-lite.vcxproj | 9 +-
adfs/adfs.cpp | 216 ++-
adfs/adfs.rc | 234 +--
adfs/adfs.vcxproj | 13 +-
apache/Makefile.am | 39 +-
apache/Makefile.in | 275 ++-
apache/{mod_apache.cpp => mod_shib.cpp} | 1850 ++++++++++++-------
apache/mod_shib13.vcxproj | 25 +-
apache/mod_shib20.vcxproj | 23 +-
apache/mod_shib22.vcxproj | 23 +-
apache/{mod_shib22.vcxproj => mod_shib24.vcxproj} | 487 +++--
apache/mod_shib_13.cpp | 2 +-
apache/mod_shib_13.rc | 14 +-
apache/mod_shib_20.cpp | 2 +-
apache/mod_shib_20.rc | 14 +-
apache/mod_shib_22.cpp | 2 +-
apache/mod_shib_22.rc | 14 +-
apache/{mod_shib_22.cpp => mod_shib_24.cpp} | 8 +-
apache/{mod_shib_20.rc => mod_shib_24.rc} | 20 +-
build-aux/depcomp | 246 ++-
build-aux/install-sh | 35 +-
build-aux/ltmain.sh | 95 +-
build-aux/missing | 148 +-
config.h.in | 54 +
config_win32.h | 11 +-
configs/Makefile.am | 44 +-
configs/Makefile.in | 116 +-
configs/SetService32.bat | 9 +
configs/SetService64.bat | 9 +
configs/accessError.html | 2 +
configs/apache.config.in | 7 +-
configs/apache2.config.in | 7 +-
configs/apache22.config.in | 7 +-
configs/{apache2.config.in => apache24.config.in} | 9 +-
configs/attrChecker.html | 50 +
configs/attribute-map.xml | 13 +-
configs/console.logger | 1 +
configs/discoveryTemplate.html | 4 +
configs/example-shibboleth2.xml | 33 +-
configs/globalLogout.html | 2 +
configs/keygen.bat | 6 +-
configs/localLogout.html | 3 +
configs/metadataError.html | 2 +
configs/metagen.sh | 15 +-
configs/native.logger.in | 1 +
configs/partialLogout.html | 2 +
configs/security-policy.xml | 5 +-
configs/sessionError.html | 2 +
configs/shibboleth2.xml | 23 +-
configs/shibd-osx.plist.in | 3 +-
configs/shibd-redhat.in | 109 +-
configs/shibd-suse.in | 13 +-
configs/shibd.logger.in | 6 +
configs/sslError.html | 2 +
configure | 1897 +++++++++++++++-----
configure.ac | 284 ++-
doc/CREDITS.txt | 79 +-
doc/Makefile.am | 15 +-
doc/Makefile.in | 127 +-
doc/README.txt | 20 +-
doc/RELEASE.txt | 16 +-
doc/logo.jpg | Bin 13660 -> 0 bytes
doc/main.css | 20 +-
doxygen.am | 24 +-
fastcgi/Makefile.am | 2 +-
fastcgi/Makefile.in | 89 +-
fastcgi/shibauthorizer.cpp | 4 +-
fastcgi/shibauthorizer.rc | 218 +--
fastcgi/shibauthorizer.vcxproj | 9 +-
fastcgi/shibresponder.cpp | 12 +-
fastcgi/shibresponder.rc | 218 +--
fastcgi/shibresponder.vcxproj | 9 +-
isapi_shib/isapi_shib.cpp | 397 ++--
isapi_shib/isapi_shib.rc | 14 +-
isapi_shib/isapi_shib.vcxproj | 13 +-
m4/acinclude.m4 | 2 +-
m4/boost.m4 | 1138 ++++++++++++
m4/doxygen.m4 | 300 +++-
m4/libtool.m4 | 265 ++-
m4/ltoptions.m4 | 19 +-
m4/ltversion.m4 | 10 +-
memcache-store/Makefile.am | 4 +-
memcache-store/Makefile.in | 141 +-
memcache-store/memcache-store.cpp | 1108 +++++-------
memcache-store/memcache-store.rc | 14 +-
memcache-store/memcache-store.vcxproj | 19 +-
msbuild/Includes.props | 68 +
msbuild/Versions.props | 106 ++
msbuild/build.make | 75 +
nsapi_shib/Makefile.am | 4 +-
nsapi_shib/Makefile.in | 132 +-
nsapi_shib/nsapi_shib.cpp | 55 +-
nsapi_shib/nsapi_shib.rc | 14 +-
nsapi_shib/nsapi_shib.vcxproj | 11 +-
odbc-store/Makefile.am | 4 +-
odbc-store/Makefile.in | 141 +-
odbc-store/odbc-store.cpp | 334 ++--
odbc-store/odbc-store.rc | 14 +-
odbc-store/odbc-store.vcxproj | 11 +-
plugins/CaseFoldingAttributeResolver.cpp | 221 +++
plugins/GSSAPIAttributeExtractor.cpp | 426 +++++
plugins/Makefile.am | 36 +
{adfs => plugins}/Makefile.in | 252 ++-
plugins/TemplateAttributeResolver.cpp | 226 +++
plugins/TimeAccessControl.cpp | 285 +++
plugins/TransformAttributeResolver.cpp | 264 +++
{shibsp => plugins}/internal.h | 30 +-
plugins/plugins.cpp | 79 +
fastcgi/shibauthorizer.rc => plugins/plugins.rc | 226 +--
adfs/adfs.vcxproj => plugins/plugins.vcxproj | 412 ++---
apache/mod_shib_13.cpp => plugins/resource.h | 35 +-
schemas/Makefile.in | 74 +-
schemas/shibboleth-2.0-afp-mf-saml.xsd | 232 ++-
schemas/shibboleth-2.0-attribute-map.xsd | 73 +-
schemas/shibboleth-2.0-native-sp-config.xsd | 78 +-
selinux/Makefile.in | 83 +-
shibboleth.spec | 315 ++--
shibboleth.spec.in | 315 ++--
shibd/Makefile.am | 2 -
shibd/Makefile.in | 83 +-
shibd/shibd.cpp | 90 +-
shibd/shibd.rc | 218 +--
shibd/shibd.vcxproj | 11 +-
shibd/shibd_win32.cpp | 34 +-
shibsp/AbstractSPRequest.cpp | 77 +-
shibsp/AbstractSPRequest.h | 3 +-
shibsp/Application.cpp | 53 +-
shibsp/Application.h | 11 +
shibsp/GSSRequest.h | 8 +
shibsp/Makefile.am | 48 +-
shibsp/Makefile.in | 515 ++++--
shibsp/SPConfig.cpp | 94 +-
shibsp/SPConfig.h | 6 +
shibsp/ServiceProvider.cpp | 225 ++-
shibsp/SessionCache.h | 45 +
shibsp/TransactionLog.h | 223 ++-
shibsp/attribute/Attribute.cpp | 62 +-
shibsp/attribute/AttributeDecoder.h | 37 +-
shibsp/attribute/Base64AttributeDecoder.cpp | 23 +-
shibsp/attribute/BinaryAttribute.cpp | 135 ++
.../{NameIDAttribute.h => BinaryAttribute.h} | 60 +-
shibsp/attribute/DOMAttributeDecoder.cpp | 36 +-
shibsp/attribute/ExtensibleAttribute.cpp | 40 +-
shibsp/attribute/KeyInfoAttributeDecoder.cpp | 35 +-
shibsp/attribute/NameIDAttribute.cpp | 60 +-
shibsp/attribute/NameIDAttribute.h | 5 +-
shibsp/attribute/NameIDAttributeDecoder.cpp | 64 +-
.../attribute/NameIDFromScopedAttributeDecoder.cpp | 29 +-
shibsp/attribute/ScopedAttribute.cpp | 19 +-
shibsp/attribute/ScopedAttributeDecoder.cpp | 32 +-
shibsp/attribute/StringAttributeDecoder.cpp | 46 +-
shibsp/attribute/XMLAttributeDecoder.cpp | 21 +-
shibsp/attribute/filtering/MatchFunctor.h | 18 +
.../attribute/filtering/impl/AndMatchFunctor.cpp | 30 +-
.../impl/AttributeIssuerEntityAttributeFunctor.cpp | 79 +
.../impl/AttributeIssuerEntityMatcherFunctor.cpp | 79 +
.../filtering/impl/AttributeIssuerRegexFunctor.cpp | 12 +-
.../impl/AttributeIssuerStringFunctor.cpp | 5 +-
.../AttributeRequesterEntityAttributeFunctor.cpp | 78 +
... => AttributeRequesterEntityMatcherFunctor.cpp} | 45 +-
.../impl/AttributeRequesterRegexFunctor.cpp | 12 +-
.../impl/AttributeRequesterStringFunctor.cpp | 5 +-
.../AttributeScopeMatchesShibMDScopeFunctor.cpp | 33 +-
.../filtering/impl/AttributeScopeRegexFunctor.cpp | 21 +-
.../filtering/impl/AttributeScopeStringFunctor.cpp | 43 +-
.../filtering/impl/AttributeValueRegexFunctor.cpp | 22 +-
.../filtering/impl/AttributeValueStringFunctor.cpp | 25 +-
.../impl/AuthenticationMethodRegexFunctor.cpp | 12 +-
.../filtering/impl/ChainingAttributeFilter.cpp | 36 +-
shibsp/attribute/filtering/impl/MatchFunctor.cpp | 24 +
.../attribute/filtering/impl/NotMatchFunctor.cpp | 11 +-
shibsp/attribute/filtering/impl/OrMatchFunctor.cpp | 30 +-
.../filtering/impl/XMLAttributeFilter.cpp | 83 +-
shibsp/attribute/resolver/AttributeExtractor.h | 28 +-
shibsp/attribute/resolver/AttributeResolver.h | 37 +-
.../resolver/impl/AssertionAttributeExtractor.cpp | 372 ++++
.../resolver/impl/ChainingAttributeExtractor.cpp | 78 +-
.../resolver/impl/ChainingAttributeResolver.cpp | 128 +-
.../resolver/impl/DelegationAttributeExtractor.cpp | 73 +-
.../impl/KeyDescriptorAttributeExtractor.cpp | 35 +-
.../resolver/impl/MetadataAttributeExtractor.cpp | 392 ++++
.../resolver/impl/QueryAttributeResolver.cpp | 161 +-
.../impl/SimpleAggregationAttributeResolver.cpp | 311 ++--
.../resolver/impl/XMLAttributeExtractor.cpp | 523 +++---
shibsp/base.h | 60 +-
shibsp/binding/ArtifactResolver.h | 2 +
shibsp/binding/impl/ArtifactResolver.cpp | 142 +-
shibsp/binding/impl/XMLProtocolProvider.cpp | 36 +-
shibsp/config_pub.h | 9 +-
shibsp/config_pub.h.in | 3 +
shibsp/handler/AssertionConsumerService.h | 71 +-
shibsp/handler/Handler.h | 20 +
shibsp/handler/LogoutHandler.h | 20 +
shibsp/handler/SecuredHandler.h | 83 +
shibsp/handler/SessionInitiator.h | 24 +
shibsp/handler/impl/AbstractHandler.cpp | 253 ++-
shibsp/handler/impl/AssertionConsumerService.cpp | 404 +++--
shibsp/handler/impl/AssertionLookup.cpp | 74 +-
shibsp/handler/impl/AttributeCheckerHandler.cpp | 209 +++
shibsp/handler/impl/ChainingLogoutInitiator.cpp | 24 +-
shibsp/handler/impl/ChainingSessionInitiator.cpp | 32 +-
shibsp/handler/impl/DiscoveryFeed.cpp | 17 +-
shibsp/handler/impl/ExternalAuthHandler.cpp | 827 +++++++++
shibsp/handler/impl/FormSessionInitiator.cpp | 4 +-
shibsp/handler/impl/LocalLogoutInitiator.cpp | 115 +-
shibsp/handler/impl/LogoutHandler.cpp | 70 +-
shibsp/handler/impl/MetadataGenerator.cpp | 338 ++--
shibsp/handler/impl/RemotedHandler.cpp | 139 +-
shibsp/handler/impl/SAML1Consumer.cpp | 82 +-
shibsp/handler/impl/SAML2ArtifactResolution.cpp | 89 +-
shibsp/handler/impl/SAML2Consumer.cpp | 231 ++-
shibsp/handler/impl/SAML2Logout.cpp | 304 ++--
shibsp/handler/impl/SAML2LogoutInitiator.cpp | 249 ++-
shibsp/handler/impl/SAML2NameIDMgmt.cpp | 167 +-
shibsp/handler/impl/SAML2SessionInitiator.cpp | 237 +--
shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 18 +-
shibsp/handler/impl/SecuredHandler.cpp | 112 ++
shibsp/handler/impl/SessionHandler.cpp | 245 ++-
shibsp/handler/impl/SessionInitiator.cpp | 34 +
shibsp/handler/impl/Shib1SessionInitiator.cpp | 49 +-
shibsp/handler/impl/StatusHandler.cpp | 169 +-
shibsp/handler/impl/TransformSessionInitiator.cpp | 38 +-
shibsp/handler/impl/WAYFSessionInitiator.cpp | 14 +-
shibsp/impl/ChainingAccessControl.cpp | 52 +-
shibsp/impl/StorageServiceSessionCache.cpp | 693 ++++---
shibsp/impl/TransactionLog.cpp | 925 ++++++++++
shibsp/impl/XMLAccessControl.cpp | 169 +-
shibsp/impl/XMLRequestMapper.cpp | 446 ++---
shibsp/impl/XMLSecurityPolicyProvider.cpp | 86 +-
shibsp/impl/XMLServiceProvider.cpp | 1305 ++++++++------
shibsp/internal.h | 9 -
shibsp/metadata/DynamicMetadataProvider.cpp | 60 +-
shibsp/metadata/MetadataExtImpl.cpp | 12 +-
shibsp/paths.h | 23 +-
shibsp/paths.h.in | 23 +-
shibsp/remoting/ddf.h | 2 +-
shibsp/remoting/impl/ListenerService.cpp | 21 +-
shibsp/remoting/impl/SocketListener.cpp | 38 +-
shibsp/remoting/impl/SocketListener.h | 11 +-
shibsp/remoting/impl/TCPListener.cpp | 155 +-
shibsp/remoting/impl/UnixListener.cpp | 10 +-
shibsp/remoting/impl/ddf.cpp | 17 +-
shibsp/security/PKIXTrustEngine.cpp | 59 +-
shibsp/security/SecurityPolicyProvider.h | 11 +
shibsp/shibsp-lite.vcxproj | 34 +-
shibsp/shibsp-lite.vcxproj.filters | 27 +
shibsp/shibsp.rc | 274 +--
shibsp/shibsp.vcxproj | 43 +-
shibsp/shibsp.vcxproj.filters | 48 +
shibsp/util/CGIParser.cpp | 157 +-
shibsp/util/CGIParser.h | 10 +-
shibsp/util/DOMPropertySet.cpp | 67 +-
shibsp/util/DOMPropertySet.h | 3 +-
shibsp/util/IPRange.cpp | 192 ++
shibsp/util/IPRange.h | 121 ++
shibsp/util/SPConstants.cpp | 8 +
shibsp/util/SPConstants.h | 3 +
shibsp/util/TemplateParameters.cpp | 34 +-
shibsp/util/TemplateParameters.h | 17 +-
apache/mod_shib_13.cpp => shibsp/version.cpp | 31 +-
shibsp/version.h | 18 +-
util/Makefile.am | 6 +-
util/Makefile.in | 114 +-
nsapi_shib/nsapi_shib.rc => util/mdquery.rc | 22 +-
util/mdquery.vcxproj | 17 +-
util/resolvertest.cpp | 50 +-
nsapi_shib/nsapi_shib.rc => util/resolvertest.rc | 22 +-
util/resolvertest.vcxproj | 18 +-
apache/mod_shib_13.cpp => util/resource.h | 35 +-
275 files changed, 22620 insertions(+), 9590 deletions(-)
diff --cc configs/Makefile.am
index 9ff0a9b,ee90def..841f9de
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@@ -2,13 -2,14 +2,14 @@@
AUTOMAKE_OPTIONS = foreign
- pkglibdir = ${libdir}/@PACKAGE@
- pkglogdir = ${localstatedir}/log/@PACKAGE@
- pkgdocdir = ${datadir}/doc/@PACKAGE@
+ pkglibdir = ${libdir}/@PACKAGE_NAME@
+ pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
-shirelogdir = ${localstatedir}/log/httpd
+shirelogdir = ${localstatedir}/log/apache2
- pkgxmldir = $(datadir)/xml/@PACKAGE@
- pkgrundir = $(localstatedir)/run/@PACKAGE@
- pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+ pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
+ pkgwebdir = $(datadir)/@PACKAGE_NAME@
+ pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
+ pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
pkgsysconf_DATA = \
shibd-redhat \
shibd-suse \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list