[cpp-linbuild] branch main updated: Update versions, specfile adjustments.

Scott Cantor cantor.2 at osu.edu
Thu Oct 28 21:28:44 UTC 2021


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

scantor pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=4c39a98f5a05d99136740a38b10eb43b781cb587

The following commit(s) were added to refs/heads/main by this push:
     new 4c39a98  Update versions, specfile adjustments.
4c39a98 is described below

commit 4c39a98f5a05d99136740a38b10eb43b781cb587
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Oct 28 17:28:39 2021 -0400

    Update versions, specfile adjustments.
---
 Makefile                         |  8 ++++----
 common/SPECS/curl-openssl.spec   |  7 ++-----
 common/SPECS/log4shib.spec       | 18 ++++++++++--------
 common/SPECS/xml-security-c.spec |  3 +--
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index e00b593..b589148 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ SHIBEDS_DISTFILE=$(SHIBEDS_COMPNAME)-$(SHIBEDS_VERSION).tar.gz
 SHIBEDS_URL=https://shibboleth.net/downloads/embedded-discovery-service/$(SHIBEDS_VERSION)/$(SHIBEDS_DISTFILE)
 
 LOG4SHIB_COMPNAME=log4shib
-LOG4SHIB_VERSION=2.0.0
+LOG4SHIB_VERSION=2.0.1
 LOG4SHIB_DISTFILE=$(LOG4SHIB_COMPNAME)-$(LOG4SHIB_VERSION).$(DEFAULT_DIST_EXT)
 LOG4SHIB_URL=https://shibboleth.net/downloads/$(LOG4SHIB_COMPNAME)/$(LOG4SHIB_VERSION)/$(LOG4SHIB_DISTFILE)
 
@@ -81,14 +81,14 @@ XERCESC_DISTFILE=$(XERCESC_COMPNAME)-$(XERCESC_VERSION).$(DEFAULT_DIST_EXT)
 XERCESC_URL=https://archive.apache.org/dist/xerces/c/$(XERCESC_MAJORVER)/sources/$(XERCESC_DISTFILE)
 
 XMLSECURITYC_COMPNAME=xml-security-c
-XMLSECURITYC_VERSION=2.0.2
+XMLSECURITYC_VERSION=2.0.4
 XMLSECURITYC_DISTFILE=$(XMLSECURITYC_COMPNAME)-$(XMLSECURITYC_VERSION).$(DEFAULT_DIST_EXT)
 XMLSECURITYC_URL=https://downloads.apache.org/santuario/c-library/$(XMLSECURITYC_DISTFILE)
 XMLSECURITYC_DEPENDS=XERCESC
 
 CURLOPENSSL_COMPNAME=curl-openssl
 CURLOPENSSL_DISTNAME=curl
-CURLOPENSSL_VERSION=7.63.0
+CURLOPENSSL_VERSION=7.79.1
 CURLOPENSSL_DISTFILE=$(CURLOPENSSL_DISTNAME)-$(CURLOPENSSL_VERSION).$(DEFAULT_DIST_EXT)
 CURLOPENSSL_URL=https://curl.haxx.se/download/$(CURLOPENSSL_DISTFILE)
 CURLOPENSSL_VALID_PLATFORMS=centos7 amazonlinux2
@@ -216,7 +216,7 @@ endef
 $(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call build-docker-image-component-platform,$(component),$(platform)))))
 
 
-# Build RPMs and SRPMs for a each component on each platform
+# Build RPMs and SRPMs for each component on each platform
 define build-component-platform
 $(1)_$(2)_token = $(srcdir).$(1)_$(2)_products
 $$($(1)_$(2)_token): $$($(1)_$(2)_image_token) $(SOURCEDIR)/$$($(1)_DISTFILE) $(SPECDIR)/$$($(1)_COMPNAME).spec
