[cpp-sp] branch main updated: Eliminate full library build and rename lite version.
Scott Cantor
cantor.2 at osu.edu
Wed Oct 30 18:09:06 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=d460efada302d61696262dff323e82959dcc7b30
The following commit(s) were added to refs/heads/main by this push:
new d460efad Eliminate full library build and rename lite version.
d460efad is described below
commit d460efada302d61696262dff323e82959dcc7b30
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Oct 30 14:07:50 2024 -0400
Eliminate full library build and rename lite version.
---
apache/Makefile.am | 2 +-
configure.ac | 9 +-----
shibsp-lite.pc.in | 13 --------
shibsp.pc.in | 4 +--
shibsp/Makefile.am | 95 ++++--------------------------------------------------
5 files changed, 11 insertions(+), 112 deletions(-)
diff --git a/apache/Makefile.am b/apache/Makefile.am
index e0b6ba4c..a84ffad8 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -17,7 +17,7 @@ mod_shib_24_la_CXXFLAGS = \
$(xmltooling_lite_CFLAGS)
mod_shib_24_la_LIBADD = \
$(APXS24_LIBS) \
- $(top_builddir)/shibsp/libshibsp-lite.la \
+ $(top_builddir)/shibsp/libshibsp.la \
$(PTHREAD_LIBS) \
$(gss_LIBS) $(gnu_gss_LIBS) \
$(xerces_LIBS) \
diff --git a/configure.ac b/configure.ac
index facc8158..41e77b11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ if test "$enable_debug" = "yes" ; then
fi
AC_CONFIG_HEADERS([config.h shibsp/config_pub.h])
-AC_CONFIG_FILES([shibsp.pc shibsp-lite.pc])
+AC_CONFIG_FILES([shibsp.pc])
AC_PROG_CC([gcc gcc3 cc])
AC_PROG_CXX([g++ g++3 c++ CC])
@@ -111,9 +111,6 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
AX_PKG_CHECK_MODULES([xerces],,[xerces-c >= 3.2],,,
[SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
-AX_PKG_CHECK_MODULES([xmlsec],,[xml-security-c >= 2],,,
- [SHIBSP_REQUIRES],[SHIBSP_REQUIRES_PRIVATE])
-
AX_PKG_CHECK_MODULES([xmltooling],,[xmltooling >= 3.1],,,
[SHIBSP_REQUIRES],[SHIBSP_REQUIRES_PRIVATE])
PKG_CHECK_VAR([xmltooling_includedir],[xmltooling],[includedir])
@@ -123,10 +120,6 @@ DX_INCLUDE="$DX_INCLUDE $xmltooling_includedir"
AX_PKG_CHECK_MODULES([xmltooling_lite],,[xmltooling-lite >= 3.1],,,
[SHIBSP_LITE_REQUIRES],[SHIBSP_LITE_REQUIRES_PRIVATE])
-AX_PKG_CHECK_MODULES([opensaml],,[opensaml >= 3.1],,,
- [SHIBSP_REQUIRES],[SHIBSP_REQUIRES_PRIVATE])
-PKG_CHECK_VAR([OPENSAMLXMLDIR],[opensaml],[pkgxmldir])
-
# output the underlying makefiles
WANT_SUBDIRS="doc schemas configs shibsp"
AC_CONFIG_FILES([Makefile doc/Makefile schemas/Makefile \
diff --git a/shibsp-lite.pc.in b/shibsp-lite.pc.in
deleted file mode 100644
index 40f53bc8..00000000
--- a/shibsp-lite.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: @PACKAGE_NAME@ (lite version)
-Description: Shibboleth Service Provider library (lite version)
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lshibsp-lite
-Libs.private: @PTHREAD_LIBS@
-Cflags: -I${includedir} @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@
-Requires: @SHIBSP_LITE_REQUIRES@
-Requires.private: @SHIBSP_LITE_REQUIRES_PRIVATE@
diff --git a/shibsp.pc.in b/shibsp.pc.in
index 236557bf..2c718bb1 100644
--- a/shibsp.pc.in
+++ b/shibsp.pc.in
@@ -9,5 +9,5 @@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lshibsp
Libs.private: @PTHREAD_LIBS@
Cflags: -I${includedir} @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@
-Requires: @SHIBSP_REQUIRES@ @SHIBSP_LITE_REQUIRES@
-Requires.private: @SHIBSP_REQUIRES_PRIVATE@ @SHIBSP_LITE_REQUIRES_PRIVATE@
+Requires: @SHIBSP_REQUIRES@
+Requires.private: @SHIBSP_REQUIRES_PRIVATE@
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 8b5d7778..36cc1d59 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign subdir-objects
-lib_LTLIBRARIES = libshibsp.la libshibsp-lite.la
+lib_LTLIBRARIES = libshibsp.la
libshibspincludedir = $(includedir)/shibsp
@@ -111,7 +111,7 @@ noinst_HEADERS = \
impl/XMLServiceProvider.h \
remoting/impl/SocketListener.h
-common_sources = \
+libshibsp_la_SOURCES = \
AbstractSPRequest.cpp \
Application.cpp \
ServiceProvider.cpp \
@@ -163,6 +163,8 @@ common_sources = \
impl/XMLApplication.cpp \
impl/XMLRequestMapper.cpp \
impl/XMLServiceProvider.cpp \
+ lite/CommonDomainCookie.cpp \
+ lite/SAMLConstants.cpp \
remoting/impl/ddf.cpp \
remoting/impl/ListenerService.cpp \
remoting/impl/SocketListener.cpp \
@@ -174,94 +176,11 @@ common_sources = \
util/SPConstants.cpp \
util/TemplateParameters.cpp
-libshibsp_lite_la_SOURCES = \
- ${common_sources} \
- lite/CommonDomainCookie.cpp \
- lite/SAMLConstants.cpp
-
-libshibsp_la_SOURCES = \
- ${common_sources} \
- attribute/Base64AttributeDecoder.cpp \
- attribute/DOMAttributeDecoder.cpp \
- attribute/KeyInfoAttributeDecoder.cpp \
- attribute/NameIDAttributeDecoder.cpp \
- attribute/NameIDFromScopedAttributeDecoder.cpp \
- attribute/ScopedAttributeDecoder.cpp \
- attribute/StringAttributeDecoder.cpp \
- attribute/XMLAttributeDecoder.cpp \
- attribute/filtering/impl/AttributeFilter.cpp \
- attribute/filtering/impl/ChainingAttributeFilter.cpp \
- attribute/filtering/impl/DummyAttributeFilter.cpp \
- attribute/filtering/impl/XMLAttributeFilter.cpp \
- attribute/filtering/impl/BasicFilteringContext.cpp \
- attribute/filtering/impl/MatchFunctor.cpp \
- attribute/filtering/impl/AndMatchFunctor.cpp \
- attribute/filtering/impl/AnyMatchFunctor.cpp \
- attribute/filtering/impl/NotMatchFunctor.cpp \
- attribute/filtering/impl/OrMatchFunctor.cpp \
- attribute/filtering/impl/AttributeIssuerStringFunctor.cpp \
- attribute/filtering/impl/AttributeRequesterStringFunctor.cpp \
- attribute/filtering/impl/AttributeScopeStringFunctor.cpp \
- attribute/filtering/impl/AttributeValueStringFunctor.cpp \
- attribute/filtering/impl/AuthenticationMethodStringFunctor.cpp \
- attribute/filtering/impl/AttributeIssuerRegexFunctor.cpp \
- attribute/filtering/impl/AttributeRequesterRegexFunctor.cpp \
- attribute/filtering/impl/AttributeScopeRegexFunctor.cpp \
- attribute/filtering/impl/AttributeValueRegexFunctor.cpp \
- attribute/filtering/impl/AuthenticationMethodRegexFunctor.cpp \
- attribute/filtering/impl/NameIDFormatFunctor.cpp \
- attribute/filtering/impl/NameIDQualifierStringFunctor.cpp \
- attribute/filtering/impl/NumberOfAttributeValuesFunctor.cpp \
- attribute/filtering/impl/AttributeIssuerInEntityGroupFunctor.cpp \
- attribute/filtering/impl/AttributeRequesterInEntityGroupFunctor.cpp \
- attribute/filtering/impl/AttributeIssuerEntityAttributeFunctor.cpp \
- attribute/filtering/impl/AttributeRequesterEntityAttributeFunctor.cpp \
- attribute/filtering/impl/AttributeIssuerEntityMatcherFunctor.cpp \
- attribute/filtering/impl/AttributeRequesterEntityMatcherFunctor.cpp \
- attribute/filtering/impl/AttributeMatchesShibMDScopeFunctor.cpp \
- attribute/filtering/impl/RegistrationAuthorityFunctor.cpp \
- attribute/resolver/impl/ChainingAttributeResolver.cpp \
- attribute/resolver/impl/QueryAttributeResolver.cpp \
- attribute/resolver/impl/SimpleAggregationAttributeResolver.cpp \
- attribute/resolver/impl/AssertionAttributeExtractor.cpp \
- attribute/resolver/impl/ChainingAttributeExtractor.cpp \
- attribute/resolver/impl/DelegationAttributeExtractor.cpp \
- attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp \
- attribute/resolver/impl/MetadataAttributeExtractor.cpp \
- attribute/resolver/impl/XMLAttributeExtractor.cpp \
- binding/impl/ArtifactResolver.cpp \
- binding/impl/SOAPClient.cpp \
- impl/TransactionLog.cpp \
- impl/XMLSecurityPolicyProvider.cpp \
- metadata/DynamicMetadataProvider.cpp \
- metadata/MetadataExtImpl.cpp \
- metadata/MetadataExtSchemaValidators.cpp \
- metadata/MetadataProviderCriteria.cpp \
- security/SecurityPolicy.cpp
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = -version-info 12:0:0
-libshibsp_la_CXXFLAGS = \
- $(AM_CXXFLAGS) \
- $(BOOST_CPPFLAGS) \
- $(PTHREAD_CFLAGS) \
- $(gss_CFLAGS) $(gnu_gss_CFLAGS) \
- $(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
- $(opensaml_CFLAGS) \
- $(xerces_CFLAGS) \
- $(xmlsec_CFLAGS) \
- $(xmltooling_CFLAGS)
-libshibsp_la_LIBADD = \
- $(PTHREAD_LIBS) \
- $(gss_LIBS) $(gnu_gss_LIBS) \
- $(log4shib_LIBS) $(log4cpp_LIBS) \
- $(opensaml_LIBS) \
- $(xerces_LIBS) \
- $(xmlsec_LIBS) \
- $(xmltooling_LIBS)
-libshibsp_lite_la_LDFLAGS = -version-info 12:0:0
-libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+libshibsp_la_LDFLAGS = -version-info 13:0:0
+libshibsp_la_CXXFLAGS = -DSHIBSP_LITE \
$(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
@@ -269,7 +188,7 @@ libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
$(xerces_CFLAGS) \
$(xmltooling_lite_CFLAGS)
-libshibsp_lite_la_LIBADD = \
+libshibsp_la_LIBADD = \
$(PTHREAD_LIBS) \
$(gss_LIBS) $(gnu_gss_LIBS) \
$(log4shib_LIBS) $(log4cpp_LIBS) \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list