Compare commits

..

2 commits

Author SHA1 Message Date
Matej Tyc
86985e5aeb Removed the RHEL6 product build. 2021-02-16 12:19:09 +01:00
Matej Tyc
a657150be2 Unified the spec file with its RHEL8 counterpart. 2021-02-12 16:00:05 +01:00
11 changed files with 89 additions and 322 deletions

View file

@ -1 +0,0 @@
1

42
.gitignore vendored
View file

@ -1,2 +1,40 @@
/scap-security-guide-0.1.78.tar.bz2
/scap-security-guide-0.1.79.tar.bz2
/scap-security-guide-0.1-3.tar.gz
/scap-security-guide-0.1.4.tar.gz
/scap-security-guide-0.1-16.tar.gz
/scap-security-guide-0.1.5.tar.gz
/scap-security-guide-0.1.18.tar.gz
/scap-security-guide-0.1.19.tar.gz
/scap-security-guide-0.1.21.tar.gz
/v0.1.22.tar.gz
/v0.1.23.tar.gz
/v0.1.24.tar.gz
/v0.1.25.tar.gz
/v0.1.26.tar.gz
/v0.1.27.tar.gz
/v0.1.28.tar.gz
/scap-security-guide-0.1.29.tar.gz
/0.1.29.tar.gz
/v0.1.29.tar.gz
/v0.1.30.tar.gz
/scap-security-guide-0.1.31.tar.gz
/scap-security-guide-0.1.32.tar.gz
/scap-security-guide-0.1.33.tar.bz2
/scap-security-guide-0.1.34.tar.bz2
/scap-security-guide-0.1.35.tar.bz2
/scap-security-guide-0.1.36.tar.bz2
/scap-security-guide-0.1.37.tar.bz2
/scap-security-guide-0.1.38.tar.bz2
/scap-security-guide-0.1.39.tar.bz2
/scap-security-guide-0.1.40.tar.bz2
/scap-security-guide-0.1.41.tar.bz2
/scap-security-guide-0.1.42.tar.bz2
/scap-security-guide-0.1.43.tar.bz2
/scap-security-guide-0.1.44.tar.bz2
/scap-security-guide-0.1.45.tar.bz2
/scap-security-guide-0.1.47.tar.bz2
/scap-security-guide-0.1.48.tar.bz2
/scap-security-guide-0.1.49.tar.bz2
/scap-security-guide-0.1.51.tar.bz2
/scap-security-guide-0.1.52.tar.bz2
/scap-security-guide-0.1.53.tar.bz2
/scap-security-guide-0.1.54.tar.bz2

1
ci.fmf
View file

@ -1 +0,0 @@
resultsdb-testcase: separate

View file

@ -1,20 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional}
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional}
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/tier1.functional}

14
gating.yml Normal file
View file

@ -0,0 +1,14 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

View file

@ -1,5 +0,0 @@
summary: Run all tests in this repository
discover:
how: fmf
execute:
how: tmt

View file

