rpms/scap-security-guide
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add AlmaLinux 10 support

Browse Source
This commit is contained in:
Andrew Lukoshko 2025-10-11 03:55:58 +00:00 committed by root
commit cf19c69373
5 changed files with 489 additions and 1925 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -59,3 +59,5 @@
/scap-security-guide-0.1.73.tar.bz2
/scap-security-guide-0.1.74.tar.bz2
/scap-security-guide-0.1.76.tar.bz2
/scap-security-guide-0.1.77.tar.bz2
/scap-security-guide-0.1.78.tar.bz2

17
disable_ospp.patch
View File

@ -1,22 +1,11 @@
From 56f17c7c5c9544633ac88a54c264ab232268a40d Mon Sep 17 00:00:00 2001
From: Vojtech Polasek <vpolasek@redhat.com>
Date: Tue, 25 Feb 2025 17:18:53 +0100
Subject: prevent ospp profile from being built on rhel10 product
---
products/rhel10/profiles/ospp.profile | 1 +
1 file changed, 1 insertion(+)
diff --git a/products/rhel10/profiles/ospp.profile b/products/rhel10/profiles/ospp.profile
index 0642cbab2e..bf87808035 100644
index 23e2baf806..d3b46bc354 100644
--- a/products/rhel10/profiles/ospp.profile
+++ b/products/rhel10/profiles/ospp.profile
@@ -1,4 +1,5 @@
@@ -1,5 +1,6 @@
---
documentation_complete: true
+hidden: true
metadata:
version: 4.3
--
2.48.1

2369
scap-security-guide-add-almalinux10-product.patch
View File

File diff suppressed because it is too large Load Diff

24
scap-security-guide.spec
View File

@ -4,8 +4,8 @@
%global _vpath_builddir build
Name: scap-security-guide
Version: 0.1.76
Release: 2%{?dist}.alma.1
Version: 0.1.78
Release: 1%{?dist}.alma.1
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
URL: https://github.com/ComplianceAsCode/content/
@ -14,10 +14,10 @@ Patch0: disable_ospp.patch
# AlmaLinux Patch
Patch1000: scap-security-guide-add-almalinux10-product.patch
BuildArch: noarch
BuildRequires: libxslt
BuildRequires: expat
BuildRequires: openscap-scanner >= 1.2.5
BuildRequires: cmake >= 2.8
# To get python3 inside the buildroot require its path explicitly in BuildRequires
@ -65,13 +65,13 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul
%define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF
%define cmake_defines_specific %{nil}
%if 0%{?rhel} && ! %{defined eln}
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON -DSSG_SCE_ENABLED:BOOL=ON
%endif
%if 0%{?centos}
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -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=FALSE -DSSG_PRODUCT_ALMALINUX%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_ALMALINUX%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_SCE_ENABLED:BOOL=ON
%endif
mkdir -p build
@ -105,9 +105,19 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
%endif
%changelog
* Tue May 27 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.76-2.alma.1
* Sat Oct 11 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.78-1.alma.1
- Add AlmaLinux 10 support
* Mon Sep 15 2025 Vojtech Polasek <vpolasek@redhat.com> - 0.1.78-1
- rebase scap-security-guide to the latest version 0.1.78 (RHEL-120076)
* Fri Jun 27 2025 Vojtech Polasek <vpolasek@redhat.com> - 0.1.77-2
- fix incorrect applicability of Grub2 UEFI specific rules
- replace grub-mkconfig with grub2-mkconfig in rule descriptions
* Tue Jun 03 2025 Matthew Burket <mburket@redhat.com> - 0.1.77-1
- Rebase scap-security-guide to the latest upstream version 0.1.77 (RHEL-94804)
* Thu Feb 27 2025 Vojtech Polasek <vpolasek@redhat.com> - 0.1.76-2
- rebuilt

2
sources
View File

@ -1 +1 @@
SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c
SHA512 (scap-security-guide-0.1.78.tar.bz2) = b84c549fe42799a6daffecf5720c5208f9946974f74193b9f6beb3fba04c35d9f073953c94b83c5ddf36855d59be1c66dafb011dde4427ab040dd1ec5048c063