Step 4 only rewrote the list-membership form (product in [...,"rhel9"]), so the shared rules using the equality form (product == "rhel9") fell through to the generic else branch for almalinux9. Most visibly, configure_custom_crypto_policy_cis dropped NO-SSHWEAKCIPHERS/NO-SSHWEAKMACS/ NO-WEAKMAC/NO-RPMSHA1, weakening the CIS crypto remediation vs the rhel9 base (no hard failure since NO-SHA1 still ships on EL9). Now almalinux9 follows the rhel9 branch. Also set auto_increment on the .alma.1 release suffix.
57 lines
2.0 KiB
YAML
57 lines
2.0 KiB
YAML
actions:
|
|
- add_files:
|
|
- type: "source"
|
|
name: "add-almalinux9-support.sh"
|
|
number: 9001
|
|
- type: "patch"
|
|
name: "1001-add-almalinux-to-ansible-product-whitelist.patch"
|
|
number: 1001
|
|
|
|
- replace:
|
|
- target: "spec"
|
|
find: "%autosetup -p1"
|
|
replace: |
|
|
%autosetup -p1
|
|
bash %{SOURCE9001}
|
|
count: 1
|
|
- target: "spec"
|
|
find: |
|
|
%if ( %{defined rhel} && (! %{defined centos}) )
|
|
%package rule-playbooks
|
|
replace: |
|
|
%if %{defined rhel}
|
|
%package rule-playbooks
|
|
count: 1
|
|
- target: "spec"
|
|
find: |
|
|
%if 0%{?centos}
|
|
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=OFF -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=ON -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON
|
|
%endif
|
|
replace: |
|
|
%if 0%{?centos}
|
|
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=OFF -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=ON -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON
|
|
%endif
|
|
%if 0%{?almalinux}
|
|
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=OFF -DSSG_PRODUCT_ALMALINUX%{almalinux}:BOOLEAN=ON -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_SCE_ENABLED:BOOL=ON -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON
|
|
%endif
|
|
count: 1
|
|
- target: "spec"
|
|
find: |
|
|
%if ( %{defined rhel} && (! %{defined centos}) )
|
|
%files rule-playbooks
|
|
replace: |
|
|
%if %{defined rhel}
|
|
%files rule-playbooks
|
|
count: 1
|
|
|
|
- modify_release:
|
|
- suffix: ".alma.1"
|
|
enabled: true
|
|
auto_increment: true
|
|
|
|
- changelog_entry:
|
|
- name: "Andrew Lukoshko"
|
|
email: "alukoshko@almalinux.org"
|
|
line:
|
|
- "Add AlmaLinux 9 support"
|