[cpp-linbuild] 01/02: SSPCPP-1003 Remove support for RHEL 6

Fri Feb 7 16:10:07 UTC 2025

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

obrienjw 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=3c14fbc5fc447a9af7735ef6e30e3a59755a74dd

commit 3c14fbc5fc447a9af7735ef6e30e3a59755a74dd
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Thu Feb 6 19:21:54 2025 +0000

    SSPCPP-1003 Remove support for RHEL 6
---
 common/SPECS/opensaml.spec     |  7 +++++--
 common/SPECS/shibboleth.spec   | 29 ++++++++++++-----------------
 common/SPECS/shibresolver.spec |  9 ++++-----
 common/SPECS/xmltooling.spec   | 15 +++++++++------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index f48a6b1..527f649 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -6,7 +6,7 @@
 
 Name: %{libname}
 Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: OpenSAML SAML library
 Group: Development/Libraries/C and C++
 Vendor: Shibboleth Consortium
@@ -86,7 +86,7 @@ This package includes XML schemas and related files.
 %setup -q -n %{compname}-%{version}
 
 %build
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 7 || 0%{?amzn} >= 1
 %configure %{?saml_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
 %else
 %configure %{?saml_options}
@@ -130,6 +130,9 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.3.0-3
+- SSPCPP-1003 Remove support for RHEL 6
+
 * Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.3.0-2
 - SSPCPP-1002 Remove support for SUSE
 
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index 48cc592..424ce26 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,6 +1,6 @@
 Name: shibboleth
 Version: 3.5.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Open source system for attribute-based Web SSO
 Group: Productivity/Networking/Security
 Vendor: Shibboleth Consortium
@@ -9,7 +9,7 @@ URL: http://shibboleth.net/
 Source0: https://shibboleth.net/downloads/service-provider/%{version}/%{name}-sp-%{version}.tar.bz2
 Obsoletes: shibboleth-sp = 2.5.0
 Requires: openssl
-%if 0%{?rhel} >= 6 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} >= 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 Requires(pre,preun): xmltooling-schemas%{?_isa} >= 3.3.0
 Requires(pre,preun): opensaml-schemas%{?_isa} >= 3.3.0
 %else
@@ -31,7 +31,7 @@ BuildRequires: libxmltooling-devel >= 3.2.0
 BuildRequires: libsaml-devel >= 3.2.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 2}
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 Requires: libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires: chrpath
 %endif
@@ -42,19 +42,19 @@ BuildRequires: boost-devel >= 1.32.0
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
-%if 0%{?centos} == 6 || 0%{?centos} == 7 || 0%{?rhel} >= 6 || 0%{?amzn2023}
+%if 0%{?centos} == 7 || 0%{?rhel} == 7 || 0%{?amzn2023}
 BuildRequires: libmemcached-devel
 %endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%if 0%{?rhel} >= 6 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} >= 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 %{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}}
 %else
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
 %endif
 BuildRequires: redhat-rpm-config
 Requires(pre): shadow-utils
-%if 0%{?rhel} == 6 || 0%{?amzn} == 1
+%if 0%{?amzn} == 1
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -104,19 +104,11 @@ This package includes files needed for development with Shibboleth.
 %if 0%{?rhel} >= 7
     # includes Amazon Linux 2
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{!?_without_systemd:--enable-systemd} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
-%else
-%if 0%{?centos} >= 6
-    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
-%else
-%if 0%{?rhel} >= 6
-    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
 %else
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
 %endif
 %endif
 %endif
-%endif
-%endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install
@@ -191,7 +183,7 @@ Before=httpd.service
 Type=notify
 NotifyAccess=main
 User=%{runuser}
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 Environment=LD_LIBRARY_PATH=/opt/shibboleth/%{_lib}
 %endif
 ExecStart=%{_sbindir}/shibd -f -F
@@ -220,7 +212,7 @@ SHIBD_USER=%{runuser}
 # Wait period (secs) for configuration (and metadata) to load
 SHIBD_WAIT=30
 EOF
-    %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+    %if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
         cat >> $SYSCONFIG_SHIBD <<EOF
 
 # Override OS-supplied libcurl
@@ -229,7 +221,7 @@ EOF
     %endif
 fi
 
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
     # Strip existing rpath to libcurl.
     chrpath -d $RPM_BUILD_ROOT%{_sbindir}/shibd
     chrpath -d $RPM_BUILD_ROOT%{_bindir}/mdquery
@@ -392,6 +384,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.5.0-4
+- SSPCPP-1003 Remove support for RHEL 6
+
 * Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.5.0-3
 - SSPCPP-1002 Remove support for SUSE
 - SSPCPP-991 Finish conversion from SysV to SystemD
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index e0839d7..0e0f324 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -6,7 +6,7 @@
 Name: %{libname}
 Version: 3.5.0
 Summary: Shibboleth SP Attribute Resolver Library
-Release: 2%{?dist}
+Release: 3%{?dist}
 Vendor: Shibboleth Consortium
 Group: System Environment/Libraries
 License: Apache-2.0
@@ -64,13 +64,9 @@ This package includes files needed for development.
 %build
 %if 0%{?rhel} >= 7
     %configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
-%else
-%if 0%{?rhel} >= 6
-    %configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
 %else
     %configure --with-gssapi %{?shib_options}
 %endif
-%endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install
@@ -102,6 +98,9 @@ This package includes files needed for development.
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.5.0-3
+- SSPCPP-1003 Remove support for RHEL 6
+
 * Fri Dec 27 2024 John W. O'Brien <john at saltant.com> = 3.5.0-2
 - SSPCPP-1002 Remove support for SUSE
 
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 08e9beb..79fde9f 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -5,7 +5,7 @@
 
 Name: %{libname}
 Version: 3.3.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: OpenSAML XML Processing library
 Group: Development/Libraries/C and C++
 Vendor: Shibboleth Consortium
@@ -23,7 +23,7 @@ BuildRequires: pkgconfig
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: boost-devel >= 1.32.0
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
 %else
@@ -40,8 +40,8 @@ BuildRequires: gdb
 
 %define pkgdocdir %{_docdir}/%{compname}-%{version}
 
-# Prevent the RHEL/etc 6+ package from requiring a vanilla libcurl.
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+# Prevent the RHEL/etc 7+ package from requiring a vanilla libcurl.
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 %filter_from_requires /libcurl\.so\..*/d
 %filter_setup
 %endif
@@ -67,7 +67,7 @@ Requires: libxml-security-c-devel >= 2.0.0
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 Requires: openssl-devel
 Requires: boost-devel >= 1.32.0
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 Requires: libcurl-openssl-devel >= 7.21.7
 %else
 Requires: curl-devel >= 7.10.6
@@ -99,7 +99,7 @@ This package includes XML schemas and related files.
 %setup -q -n %{compname}-%{version}
 
 %build
-%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
 %configure %{?xmltooling_options} %{!?_without_xmlsec: --with-xmlsec} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig CXXFLAGS="-std=c++11"
 %else
 %configure %{?xmltooling_options} %{!?_without_xmlsec: --with-xmlsec}
@@ -140,6 +140,9 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.3.0-3
+- SSPCPP-1003 Remove support for RHEL 6
+
 * Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.3.0-2
 - SSPCPP-1002 Remove support for SUSE
 

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