Compare commits

...

15 Commits
c8 ... a8

Author SHA1 Message Date
Andrew Lukoshko a891ae0662 Bump release 2024-03-04 15:53:44 +00:00
Andrew Lukoshko 78d0e8d4e5 Update patch 2024-03-04 15:52:37 +00:00
eabdullin 37fa15ce36 Merge branch 'c8' into a8 2024-02-27 04:27:40 +00:00
Andrew Lukoshko aff5395060 Update AlmaLinux patch 2023-10-30 15:13:07 +00:00
Andrew Lukoshko 8bab06a9ca Merge branch 'c8' into a8 2023-10-30 14:56:59 +00:00
Andrew Lukoshko 97d3e26c5a Update AlmaLinux patch 2023-02-21 13:38:18 +00:00
eabdullin 7d6752f01c Fix date 2023-02-21 10:27:25 +03:00
eabdullin e4bd8b72ab Merge branch 'c8' into a8 2023-02-21 10:09:40 +03:00
eabdullin 64af91adb7 Merge branch 'c8' into a8 2022-11-08 06:45:26 +00:00
eabdullin c6d62de159 Update AlmaLinux patch 2022-06-29 11:41:07 +03:00
eabdullin da87b3ef00 Merge branch 'c8' into a8 2022-06-29 03:34:10 +00:00
eabdullin cb5787e83c Merge branch 'c8' into a8 2022-05-10 07:45:28 +00:00
eabdullin 5d623aa88d Merge branch 'c8' into a8 2022-04-26 18:09:29 +00:00
eabdullin c3a1d91990 AlmaLinux changes 2021-11-17 16:33:00 +03:00
Andrew Lukoshko 0e201cce7f AlmaLinux changes 2021-09-15 11:41:44 +00:00
2 changed files with 27232 additions and 20 deletions

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
Name: scap-security-guide
Version: 0.1.72
Release: 2%{?dist}
Release: 2%{?dist}.alma.1
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
Group: Applications/System
@ -17,6 +17,10 @@ Source1: %{_static_rhel6_content}.tar.bz2
# Patch hides cjis, rht-ccp and standard profiles for RHEL8
Patch0: hide-profiles-not-in-good-shape-for-RHEL.patch
# AlmaLinux patches
Patch1001: 0001-Add-AlmaLinux-8-support.patch
BuildArch: noarch
BuildRequires: libxslt
@ -54,7 +58,6 @@ The %{name}-doc package contains HTML formatted documents containing
hardening guidances that have been generated from XCCDF benchmarks
present in %{name} package.
%if ( %{defined rhel} && (! %{defined centos}) )
%package rule-playbooks
Summary: Ansible playbooks per each rule.
Group: System Environment/Base
@ -62,7 +65,6 @@ Requires: %{name} = %{version}-%{release}
%description rule-playbooks
The %{name}-rule-playbooks package contains individual ansible playbooks per rule.
%endif
%prep
%autosetup -p1 -b1
@ -72,19 +74,14 @@ mkdir -p build
cd build
%cmake \
-DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
-DSSG_PRODUCT_RHEL7:BOOLEAN=TRUE \
-DSSG_PRODUCT_RHEL8:BOOLEAN=TRUE \
-DSSG_PRODUCT_RHEL7:BOOLEAN=FALSE \
-DSSG_PRODUCT_RHEL8:BOOLEAN=FALSE \
-DSSG_PRODUCT_ALMALINUX8:BOOLEAN=TRUE \
-DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \
-DSSG_PRODUCT_JRE:BOOLEAN=TRUE \
%if %{defined centos}
-DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON \
%else
-DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF \
%endif
-DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF \
%if ( %{defined rhel} && (! %{defined centos}) )
-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON \
%endif
../
%cmake_build
@ -93,9 +90,10 @@ cd build
%cmake_install
# Manually install pre-built rhel6 content
cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
# Disabled on AlmaLinux
# cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
# cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
# cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
%files
%{_datadir}/xml/scap/ssg/content
@ -107,24 +105,22 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
%doc %{_docdir}/%{name}/LICENSE
%doc %{_docdir}/%{name}/README.md
%doc %{_docdir}/%{name}/Contributors.md
%if ( %{defined rhel} && (! %{defined centos}) )
%exclude %{_datadir}/%{name}/ansible/rule_playbooks
%endif
%files doc
%doc %{_docdir}/%{name}/guides/*.html
%doc %{_docdir}/%{name}/tables/*.html
%if ( %{defined rhel} && (! %{defined centos}) )
%files rule-playbooks
%defattr(-,root,root,-)
%{_datadir}/%{name}/ansible/rule_playbooks
%endif
%changelog
* Tue Feb 27 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.72-2.alma.1
- Add AlmaLinux support
* Fri Feb 16 2024 Marcus Burghardt <maburgha@redhat.com> - 0.1.72-2
- Unlist profiles no longer maintained in RHEL8.
* Wed Feb 14 2024 Marcus Burghardt <maburgha@redhat.com> - 0.1.72-1
- Rebase to a new upstream release 0.1.72 (RHEL-25250)
- Increase CIS standards coverage regarding SSH and cron (RHEL-1314)
@ -188,7 +184,6 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
* Wed Aug 17 2022 Watson Sato <wsato@redhat.com> - 0.1.63-4
- Fix check of enable_fips_mode on s390x (RHBZ#2070564)
* Mon Aug 15 2022 Watson Sato <wsato@redhat.com> - 0.1.63-3
- Fix Ansible partition conditional (RHBZ#2032403)