Add AlmaLinux 9 support

This commit is contained in:
Andrew Lukoshko 2026-06-09 16:22:50 +00:00 committed by root
parent 436ca4751d
commit 514fc2ac73
2 changed files with 16 additions and 2 deletions

View File

@ -29,9 +29,20 @@ find ./shared -type f -exec sed -i \
-e 's|<platform>multi_platform_rhel</platform>|<platform>multi_platform_rhel</platform>\n<platform>multi_platform_almalinux</platform>|g' {} \;
# 4. Improve Ansible support in conditionals
# Two product-gating idioms are used in the shared rule templates:
# - list membership: {% if product in [..., "rhel9"] %}
# - equality: {% if product == "rhel9" %}
# The list form is rewritten below. The equality form is NOT a substring of
# the list form, so it must be handled separately, otherwise almalinux9
# silently falls through to the generic `else` branch of those rules (e.g.
# configure_custom_crypto_policy_cis drops NO-SSHWEAKCIPHERS/NO-SSHWEAKMACS/
# NO-WEAKMAC/NO-RPMSHA1, weakening the CIS crypto remediation vs the rhel9 base).
find ./linux_os -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i \
-e '/if product in/ s/"rhel9"/"rhel9", "almalinux9"/g' {} \;
find ./linux_os ./shared -type d -name ensure_redhat_gpgkey_installed -prune -o -type f -exec sed -i -E \
-e 's/product == (["'\''])rhel9\1/(product == \1rhel9\1 or product == \1almalinux9\1)/g' {} \;
# 5. Add disa references symlinks for AlmaLinux
for xml in $(find shared/references/ -type f -name 'disa-stig-rhel*.xml'); do
target="$(echo "$xml" | sed 's/rhel/almalinux/g')"
@ -105,6 +116,9 @@ sed -i \
sed -i 's/rhel/almalinux/g' products/almalinux9/CMakeLists.txt
sed -i '/In addition to being applicable/,/- Red Hat Containers with a Red Hat Enterprise Linux 9 image/{/- Red Hat Containers/{N;d};d}' \
products/almalinux9/profiles/stig*.profile
sed -i -z \
-e 's/Red Hat Enterprise Linux/AlmaLinux OS/g' \
-e 's/red_hat_linux/almalinuxos_linux/g' \

View File

@ -6,7 +6,7 @@
Name: scap-security-guide
Version: 0.1.80
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/
@ -107,7 +107,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
%endif
%changelog
* Tue Mar 31 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.80-1.alma.1
* Tue Jun 09 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.80-1.alma.2
- Add AlmaLinux 9 support
* Wed Mar 11 2026 Vojtech Polasek <vpolasek@redhat.com> - 0.1.80-1