diff --git a/common/SPECS/curl-openssl.spec b/common/SPECS/curl-openssl.spec
index 02874eb..c84c6c7 100644
--- a/common/SPECS/curl-openssl.spec
+++ b/common/SPECS/curl-openssl.spec
@@ -6,7 +6,7 @@
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl-openssl
-Version: 7.63.0
+Version: 7.79.1
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -108,9 +108,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc CHANGES README* COPYING
-%doc docs/BUGS docs/FAQ docs/FEATURES
-%doc docs/MANUAL docs/RESOURCES
-%doc docs/TheArtOfHttpScripting docs/TODO
+%doc docs/FAQ docs/TODO
 %dir %{_bindir}
 %{_bindir}/curl
 %dir %{_mandir}
@@ -126,7 +124,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libcurl-openssl-devel
 %defattr(-,root,root,-)
 %doc docs/examples/*.c docs/examples/Makefile.example
-%doc docs/libcurl/ABI
 %dir %{_bindir}
 %dir %{_includedir}
 %dir %{_libdir}/pkgconfig
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index 3adc02c..c3c8c10 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -1,11 +1,11 @@
 Name:       log4shib
-Version:    2.0.0
+Version:    2.0.1
 Release:    1
 Summary:    Log for C++, Shibboleth Edition
 License:    LGPL
 Group:      Development/Libraries
 Vendor:     Shibboleth Consortium
-URL:        http://shibboleth.net/downloads/log4shib/2.0.0
+URL:        http://shibboleth.net/downloads/log4shib/%version%
 Source:     %name-%version.tar.bz2
 BuildRoot:  %_tmppath/%name-%version-root
 BuildRequires:  gcc-c++ pkgconfig
@@ -70,18 +70,14 @@ config/install-sh -m 644 -c AUTHORS COPYING INSTALL NEWS README THANKS ChangeLog
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%ifnos solaris2.8 solaris2.9 solaris2.10
 %post -n liblog4shib2 -p /sbin/ldconfig
-%endif
 
 %post -n liblog4shib-devel
 if test "x$RPM_INSTALL_PREFIX0" != "x" ; then
     %{__perl} -pi -e"s|^prefix=\"[^\"]*\"|prefix=\"$RPM_INSTALL_PREFIX0\"|" $RPM_INSTALL_PREFIX0/bin/log4shib-config
 fi
 
-%ifnos solaris2.8 solaris2.9 solaris2.10 
 %postun -n liblog4shib2 -p /sbin/ldconfig
-%endif
 
 %files -n liblog4shib2
 %defattr(-,root,root,755)
@@ -91,13 +87,19 @@ fi
 %defattr(-,root,root,755)
 %{_includedir}/*
 %{!?_without_doxygenrpm:%{_mandir}/man?/*}
-%attr(755,root,root) %{_libdir}/*.so
-%attr(644,root,root) %{_libdir}/*.a
+%{_libdir}/*.so
 %attr(644,root,root) %{_libdir}/pkgconfig/log4shib.pc
 %exclude %{_libdir}/*.la
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Oct 28 2021 Scott Cantor <cantor.2 at osu.edu> - 2.0.1-1
+- Remove static library from manifest.
+
+* Fri Sep 27 2019 Scott Cantor <cantor.2 at osu.edu> - 2.0.0-2
+- Remove old Solaris exclusions
+- Add CentOS 8 gdb dependency
+
 * Mon Jun 25 2018 Scott Cantor <cantor.2 at osu.edu> - 2.0.0-1
 - Bump version
 - Switch to bzipped source
diff --git a/common/SPECS/xml-security-c.spec b/common/SPECS/xml-security-c.spec
index 8fabc8e..fba275d 100644
--- a/common/SPECS/xml-security-c.spec
+++ b/common/SPECS/xml-security-c.spec
@@ -1,5 +1,5 @@
 Name:           xml-security-c
-Version:        2.0.2
+Version:        2.0.4
 Release:        1
 Summary:        Apache XML security C++ library
 Group:          Development/Libraries/C and C++
@@ -97,7 +97,6 @@ This package includes files needed for development with xml-security-c.
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/*.a
 %{_libdir}/pkgconfig/xml-security-c.pc
 %exclude %{_libdir}/*.la
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list