[shibboleth-sp2] 01/17: Merge tag 'upstream/2.6.0+dfsg1' into debian/master

Ferenc Wágner wferi at moszumanska.debian.org
Thu Sep 1 09:29:33 UTC 2016


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

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

commit e70419ae779852446a38ffcbb804a28696abaf4a
Merge: 5d9a21f 487d91b
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Aug 31 09:23:56 2016 +0200

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

 Makefile.am                                        |    2 +-
 Makefile.in                                        |  341 +--
 Shibboleth.sln => Projects/vc10/Shibboleth.sln     |  161 +-
 Projects/vc10/Wix/Installer.vcxproj                |   98 +
 Projects/vc10/Wix/MergeModules.vcxproj             |  117 +
 {adfs => Projects/vc10/adfs}/adfs-lite.vcxproj     |   34 +-
 {adfs => Projects/vc10/adfs}/adfs.vcxproj          |   34 +-
 .../vc10/apache}/mod_shib13.vcxproj                |   40 +-
 .../vc10/apache}/mod_shib20.vcxproj                |   40 +-
 .../vc10/apache}/mod_shib22.vcxproj                |   40 +-
 .../vc10/apache}/mod_shib24.vcxproj                |   40 +-
 .../vc10/fastcgi}/shibauthorizer.vcxproj           |   31 +-
 .../vc10/fastcgi}/shibresponder.vcxproj            |   31 +-
 .../vc10/isapi_shib}/isapi_shib.vcxproj            |   33 +-
 .../vc10/memcache-store}/memcache-store.vcxproj    |   37 +-
 .../vc10/nsapi_shib}/nsapi_shib.vcxproj            |   35 +-
 .../vc10/odbc-store}/odbc-store.vcxproj            |   34 +-
 .../vc10/plugins/plugins-lite.vcxproj              |  106 +-
 {plugins => Projects/vc10/plugins}/plugins.vcxproj |   49 +-
 Projects/vc10/plugins/plugins.vcxproj.filters      |   22 +
 {shibd => Projects/vc10/shibd}/shibd.vcxproj       |   40 +-
 .../vc10/shibsp}/shibsp-lite.vcxproj               |  245 +-
 .../vc10/shibsp}/shibsp-lite.vcxproj.filters       |  310 +--
 Projects/vc10/shibsp/shibsp.vcxproj                |  368 +++
 .../vc10/shibsp}/shibsp.vcxproj.filters            |  621 ++---
 {util => Projects/vc10/util}/mdquery.vcxproj       |   31 +-
 Projects/vc10/util/messages.vcxproj                |  180 ++
 Projects/vc10/util/messages.vcxproj.filters        |   27 +
 {util => Projects/vc10/util}/resolvertest.vcxproj  |   31 +-
 Shibboleth.sln => Projects/vc14/Shibboleth.sln     |  753 +++---
 Projects/vc14/Wix/Installer.vcxproj                |   96 +
 Projects/vc14/Wix/MergeModules.vcxproj             |  115 +
 {adfs => Projects/vc14/adfs}/adfs-lite.vcxproj     |  434 +--
 {adfs => Projects/vc14/adfs}/adfs.vcxproj          |  418 +--
 .../vc14/apache}/mod_shib13.vcxproj                |  506 ++--
 .../vc14/apache}/mod_shib20.vcxproj                |  518 ++--
 .../vc14/apache}/mod_shib22.vcxproj                |  534 ++--
 .../vc14/apache}/mod_shib24.vcxproj                |  462 ++--
 .../vc14/fastcgi}/shibauthorizer.vcxproj           |  470 ++--
 .../vc14/fastcgi}/shibresponder.vcxproj            |  472 ++--
 .../vc14/isapi_shib}/isapi_shib.vcxproj            |  488 ++--
 .../vc14/memcache-store}/memcache-store.vcxproj    |  398 +--
 .../vc14/nsapi_shib}/nsapi_shib.vcxproj            |  486 ++--
 .../vc14/odbc-store}/odbc-store.vcxproj            |  390 +--
 .../vc14/plugins/plugins-lite.vcxproj              |  428 +--
 {plugins => Projects/vc14/plugins}/plugins.vcxproj |  425 +--
 Projects/vc14/plugins/plugins.vcxproj.filters      |   22 +
 {shibd => Projects/vc14/shibd}/shibd.vcxproj       |  454 ++--
 .../vc14/shibsp}/shibsp-lite.vcxproj               |  618 ++---
 .../vc14/shibsp}/shibsp-lite.vcxproj.filters       |  768 +++---
 Projects/vc14/shibsp/shibsp.vcxproj                |  375 +++
 .../vc14/shibsp}/shibsp.vcxproj.filters            | 1230 ++++-----
 {util => Projects/vc14/util}/mdquery.vcxproj       |  442 ++--
 Projects/vc14/util/messages.vcxproj                |  184 ++
 Projects/vc14/util/messages.vcxproj.filters        |   25 +
 {util => Projects/vc14/util}/resolvertest.vcxproj  |  451 ++--
 aclocal.m4                                         |  608 +++--
 adfs/Makefile.am                                   |    2 +-
 adfs/Makefile.in                                   |  266 +-
 adfs/adfs.cpp                                      |   17 +-
 adfs/adfs.rc                                       |   10 +-
 apache/Makefile.am                                 |    1 -
 apache/Makefile.in                                 |  337 ++-
 apache/mod_shib_13.rc                              |   10 +-
 apache/mod_shib_20.rc                              |   10 +-
 apache/mod_shib_22.rc                              |   10 +-
 apache/mod_shib_24.rc                              |   10 +-
 build-aux/config.guess                             |  184 +-
 build-aux/config.sub                               |   88 +-
 build-aux/depcomp                                  |  455 ++--
 build-aux/install-sh                               |   14 +-
 build-aux/ltmain.sh                                |   32 +-
 build-aux/missing                                  |  414 ++-
 config_win32.h                                     |    6 +-
 configs/Makefile.am                                |    5 +-
 configs/Makefile.in                                |  113 +-
 configs/attribute-map.xml                          |  109 +-
 configs/attribute-policy.xml                       |    9 +-
 configs/example-shibboleth2.xml                    |    2 +-
 configs/keygen.bat                                 |   42 +-
 configs/keygen.sh                                  |   40 +-
 configs/shibboleth2.xml                            |    3 +-
 configs/upgrade.xsl                                |  461 ----
 configs/xsltproc.js                                |   45 -
 configure                                          |  348 ++-
 configure.ac                                       |    2 +-
 doc/CREDITS.txt                                    |    2 +
 doc/LOG4CPP.LICENSE                                |   20 +-
 doc/Makefile.in                                    |  110 +-
 doc/NOTICE.txt                                     |    3 +-
 fastcgi/Makefile.am                                |    2 -
 fastcgi/Makefile.in                                |  289 +-
 fastcgi/shibauthorizer.rc                          |   10 +-
 fastcgi/shibresponder.rc                           |   10 +-
 isapi_shib/.gitignore                              |    7 -
 isapi_shib/isapi_shib.cpp                          |   55 +-
 isapi_shib/isapi_shib.rc                           |   10 +-
 m4/boost.m4                                        |    4 +-
 m4/libtool.m4                                      |   61 +-
 memcache-store/Makefile.am                         |    2 +-
 memcache-store/Makefile.in                         |  254 +-
 memcache-store/memcache-store.cpp                  |   29 +-
 memcache-store/memcache-store.rc                   |   10 +-
 nsapi_shib/Makefile.am                             |    2 +-
 nsapi_shib/Makefile.in                             |  261 +-
 nsapi_shib/nsapi_shib.rc                           |   10 +-
 odbc-store/Makefile.am                             |    2 +-
 odbc-store/Makefile.in                             |  254 +-
 odbc-store/odbc-store.cpp                          |    2 +
 odbc-store/odbc-store.rc                           |   10 +-
 plugins/AttributeResolverHandler.cpp               |  509 ++++
 plugins/Makefile.am                                |    3 +-
 plugins/Makefile.in                                |  290 ++-
 plugins/plugins.cpp                                |    3 +
 plugins/plugins.rc                                 |   10 +-
 schemas/Makefile.in                                |  107 +-
 schemas/shibboleth-2.0-afp-mf-basic.xsd            |   48 +-
 schemas/shibboleth-2.0-afp-mf-saml.xsd             |  120 +-
 schemas/shibboleth-2.0-afp.xsd                     |   19 +-
 schemas/shibboleth-2.0-native-sp-config.xsd        |   40 +-
 selinux/Makefile.in                                |  109 +-
 shibboleth.spec                                    |   23 +-
 shibboleth.spec.in                                 |   21 +-
 shibd/Makefile.am                                  |    2 +-
 shibd/Makefile.in                                  |  259 +-
 shibd/shibd.rc                                     |   10 +-
 shibd/shibd_win32.cpp                              |   16 +-
 shibsp/Makefile.am                                 |   14 +-
 shibsp/Makefile.in                                 | 2751 ++++++++++----------
 shibsp/SPConfig.cpp                                |   47 +
 shibsp/SPConfig.h                                  |   12 +
 shibsp/ServiceProvider.cpp                         |  200 +-
 shibsp/TransactionLog.h                            |   23 +-
 shibsp/attribute/Attribute.cpp                     |    3 +-
 shibsp/attribute/filtering/MatchFunctor.h          |   20 +-
 ....cpp => AttributeMatchesShibMDScopeFunctor.cpp} |   40 +-
 shibsp/attribute/filtering/impl/MatchFunctor.cpp   |   22 +
 .../impl/RegistrationAuthorityFunctor.cpp          |  149 ++
 .../filtering/impl/XMLAttributeFilter.cpp          |    7 +
 .../resolver/impl/QueryAttributeResolver.cpp       |   35 +-
 .../impl/SimpleAggregationAttributeResolver.cpp    |   37 +-
 shibsp/binding/impl/SOAPClient.cpp                 |   28 +-
 shibsp/binding/impl/XMLProtocolProvider.cpp        |   14 +
 shibsp/config_pub.h                                |    8 +-
 shibsp/handler/AbstractHandler.h                   |   35 +-
 shibsp/handler/AssertionConsumerService.h          |    3 +-
 shibsp/handler/Handler.h                           |    7 +
 shibsp/handler/LogoutHandler.h                     |    2 +
 shibsp/handler/SessionInitiator.h                  |    1 +
 shibsp/handler/impl/AbstractHandler.cpp            |   56 +-
 shibsp/handler/impl/AssertionConsumerService.cpp   |    6 +
 shibsp/handler/impl/LogoutHandler.cpp              |    4 +
 shibsp/handler/impl/SAML2ArtifactResolution.cpp    |    2 +-
 shibsp/handler/impl/SAML2Logout.cpp                |    2 +-
 shibsp/handler/impl/SAML2LogoutInitiator.cpp       |   66 +-
 shibsp/handler/impl/SAML2NameIDMgmt.cpp            |    7 +-
 shibsp/handler/impl/SAML2SessionInitiator.cpp      |  116 +-
 shibsp/handler/impl/SessionInitiator.cpp           |    5 +
 shibsp/impl/StorageServiceSessionCache.cpp         |   43 +-
 shibsp/impl/XMLAccessControl.cpp                   |   25 +-
 shibsp/impl/XMLRequestMapper.cpp                   |   19 +-
 shibsp/impl/XMLServiceProvider.cpp                 |   21 +-
 shibsp/metadata/DynamicMetadataProvider.cpp        |   20 +-
 shibsp/paths.h                                     |   16 +-
 shibsp/remoting/impl/TCPListener.cpp               |   41 +-
 shibsp/remoting/impl/UnixListener.cpp              |   21 +-
 shibsp/shibsp.rc                                   |   26 +-
 shibsp/shibsp.vcxproj                              |  365 ---
 shibsp/version.h                                   |    4 +-
 util/Makefile.am                                   |    7 +-
 util/Makefile.in                                   |  249 +-
 util/mdquery.rc                                    |   10 +-
 util/message.mc                                    |  183 ++
 util/messageResource.rc                            |  Bin 0 -> 52 bytes
 util/resolvertest.rc                               |   10 +-
 175 files changed, 15048 insertions(+), 11535 deletions(-)

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



More information about the Pkg-shibboleth-devel mailing list