From 3d20eb647f7c4a218c66a6213f25b7ae6538d6c9 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 16 Jul 2026 13:31:51 +0000 Subject: [PATCH] Add AlmaLinux 10 support --- add-almalinux10-support.sh | 7 +++++-- scap-security-guide.spec | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/add-almalinux10-support.sh b/add-almalinux10-support.sh index 39f7382..96cf57f 100644 --- a/add-almalinux10-support.sh +++ b/add-almalinux10-support.sh @@ -44,8 +44,11 @@ find ./shared -type f -exec sed -i \ # silently falls through to the generic `else` branch of those rules (e.g. # configure_custom_crypto_policy_cis emits DEFAULT:NO-SHA1, a module dropped # from crypto-policies on EL10, breaking `update-crypto-policies --set`). -find ./linux_os -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \ - -e '/if product in/ s/"rhel10"/"rhel10", "almalinux10"/g' {} \; +find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \ + -e '/if product in/ s/"rhel10"/"rhel10", "almalinux10"/g' \ + -e "/if product in/ s/'rhel10'/'rhel10', 'almalinux10'/g" \ + -e '/if product not in/ s/"rhel10"/"rhel10", "almalinux10"/g' \ + -e "/if product not in/ s/'rhel10'/'rhel10', 'almalinux10'/g" {} \; find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i -E \ -e 's/product == (["'\''])rhel10\1/(product == \1rhel10\1 or product == \1almalinux10\1)/g' {} \; diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 85a194a..df47aed 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.81 -Release: 1%{?dist}.alma.1 +Release: 1%{?dist}.alma.2 Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -111,7 +111,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog -* Mon Jun 22 2026 Andrew Lukoshko - 0.1.81-1.alma.1 +* Thu Jul 16 2026 Andrew Lukoshko - 0.1.81-1.alma.2 - Add AlmaLinux 10 support * Mon Jun 01 2026 Jan Černý - 0.1.81-1