Compare commits
17 Commits
Author | SHA1 | Date |
---|---|---|
Andrew Lukoshko | d563de6142 | |
Andrew Lukoshko | df37244411 | |
Andrew Lukoshko | a891ae0662 | |
Andrew Lukoshko | 78d0e8d4e5 | |
eabdullin | 37fa15ce36 | |
Andrew Lukoshko | aff5395060 | |
Andrew Lukoshko | 8bab06a9ca | |
Andrew Lukoshko | 97d3e26c5a | |
eabdullin | 7d6752f01c | |
eabdullin | e4bd8b72ab | |
eabdullin | 64af91adb7 | |
eabdullin | c6d62de159 | |
eabdullin | da87b3ef00 | |
eabdullin | cb5787e83c | |
eabdullin | 5d623aa88d | |
eabdullin | c3a1d91990 | |
Andrew Lukoshko | 0e201cce7f |
File diff suppressed because it is too large
Load Diff
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
Name: scap-security-guide
|
Name: scap-security-guide
|
||||||
Version: 0.1.73
|
Version: 0.1.73
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}.alma.1
|
||||||
Summary: Security guidance and baselines in SCAP formats
|
Summary: Security guidance and baselines in SCAP formats
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
|
@ -15,6 +15,10 @@ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{versio
|
||||||
# Include tarball with last released rhel6 content
|
# Include tarball with last released rhel6 content
|
||||||
Source1: %{_static_rhel6_content}.tar.bz2
|
Source1: %{_static_rhel6_content}.tar.bz2
|
||||||
|
|
||||||
|
|
||||||
|
# AlmaLinux patches
|
||||||
|
Patch1001: 0001-Add-AlmaLinux-8-support.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
|
@ -51,7 +55,6 @@ The %{name}-doc package contains HTML formatted documents containing
|
||||||
hardening guidances that have been generated from XCCDF benchmarks
|
hardening guidances that have been generated from XCCDF benchmarks
|
||||||
present in %{name} package.
|
present in %{name} package.
|
||||||
|
|
||||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
|
||||||
%package rule-playbooks
|
%package rule-playbooks
|
||||||
Summary: Ansible playbooks per each rule.
|
Summary: Ansible playbooks per each rule.
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
|
@ -59,7 +62,6 @@ Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
%description rule-playbooks
|
%description rule-playbooks
|
||||||
The %{name}-rule-playbooks package contains individual ansible playbooks per rule.
|
The %{name}-rule-playbooks package contains individual ansible playbooks per rule.
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -b1
|
%autosetup -p1 -b1
|
||||||
|
@ -69,19 +71,14 @@ mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
%cmake \
|
%cmake \
|
||||||
-DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
|
-DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE \
|
||||||
-DSSG_PRODUCT_RHEL7:BOOLEAN=TRUE \
|
-DSSG_PRODUCT_RHEL7:BOOLEAN=FALSE \
|
||||||
-DSSG_PRODUCT_RHEL8:BOOLEAN=TRUE \
|
-DSSG_PRODUCT_RHEL8:BOOLEAN=FALSE \
|
||||||
|
-DSSG_PRODUCT_ALMALINUX8:BOOLEAN=TRUE \
|
||||||
-DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \
|
-DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \
|
||||||
-DSSG_PRODUCT_JRE:BOOLEAN=TRUE \
|
-DSSG_PRODUCT_JRE:BOOLEAN=TRUE \
|
||||||
%if %{defined centos}
|
|
||||||
-DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON \
|
|
||||||
%else
|
|
||||||
-DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF \
|
-DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF \
|
||||||
%endif
|
|
||||||
-DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF \
|
-DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF \
|
||||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
|
||||||
-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON \
|
-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON \
|
||||||
%endif
|
|
||||||
../
|
../
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
|
@ -90,9 +87,10 @@ cd build
|
||||||
%cmake_install
|
%cmake_install
|
||||||
|
|
||||||
# Manually install pre-built rhel6 content
|
# Manually install pre-built rhel6 content
|
||||||
cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
|
# Disabled on AlmaLinux
|
||||||
cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
|
# cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
|
||||||
cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
|
# cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
|
||||||
|
# cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_datadir}/xml/scap/ssg/content
|
%{_datadir}/xml/scap/ssg/content
|
||||||
|
@ -104,21 +102,20 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
|
||||||
%doc %{_docdir}/%{name}/LICENSE
|
%doc %{_docdir}/%{name}/LICENSE
|
||||||
%doc %{_docdir}/%{name}/README.md
|
%doc %{_docdir}/%{name}/README.md
|
||||||
%doc %{_docdir}/%{name}/Contributors.md
|
%doc %{_docdir}/%{name}/Contributors.md
|
||||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
|
||||||
%exclude %{_datadir}/%{name}/ansible/rule_playbooks
|
%exclude %{_datadir}/%{name}/ansible/rule_playbooks
|
||||||
%endif
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%doc %{_docdir}/%{name}/guides/*.html
|
%doc %{_docdir}/%{name}/guides/*.html
|
||||||
%doc %{_docdir}/%{name}/tables/*.html
|
%doc %{_docdir}/%{name}/tables/*.html
|
||||||
|
|
||||||
%if ( %{defined rhel} && (! %{defined centos}) )
|
|
||||||
%files rule-playbooks
|
%files rule-playbooks
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_datadir}/%{name}/ansible/rule_playbooks
|
%{_datadir}/%{name}/ansible/rule_playbooks
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jun 07 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.73-1.alma.1
|
||||||
|
- Add AlmaLinux support
|
||||||
|
|
||||||
* Tue May 21 2024 Jan Černý <jcerny@redhat.com> - 0.1.73-1
|
* Tue May 21 2024 Jan Černý <jcerny@redhat.com> - 0.1.73-1
|
||||||
- Rebase scap-security-guide package to version 0.1.73 (RHEL-36733)
|
- Rebase scap-security-guide package to version 0.1.73 (RHEL-36733)
|
||||||
- Change crypto policy used in the CUI profile to FIPS (RHEL-30346)
|
- Change crypto policy used in the CUI profile to FIPS (RHEL-30346)
|
||||||
|
@ -128,7 +125,6 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
|
||||||
|
|
||||||
* Fri Feb 16 2024 Marcus Burghardt <maburgha@redhat.com> - 0.1.72-2
|
* Fri Feb 16 2024 Marcus Burghardt <maburgha@redhat.com> - 0.1.72-2
|
||||||
- Unlist profiles no longer maintained in RHEL8.
|
- Unlist profiles no longer maintained in RHEL8.
|
||||||
|
|
||||||
* Wed Feb 14 2024 Marcus Burghardt <maburgha@redhat.com> - 0.1.72-1
|
* Wed Feb 14 2024 Marcus Burghardt <maburgha@redhat.com> - 0.1.72-1
|
||||||
- Rebase to a new upstream release 0.1.72 (RHEL-25250)
|
- Rebase to a new upstream release 0.1.72 (RHEL-25250)
|
||||||
- Increase CIS standards coverage regarding SSH and cron (RHEL-1314)
|
- Increase CIS standards coverage regarding SSH and cron (RHEL-1314)
|
||||||
|
@ -192,7 +188,6 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
|
||||||
|
|
||||||
* Wed Aug 17 2022 Watson Sato <wsato@redhat.com> - 0.1.63-4
|
* Wed Aug 17 2022 Watson Sato <wsato@redhat.com> - 0.1.63-4
|
||||||
- Fix check of enable_fips_mode on s390x (RHBZ#2070564)
|
- Fix check of enable_fips_mode on s390x (RHBZ#2070564)
|
||||||
|
|
||||||
* Mon Aug 15 2022 Watson Sato <wsato@redhat.com> - 0.1.63-3
|
* Mon Aug 15 2022 Watson Sato <wsato@redhat.com> - 0.1.63-3
|
||||||
- Fix Ansible partition conditional (RHBZ#2032403)
|
- Fix Ansible partition conditional (RHBZ#2032403)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue