[cpp-sp] 03/07: Merge tag 'upstream/2.5.2+dfsg'

[Scott Cantor]

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

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

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

commit 9d216506814fd3ba72dae8b1b89566403204d6a9
Merge: 310b983 1554c25
Author: Russ Allbery <rra at debian.org>
AuthorDate: Tue Jun 18 11:13:46 2013 -0700

    Merge tag 'upstream/2.5.2+dfsg'
    
    Upstream version 2.5.2+dfsg

 Makefile.am                                        |   4 -
 Makefile.in                                        |  34 +-
 Shibboleth.sln                                     |   1 +
 aclocal.m4                                         |   6 +-
 adfs/Makefile.in                                   |   2 +-
 adfs/adfs-lite.vcxproj                             |   4 +-
 adfs/adfs.rc                                       |  12 +-
 adfs/adfs.vcxproj                                  |   4 +-
 apache/Makefile.in                                 |   2 +-
 apache/mod_shib.cpp                                |  99 ++++-
 apache/mod_shib13.vcxproj                          |   4 +-
 apache/mod_shib20.vcxproj                          |   4 +-
 apache/mod_shib22.vcxproj                          |   4 +-
 apache/mod_shib24.vcxproj                          |   4 +-
 apache/mod_shib_13.rc                              |  12 +-
 apache/mod_shib_20.rc                              |  12 +-
 apache/mod_shib_22.rc                              |  12 +-
 apache/mod_shib_24.rc                              |  12 +-
 build-aux/depcomp                                  |  11 +-
 config.h.in                                        |   3 +
 config_win32.h                                     |   6 +-
 configs/Makefile.in                                |   2 +-
 configs/apache.config.in                           |  19 +-
 configs/apache2.config.in                          |   9 +
 configs/apache22.config.in                         |   9 +
 configs/apache24.config.in                         |  18 +-
 configs/metagen.sh                                 |  18 +-
 configure                                          |  76 +++-
 configure.ac                                       |  34 +-
 doc/Makefile.in                                    |   2 +-
 fastcgi/Makefile.am                                |   4 +-
 fastcgi/Makefile.in                                |   6 +-
 fastcgi/shibauthorizer.rc                          |  12 +-
 fastcgi/shibauthorizer.vcxproj                     |   4 +-
 fastcgi/shibresponder.rc                           |  12 +-
 fastcgi/shibresponder.vcxproj                      |   4 +-
 isapi_shib/isapi_shib.rc                           |  12 +-
 isapi_shib/isapi_shib.vcproj                       | 400 ---------------------
 isapi_shib/isapi_shib.vcxproj                      |   4 +-
 memcache-store/Makefile.am                         |   7 +-
 memcache-store/Makefile.in                         |   8 +-
 memcache-store/memcache-store.rc                   |  12 +-
 memcache-store/memcache-store.vcxproj              |   6 +-
 msbuild/Includes.props                             |  68 ----
 msbuild/Versions.props                             | 106 ------
 msbuild/build.make                                 |  75 ----
 nsapi_shib/Makefile.in                             |   2 +-
 nsapi_shib/nsapi_shib.rc                           |  12 +-
 nsapi_shib/nsapi_shib.vcxproj                      |   4 +-
 odbc-store/Makefile.in                             |   2 +-
 odbc-store/odbc-store.rc                           |  12 +-
 odbc-store/odbc-store.vcxproj                      |   4 +-
 plugins/Makefile.in                                |   2 +-
 plugins/plugins.rc                                 |  12 +-
 plugins/plugins.vcxproj                            |   4 +-
 schemas/Makefile.in                                |   2 +-
 selinux/Makefile.in                                |   2 +-
 shibboleth.spec                                    |  10 +-
 shibboleth.spec.in                                 |   8 +-
 shibd/Makefile.in                                  |   2 +-
 shibd/shibd.rc                                     |  12 +-
 shibd/shibd.vcxproj                                |   4 +-
 shibsp/Makefile.am                                 |   4 +-
 shibsp/Makefile.in                                 |  10 +-
 .../resolver/impl/MetadataAttributeExtractor.cpp   |   8 +-
 shibsp/handler/impl/DiscoveryFeed.cpp              |   6 +-
 shibsp/handler/impl/SAML2LogoutInitiator.cpp       |   2 +-
 shibsp/remoting/impl/TCPListener.cpp               |  37 +-
 shibsp/remoting/impl/UnixListener.cpp              |  20 +-
 shibsp/shibsp-lite.vcxproj                         |   4 +-
 shibsp/shibsp.rc                                   |  12 +-
 shibsp/shibsp.vcxproj                              |   4 +-
 shibsp/version.h                                   |   2 +-
 util/Makefile.in                                   |   2 +-
 util/mdquery.rc                                    |  12 +-
 util/mdquery.vcxproj                               |   4 +-
 util/resolvertest.rc                               |  12 +-
 util/resolvertest.vcxproj                          |   4 +-
 78 files changed, 506 insertions(+), 910 deletions(-)

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