[cpp-sp] 07/40: Merge branch 'bug/autoconf-doxygen'
Scott Cantor
cantor.2 at osu.edu
Thu Dec 20 19:42:28 EST 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/2.2.1+dfsg-1
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=762a4b7238029366c96a7d688b229b861e4d4716
commit 762a4b7238029366c96a7d688b229b861e4d4716
Merge: 4db637d dd8cdbd
Author: Russ Allbery <rra at debian.org>
AuthorDate: Fri Aug 21 10:40:12 2009 -0700
Merge branch 'bug/autoconf-doxygen'
Conflicts:
configs/Makefile.am
configs/Makefile.in
configs/shibd-debian.in
shibsp/paths.h
Makefile.am | 30 +-
Makefile.in | 66 +-
Portfile | 69 +
Portfile.in | 69 +
Shibboleth.sln | 106 +-
adfs/adfs-lite.vcproj | 85 +-
adfs/adfs.cpp | 125 +-
adfs/adfs.rc | 12 +-
adfs/adfs.vcproj | 83 +-
apache/mod_apache.cpp | 95 +-
apache/mod_shib13.vcproj | 103 +-
apache/mod_shib20.vcproj | 103 +-
apache/mod_shib22.vcproj | 103 +-
apache/mod_shib_13.cpp | 3 +-
apache/mod_shib_13.rc | 12 +-
apache/mod_shib_20.cpp | 3 +-
apache/mod_shib_20.rc | 12 +-
apache/mod_shib_22.cpp | 3 +-
apache/mod_shib_22.rc | 12 +-
config.h.in | 6 +
config_win32.h | 13 +-
configs/Makefile.am | 13 +-
configs/Makefile.in | 11 +
configs/attribute-map.xml | 10 +-
configs/keygen.bat | 2 +-
configs/metagen.sh | 211 +++
configs/postTemplate.html | 41 +
configs/shibboleth2.xml | 52 +-
configs/shibd-debian.in | 6 +-
configs/shibd-osx.plist.in | 1 +
configs/shibd-redhat.in | 10 +-
configs/shibd-suse.in | 112 ++
configure | 487 +++--
configure.ac | 95 +-
depend | 4 +-
doc/FASTCGI.LICENSE | 56 +-
doc/LOG4CPP.LICENSE | 1008 +++++-----
doc/Makefile.am | 6 +-
doc/Makefile.in | 23 +-
doc/OPENSSL.LICENSE | 254 +--
doc/README.txt | 3 +-
doc/RELEASE.txt | 21 +-
doc/main.css | 76 +-
doxygen.m4 | 3 +
fastcgi/shibauthorizer.cpp | 22 +-
fastcgi/shibauthorizer.rc | 12 +-
fastcgi/shibauthorizer.vcproj | 104 +-
fastcgi/shibresponder.cpp | 3 +
fastcgi/shibresponder.rc | 12 +-
fastcgi/shibresponder.vcproj | 105 +-
isapi_shib/isapi_shib.cpp | 199 +-
isapi_shib/{isapi_shib.cpp => isapi_shib.cpp.mine} | 1929 ++++++++++----------
.../{isapi_shib.cpp => isapi_shib.cpp.r3059} | 36 +-
.../{isapi_shib.cpp => isapi_shib.cpp.r3097} | 174 +-
isapi_shib/isapi_shib.rc | 12 +-
isapi_shib/isapi_shib.vcproj | 97 +-
memcache-store/memcache-store.cpp | 154 +-
memcache-store/memcache-store.rc | 12 +-
memcache-store/memcache-store.vcproj | 93 +-
nsapi_shib/nsapi_shib.cpp | 157 +-
nsapi_shib/nsapi_shib.rc | 12 +-
nsapi_shib/nsapi_shib.vcproj | 99 +-
odbc-store/odbc-store.rc | 12 +-
odbc-store/odbc-store.vcproj | 83 +-
pkginfo | 2 +-
pkginfo.in | 2 +-
schemas/shibboleth-2.0-attribute-map.xsd | 35 +-
schemas/shibboleth-2.0-native-sp-config.xsd | 22 +-
shibboleth.spec | 240 ++-
shibboleth.spec.in | 242 ++-
shibd/shibd.cpp | 135 +-
shibd/shibd.rc | 12 +-
shibd/shibd.vcproj | 85 +-
shibsp/AbstractSPRequest.cpp | 46 +-
shibsp/AbstractSPRequest.h | 2 +
shibsp/AccessControl.h | 19 +-
shibsp/Application.cpp | 15 +
shibsp/Application.h | 86 +-
shibsp/Makefile.am | 30 +-
shibsp/Makefile.in | 148 +-
shibsp/SPConfig.cpp | 40 +-
shibsp/SPConfig.h | 8 +-
shibsp/SPRequest.h | 56 +-
shibsp/ServiceProvider.cpp | 63 +-
shibsp/attribute/Attribute.cpp | 116 +-
shibsp/attribute/Attribute.h | 116 +-
shibsp/attribute/AttributeDecoder.h | 26 +-
shibsp/attribute/DOMAttributeDecoder.cpp | 226 +++
shibsp/attribute/ExtensibleAttribute.cpp | 79 +
shibsp/attribute/ExtensibleAttribute.h | 118 ++
shibsp/attribute/KeyInfoAttributeDecoder.cpp | 157 ++
shibsp/attribute/NameIDAttribute.h | 17 +-
shibsp/attribute/NameIDAttributeDecoder.cpp | 26 +-
.../attribute/NameIDFromScopedAttributeDecoder.cpp | 28 +-
shibsp/attribute/ScopedAttribute.h | 13 +-
shibsp/attribute/ScopedAttributeDecoder.cpp | 9 +-
shibsp/attribute/StringAttributeDecoder.cpp | 7 +-
shibsp/attribute/XMLAttribute.h | 111 ++
shibsp/attribute/XMLAttributeDecoder.cpp | 138 ++
.../attribute/filtering/impl/AndMatchFunctor.cpp | 2 +-
shibsp/attribute/filtering/impl/MatchFunctor.cpp | 8 +-
.../attribute/filtering/impl/NotMatchFunctor.cpp | 2 +-
shibsp/attribute/filtering/impl/OrMatchFunctor.cpp | 2 +-
.../filtering/impl/XMLAttributeFilter.cpp | 32 +-
shibsp/attribute/resolver/AttributeExtractor.h | 16 +-
shibsp/attribute/resolver/AttributeResolver.h | 21 +-
.../resolver/impl/ChainingAttributeExtractor.cpp | 6 +-
.../resolver/impl/ChainingAttributeResolver.cpp | 7 +-
.../resolver/impl/DelegationAttributeExtractor.cpp | 205 +++
.../impl/KeyDescriptorAttributeExtractor.cpp | 177 ++
.../resolver/impl/QueryAttributeResolver.cpp | 65 +-
.../impl/SimpleAggregationAttributeResolver.cpp | 603 ++++++
.../resolver/impl/XMLAttributeExtractor.cpp | 486 ++++-
shibsp/base.h | 41 +-
shibsp/binding/SOAPClient.h | 5 +-
shibsp/binding/impl/ArtifactResolver.cpp | 2 +-
shibsp/binding/impl/SOAPClient.cpp | 11 +-
shibsp/handler/AbstractHandler.h | 57 +-
shibsp/handler/AssertionConsumerService.h | 19 +-
shibsp/handler/impl/AbstractHandler.cpp | 262 ++-
shibsp/handler/impl/AssertionConsumerService.cpp | 91 +-
shibsp/handler/impl/AssertionLookup.cpp | 21 +-
shibsp/handler/impl/ChainingLogoutInitiator.cpp | 7 +-
shibsp/handler/impl/ChainingSessionInitiator.cpp | 7 +-
shibsp/handler/impl/LogoutHandler.cpp | 20 +-
shibsp/handler/impl/MetadataGenerator.cpp | 45 +-
shibsp/handler/impl/RemotedHandler.cpp | 10 +-
shibsp/handler/impl/SAML1Consumer.cpp | 63 +-
shibsp/handler/impl/SAML2ArtifactResolution.cpp | 4 +-
shibsp/handler/impl/SAML2Consumer.cpp | 110 +-
shibsp/handler/impl/SAML2Logout.cpp | 43 +-
shibsp/handler/impl/SAML2LogoutInitiator.cpp | 10 +-
shibsp/handler/impl/SAML2NameIDMgmt.cpp | 35 +-
shibsp/handler/impl/SAML2SessionInitiator.cpp | 134 +-
shibsp/handler/impl/SAMLDSSessionInitiator.cpp | 20 +-
shibsp/handler/impl/SessionHandler.cpp | 15 +-
shibsp/handler/impl/Shib1SessionInitiator.cpp | 75 +-
shibsp/handler/impl/StatusHandler.cpp | 38 +-
shibsp/handler/impl/TransformSessionInitiator.cpp | 7 +-
shibsp/handler/impl/WAYFSessionInitiator.cpp | 20 +-
shibsp/impl/ChainingAccessControl.cpp | 136 ++
shibsp/impl/StorageServiceSessionCache.cpp | 2 +-
shibsp/impl/XMLAccessControl.cpp | 57 +-
shibsp/impl/XMLRequestMapper.cpp | 81 +-
shibsp/impl/XMLServiceProvider.cpp | 356 ++--
shibsp/lite/CommonDomainCookie.cpp | 28 +-
shibsp/lite/SAMLConstants.cpp | 38 +-
shibsp/lite/SAMLConstants.h | 64 +-
shibsp/metadata/DynamicMetadataProvider.cpp | 15 +-
shibsp/metadata/MetadataExtImpl.cpp | 6 +-
shibsp/metadata/MetadataExtSchemaValidators.cpp | 4 +-
shibsp/metadata/MetadataProviderCriteria.h | 8 +
shibsp/paths.h | 33 +-
shibsp/paths.h.in | 33 +-
shibsp/remoting/ListenerService.h | 53 +-
shibsp/remoting/ddf.h | 9 +-
shibsp/remoting/impl/ListenerService.cpp | 8 +-
shibsp/remoting/impl/SocketListener.cpp | 95 +-
shibsp/remoting/impl/SocketListener.h | 11 +-
shibsp/remoting/impl/TCPListener.cpp | 38 +-
shibsp/remoting/impl/ddf.cpp | 110 +-
shibsp/security/PKIXTrustEngine.cpp | 3 +-
shibsp/security/SecurityPolicy.cpp | 33 +-
shibsp/security/SecurityPolicy.h | 23 +-
shibsp/shibsp-lite.vcproj | 55 +-
shibsp/shibsp.rc | 28 +-
shibsp/shibsp.vcproj | 83 +-
shibsp/util/CGIParser.cpp | 4 +-
shibsp/util/CGIParser.h | 4 +-
shibsp/version.h | 12 +-
util/mdquery.cpp | 37 +-
util/mdquery.vcproj | 87 +-
util/resolvertest.cpp | 98 +-
util/resolvertest.vcproj | 89 +-
174 files changed, 9437 insertions(+), 4528 deletions(-)
diff --cc configs/shibd-debian.in
index 7ffc1f6,13e8240..3b59c86
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -69,9 -69,10 +69,9 @@@ stop
restart|force-reload)
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
- sleep 1
- start-stop-daemon --start --quiet \
- --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+ --retry TERM/30/KILL/5 --exec $DAEMON
- start-stop-daemon --background --start --quiet \
- --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
++ start-stop-daemon --start --quiet --pidfile $PIDFILE \
++ --exec $DAEMON -- $DAEMON_OPTS
echo "$NAME."
;;
*)
diff --cc shibsp/paths.h
index cd361ea,6eb507d..6ad2036
--- a/shibsp/paths.h
+++ b/shibsp/paths.h
@@@ -23,24 -23,31 +23,31 @@@
#ifndef __shibsp_paths_h__
#define __shibsp_paths_h__
- /**
- * Default schema catalogs.
- */
+ /** Default schema catalogs. */
-#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
+#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
- /**
- * Default name of SP configuration file.
- */
+ /** Default name of SP configuration file. */
#define SHIBSP_CONFIG "shibboleth2.xml"
- /**
- * Default name of SP console tool logging file.
- */
+ /** Default name of SP console tool logging file. */
#define SHIBSP_LOGGING "console.logger"
- /**
- * Default prefix for installation (used to resolve relative paths).
- */
+ /** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX "/opt/shibboleth-sp"
+#define SHIBSP_PREFIX "/usr"
+ /** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR "/opt/shibboleth-sp/lib"
++#define SHIBSP_LIBDIR "/usr/lib"
+
+ /** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR "/opt/shibboleth-sp/var/log"
++#define SHIBSP_LOGDIR "/var/log/shibboleth"
+
+ /** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR "/opt/shibboleth-sp/etc"
++#define SHIBSP_CFGDIR "/etc/shibboleth"
+
+ /** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR "/opt/shibboleth-sp/var/run"
++#define SHIBSP_RUNDIR "/var/run/shibboleth"
+
+ /** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR "/opt/shibboleth-sp/share/xml"
++#define SHIBSP_XMLDIR "/usr/share/xml/shibboleth"
+
#endif /* __shibsp_paths_h__ */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list