[shibboleth-sp2] 02/02: Merge tag 'upstream/2.6.1+dfsg1' into debian/master

[Ferenc Wágner]

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

wferi pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit a15d712f27348afeea3484a4fac55347565a2b9b
Merge: 81ba32b f2e34f4
Author: Ferenc Wágner <wferi at debian.org>
Date:   Thu Nov 16 15:23:10 2017 +0100

    Merge tag 'upstream/2.6.1+dfsg1' into debian/master
    
    Upstream version 2.6.1+dfsg1

 Makefile.in                                        |   70 +-
 Projects/vc10/fastcgi/shibauthorizer.vcxproj       |    7 +-
 Projects/vc10/fastcgi/shibresponder.vcxproj        |    7 +-
 aclocal.m4                                         |  393 +-
 adfs/Makefile.in                                   |   25 +-
 adfs/adfs.rc                                       |   12 +-
 apache/Makefile.in                                 |   25 +-
 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/compile                                  |  348 ++
 build-aux/config.guess                             |  375 +-
 build-aux/config.sub                               |  118 +-
 build-aux/depcomp                                  |    6 +-
 build-aux/install-sh                               |  368 +-
 build-aux/ltmain.sh                                | 5530 +++++++++++++-------
 build-aux/missing                                  |    8 +-
 config.h.in                                        |    3 +-
 config_win32.h                                     |    6 +-
 configs/Makefile.in                                |   23 +-
 configs/keygen.sh                                  |    2 +-
 configs/shibboleth2.xml                            |    3 +-
 configure                                          | 3362 +++++++-----
 configure.ac                                       |    2 +-
 doc/Makefile.in                                    |   23 +-
 fastcgi/Makefile.in                                |   25 +-
 fastcgi/shibauthorizer.rc                          |   12 +-
 fastcgi/shibresponder.rc                           |   12 +-
 isapi_shib/isapi_shib.rc                           |   12 +-
 m4/._libtool.m4                                    |  Bin 0 -> 239 bytes
 m4/._ltoptions.m4                                  |  Bin 0 -> 239 bytes
 m4/._ltsugar.m4                                    |  Bin 0 -> 239 bytes
 m4/._lt~obsolete.m4                                |  Bin 0 -> 239 bytes
 m4/libtool.m4                                      | 2567 +++++----
 m4/ltoptions.m4                                    |  127 +-
 m4/ltsugar.m4                                      |    7 +-
 m4/ltversion.m4                                    |   12 +-
 m4/lt~obsolete.m4                                  |    7 +-
 memcache-store/Makefile.in                         |   25 +-
 memcache-store/memcache-store.rc                   |   12 +-
 nsapi_shib/Makefile.in                             |   25 +-
 nsapi_shib/nsapi_shib.rc                           |   12 +-
 odbc-store/Makefile.in                             |   25 +-
 odbc-store/odbc-store.rc                           |   12 +-
 plugins/Makefile.in                                |   26 +-
 plugins/plugins.rc                                 |   12 +-
 schemas/Makefile.in                                |   23 +-
 selinux/Makefile.in                                |   23 +-
 shibboleth.spec                                    |    2 +-
 shibd/Makefile.in                                  |   25 +-
 shibd/shibd.rc                                     |   12 +-
 shibsp/Makefile.am                                 |    4 +-
 shibsp/Makefile.in                                 |   45 +-
 shibsp/ServiceProvider.cpp                         |    2 +-
 .../impl/AttributeMatchesShibMDScopeFunctor.cpp    |   10 +-
 shibsp/handler/impl/AttributeCheckerHandler.cpp    |    3 +
 shibsp/handler/impl/ExternalAuthHandler.cpp        |    6 +-
 shibsp/handler/impl/RemotedHandler.cpp             |    7 +-
 shibsp/impl/StorageServiceSessionCache.cpp         |    2 +-
 shibsp/impl/XMLRequestMapper.cpp                   |   34 +-
 shibsp/metadata/DynamicMetadataProvider.cpp        |    2 +-
 shibsp/paths.h                                     |   16 +-
 shibsp/shibsp.rc                                   |   10 +-
 shibsp/version.h                                   |    2 +-
 util/Makefile.in                                   |   25 +-
 util/mdquery.rc                                    |   12 +-
 util/resolvertest.rc                               |   12 +-
 68 files changed, 8644 insertions(+), 5327 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git