diff --git a/dist b/dist index 1fe92cf0fdf9c2625d878a2ace258f64c1e8ca44..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_10 +an8 diff --git a/download b/download index e15f417c334ac27c50a7f492d5f689c5dcc10aaa..a598ab4c084ae191d7730a3099dd4a49a6d8a209 100644 --- a/download +++ b/download @@ -1,3 +1,3 @@ 219c992603514558e5f6f3d29adaa534 scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2 8cf987028930d5baf17214fb65ad8b6b scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2 -70e27d8bb68eb1f11c93c75e1b49f7c7 scap-security-guide-0.1.74.tar.bz2 +b7bb21df2f6ba01161b9068df5db3342 scap-security-guide-0.1.75.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index b9d8464db6f816dfeb51e4bcfc1aa685ec1fc6f0..5a67c451ee5d12541a347aa29bd8f9734918bf2e 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -7,32 +7,31 @@ %global _vpath_builddir build # global _default_patch_fuzz 2 # Normally shouldn't be needed as patches should apply cleanly -Name: scap-security-guide -Version: 0.1.74 -Release: 3%{anolis_release}%{?dist} -Summary: Security guidance and baselines in SCAP formats -License: BSD-3-Clause -Group: Applications/System -URL: https://github.com/ComplianceAsCode/content/ -Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 +Name: scap-security-guide +Version: 0.1.75 +Release: 1%{anolis_release}%{?dist} +Summary: Security guidance and baselines in SCAP formats +License: BSD-3-Clause +Group: Applications/System +URL: https://github.com/ComplianceAsCode/content/ +Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2 # Include tarball with last released rhel6 content -Source1: %{_static_rhel6_content}.tar.bz2 +Source1: %{_static_rhel6_content}.tar.bz2 # Include tarball with last released rhel7 content -Source2: %{_static_rhel7_content}.tar.bz2 - -BuildArch: noarch - -BuildRequires: libxslt -BuildRequires: expat -BuildRequires: openscap-scanner >= 1.2.5 -BuildRequires: cmake >= 2.8 -BuildRequires: python3-devel -BuildRequires: python%{python3_pkgversion} -BuildRequires: python%{python3_pkgversion}-jinja2 -BuildRequires: python%{python3_pkgversion}-PyYAML -Requires: xml-common, openscap-scanner >= 1.2.5 -Obsoletes: openscap-content < 0:0.9.13 -Provides: openscap-content +Source2: %{_static_rhel7_content}.tar.bz2 + +BuildArch: noarch + +BuildRequires: libxslt +BuildRequires: openscap-scanner >= 1.2.5 +BuildRequires: cmake >= 2.8 +BuildRequires: python3-devel +BuildRequires: python%{python3_pkgversion} +BuildRequires: python%{python3_pkgversion}-jinja2 +BuildRequires: python%{python3_pkgversion}-PyYAML +Requires: xml-common, openscap-scanner >= 1.2.5 +Obsoletes: openscap-content < 0:0.9.13 +Provides: openscap-content %description The scap-security-guide project provides a guide for configuration of the @@ -47,9 +46,9 @@ conforms to provided guideline. Refer to scap-security-guide(8) manual page for further information. %package doc -Summary: HTML formatted security guides generated from XCCDF benchmarks -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} +Summary: HTML formatted security guides generated from XCCDF benchmarks +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} %description doc The %{name}-doc package contains HTML formatted documents containing @@ -66,9 +65,9 @@ The %{name}-extra package contains various situation guidebooks %if ( %{defined rhel} && (! %{defined centos}) ) %package rule-playbooks -Summary: Ansible playbooks per each rule. -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} +Summary: Ansible playbooks per each rule. +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} %description rule-playbooks The %{name}-rule-playbooks package contains individual ansible playbooks per rule. @@ -155,10 +154,14 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %endif %changelog -* Tue Aug 27 2024 Chang Gao - 0.1.74-3.0.1 +* Tue Dec 10 2024 Chang Gao - 0.1.75-1.0.1 - Add extra package - Add product for Anolis8 (#9770)(Yuqing) +* Fri Nov 15 2024 Matthew Burket - 0.1.75-1 +- Rebase scap-security-guide to the latest upstream version (RHEL-66153) +- detection of Grub2 kernel command line arguments has been enhanced to cover more use cases (RHEL-53365) + * Mon Aug 19 2024 Vojtech Polasek - 0.1.74-3 - fix build - keep firefox and rhel8 ds-1.2 files in the package in form of symbolic links to regular ds files