From 4f075bc3dd1221f25a5cf6a8209ba18cef45b5b8 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 10 Dec 2024 10:24:34 +0800 Subject: [PATCH 1/3] [BUG]update to scap-security-guide-0.1.75-1.src.rpm to #IBA71Y update to scap-security-guide-0.1.75-1.src.rpm for bugfix Signed-off-by: Zhao Hang --- dist | 2 +- download | 2 +- scap-security-guide.spec | 87 +++++++++++++++------------------------- 3 files changed, 34 insertions(+), 57 deletions(-) diff --git a/dist b/dist index 1fe92cf..9c0e36e 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_10 +an8 diff --git a/download b/download index e15f417..a598ab4 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 b9d8464..638ab7f 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Base name of static rhel6 content tarball %global _static_rhel6_content %{name}-0.1.52-2.el7_9-rhel6 # Base name of static rhel7 content tarball @@ -7,32 +6,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%{?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,28 +45,20 @@ 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 hardening guidances that have been generated from XCCDF benchmarks present in %{name} package. -%package extra -Summary: Extra files package -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} - -%description extra -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. @@ -86,7 +76,6 @@ cd build -DSSG_PRODUCT_RHEL8:BOOLEAN=TRUE \ -DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \ -DSSG_PRODUCT_JRE:BOOLEAN=TRUE \ --DSSG_PRODUCT_ANOLIS8:BOOLEAN=TRUE \ %if %{defined centos} -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON \ %else @@ -119,11 +108,6 @@ ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml %files -%exclude %{_datadir}/%{name}/ansible/rhel* -%exclude %{_datadir}/%{name}/bash/rhel* -%exclude %{_datadir}/%{name}/kickstart/ssg-rhel* -%exclude %{_datadir}/%{name}/tailoring/rhel* -%exclude %{_datadir}/xml/scap/ssg/content/ssg-rhel* %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible @@ -141,13 +125,6 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html -%files extra -%{_datadir}/%{name}/ansible/rhel* -%{_datadir}/%{name}/bash/rhel* -%{_datadir}/%{name}/kickstart/ssg-rhel* -%{_datadir}/%{name}/tailoring/rhel* -%{_datadir}/xml/scap/ssg/content/ssg-rhel* - %if ( %{defined rhel} && (! %{defined centos}) ) %files rule-playbooks %defattr(-,root,root,-) @@ -155,9 +132,9 @@ 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 -- 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 -- Gitee From e4b686e1b96aa490972e965aeaa84c3e67e8ab2c Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Thu, 10 Nov 2022 02:22:35 +0800 Subject: [PATCH 2/3] Add extra package --- scap-security-guide.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 638ab7f..e3a53a5 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # Base name of static rhel6 content tarball %global _static_rhel6_content %{name}-0.1.52-2.el7_9-rhel6 # Base name of static rhel7 content tarball @@ -8,7 +9,7 @@ Name: scap-security-guide Version: 0.1.75 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause Group: Applications/System @@ -54,6 +55,14 @@ The %{name}-doc package contains HTML formatted documents containing hardening guidances that have been generated from XCCDF benchmarks present in %{name} package. +%package extra +Summary: Extra files package +Group: System Environment/Base +Requires: %{name} = %{version}-%{release} + +%description extra +The %{name}-extra package contains various situation guidebooks + %if ( %{defined rhel} && (! %{defined centos}) ) %package rule-playbooks Summary: Ansible playbooks per each rule. @@ -108,6 +117,11 @@ ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml %files +%exclude %{_datadir}/%{name}/ansible/rhel* +%exclude %{_datadir}/%{name}/bash/rhel* +%exclude %{_datadir}/%{name}/kickstart/ssg-rhel* +%exclude %{_datadir}/%{name}/tailoring/rhel* +%exclude %{_datadir}/xml/scap/ssg/content/ssg-rhel* %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart %{_datadir}/%{name}/ansible @@ -125,6 +139,13 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html +%files extra +%{_datadir}/%{name}/ansible/rhel* +%{_datadir}/%{name}/bash/rhel* +%{_datadir}/%{name}/kickstart/ssg-rhel* +%{_datadir}/%{name}/tailoring/rhel* +%{_datadir}/xml/scap/ssg/content/ssg-rhel* + %if ( %{defined rhel} && (! %{defined centos}) ) %files rule-playbooks %defattr(-,root,root,-) @@ -132,6 +153,9 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %endif %changelog +* Tue Dec 10 2024 Chang Gao - 0.1.75-1.0.1 +- Add extra package + * 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) -- Gitee From 6214d865a068d6726c2ffcea0ae39db2b25c66f0 Mon Sep 17 00:00:00 2001 From: qhw01063182 Date: Thu, 23 Feb 2023 16:49:16 +0800 Subject: [PATCH 3/3] Add product for Anolis8 Signed-off-by: qhw01063182 --- scap-security-guide.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index e3a53a5..5a67c45 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -85,6 +85,7 @@ cd build -DSSG_PRODUCT_RHEL8:BOOLEAN=TRUE \ -DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE \ -DSSG_PRODUCT_JRE:BOOLEAN=TRUE \ +-DSSG_PRODUCT_ANOLIS8:BOOLEAN=TRUE \ %if %{defined centos} -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON \ %else @@ -155,6 +156,7 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo %changelog * 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) -- Gitee