diff --git a/download b/download index db0e0a4374f8723e024224bf5681a5c7eaeb4c1d..e15f417c334ac27c50a7f492d5f689c5dcc10aaa 100644 --- a/download +++ b/download @@ -1,2 +1,3 @@ 219c992603514558e5f6f3d29adaa534 scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2 -6fbaea66cae3aa3148ad98578dcc603d scap-security-guide-0.1.73.tar.bz2 +8cf987028930d5baf17214fb65ad8b6b scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2 +70e27d8bb68eb1f11c93c75e1b49f7c7 scap-security-guide-0.1.74.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index c8a312a513946c12b3615563f295293caa2cf6b2..b9d8464db6f816dfeb51e4bcfc1aa685ec1fc6f0 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -1,13 +1,15 @@ %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 +%global _static_rhel7_content %{name}-0.1.73-1.el7_9-rhel7 # https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds %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.73 -Release: 1%{anolis_release}%{?dist} +Version: 0.1.74 +Release: 3%{anolis_release}%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause Group: Applications/System @@ -15,6 +17,8 @@ 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 +# Include tarball with last released rhel7 content +Source2: %{_static_rhel7_content}.tar.bz2 BuildArch: noarch @@ -71,7 +75,7 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %endif %prep -%autosetup -p1 -b1 +%setup -q -b1 -b2 %build mkdir -p build @@ -104,6 +108,16 @@ 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} +# Manually install pre-built rhel7 content +cp -r %{_builddir}/%{_static_rhel7_content}/usr %{buildroot} +cp -r %{_builddir}/%{_static_rhel7_content}/tables %{buildroot}%{_docdir}/%{name} +cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name} + +# create symlinks for ssg--ds-1.2.xml to ssg--ds.xml +# this is for backward compatibility +ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds-1.2.xml +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* @@ -141,10 +155,25 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name %endif %changelog -* Mon Jul 22 2024 Chang Gao - 0.1.73-1.0.1 +* Tue Aug 27 2024 Chang Gao - 0.1.74-3.0.1 - Add extra package - Add product for Anolis8 (#9770)(Yuqing) +* 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 + +* Fri Aug 16 2024 Vojtech Polasek - 0.1.74-2 +- include RHEL 7 artifacts from the last RHEL 7 build + +* Fri Aug 09 2024 Matthew Burket - 0.1.74-1 +- Rebase to a new upstream release 0.1.74 (RHEL-53913) +- Improve Rsyslog rules to support RainerScript syntax (RHEL-1816) +- Update password hashing settings for ANSSI-BP-028 (RHEL-54390) + +* Wed Aug 07 2024 Milan Lysonek - 0.1.73-2 +- Switch gating to tmt plan (RHEL-43242) + * Tue May 21 2024 Jan Černý - 0.1.73-1 - Rebase scap-security-guide package to version 0.1.73 (RHEL-36733) - Change crypto policy used in the CUI profile to FIPS (RHEL-30346)