[shibboleth-sp2] 01/04: Merge branch 'debian/master' into debian/wheezy-backports-sloppy
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 3 12:47:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
edm-guest pushed a commit to branch edm/debian/wheezy-backports-sloppy
in repository shibboleth-sp2.
commit 9478c83986235472677b8ee253af78abd132c0fa
Merge: 0f99ed0 5b3a209
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date: Thu Nov 3 09:27:37 2016 +0100
Merge branch 'debian/master' into debian/wheezy-backports-sloppy
Also revert Apache 2.4 changes back to 2.2.
Conflicts:
debian/changelog
debian/control
debian/libapache2-mod-shib2.README.Debian
debian/libapache2-mod-shib2.apache2
debian/libapache2-mod-shib2.dirs
debian/libapache2-mod-shib2.install
debian/patches/series
debian/rules
debian/shibboleth-sp2-utils.postinst
Makefile.am | 4 +-
Makefile.in | 254 +-
Shibboleth.sln => Projects/vc10/Shibboleth.sln | 749 +++---
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 | 456 ++--
.../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 | 417 +--
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 | 173 +-
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 | 46 +-
.../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 | 59 +-
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 | 493 +++-
adfs/Makefile.am | 2 +-
adfs/Makefile.in | 222 +-
adfs/adfs.cpp | 29 +-
adfs/adfs.rc | 234 +-
apache/Makefile.am | 1 -
apache/Makefile.in | 288 ++-
apache/mod_shib.cpp | 30 +-
apache/mod_shib_13.rc | 218 +-
apache/mod_shib_20.rc | 218 +-
apache/mod_shib_22.rc | 218 +-
apache/mod_shib_24.rc | 218 +-
build-aux/config.guess | 1097 ++++----
build-aux/config.sub | 524 +++-
build-aux/depcomp | 410 +--
build-aux/ltmain.sh | 65 +-
build-aux/missing | 405 ++-
config.h.in | 21 +
config_win32.h | 6 +-
configs/Makefile.am | 24 +-
configs/Makefile.in | 129 +-
configs/attribute-map.xml | 109 +-
configs/attribute-policy.xml | 9 +-
configs/example-shibboleth2.xml | 15 +-
configs/keygen.bat | 42 +-
configs/keygen.sh | 40 +-
configs/shibboleth2.xml | 12 +-
configs/{shibd-redhat.in => shibd-amazon.in} | 8 +-
configs/shibd-debian.in | 9 +-
configs/shibd-osx.plist.in | 3 +-
configs/shibd-redhat.in | 8 +-
configs/shibd-suse.in | 12 +-
configs/shibd-systemd.in | 21 +
configs/upgrade.xsl | 461 ----
configs/xsltproc.js | 45 -
configure | 572 +++-
configure.ac | 31 +-
debian/changelog | 150 ++
debian/clean | 1 -
debian/control | 124 +-
debian/copyright | 16 +-
debian/gbp.conf | 14 +
debian/libapache2-mod-shib2.NEWS | 8 +
debian/libapache2-mod-shib2.README.Debian | 45 +-
debian/libapache2-mod-shib2.dirs | 1 -
debian/libapache2-mod-shib2.docs | 2 -
debian/libapache2-mod-shib2.install | 4 +
debian/libapache2-mod-shib2.lintian-overrides | 3 +
debian/libapache2-mod-shib2.postrm | 9 +
debian/libshibsp-dev.install | 1 +
debian/libshibsp-doc.doc-base | 4 +-
debian/libshibsp-doc.docs | 2 -
debian/libshibsp-doc.install | 2 +-
debian/libshibsp-doc.lintian-overrides | 2 +-
debian/{libshibsp6.install => libshibsp7.install} | 0
debian/man-pages/{mdquery.pod => mdquery.1.pod} | 0
.../{resolvertest.pod => resolvertest.1.pod} | 0
.../{shib-keygen.pod => shib-keygen.8.pod} | 14 +-
.../{shib-metagen.pod => shib-metagen.1.pod} | 0
debian/man-pages/{shibd.pod => shibd.8.pod} | 0
.../patches/0004-Shire-log-path-for-Debian.patch | 23 -
.../0005-Default-native-logger-to-syslog.patch | 69 -
...d-Documentation-key-to-shibd-service-file.patch | 20 +
...fig-files-for-libshibsp-and-libshibsp-lit.patch | 162 ++
...-flag.patch => Avoid-libtool-silent-flag.patch} | 4 +-
...k-for-strerror_r-with-C-language-selected.patch | 55 +
...bianize-the-systemd-service-file-of-shibd.patch | 27 +
.../Enable-the-dot-feature-of-Doxygen.patch | 20 +
...cript.patch => Improve-shibd-init-script.patch} | 10 +-
...se-the-timeouts-in-the-shibd-service-file.patch | 24 +
.../Localize-Boost-preprocessor-flags.patch | 130 +
.../patches/Localize-pthread-library-flags.patch | 206 ++
...atch => Remove-WSTrust-schema-references.patch} | 2 +-
.../Remove-superfluous-xmlsec-linkages.patch | 140 +
...r-libsystemd-instead-of-libsystemd-daemon.patch | 29 +
...-use-GSSAPI-only-if-the-naming-extensions.patch | 78 +
debian/patches/Use-pkg-config-for-GSSAPI.patch | 386 +++
debian/patches/Use-pkg-config-for-OpenSAML.patch | 216 ++
debian/patches/Use-pkg-config-for-Xerces.patch | 448 ++++
.../Use-pkg-config-for-log4shib-log4cpp.patch | 135 +
debian/patches/Use-pkg-config-for-xmlsec.patch | 239 ++
debian/patches/Use-pkg-config-for-xmltooling.patch | 372 +++
debian/patches/We-don-t-use-OpenSSL-directly.patch | 43 +
.../Fix-misspelled-error-message.patch | 22 +
.../SSPCPP-704-Fix-assignment-as-boolean.patch | 24 +
....patch => keygen-improvements-for-Debian.patch} | 6 +-
debian/patches/series | 31 +-
debian/rules | 114 +-
debian/shibboleth-sp2-common.install | 4 +-
debian/shibboleth-sp2-utils.install | 10 +-
debian/shibboleth-sp2-utils.postinst | 17 +-
debian/shibboleth-sp2-utils.postrm | 9 +-
debian/shibboleth-sp2-utils.shibd.tmpfile | 1 +
debian/source/options | 1 -
debian/upstream/signing-key.asc | 964 +++++++
debian/watch | 6 +-
doc/CREDITS.txt | 2 +
doc/LOG4CPP.LICENSE | 20 +-
doc/Makefile.am | 3 +-
doc/Makefile.in | 112 +-
doc/NOTICE.txt | 3 +-
doc/README.txt | 2 +-
fastcgi/Makefile.am | 2 -
fastcgi/Makefile.in | 279 +-
fastcgi/shibauthorizer.cpp | 14 +-
fastcgi/shibauthorizer.rc | 218 +-
fastcgi/shibresponder.cpp | 14 +-
fastcgi/shibresponder.rc | 218 +-
isapi_shib/isapi_shib.cpp | 83 +-
isapi_shib/isapi_shib.rc | 218 +-
m4/boost.m4 | 518 +++-
m4/libtool.m4 | 6 +-
memcache-store/Makefile.am | 2 +-
memcache-store/Makefile.in | 210 +-
memcache-store/memcache-store.cpp | 29 +-
memcache-store/memcache-store.rc | 202 +-
nsapi_shib/Makefile.am | 2 +-
nsapi_shib/Makefile.in | 219 +-
nsapi_shib/nsapi_shib.cpp | 6 +-
nsapi_shib/nsapi_shib.rc | 218 +-
odbc-store/Makefile.am | 2 +-
odbc-store/Makefile.in | 210 +-
odbc-store/odbc-store.cpp | 46 +-
odbc-store/odbc-store.rc | 202 +-
plugins/AttributeResolverHandler.cpp | 509 ++++
plugins/CaseFoldingAttributeResolver.cpp | 2 +-
plugins/GSSAPIAttributeExtractor.cpp | 3 +-
plugins/Makefile.am | 3 +-
plugins/Makefile.in | 247 +-
plugins/TemplateAttributeResolver.cpp | 3 +-
plugins/TimeAccessControl.cpp | 1 +
plugins/TransformAttributeResolver.cpp | 6 +-
plugins/plugins.cpp | 3 +
plugins/plugins.rc | 234 +-
schemas/Makefile.am | 2 +-
schemas/Makefile.in | 106 +-
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.am | 2 +-
selinux/Makefile.in | 108 +-
shibboleth.spec | 272 +-
shibboleth.spec.in | 270 +-
shibd/Makefile.am | 6 +-
shibd/Makefile.in | 253 +-
shibd/shibd.cpp | 35 +-
shibd/shibd.rc | 218 +-
shibd/shibd_win32.cpp | 16 +-
shibsp/Makefile.am | 558 ++--
shibsp/Makefile.in | 2723 ++++++++++----------
shibsp/SPConfig.cpp | 57 +-
shibsp/SPConfig.h | 12 +
shibsp/ServiceProvider.cpp | 212 +-
shibsp/TransactionLog.h | 23 +-
shibsp/attribute/Attribute.cpp | 3 +-
shibsp/attribute/Base64AttributeDecoder.cpp | 2 +-
shibsp/attribute/DOMAttributeDecoder.cpp | 4 +-
shibsp/attribute/KeyInfoAttributeDecoder.cpp | 2 +-
shibsp/attribute/NameIDAttribute.cpp | 2 +-
shibsp/attribute/NameIDAttributeDecoder.cpp | 2 +-
.../attribute/NameIDFromScopedAttributeDecoder.cpp | 2 +-
shibsp/attribute/ScopedAttributeDecoder.cpp | 2 +-
shibsp/attribute/StringAttributeDecoder.cpp | 2 +-
shibsp/attribute/XMLAttributeDecoder.cpp | 2 +-
shibsp/attribute/filtering/MatchFunctor.h | 20 +-
....cpp => AttributeMatchesShibMDScopeFunctor.cpp} | 40 +-
.../filtering/impl/AttributeValueStringFunctor.cpp | 2 +-
.../filtering/impl/ChainingAttributeFilter.cpp | 2 +-
.../filtering/impl/DummyAttributeFilter.cpp | 2 +-
shibsp/attribute/filtering/impl/MatchFunctor.cpp | 22 +
.../impl/NameIDQualifierStringFunctor.cpp | 14 +-
.../impl/RegistrationAuthorityFunctor.cpp | 149 ++
.../filtering/impl/XMLAttributeFilter.cpp | 29 +-
.../resolver/impl/ChainingAttributeExtractor.cpp | 4 +-
.../resolver/impl/ChainingAttributeResolver.cpp | 6 +-
.../resolver/impl/DelegationAttributeExtractor.cpp | 2 +-
.../resolver/impl/MetadataAttributeExtractor.cpp | 4 +-
.../resolver/impl/QueryAttributeResolver.cpp | 37 +-
.../impl/SimpleAggregationAttributeResolver.cpp | 40 +-
.../resolver/impl/XMLAttributeExtractor.cpp | 27 +-
shibsp/binding/impl/ArtifactResolver.cpp | 4 +-
shibsp/binding/impl/SOAPClient.cpp | 34 +-
shibsp/binding/impl/XMLProtocolProvider.cpp | 16 +-
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 | 58 +-
shibsp/handler/impl/AssertionConsumerService.cpp | 6 +
shibsp/handler/impl/AssertionLookup.cpp | 2 +-
shibsp/handler/impl/AttributeCheckerHandler.cpp | 3 +-
shibsp/handler/impl/ChainingLogoutInitiator.cpp | 2 +-
shibsp/handler/impl/ChainingSessionInitiator.cpp | 2 +-
shibsp/handler/impl/CookieSessionInitiator.cpp | 2 +-
shibsp/handler/impl/DiscoveryFeed.cpp | 37 +-
shibsp/handler/impl/ExternalAuthHandler.cpp | 2 +-
shibsp/handler/impl/FormSessionInitiator.cpp | 2 +-
shibsp/handler/impl/LocalLogoutInitiator.cpp | 2 +-
shibsp/handler/impl/LogoutHandler.cpp | 14 +-
shibsp/handler/impl/MetadataGenerator.cpp | 2 +-
shibsp/handler/impl/RemotedHandler.cpp | 6 +-
shibsp/handler/impl/SAML1Consumer.cpp | 2 +-
shibsp/handler/impl/SAML2ArtifactResolution.cpp | 4 +-
shibsp/handler/impl/SAML2Consumer.cpp | 6 +-
shibsp/handler/impl/SAML2Logout.cpp | 17 +-
shibsp/handler/impl/SAML2LogoutInitiator.cpp | 72 +-
shibsp/handler/impl/SAML2NameIDMgmt.cpp | 10 +-
shibsp/handler/impl/SAML2SessionInitiator.cpp | 126 +-
shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 3 +-
shibsp/handler/impl/SecuredHandler.cpp | 1 +
shibsp/handler/impl/SessionHandler.cpp | 2 +-
shibsp/handler/impl/SessionInitiator.cpp | 9 +-
shibsp/handler/impl/Shib1SessionInitiator.cpp | 2 +-
shibsp/handler/impl/StatusHandler.cpp | 2 +-
shibsp/handler/impl/TransformSessionInitiator.cpp | 8 +-
shibsp/handler/impl/WAYFSessionInitiator.cpp | 2 +-
shibsp/impl/ChainingAccessControl.cpp | 2 +-
shibsp/impl/StorageServiceSessionCache.cpp | 90 +-
shibsp/impl/XMLAccessControl.cpp | 28 +-
shibsp/impl/XMLRequestMapper.cpp | 27 +-
shibsp/impl/XMLSecurityPolicyProvider.cpp | 2 +-
shibsp/impl/XMLServiceProvider.cpp | 55 +-
shibsp/metadata/DynamicMetadataProvider.cpp | 22 +-
shibsp/remoting/impl/ListenerService.cpp | 4 +-
shibsp/remoting/impl/SocketListener.cpp | 4 +-
shibsp/remoting/impl/TCPListener.cpp | 42 +-
shibsp/remoting/impl/UnixListener.cpp | 21 +-
shibsp/shibsp.rc | 274 +-
shibsp/shibsp.vcxproj | 365 ---
shibsp/util/DOMPropertySet.cpp | 2 +-
shibsp/util/IPRange.cpp | 2 +-
shibsp/version.h | 4 +-
util/Makefile.am | 7 +-
util/Makefile.in | 235 +-
util/mdquery.cpp | 2 +-
util/mdquery.rc | 218 +-
util/message.mc | 183 ++
util/messageResource.rc | Bin 0 -> 52 bytes
util/resolvertest.cpp | 4 +-
util/resolvertest.rc | 218 +-
298 files changed, 23372 insertions(+), 14304 deletions(-)
diff --cc debian/changelog
index 609820f,07ca62b..5ceb237
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,153 +1,182 @@@
+ shibboleth-sp2 (2.6.0+dfsg1-3) unstable; urgency=medium
+
+ * [fa3baff] Revert "Require experimental xmltooling and libsaml for matching
+ C++11 strings"
+ This reverts commit 04424d9e0c1329017c3a1d67f439ed93425e5969.
+ Our recently uploaded dependencies (xmltooling_1.6.0-2, opensaml2_2.6.0-3)
+ were compiled with the same compiler (GCC-6, because the default has already
+ changed in unstable) that's going to compile us.
+ * [19a977e] Migrate to my Debian address
+ * Upload to unstable
+
+ -- Ferenc Wágner <wferi at debian.org> Sat, 03 Sep 2016 08:27:45 +0200
+
+ shibboleth-sp2 (2.6.0+dfsg1-2) experimental; urgency=medium
+
+ * [797b5cc] In arch-only builds there's no Doxygen tag file to remove
+ * [952e7ee] Don't ship the .md5 and .map files from Doxygen.
+ These are generated since we use dot with Doxygen.
+
+ -- Ferenc Wágner <wferi at niif.hu> Thu, 01 Sep 2016 10:43:17 +0200
+
+ shibboleth-sp2 (2.6.0+dfsg1-1) experimental; urgency=medium
+
+ * [e70419a] New upstream release (2.6.0)
+ * [052a745] Refresh our patches
+ * [3f021f9] Document the new -n option of shib-keygen.
+ It was introduced by upstream in d94c761.
+ * [4a05921] Add several patches migrating to pkg-config
+ * [f830920] Ship the pkg-config files
+ * [d769d38] Rename library package for upstream SONAME bump
+ * [54944c3] The build system now links with the needed libraries only.
+ Separating the discovered dependency libraries into specific variables
+ instead of putting everything into LIBS made the --as-needed linker
+ options superfluous.
+ * [14eef6f] upgrade.xsl was removed upstream.
+ In commit 813ecb5: Remove long outdated style sheet for config migration.
+ * [21b6b88] New patch The-plugins-use-GSSAPI-only-if-the-naming-
+ extensions.patch.
+ The plugins use GSSAPI only if the naming extensions are available
+ * [c7e8862] Include some post-2.6 upstream fixes:
+ 5504c79: SSPCPP-704 Fix 'assignment as boolean'
+ b173bb1: Fix misspelled error message.
+ * [3c1d70e] Switch gbp dch to verbose changelog entries
+ * [48c995c] Update copyright years
+ * [04424d9] Require experimental xmltooling and libsaml for matching C++11
+ strings.
+ This change will be reverted during the transition into unstable, when
+ xmltooling in unstable will have already been compiled with GCC 6 as well.
+ * [9c44db0] Removal of unneeded files belongs to the dh_install step
+ * [ab57aac] The Doxygen tag file is unreproducible, don't ship it.
+ It uses absolute paths for some reason, capturing the build directory.
+ * [997236c] New patch Enable-the-dot-feature-of-Doxygen.patch.
+ Enable the dot feature of Doxygen
+
+ -- Ferenc Wágner <wferi at debian.org> Wed, 31 Aug 2016 16:05:52 +0200
+
+ shibboleth-sp2 (2.5.6+dfsg1-2) unstable; urgency=medium
+
+ [ Faidon Liambotis ]
+ * [db10c44] Remove myself (Faidon) from Uploaders
+
+ [ Ferenc Wágner ]
+ * [9e20440] Eliminate some path repetitions
+ * [430bdd8] Simplify removal of documentation files
+ * [f1a50f2] Empty directory structures don't trigger --fail-missing
+ * [81f57c3] We ship the systemd service file only when it's usable
+ * [4785164] Drop superfluous libssl-dev build dependency
+ * [136119d] Update Standards-Version to 3.9.8 (no changes needed)
+ * [9c11de5] Fix typo in README.Debian
+ * [cfe5433] New patch Check-for-strerror_r-with-C-language-selected.patch
+ * [91e4365] Fall back to --list-missing until #831786 is solved
+ (Closes: #819416)
+ * [676f4aa] /var/log/shibboleth-www is dh_installed in arch builds only
+
+ -- Ferenc Wágner <wferi at niif.hu> Thu, 11 Aug 2016 11:47:58 +0200
+
+ shibboleth-sp2 (2.5.6+dfsg1-1) unstable; urgency=medium
+
+ * [60fd776] Replace obsolete libsystemd-daemon-dev B-D with libsystemd-dev
+ (Closes: #813480)
+ * [9dbea00] Move doxygen and graphviz into Build-Depends-Indep
+ * [2dabf1d] Use systemd on Linux only
+ * [f46e4ac] Rename files via dh-exec, now that we use it anyway
+ * [36e1b4c] Let dh_fixperms make shib-keygen executable
+ * [d90b945] New patch Add-Documentation-key-to-shibd-service-file.patch
+ * [3e6b865] Install the Apache module by dh_install
+ * [94c2670] Upstream version 2.5.6+dfsg1
+ * [469e9f2] Remove two upstreamed patches, update the rest
+ * [0047c9a] Update Standards-Version to 3.9.7 (no changes needed)
+ * [cd08c31] Fix fallout from dh-exec migration
+
+ -- Ferenc Wágner <wferi at niif.hu> Fri, 11 Mar 2016 16:19:29 +0100
+
+ shibboleth-sp2 (2.5.5+dfsg1-1) unstable; urgency=medium
+
+ * [62d4d8a] Add debian/gbp.conf for DEP-14 layout
+ * [06926cf] Run wrap-and-sort -ast on the package
+ * [9c6bd0a] Correct my name in Uploaders
+ * [c67b7e5] Switch watch file to check for bzip-compressed archives
+ * [c5c45a4] Check signature in watch file
+ * [de0f61d] Upstream version 2.5.5
+ * [c5b1307] Refresh patches
+ * [a6ccea4] Reset native.logger (Apache module logs) to upstream behavior
+ * [f1946c9] Rename libshibsp6 package to libshibsp6v5 (Closes: #797770)
+ * [d271e5e] dh_auto_configure uses --disable-dependency-tracking by default
+ * [20863ed] The default compressor is xz since jessie
+ * [e17229c] Enable all hardening features
+ * [0d96798] Update Standards-Version to 3.9.6 (no changes needed)
+ * [4a20cce] Remove relics of the package split before jessie
+ * [1ccc9e2] Include the js files in the doc-base Files declaration
+ * [0c68702] Really enable debug mode in noopt builds
+ * [502e709] Ship the installed documentation, not the one from the build tree
+ * [e227a3b] Remove superfluous configure arguments
+ * [9d9dc63] Upstream added systemd support, enable it
+ * [f636fbe] The DOCS variable is unused since we stopped symlinking Doxygen's
+ jQuery
+ * [3d6bc29] Cut down repetition in manpage installation
+ * [a2c6325] Support repacking by uscan
+ * [cc7b5dd] Simplify the get-orig-source target
+ * [179ec31] Enable parallel builds
+ * [e2e71ac] Remove Amazon Linux init script
+ * [cec9a85] We've got an apache2-api-YYYYMMNN dependency next to apache2-bin
+ * [f3e2015] Switch to secure VCS URIs as Lintian suggests
+ * [0a3d5c7] Try harder to override the jQuery Lintian warning
+ * [9cda82e] New patches fixing typos
+ * [f3021a8] Update debian/copyright
+ * [fe391f3] /var/log/shibboleth is filled by shibd, part of shibboleth-
+ sp2-utils
+ * [059b366] Add cache and log dir to shibboleth-sp2-utils with suitable
+ statoverrides
+ * [1cb6750] Update TestShib instructions
+ * [358c705] More detailed manual for shib-keygen -b
+
+ -- Ferenc Wágner <wferi at niif.hu> Tue, 26 Jan 2016 21:09:23 +0100
+
+ shibboleth-sp2 (2.5.3+dfsg-2.1) unstable; urgency=medium
+
+ * Non maintainer upload.
+ * Call cpp with -P for boost config. Closes: #778117.
+
+ -- Matthias Klose <doko at debian.org> Mon, 13 Jul 2015 15:56:14 +0200
+
+shibboleth-sp2 (2.5.3+dfsg-2~bpo70+1) wheezy-backports; urgency=high
+
+ [ Ferenc Wagner ]
+ * Incorporate security fix from V2.5.4 for CVE-2015-2684: authenticated
+ denial of service vulnerability that results in a crash on certain
+ kinds of malformed SAML messages.
+
+ [ Russ Allbery ]
+ * Move enabling of the Apache module from the postinst script of
+ shibboleth-sp2-utils to libapache2-mod-shib2, which is only used with
+ Apache, and add a dependency on apache2.2-common.
+
+ -- Ferenc Wagner <wferi at niif.hu> Wed, 25 Mar 2015 14:43:45 +0100
+
+ shibboleth-sp2 (2.5.3+dfsg-2) unstable; urgency=high
+
+ * Incorporate security fix from V2.5.4 for CVE-2015-2684: authenticated
+ denial of service vulnerability that results in a crash on certain
+ kinds of malformed SAML messages.
+
+ -- Ferenc Wagner <wferi at niif.hu> Tue, 24 Mar 2015 08:55:06 +0100
+
+shibboleth-sp2 (2.5.3+dfsg-1~bpo70+2) wheezy-backports; urgency=medium
+
+ * shibboleth-sp2-utils: check before enabling Apache module
+ (Closes: #758600)
+
+ -- Luca Bruno <lucab at debian.org> Fri, 14 Nov 2014 12:42:46 +0100
+
+shibboleth-sp2 (2.5.3+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Backport to wheezy.
+ * Revert the changes to build against Apache 2.4 and use dh_apache2, but
+ keep the change to enable the module by default on new installs.
+
+ -- Russ Allbery <rra at debian.org> Thu, 10 Jul 2014 22:36:01 -0700
+
shibboleth-sp2 (2.5.3+dfsg-1) unstable; urgency=medium
* New upstream release.
diff --cc debian/control
index 729866a,0b26473..a1cd0f5
--- a/debian/control
+++ b/debian/control
@@@ -2,25 -2,46 +2,48 @@@ Source: shibboleth-sp
Section: web
Priority: extra
Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
- Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
- Faidon Liambotis <paravoid at debian.org>
- Build-Depends: debhelper (>= 9), apache2-threaded-dev,
- dh-autoreconf, doxygen, graphviz, libboost-dev, libfcgi-dev, libkrb5-dev,
- liblog4shib-dev, libmemcached-dev (>= 1.0), libsaml2-dev (>= 2.5),
- libssl-dev, libxerces-c-dev, libxml-security-c-dev (>= 1.7),
- libxmltooling-dev (>= 1.5), opensaml2-schemas, pkg-config, unixodbc-dev,
- xmltooling-schemas
- Standards-Version: 3.9.5
+ Uploaders:
+ Russ Allbery <rra at debian.org>,
+ Ferenc Wágner <wferi at debian.org>,
+ Etienne Dysli Metref <etienne.dysli-metref at switch.ch>,
+ Build-Depends:
- apache2-dev (>> 2.4.4),
++ apache2-threaded-dev,
+ debhelper (>= 9),
- dh-apache2,
+ dh-autoreconf,
+ dh-exec,
+ libboost-dev,
+ libfcgi-dev,
+ libkrb5-dev,
+ liblog4shib-dev,
+ libmemcached-dev (>= 1.0),
+ libsaml2-dev (>= 2.6),
- libsystemd-dev [linux-any],
++ libsystemd-daemon-dev [linux-any],
+ libxerces-c-dev,
+ libxml-security-c-dev (>= 1.7),
+ libxmltooling-dev (>= 1.6),
+ opensaml2-schemas,
+ pkg-config,
+ unixodbc-dev,
+ xmltooling-schemas,
+ Build-Depends-Indep:
+ doxygen,
+ graphviz,
+ Standards-Version: 3.9.8
Homepage: http://shibboleth.net/
- Vcs-Git: git://anonscm.debian.org/pkg-shibboleth/shibboleth-sp2.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shibboleth/shibboleth-sp2.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-shibboleth/shibboleth-sp2.git/
Package: libapache2-mod-shib2
Section: httpd
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, apache2.2-common,
- libshibsp-plugins (= ${binary:Version}), shibboleth-sp2-utils (>= 2.5)
- Recommends: apache2
+ Depends:
++ apache2.2-common,
+ libshibsp-plugins (= ${binary:Version}),
+ shibboleth-sp2-utils (>= 2.6),
+ ${misc:Depends},
+ ${shlibs:Depends},
++Recommends:
++ apache2,
Description: Federated web single sign-on system (Apache module)
The Shibboleth System is a standards based software package for web
single sign-on across or within organizational boundaries. It supports
diff --cc debian/libapache2-mod-shib2.README.Debian
index 292814b,d7deaf8..41b5f84
--- a/debian/libapache2-mod-shib2.README.Debian
+++ b/debian/libapache2-mod-shib2.README.Debian
@@@ -63,6 -65,6 +63,7 @@@ Installation and Configuratio
<Location /secure>
AuthType shibboleth
++ ShibCompatWith24 On
ShibRequestSetting requireSession 1
Require shib-session
</Location>
@@@ -152,4 -152,4 +151,4 @@@ Further Informatio
https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPConfiguration
- -- Russ Allbery <rra at debian.org>, Sun, 6 Apr 2014 18:13:30 -0700
- -- Ferenc Wágner <wferi at niif.hu>, Tue, 26 Jan 2016 21:08:43 +0100
++ -- Etienne Dysli-Metref <etienne.dysli-metref at switch.ch>, Thu, 3 Nov 2016 09:22:24 +0100
diff --cc debian/libapache2-mod-shib2.dirs
index 34535f9,0000000..8e8d38b
mode 100644,000000..100644
--- a/debian/libapache2-mod-shib2.dirs
+++ b/debian/libapache2-mod-shib2.dirs
@@@ -1,2 -1,0 +1,1 @@@
+usr/lib/apache2/modules
- var/log/shibboleth
diff --cc debian/libapache2-mod-shib2.install
index 28302a7,7656268..c370067
mode 100644,100755..100755
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@@ -1,3 -1,5 +1,7 @@@
+ #!/usr/bin/dh-exec
+
-usr/lib/${DEB_HOST_MULTIARCH}/shibboleth/mod_shib_24.so => usr/lib/apache2/modules/mod_shib2.so
++usr/lib/${DEB_HOST_MULTIARCH}/shibboleth/mod_shib_22.so => usr/lib/apache2/modules/mod_shib2.so
usr/share/shibboleth
+ var/log/shibboleth-www
+
+debian/shib2.load etc/apache2/mods-available
diff --cc debian/rules
index 934fd7a,9707f2d..0d5b76d
--- a/debian/rules
+++ b/debian/rules
@@@ -16,56 -11,43 +11,44 @@@ els
DEBUG =
endif
- # These variables are used by get-orig-source and to generate man pages.
- DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \
- | cut -d- -f1)
- VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
- URL = http://www.shibboleth.net/downloads/service-provider/
+ ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
+ enable-systemd = --enable-systemd
+ else
+ remove-service = shibd-systemd
+ endif
# Download the upstream source and do the repackaging that we have to do for
- # DFSG reasons. Depends on wget.
+ # DFSG reasons. Depends on devscripts. Mostly a reminder until devscripts
+ # version 2.15.10 enables setting these options in the watch file.
get-orig-source:
- wget $(URL)/$(VERSION)/shibboleth-sp-$(VERSION).tar.gz
- tar xfz shibboleth-sp-$(VERSION).tar.gz
- rm shibboleth-sp-$(VERSION).tar.gz
- rm shibboleth-sp-$(VERSION)/schemas/WS-Trust.xsd
- mv shibboleth-sp-$(VERSION) shibboleth-sp2_$(DEBVERS).orig
- tar cf shibboleth-sp2_$(DEBVERS).orig.tar \
- shibboleth-sp2_$(DEBVERS).orig
- rm -rf shibboleth-sp2_$(DEBVERS).orig
- xz shibboleth-sp2_$(DEBVERS).orig.tar
+ uscan --repack --compression=xz --destdir='$(CURDIR)'
%:
- dh $@ --with autoreconf
-
- override_dh_autoreconf:
- dh_autoreconf --as-needed
- dh $@ --parallel --with apache2,autoreconf
++ dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- dh_auto_configure -- \
- --enable-apache-24 --with-apxs24=/usr/bin/apxs2 \
- $(enable-systemd) \
- --with-memcached --with-fastcgi --with-gssapi $(DEBUG)
+ dh_auto_configure -- \
+ --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/shibboleth \
+ --localstatedir=/var --enable-apache-22 \
+ --with-apxs2=/usr/bin/apxs2 --disable-dependency-tracking \
+ --with-memcached --with-fastcgi --with-gssapi $(SYSTEM)
- # Move supporting scripts from the configuration directory into /usr/sbin
- # and remove various configuration files that aren't of interest on Debian.
- # Also move the one architecture-dependent header file into an
- # architecture-specific directory.
override_dh_auto_install:
NOKEYGEN=1 dh_auto_install
- rm -r debian/tmp/usr/share/doc/shibboleth*
- rm -r debian/tmp/var/run
- rm debian/tmp/etc/shibboleth/*.dist
- rm debian/tmp/etc/shibboleth/*.config
- rm debian/tmp/etc/shibboleth/shibd-osx.plist
- rm debian/tmp/etc/shibboleth/shibd-redhat
- rm debian/tmp/etc/shibboleth/shibd-suse
- chmod +x debian/tmp/etc/shibboleth/keygen.sh
- mv debian/tmp/etc/shibboleth/keygen.sh debian/tmp/usr/sbin/shib-keygen
- mv debian/tmp/etc/shibboleth/metagen.sh debian/tmp/usr/bin/shib-metagen
- mv debian/tmp/etc/shibboleth/shibd-debian \
- debian/shibboleth-sp2-utils.shibd.init
+
+ docdir = debian/tmp/usr/share/doc/shibboleth-*
+ override_dh_install:
+ # The necessary documentation files are installed in each binary
+ # package by dh_installdocs below.
+ cd $(docdir) && \
+ rm CREDITS.txt LICENSE.txt NOTICE.txt README.txt RELEASE.txt \
+ FASTCGI.LICENSE OPENSSL.LICENSE LOG4CPP.LICENSE
+ # The tag file is unreproducible (it captures the full build path),
+ # but is used as a "stamp" file during the build.
+ cd $(docdir) && rm -f api/shibboleth.tag api/html/*.md5 api/html/*.map
+ cd debian/tmp/etc/shibboleth && \
+ rm *.dist *.config shibd-amazon shibd-osx.plist shibd-redhat shibd-suse \
+ $(remove-service)
mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp
mv debian/tmp/usr/include/shibsp/paths.h \
debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
--
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