[cpp-sp] 01/05: Merge commit 'upstream/2.3.1+dfsg' into bug/unlink-pidfile

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.3.1+dfsg-5+deb6u1
in repository cpp-sp.

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

commit b4c0bfc65ae74a6d051357c3e0a179fe662bb4f0
Merge: e3f9f27 fb303a3
Author: Ferenc Wagner <wferi at niif.hu>
AuthorDate: Tue Feb 1 16:31:24 2011 +0100

    Merge commit 'upstream/2.3.1+dfsg' into bug/unlink-pidfile

 Portfile                                           |   14 +-
 Portfile.in                                        |   12 +
 adfs/adfs.rc                                       |   10 +-
 apache/mod_shib_13.rc                              |   10 +-
 apache/mod_shib_20.rc                              |   10 +-
 apache/mod_shib_22.rc                              |   10 +-
 config_win32.h                                     |    6 +-
 configs/shibboleth2.xml                            |    2 +-
 configs/shibd-redhat.in                            |   14 +-
 configs/shibd-suse.in                              |    7 +-
 configure                                          |   20 +-
 configure.ac                                       |    4 +-
 doc/README.txt                                     |    2 +-
 doc/RELEASE.txt                                    |    6 +-
 fastcgi/shibauthorizer.rc                          |   10 +-
 fastcgi/shibresponder.rc                           |   10 +-
 isapi_shib/isapi_shib.rc                           |   10 +-
 memcache-store/memcache-store.rc                   |   10 +-
 nsapi_shib/nsapi_shib.rc                           |   10 +-
 odbc-store/odbc-store.rc                           |   10 +-
 pkginfo                                            |    2 +-
 schemas/shibboleth-2.0-native-sp-config.xsd        | 1450 ++++-----
 shibboleth.spec                                    |    7 +-
 shibboleth.spec.in                                 |    5 +-
 shibd/shibd.rc                                     |   10 +-
 shibd/shibd_win32.cpp                              |    2 +-
 shibsp/Makefile.am                                 |    4 +-
 shibsp/Makefile.in                                 |    4 +-
 .../resolver/impl/QueryAttributeResolver.cpp       |  150 +-
 .../impl/SimpleAggregationAttributeResolver.cpp    |  121 +-
 .../resolver/impl/XMLAttributeExtractor.cpp        |   76 +-
 shibsp/handler/impl/AbstractHandler.cpp            | 1352 ++++----
 shibsp/handler/impl/AssertionConsumerService.cpp   |   29 +-
 shibsp/handler/impl/SAML2ArtifactResolution.cpp    |   61 +-
 shibsp/handler/impl/SAML2Logout.cpp                |    2 +-
 shibsp/handler/impl/SAML2LogoutInitiator.cpp       |   80 +-
 shibsp/handler/impl/SAMLDSSessionInitiator.cpp     |   35 +-
 shibsp/impl/XMLServiceProvider.cpp                 | 3417 ++++++++++----------
 shibsp/paths.h                                     |    2 +-
 shibsp/shibsp.rc                                   |    8 +-
 shibsp/version.h                                   |    2 +-
 41 files changed, 3649 insertions(+), 3357 deletions(-)

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