[cpp-linbuild] 02/02: SSPCPP-1004 Remove support for Amazon Linux 1

Fri Feb 7 16:10:08 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=cb22b26cfcb1376fe65d0300e829b7c47cd646c7

commit cb22b26cfcb1376fe65d0300e829b7c47cd646c7
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Thu Feb 6 19:28:58 2025 +0000

    SSPCPP-1004 Remove support for Amazon Linux 1
---
 common/SPECS/opensaml.spec   |  3 ++-
 common/SPECS/shibboleth.spec | 18 +++++++-----------
 common/SPECS/xmltooling.spec |  9 +++++----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index 527f649..de9bf5f 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -86,7 +86,7 @@ This package includes XML schemas and related files.
 %setup -q -n %{compname}-%{version}
 
 %build
-%if 0%{?rhel} == 7 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 7 || 0%{?amzn} == 2
 %configure %{?saml_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
 %else
 %configure %{?saml_options}
@@ -132,6 +132,7 @@ This package includes XML schemas and related files.
 %changelog
 * Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.3.0-3
 - SSPCPP-1003 Remove support for RHEL 6
+- SSPCPP-1004 Remove support for Amazon Linux 1
 
 * 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 424ce26..b2f5b0d 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -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} >= 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} >= 7 || 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} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 2
 Requires: libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires: chrpath
 %endif
@@ -47,18 +47,13 @@ BuildRequires: libmemcached-devel
 %endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%if 0%{?rhel} >= 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} >= 7 || 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%{?amzn} == 1
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-%endif
 %endif
 
 %define runuser shibd
@@ -183,7 +178,7 @@ Before=httpd.service
 Type=notify
 NotifyAccess=main
 User=%{runuser}
-%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 2
 Environment=LD_LIBRARY_PATH=/opt/shibboleth/%{_lib}
 %endif
 ExecStart=%{_sbindir}/shibd -f -F
@@ -212,7 +207,7 @@ SHIBD_USER=%{runuser}
 # Wait period (secs) for configuration (and metadata) to load
 SHIBD_WAIT=30
 EOF
-    %if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+    %if 0%{?rhel} == 7 || 0%{?amzn} == 2
         cat >> $SYSCONFIG_SHIBD <<EOF
 
 # Override OS-supplied libcurl
@@ -221,7 +216,7 @@ EOF
     %endif
 fi
 
-%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 2
     # Strip existing rpath to libcurl.
     chrpath -d $RPM_BUILD_ROOT%{_sbindir}/shibd
     chrpath -d $RPM_BUILD_ROOT%{_bindir}/mdquery
@@ -386,6 +381,7 @@ exit 0
 %changelog
 * Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.5.0-4
 - SSPCPP-1003 Remove support for RHEL 6
+- SSPCPP-1004 Remove support for Amazon Linux 1
 
 * Fri Dec 27 2024 John W. O'Brien <john at saltant.com> - 3.5.0-3
 - SSPCPP-1002 Remove support for SUSE
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 79fde9f..2261938 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -23,7 +23,7 @@ BuildRequires: pkgconfig
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 BuildRequires: boost-devel >= 1.32.0
-%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 0%{?amzn} == 2
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
 %else
@@ -41,7 +41,7 @@ BuildRequires: gdb
 %define pkgdocdir %{_docdir}/%{compname}-%{version}
 
 # Prevent the RHEL/etc 7+ package from requiring a vanilla libcurl.
-%if 0%{?rhel} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 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} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 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} == 7 || 0%{?amzn} == 1 || 0%{?amzn} == 2
+%if 0%{?rhel} == 7 || 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}
@@ -142,6 +142,7 @@ This package includes XML schemas and related files.
 %changelog
 * Thu Feb 6 2025 John W. O'Brien <john at saltant.com> - 3.3.0-3
 - SSPCPP-1003 Remove support for RHEL 6
+- SSPCPP-1004 Remove support for Amazon Linux 1
 
 * 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.