@ -4,22 +4,30 @@
%global _vpath_builddir build
Name: scap-security-guide
Version: 0.1.79
Release: 1%{?dist}
Version: 0.1.54
Release: 2%{?dist}
Summary: Security guidance and baselines in SCAP formats
%if 0%{?rhel}
Group: Applications/System
%endif
License: BSD-3-Clause
URL: https://github.com/ComplianceAsCode/content/
Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
BuildArch: noarch
BuildRequires: libxslt
BuildRequires: expat
BuildRequires: openscap-scanner >= 1.2.5
BuildRequires: cmake >= 2.8
# To get python3 inside the buildroot require its path explicitly in BuildRequires
BuildRequires: /usr/bin/python3
BuildRequires: python%{python3_pkgversion}
BuildRequires: python%{python3_pkgversion}-jinja2
BuildRequires: python%{python3_pkgversion}-PyYAML
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-lxml
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
@ -35,6 +43,9 @@ further information.
%package doc
Summary: HTML formatted security guides generated from XCCDF benchmarks
%if 0%{?rhel}
Group: System Environment/Base
%endif
Requires: %{name} = %{version}-%{release}
%description doc
@ -42,211 +53,40 @@ 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}) && (! %{defined eln}) )
%package rule-playbooks
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.
%endif
%prep
%autosetup -p1
%autosetup
%define cmake_defines_common -DSSG_SEPARATE_SCAP_FILES_ENABLED=OFF -DSSG_BASH_SCRIPTS_ENABLED=OFF -DSSG_BUILD_SCAP_12_DS=OFF
%define cmake_defines_specific %{nil}
%if 0%{?rhel} && ! %{defined eln}
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{rhel}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED:BOOL=ON
%endif
%if 0%{?centos}
%define cmake_defines_specific -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL%{centos}:BOOLEAN=TRUE -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=ON
%define cmake_defines %{nil}
%if 0%{?rhel}
%define cmake_defines -DSSG_PRODUCT_DEFAULT:BOOLEAN=FALSE -DSSG_PRODUCT_RHEL7:BOOLEAN=TRUE -DSSG_PRODUCT_RHEL8:BOOLEAN=TRUE -DSSG_PRODUCT_FIREFOX:BOOLEAN=TRUE -DSSG_PRODUCT_JRE:BOOLEAN=TRUE -DSSG_CENTOS_DERIVATIVES_ENABLED:BOOL=OFF -DSSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED:BOOL=OFF
%endif
mkdir -p build
%build
%cmake %{cmake_defines_common} %{cmake_defines_specific}
%cmake %{cmake_defines}
mkdir -p build
%cmake_build
%install
%cmake_install
rm %{buildroot}/%{_docdir}/%{name}/README.md
rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
%files
%{_datadir}/xml/scap/ssg/content
%{_datadir}/%{name}/kickstart
%{_datadir}/%{name}/ansible/*.yml
%{_datadir}/%{name}/tailoring
%{_datadir}/%{name}/ansible
%{_datadir}/%{name}/bash
%lang(en) %{_mandir}/man8/scap-security-guide.8.*
%doc %{_docdir}/%{name}/LICENSE
%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )
%exclude %{_datadir}/%{name}/ansible/rule_playbooks
%endif
%doc %{_docdir}/%{name}/README.md
%doc %{_docdir}/%{name}/Contributors.md
%files doc
%doc %{_docdir}/%{name}/guides/*.html
%doc %{_docdir}/%{name}/tables/*.html
%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) )
%files rule-playbooks
%defattr(-,root,root,-)
%{_datadir}/%{name}/ansible/rule_playbooks
%endif
%changelog
* Fri Nov 28 2025 Jan Černý <jcerny@redhat.com> - 0.1.79-1
- Upgrade to the latest upstream release
* Mon Sep 08 2025 Matthew Burket <mburket@redhat.com> - 0.1.78-1
- Update to latest upstream release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.78
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.77-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Matthew Burket <mburket@redhat.com> - 0.1.77-1
- Update to latest upstream release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.77
* Fri Mar 07 2025 Matthew Burket <mburket@redhat.com> - 0.1.76-2
- Remove expat as a BuildRequires as it is no longer needed
* Tue Feb 25 2025 Evgenii Kolesnikov <ekolesni@redhat.com> - 0.1.76-1
- Update to latest upstream release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.76
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.75-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Nov 14 2024 Matthew Burket <mburket@redhat.com> - 0.1.75-1
- Update to latest upstream release
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.75
* Mon Aug 12 2024 Matthew Burket <mburket@redhat.com> - 0.1.74-1
- Update to latest upstream release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.74
- Remove /usr/bin/python3 from BuildRequires
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.73-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed May 22 2024 Jan Černý <jcerny@redhat.com> - 0.1.73-1
- Update to latest upstream release
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.73
* Fri Feb 09 2024 Vojtech Polasek <vpolasek@redhat.com> - 0.1.72-1
- Update to latest upstream SCAP-Security-Guide-0.1.72 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.72
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.71-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Dec 19 2023 Vojtech Polasek <vpolasek@redhat.com> - 0.1.71-1
- Update to latest upstream SCAP-Security-Guide-0.1.71 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.71
* Thu Oct 12 2023 Matthew Burket <mburket@redhat.com> - 0.1.70-1
- Update to latest upstream SCAP-Security-Guide-0.1.70 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.70
* Thu Aug 03 2023 Jan Černý <jcerny@redhat.com> - 0.1.69-1
- Update to latest upstream SCAP-Security-Guide-0.1.69 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.69
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.68-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 15 2023 Jan Černý <jcerny@redhat.com> - 0.1.68-1
- Update to latest upstream SCAP-Security-Guide-0.1.68 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.68
* Wed Apr 12 2023 Matthew Burket <mburket@redhat.com> - 0.1.67-1
- Update to latest upstream SCAP-Security-Guide-0.1.67 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.67
* Fri Feb 03 2023 Vojtech Polasek <vpolasek@redhat.com> - 0.1.66-1
- Update to latest upstream SCAP-Security-Guide-0.1.66 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.66
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.65-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Dec 06 2022 Marcus Burghardt <maburgha@redhat.com> - 0.1.65-1
- Update to latest upstream SCAP-Security-Guide-0.1.65 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.65
* Tue Oct 04 2022 Watson Sato <wsato@redhat.com> - 0.1.64-1
- Update to latest upstream SCAP-Security-Guide-0.1.64 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.64
* Mon Aug 01 2022 Watson Sato <wsato@redhat.com> - 0.1.63-1
- Update to latest upstream SCAP-Security-Guide-0.1.63 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.63
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.62-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jun 09 2022 Vojtech Polasek <vpolasek@redhat.com> - 0.1.62-2
- rebuild, the release did not get propagated into rawhide
* Mon May 30 2022 Vojtech Polasek <vpolasek@redhat.com> - 0.1.62-1
- Update to latest upstream SCAP-Security-Guide-0.1.62 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.62
* Wed May 04 2022 Watson Sato <wsato@redhat.com> - 0.1.61-1
- Update to latest upstream SCAP-Security-Guide-0.1.61 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.61
* Fri Jan 28 2022 Watson Sato <wsato@redhat.com> - 0.1.60-1
- Update to latest upstream SCAP-Security-Guide-0.1.60 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.60
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.59-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Dec 01 2021 Watson Sato <wsato@redhat.com> - 0.1.59-1
- Update to latest upstream SCAP-Security-Guide-0.1.59 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.59
- Fix loading of jinja files
* Thu Sep 30 2021 Watson Sato <wsato@redhat.com> - 0.1.58-1
- Update to latest upstream SCAP-Security-Guide-0.1.58 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.58
- Fix license warning.
* Thu Jul 29 2021 Matej Tyc <matyc@redhat.com> - 0.1.57-1
- Update to latest upstream SCAP-Security-Guide-0.1.57 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.57
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.56-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 08 2021 Matej Tyc <matyc@redhat.com> - 0.1.56-2
- Updated the packaging according to the RHEL development trends.
- Don't ship 1.2 datastreams and Bash remediations.
- Clean up dependencies and other package metadata.
- Change the RHEL target.
* Wed May 26 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.56-1
- Update to latest upstream SCAP-Security-Guide-0.1.56 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.56
* Fri Mar 19 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.55-2
- rebuilt
* Fri Mar 19 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.55-1
- Update to latest upstream SCAP-Security-Guide-0.1.55 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.55
* Fri Feb 12 2021 Matej Tyc <matyc@redhat.com> - 0.1.54-3
* Fri Feb 12 2021 Matej Tyc <matyc@redhat.com> - 0.1.54-2
- Moved the spec file closer to the RHEL one.
* Fri Feb 12 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.54-2
- fix definition of build directory
* Fri Feb 05 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.54-1
- Update to latest upstream SCAP-Security-Guide-0.1.54 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.54

View file

@ -1 +1 @@
SHA512 (scap-security-guide-0.1.79.tar.bz2) = 57963e896aef6089523bb7165ece32dafeedc2caf0baac594c4d0d083ff00bd37c4fdc1c98357db1c70523bb67543c07b6a41b7d989ba1a8e97907218d954311
SHA512 (scap-security-guide-0.1.54.tar.bz2) = 35d89737c5000c0fcebb36c5ad48958f95edf4563579af2a5591e0f8560fc3de8d90aad39536318ae6ab1261bf2c3e4504533604e94f68d23acc6fc153a37f96

View file

@ -1,27 +0,0 @@
summary: Test calls upstream test suite.
description: |
Runs upstream test suite against content built from the source RPM - testing
the content from the installed scap-security-guide is not feasible as the
upstream test suite is hardcoded to test the content from the CMAKE_BINARY_DIR
directory with hardcoded paths which are not the same as paths where content is
installed from the scap-security-guide RPM. Test suite is also built from the
scap-security-guide source RPM by running %prep and %build stages from the spec
file.
contact: Matus Marhefka <mmarhefk@redhat.com>
test: ./runtest.sh
framework: beakerlib
require:
- library(ControlFlow/Cleanup)
- library(rpm/snapshot)
- scap-security-guide
recommend:
- yum-utils
- rpm-build
- dnf-plugins-core
- gcc
- python3-pytest
- python3-pip
- python3-devel
- ansible
duration: 90m
enabled: true

View file

@ -1,80 +0,0 @@
#!/bin/bash
# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/scap-security-guide/Sanity/smoke-test
# Description: Test calls upstream test suite.
# Author: Marek Haicman <mhaicman@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2018 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing
# to use, modify, copy, or redistribute it subject to the terms
# and conditions of the GNU General Public License version 2.
#
# This program is distributed in the hope that it will be
# useful, but WITHOUT ANY WARRANTY; without even the implied
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
. /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="scap-security-guide"
rlJournalStart
rlPhaseStartSetup
rlImport ControlFlow/Cleanup rpm/snapshot || rlDie "Failed to import libraries"
rlAssertRpm "$PACKAGE"
RpmSnapshotCreate
CleanupRegister "RpmSnapshotRevert"
rlRun "TmpDir=\$(mktemp -d)" 0
CleanupRegister "rlRun 'rm -r $TmpDir' 0 'Removing tmp directory'"
rlRun "pushd $TmpDir"
CleanupRegister "rlRun 'popd'"
rlFetchSrcForInstalled $PACKAGE
rlRun "dnf builddep -y $PACKAGE*"
SITE_PACKAGES=$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')
rlRun "pip3 install --target=$SITE_PACKAGES ruamel.yaml yamlpath prometheus-client"
CleanupRegister "rlRun 'pip3 uninstall -y ruamel.yaml yamlpath prometheus-client'"
TOPDIR=`rpm --eval %_topdir`
rlRun "rm -rf ${TOPDIR}/BUILD/${PACKAGE}*" 0-255
rlRun "rpm -ihv `ls *.rpm`" 0 "Install $PACKAGE source RPM"
rlPhaseEnd
rlPhaseStartSetup "Prepare upstream test suite (%prep and %build stages from the spec file)"
rlRun "rpmbuild -v -bc ${TOPDIR}/SPECS/${PACKAGE}.spec"
CleanupRegister "rlRun 'rm -rf ${TOPDIR}/BUILD/${PACKAGE}*'"
CleanupRegister "rlRun 'rm -rf ${TOPDIR}/SPECS/${PACKAGE}*'"
CleanupRegister "rlRun 'rm -rf ${TOPDIR}/SOURCES/*'"
rlPhaseEnd
rlPhaseStartTest "Run upstream test suite"
BUILD_DIR_PATH="$(find $TOPDIR -name build | grep scap-security-guide)"
rlRun -s "cmake --build $BUILD_DIR_PATH --target test -- ARGS='--output-on-failure'"
rv=$?
# if we got error, submit file with result of particular test for easier debugging
if [ $rv -ne 0 ]; then
FILE="${BUILD_DIR_PATH}/Testing/Temporary/LastTest.log"
rlBundleLogs test_outputs $(readlink -f $FILE)
fi
rlPhaseEnd
rlPhaseStartCleanup
CleanupDo
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

9
tests/tests.yml Normal file
View file

@ -0,0 +1,9 @@
- hosts: localhost
roles:
- role: standard-test-beakerlib
tags:
- classic
repositories:
- repo: "https://src.fedoraproject.org/tests/scap-security-guide.git"
dest: "scap-security-guide"
fmf_filter: "tier: 1, 2"