[cpp-linbuild] branch main updated: SSPCPP-989 Fix add'l SysV/SystemD mismatches on AL2023

[John W. O'Brien]

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=32b2005d0a4186bee579b2e0e082ec68213b5581

The following commit(s) were added to refs/heads/main by this push:
     new 32b2005  SSPCPP-989 Fix add'l SysV/SystemD mismatches on AL2023
32b2005 is described below

commit 32b2005d0a4186bee579b2e0e082ec68213b5581
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Jul 26 20:58:44 2024 -0400

    SSPCPP-989 Fix add'l SysV/SystemD mismatches on AL2023
---
 common/SPECS/shibboleth.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index c515b39..f38af6c 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,6 +1,6 @@
 Name: shibboleth
 Version: 3.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Open source system for attribute-based Web SSO
 Group: Productivity/Networking/Security
 Vendor: Shibboleth Consortium
@@ -20,7 +20,7 @@ Requires(pre,preun): opensaml-schemas >= 3.2.0
 Requires(pre,preun): %{insserv_prereq}
 Requires(pre,preun): %{fillup_prereq}
 %endif
-%if 0%{?rhel} >= 7
+%if 0%{?rhel} >= 7 || 0%{?amzn2023}
 Requires: hostname
 BuildRequires: systemd-devel
 %else
@@ -323,7 +323,7 @@ if [ $1 -gt 1 ] ; then
         fi
     fi
 
-%if 0%{?rhel} >= 7
+%if 0%{?rhel} >= 7 || 0%{?amzn2023}
     # Initial prep for systemd
     %systemd_post shibd.service
     if [ $1 -gt 1 ] ; then
@@ -350,7 +350,7 @@ if [ $1 -gt 1 ] ; then
 %preun
 # On final removal, stop shibd and remove service, restart Apache if running.
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%if 0%{?rhel} >= 7
+%if 0%{?rhel} >= 7 || 0%{?amzn2023}
     %systemd_preun shibd.service
 %else
     if [ $1 -eq 0 ] ; then
@@ -380,7 +380,7 @@ exit 0
 /sbin/ldconfig
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
 # On upgrade, restart components if they're already running.
-%if 0%{?rhel} >= 7
+%if 0%{?rhel} >= 7 || 0%{?amzn2023}
     %systemd_postun_with_restart shibd.service
 %else
     if [ $1 -ge 1 ] ; then
@@ -458,7 +458,7 @@ exit 0
 %config %{_initddir}/shibd
 %{_sbindir}/rcshibd
 %endif
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?amzn2023}
 %{_tmpfilesdir}/%{name}.conf
 %endif
 %{_sysconfdir}/shibboleth/example-shibboleth2.xml
@@ -480,6 +480,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Tue Jul 30 2024 John W. O'Brien <john at saltant.com> - 3.4.1-5
+- SSPCPP-989 Fix add'l SysV/SystemD mismatches on AL2023
+
 * Sun Jun 30 2024 John W. O'Brien <john at saltant.com> - 3.4.1-4
 - SSPCPP-987 Include missed conversion from SysV to SystemD for AL2023
 

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