From adbc78f7e59ec026a75d9a64e3d8913f40aa76df Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Mon, 11 Apr 2022 17:38:09 +0200 Subject: [PATCH 01/46] Fedora CI: replace STI with tmt --- .fmf/version | 1 + gating.yaml | 8 ++++---- plans/main.fmf | 6 ++++++ tests/tests.yml | 9 --------- 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml index b16b396..4b3cff0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,17 +1,17 @@ --- !Policy product_versions: - - fedora-* + - fedora-* decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} --- !Policy product_versions: - - fedora-* + - fedora-* decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} --- !Policy product_versions: - rhel-* diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..63d6437 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,6 @@ +summary: Run tests from scap-security-guide tests repository +discover: + how: fmf + url: https://src.fedoraproject.org/tests/scap-security-guide +execute: + how: tmt diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1546340..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,9 +0,0 @@ -- 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" From 7448413b484517c85ed4acda905d9f05d875edeb Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Wed, 4 May 2022 22:36:40 +0200 Subject: [PATCH 02/46] Rebase to 0.1.61 --- .gitignore | 1 + scap-security-guide.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 10fb6cd..dd34057 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /scap-security-guide-0.1.58.tar.bz2 /scap-security-guide-0.1.59.tar.bz2 /scap-security-guide-0.1.60.tar.bz2 +/scap-security-guide-0.1.61.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index dcb9a18..2c386d0 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.60 +Version: 0.1.61 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -21,6 +21,7 @@ BuildRequires: /usr/bin/python3 BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-jinja2 BuildRequires: python%{python3_pkgversion}-PyYAML +BuildRequires: python%{python3_pkgversion}-setuptools Requires: xml-common, openscap-scanner >= 1.2.5 %description @@ -98,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Wed May 04 2022 Watson Sato - 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 - 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 diff --git a/sources b/sources index f97e8d2..a61dd0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.60.tar.bz2) = 41899c1209b64eb13e76368da141db25fe7e2ab280e67dafc750d470049062f0f16c70ee79f4b3a2131f30c9fb8e23e3c22fb354577239698f2b7f30544d969a +SHA512 (scap-security-guide-0.1.61.tar.bz2) = 95be5fc1b9734335199db54bff0958ba00f2c5f1873595d8c68b353540988f213d7bdf4139f4e338ac6d45ca9bd27cd97c81956651a5e6e78197ecc7b88e5eff From ed1967a8de3767afa11d3f4215b369b0e092131e Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Mon, 11 Apr 2022 17:38:09 +0200 Subject: [PATCH 03/46] Fedora CI: replace STI with tmt --- .fmf/version | 1 + gating.yaml | 8 ++++---- plans/main.fmf | 6 ++++++ tests/tests.yml | 9 --------- 4 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/main.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml index b16b396..4b3cff0 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,17 +1,17 @@ --- !Policy product_versions: - - fedora-* + - fedora-* decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} --- !Policy product_versions: - - fedora-* + - fedora-* decision_context: bodhi_update_push_stable subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} --- !Policy product_versions: - rhel-* diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..63d6437 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,6 @@ +summary: Run tests from scap-security-guide tests repository +discover: + how: fmf + url: https://src.fedoraproject.org/tests/scap-security-guide +execute: + how: tmt diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 1546340..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,9 +0,0 @@ -- 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" From 2500d553b08d30721ed54d2ca3945d20ddf3607d Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 30 May 2022 12:33:14 +0200 Subject: [PATCH 04/46] rebase to release 0.1.62 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd34057..9d43ed2 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /scap-security-guide-0.1.59.tar.bz2 /scap-security-guide-0.1.60.tar.bz2 /scap-security-guide-0.1.61.tar.bz2 +/scap-security-guide-0.1.62.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 2c386d0..9f983c7 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.61 +Version: 0.1.62 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon May 30 2022 Vojtech Polasek - 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 - 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 diff --git a/sources b/sources index a61dd0d..7ce9265 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.61.tar.bz2) = 95be5fc1b9734335199db54bff0958ba00f2c5f1873595d8c68b353540988f213d7bdf4139f4e338ac6d45ca9bd27cd97c81956651a5e6e78197ecc7b88e5eff +SHA512 (scap-security-guide-0.1.62.tar.bz2) = b8cdd76ad0c09c9257121283df6e5a8f2acd6c9734ff9b577673ce8ff04af8a1b9ceb37621cb8bd0873391f771844e0479954850ae77b442c780206b957a0e09 From b3dde6d19964cb4259f8573429e6a35a32c65c19 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 30 May 2022 13:29:00 +0200 Subject: [PATCH 05/46] rebase to 0.1.62 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 10fb6cd..ba1a6d5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /scap-security-guide-0.1.58.tar.bz2 /scap-security-guide-0.1.59.tar.bz2 /scap-security-guide-0.1.60.tar.bz2 +/scap-security-guide-0.1.62.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index dcb9a18..f927cfa 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.60 +Version: 0.1.62 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -98,6 +98,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon May 30 2022 Vojtech Polasek - 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 + * Fri Jan 28 2022 Watson Sato - 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 diff --git a/sources b/sources index f97e8d2..7ce9265 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.60.tar.bz2) = 41899c1209b64eb13e76368da141db25fe7e2ab280e67dafc750d470049062f0f16c70ee79f4b3a2131f30c9fb8e23e3c22fb354577239698f2b7f30544d969a +SHA512 (scap-security-guide-0.1.62.tar.bz2) = b8cdd76ad0c09c9257121283df6e5a8f2acd6c9734ff9b577673ce8ff04af8a1b9ceb37621cb8bd0873391f771844e0479954850ae77b442c780206b957a0e09 From 6a9f56ef100a9bc75b18af4834a18056fc100f6a Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 30 May 2022 13:45:38 +0200 Subject: [PATCH 06/46] add python-setuptools dependency because of CPE applicability language and version parsing --- scap-security-guide.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index f927cfa..ac0fb45 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -21,6 +21,7 @@ BuildRequires: /usr/bin/python3 BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-jinja2 BuildRequires: python%{python3_pkgversion}-PyYAML +BuildRequires: python%{python3_pkgversion}-setuptools Requires: xml-common, openscap-scanner >= 1.2.5 %description From 0d80879c9151c5be0fcfbfe400180bb805de5ca0 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Tue, 31 May 2022 10:13:10 +0200 Subject: [PATCH 07/46] Add ci.fmf file which is needed for proper CI results reporting --- ci.fmf | 1 + 1 file changed, 1 insertion(+) create mode 100644 ci.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate From ae3860f028f9564b0fc2aefbf74b0339851ffbb1 Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Tue, 31 May 2022 10:13:10 +0200 Subject: [PATCH 08/46] Add ci.fmf file which is needed for proper CI results reporting --- ci.fmf | 1 + 1 file changed, 1 insertion(+) create mode 100644 ci.fmf diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate From dc31b9b7fe69fd482c83a220fcee86ef7f4e683c Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Wed, 1 Jun 2022 17:22:45 +0200 Subject: [PATCH 09/46] main is reserved keyword by tmt and cannot be used as a plan name --- gating.yaml | 4 ++-- plans/{main.fmf => fedora_tests.fmf} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename plans/{main.fmf => fedora_tests.fmf} (100%) diff --git a/gating.yaml b/gating.yaml index 4b3cff0..1d65cc1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,14 +4,14 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} + - !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/main.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} --- !Policy product_versions: - rhel-* diff --git a/plans/main.fmf b/plans/fedora_tests.fmf similarity index 100% rename from plans/main.fmf rename to plans/fedora_tests.fmf From 9e43a57baaa5af1e33badf44f1a01624d5f8b3ad Mon Sep 17 00:00:00 2001 From: Matus Marhefka Date: Wed, 1 Jun 2022 17:22:45 +0200 Subject: [PATCH 10/46] main is reserved keyword by tmt and cannot be used as a plan name --- gating.yaml | 4 ++-- plans/{main.fmf => fedora_tests.fmf} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename plans/{main.fmf => fedora_tests.fmf} (100%) diff --git a/gating.yaml b/gating.yaml index 4b3cff0..1d65cc1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -4,14 +4,14 @@ product_versions: decision_context: bodhi_update_push_testing subject_type: koji_build rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/main.functional} + - !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/main.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/fedora_tests.functional} --- !Policy product_versions: - rhel-* diff --git a/plans/main.fmf b/plans/fedora_tests.fmf similarity index 100% rename from plans/main.fmf rename to plans/fedora_tests.fmf From c64d08d2c617996cdd9f0c20a7b2f90a096b0be4 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Thu, 9 Jun 2022 16:06:25 +0200 Subject: [PATCH 11/46] do a rebuild, build did not propagate into rawhide --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 9f983c7..61ce4a9 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.62 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Thu Jun 09 2022 Vojtech Polasek - 0.1.62-2 +- rebuild, the release did not get propagated into rawhide + * Mon May 30 2022 Vojtech Polasek - 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 From 192107cf596b2d347be24c5d27cf18606a9b941d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:07:13 +0000 Subject: [PATCH 12/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 61ce4a9..73d3486 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.62 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.1.62-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jun 09 2022 Vojtech Polasek - 0.1.62-2 - rebuild, the release did not get propagated into rawhide From 13c5eb800178a57bce5ca2734eda5d3b8614d473 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 1 Aug 2022 15:07:33 +0200 Subject: [PATCH 13/46] Rebase to 0.1.63 --- .gitignore | 1 + scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9d43ed2..6268d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /scap-security-guide-0.1.60.tar.bz2 /scap-security-guide-0.1.61.tar.bz2 /scap-security-guide-0.1.62.tar.bz2 +/scap-security-guide-0.1.63.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 73d3486..63b6e11 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.62 -Release: 3%{?dist} +Version: 0.1.63 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Aug 01 2022 Watson Sato - 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 - 0.1.62-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 7ce9265..553cad7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.62.tar.bz2) = b8cdd76ad0c09c9257121283df6e5a8f2acd6c9734ff9b577673ce8ff04af8a1b9ceb37621cb8bd0873391f771844e0479954850ae77b442c780206b957a0e09 +SHA512 (scap-security-guide-0.1.63.tar.bz2) = ad2f7f873af22b0bc2916d8487f6d5621c65495c4c84a0a4e8c98969d5edd2a0833e956b32c19c893e1852b15adc65af24bb4fea7db71b3042c5e1b512a3957b From 6444a5f3d947756e322a5b0ce220125ce7f7edfc Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Mon, 1 Aug 2022 15:07:33 +0200 Subject: [PATCH 14/46] Rebase to 0.1.63 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ba1a6d5..74183ff 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /scap-security-guide-0.1.59.tar.bz2 /scap-security-guide-0.1.60.tar.bz2 /scap-security-guide-0.1.62.tar.bz2 +/scap-security-guide-0.1.63.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index ac0fb45..69cd8a7 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.62 +Version: 0.1.63 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Aug 01 2022 Watson Sato - 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 + * Mon May 30 2022 Vojtech Polasek - 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 diff --git a/sources b/sources index 7ce9265..553cad7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.62.tar.bz2) = b8cdd76ad0c09c9257121283df6e5a8f2acd6c9734ff9b577673ce8ff04af8a1b9ceb37621cb8bd0873391f771844e0479954850ae77b442c780206b957a0e09 +SHA512 (scap-security-guide-0.1.63.tar.bz2) = ad2f7f873af22b0bc2916d8487f6d5621c65495c4c84a0a4e8c98969d5edd2a0833e956b32c19c893e1852b15adc65af24bb4fea7db71b3042c5e1b512a3957b From e588252f32aad97c65defae9047f8d65cc9aaf36 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Tue, 4 Oct 2022 15:17:11 +0200 Subject: [PATCH 15/46] Rebase to 0.1.64 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6268d6c..ea6ab63 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /scap-security-guide-0.1.61.tar.bz2 /scap-security-guide-0.1.62.tar.bz2 /scap-security-guide-0.1.63.tar.bz2 +/scap-security-guide-0.1.64.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 63b6e11..8f29321 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.63 +Version: 0.1.64 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Oct 04 2022 Watson Sato - 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 - 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 diff --git a/sources b/sources index 553cad7..c7ad9b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.63.tar.bz2) = ad2f7f873af22b0bc2916d8487f6d5621c65495c4c84a0a4e8c98969d5edd2a0833e956b32c19c893e1852b15adc65af24bb4fea7db71b3042c5e1b512a3957b +SHA512 (scap-security-guide-0.1.64.tar.bz2) = fc295bafdac8a3fafbcd1bff50b7043a11de23e1a363883a7fac11d3734e9d381dad2e180cc14c259e34fa4eea8b0c27720a8df455d509be3c97913f51294850 From 4291626786f19c4788a84408d1fb1ea37a770597 Mon Sep 17 00:00:00 2001 From: Watson Sato Date: Tue, 4 Oct 2022 15:17:11 +0200 Subject: [PATCH 16/46] Rebase to 0.1.64 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 74183ff..b19d1ae 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /scap-security-guide-0.1.60.tar.bz2 /scap-security-guide-0.1.62.tar.bz2 /scap-security-guide-0.1.63.tar.bz2 +/scap-security-guide-0.1.64.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 69cd8a7..48b7082 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.63 +Version: 0.1.64 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Oct 04 2022 Watson Sato - 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 - 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 diff --git a/sources b/sources index 553cad7..c7ad9b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.63.tar.bz2) = ad2f7f873af22b0bc2916d8487f6d5621c65495c4c84a0a4e8c98969d5edd2a0833e956b32c19c893e1852b15adc65af24bb4fea7db71b3042c5e1b512a3957b +SHA512 (scap-security-guide-0.1.64.tar.bz2) = fc295bafdac8a3fafbcd1bff50b7043a11de23e1a363883a7fac11d3734e9d381dad2e180cc14c259e34fa4eea8b0c27720a8df455d509be3c97913f51294850 From 5d3f57ca9207608ce775803ecf585838457ec12e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 24 Nov 2022 12:52:04 -0500 Subject: [PATCH 17/46] Fix ELN build On RHEL, only the product-specific data for RHEL is built and shipped, but ELN is defined as the precursor to the next major version of RHEL, for which data has not yet been created upstream. Therefore, for ELN, follow Fedora which builds and ships data for all distributions. --- scap-security-guide.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 8f29321..40c3370 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -45,7 +45,7 @@ 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}) ) +%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) ) %package rule-playbooks Summary: Ansible playbooks per each rule. Group: System Environment/Base @@ -60,7 +60,7 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %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} +%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} @@ -84,7 +84,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %{_datadir}/%{name}/tailoring %lang(en) %{_mandir}/man8/scap-security-guide.8.* %doc %{_docdir}/%{name}/LICENSE -%if ( %{defined rhel} && (! %{defined centos}) ) +%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) ) %exclude %{_datadir}/%{name}/ansible/rule_playbooks %endif @@ -92,7 +92,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %doc %{_docdir}/%{name}/guides/*.html %doc %{_docdir}/%{name}/tables/*.html -%if ( %{defined rhel} && (! %{defined centos}) ) +%if ( %{defined rhel} && (! %{defined centos}) && (! %{defined eln}) ) %files rule-playbooks %defattr(-,root,root,-) %{_datadir}/%{name}/ansible/rule_playbooks From 317dec4c14f49bdbf425ea54f491c480223582e9 Mon Sep 17 00:00:00 2001 From: Marcus Burghardt Date: Tue, 6 Dec 2022 16:07:34 +0100 Subject: [PATCH 18/46] Rebase to 0.1.65 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ea6ab63..2c5004b 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /scap-security-guide-0.1.62.tar.bz2 /scap-security-guide-0.1.63.tar.bz2 /scap-security-guide-0.1.64.tar.bz2 +/scap-security-guide-0.1.65.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 8f29321..9cd961b 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.64 +Version: 0.1.65 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Dec 06 2022 Marcus Burghardt - 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 - 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 diff --git a/sources b/sources index c7ad9b3..ece9ecf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.64.tar.bz2) = fc295bafdac8a3fafbcd1bff50b7043a11de23e1a363883a7fac11d3734e9d381dad2e180cc14c259e34fa4eea8b0c27720a8df455d509be3c97913f51294850 +SHA512 (scap-security-guide-0.1.65.tar.bz2) = 8c0f7431da33d80878d37cecff6afd55cfc3cc4085e987a5b0d5cecc8969373afa24c409d25bbe6de5ce1b6a718ed0d8c685a029ec7fec0c0de7d66f5040ad16 From 1f763ec42c377cc27be99e6d7fe17e8e522bb353 Mon Sep 17 00:00:00 2001 From: Marcus Burghardt Date: Tue, 6 Dec 2022 16:07:34 +0100 Subject: [PATCH 19/46] Rebase to 0.1.65 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b19d1ae..74d11e8 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /scap-security-guide-0.1.62.tar.bz2 /scap-security-guide-0.1.63.tar.bz2 /scap-security-guide-0.1.64.tar.bz2 +/scap-security-guide-0.1.65.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 48b7082..7e4cba3 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.64 +Version: 0.1.65 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Dec 06 2022 Marcus Burghardt - 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 - 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 diff --git a/sources b/sources index c7ad9b3..ece9ecf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.64.tar.bz2) = fc295bafdac8a3fafbcd1bff50b7043a11de23e1a363883a7fac11d3734e9d381dad2e180cc14c259e34fa4eea8b0c27720a8df455d509be3c97913f51294850 +SHA512 (scap-security-guide-0.1.65.tar.bz2) = 8c0f7431da33d80878d37cecff6afd55cfc3cc4085e987a5b0d5cecc8969373afa24c409d25bbe6de5ce1b6a718ed0d8c685a029ec7fec0c0de7d66f5040ad16 From e9550519bf2387cef673382b89b2604027edce4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 02:45:23 +0000 Subject: [PATCH 20/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index ef667e6..34364b3 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.65 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.1.65-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 06 2022 Marcus Burghardt - 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 From 8a305566a31c1040bdb0d0f94bea163100ad46d7 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 3 Feb 2023 15:33:57 +0100 Subject: [PATCH 21/46] rebase to scap-security-guide 0.1.66 --- .gitignore | 1 + scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2c5004b..c336565 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /scap-security-guide-0.1.63.tar.bz2 /scap-security-guide-0.1.64.tar.bz2 /scap-security-guide-0.1.65.tar.bz2 +/scap-security-guide-0.1.66.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 34364b3..a0245ff 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.65 -Release: 2%{?dist} +Version: 0.1.66 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Fri Feb 03 2023 Vojtech Polasek - 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 - 0.1.65-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index ece9ecf..90a355e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.65.tar.bz2) = 8c0f7431da33d80878d37cecff6afd55cfc3cc4085e987a5b0d5cecc8969373afa24c409d25bbe6de5ce1b6a718ed0d8c685a029ec7fec0c0de7d66f5040ad16 +SHA512 (scap-security-guide-0.1.66.tar.bz2) = 1eee044d7d160c6f271db9a2d5262de2a577e03e103fe697e341000c34bf5208037fc88e9f4d7bfdb0b04a46660c4244a7cba214a4fe949f94e3358b12f15cc3 From c21bb080061958192b4ec7eb1a6c7f1bfa65505e Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 6 Feb 2023 14:19:32 +0100 Subject: [PATCH 22/46] update to version 0.1.66 --- .gitignore | 1 + ...ide-0.1.60-fix-jinja-loading-PR_7944.patch | 85 ------------------- scap-security-guide.spec | 6 +- sources | 2 +- 4 files changed, 7 insertions(+), 87 deletions(-) delete mode 100644 scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch diff --git a/.gitignore b/.gitignore index 74d11e8..c769772 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /scap-security-guide-0.1.63.tar.bz2 /scap-security-guide-0.1.64.tar.bz2 /scap-security-guide-0.1.65.tar.bz2 +/scap-security-guide-0.1.66.tar.bz2 diff --git a/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch b/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch deleted file mode 100644 index 72a07c4..0000000 --- a/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 396fb9029e74b38ea09236c6cd1a7cb38f545afe Mon Sep 17 00:00:00 2001 -From: Gabriel Becker -Date: Wed, 1 Dec 2021 13:20:47 +0100 -Subject: [PATCH] Fix jinja issue on fedora rawhide. - ---- - tests/unit/ssg-module/test_playbook_builder.py | 4 ++-- - utils/duplicated_prodtypes.py | 4 ++-- - utils/fix_file_ocilclause.py | 4 ++-- - utils/move_rules.py | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/unit/ssg-module/test_playbook_builder.py b/tests/unit/ssg-module/test_playbook_builder.py -index 6692c54dfab..38b6f1f52e2 100644 ---- a/tests/unit/ssg-module/test_playbook_builder.py -+++ b/tests/unit/ssg-module/test_playbook_builder.py -@@ -34,9 +34,9 @@ def test_build_rule_playbook(): - assert os.path.exists(real_output_filepath) - - with open(real_output_filepath, "r") as real_output: -- real_output_yaml = yaml.load(real_output) -+ real_output_yaml = yaml.load(real_output, Loader=yaml.Loader) - with open(expected_output_filepath, "r") as expected_output: -- expected_output_yaml = yaml.load(expected_output) -+ expected_output_yaml = yaml.load(expected_output, Loader=yaml.Loader) - - real_play = real_output_yaml.pop() - expected_play = expected_output_yaml.pop() -diff --git a/utils/duplicated_prodtypes.py b/utils/duplicated_prodtypes.py -index 4cb2c16fef8..25c36c58d81 100755 ---- a/utils/duplicated_prodtypes.py -+++ b/utils/duplicated_prodtypes.py -@@ -23,7 +23,7 @@ def _create_profile_cache(ssg_root): - files.sort() - for filename in files: - profile_path = os.path.join(prod_profiles_dir, filename) -- parsed_profile = yaml.load(open(profile_path, 'r')) -+ parsed_profile = yaml.load(open(profile_path, 'r'), Loader=yaml.Loader) - for _obj in parsed_profile['selections']: - obj = _obj - if '=' in obj: -@@ -210,7 +210,7 @@ def find_profiles(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): -diff --git a/utils/fix_file_ocilclause.py b/utils/fix_file_ocilclause.py -index 462d2b37c15..d79bb8c51e0 100755 ---- a/utils/fix_file_ocilclause.py -+++ b/utils/fix_file_ocilclause.py -@@ -23,7 +23,7 @@ def _create_profile_cache(ssg_root): - files.sort() - for filename in files: - profile_path = os.path.join(prod_profiles_dir, filename) -- parsed_profile = yaml.load(open(profile_path, 'r')) -+ parsed_profile = yaml.load(open(profile_path, 'r'), Loader=yaml.Loader) - for _obj in parsed_profile['selections']: - obj = _obj - if '=' in obj: -@@ -205,7 +205,7 @@ def fix_ocil_clause(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): -diff --git a/utils/move_rules.py b/utils/move_rules.py -index 2deb62b488a..e91a661be85 100755 ---- a/utils/move_rules.py -+++ b/utils/move_rules.py -@@ -340,7 +340,7 @@ def fix_ocil_clause(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 7e4cba3..bdb9efd 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.65 +Version: 0.1.66 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Feb 06 2023 Vojtech Polasek - 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 + * Tue Dec 06 2022 Marcus Burghardt - 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 diff --git a/sources b/sources index ece9ecf..90a355e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.65.tar.bz2) = 8c0f7431da33d80878d37cecff6afd55cfc3cc4085e987a5b0d5cecc8969373afa24c409d25bbe6de5ce1b6a718ed0d8c685a029ec7fec0c0de7d66f5040ad16 +SHA512 (scap-security-guide-0.1.66.tar.bz2) = 1eee044d7d160c6f271db9a2d5262de2a577e03e103fe697e341000c34bf5208037fc88e9f4d7bfdb0b04a46660c4244a7cba214a4fe949f94e3358b12f15cc3 From 36de3a55f5ceb23009f07ab4b99710f8bf3619d8 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 6 Feb 2023 14:47:01 +0100 Subject: [PATCH 23/46] remove no longer used patch --- ...ide-0.1.60-fix-jinja-loading-PR_7944.patch | 85 ------------------- 1 file changed, 85 deletions(-) delete mode 100644 scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch diff --git a/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch b/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch deleted file mode 100644 index 72a07c4..0000000 --- a/scap-security-guide-0.1.60-fix-jinja-loading-PR_7944.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 396fb9029e74b38ea09236c6cd1a7cb38f545afe Mon Sep 17 00:00:00 2001 -From: Gabriel Becker -Date: Wed, 1 Dec 2021 13:20:47 +0100 -Subject: [PATCH] Fix jinja issue on fedora rawhide. - ---- - tests/unit/ssg-module/test_playbook_builder.py | 4 ++-- - utils/duplicated_prodtypes.py | 4 ++-- - utils/fix_file_ocilclause.py | 4 ++-- - utils/move_rules.py | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/unit/ssg-module/test_playbook_builder.py b/tests/unit/ssg-module/test_playbook_builder.py -index 6692c54dfab..38b6f1f52e2 100644 ---- a/tests/unit/ssg-module/test_playbook_builder.py -+++ b/tests/unit/ssg-module/test_playbook_builder.py -@@ -34,9 +34,9 @@ def test_build_rule_playbook(): - assert os.path.exists(real_output_filepath) - - with open(real_output_filepath, "r") as real_output: -- real_output_yaml = yaml.load(real_output) -+ real_output_yaml = yaml.load(real_output, Loader=yaml.Loader) - with open(expected_output_filepath, "r") as expected_output: -- expected_output_yaml = yaml.load(expected_output) -+ expected_output_yaml = yaml.load(expected_output, Loader=yaml.Loader) - - real_play = real_output_yaml.pop() - expected_play = expected_output_yaml.pop() -diff --git a/utils/duplicated_prodtypes.py b/utils/duplicated_prodtypes.py -index 4cb2c16fef8..25c36c58d81 100755 ---- a/utils/duplicated_prodtypes.py -+++ b/utils/duplicated_prodtypes.py -@@ -23,7 +23,7 @@ def _create_profile_cache(ssg_root): - files.sort() - for filename in files: - profile_path = os.path.join(prod_profiles_dir, filename) -- parsed_profile = yaml.load(open(profile_path, 'r')) -+ parsed_profile = yaml.load(open(profile_path, 'r'), Loader=yaml.Loader) - for _obj in parsed_profile['selections']: - obj = _obj - if '=' in obj: -@@ -210,7 +210,7 @@ def find_profiles(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): -diff --git a/utils/fix_file_ocilclause.py b/utils/fix_file_ocilclause.py -index 462d2b37c15..d79bb8c51e0 100755 ---- a/utils/fix_file_ocilclause.py -+++ b/utils/fix_file_ocilclause.py -@@ -23,7 +23,7 @@ def _create_profile_cache(ssg_root): - files.sort() - for filename in files: - profile_path = os.path.join(prod_profiles_dir, filename) -- parsed_profile = yaml.load(open(profile_path, 'r')) -+ parsed_profile = yaml.load(open(profile_path, 'r'), Loader=yaml.Loader) - for _obj in parsed_profile['selections']: - obj = _obj - if '=' in obj: -@@ -205,7 +205,7 @@ def fix_ocil_clause(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): -diff --git a/utils/move_rules.py b/utils/move_rules.py -index 2deb62b488a..e91a661be85 100755 ---- a/utils/move_rules.py -+++ b/utils/move_rules.py -@@ -340,7 +340,7 @@ def fix_ocil_clause(ssg_root, path, obj_name): - def parse_from_yaml(file_contents, lines): - new_file_arr = file_contents[lines[0]:lines[1] + 1] - new_file = "\n".join(new_file_arr) -- return yaml.load(new_file) -+ return yaml.load(new_file, Loader=yaml.Loader) - - - def print_file(file_contents): From 1ec1d5000db91335ec785f61676aa891049bd2bf Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Wed, 12 Apr 2023 16:31:10 -0500 Subject: [PATCH 24/46] Rebase to 0.1.67 --- .gitignore | 1 + scap-security-guide.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c336565..dea9052 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /scap-security-guide-0.1.64.tar.bz2 /scap-security-guide-0.1.65.tar.bz2 /scap-security-guide-0.1.66.tar.bz2 +/scap-security-guide-0.1.67.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index a0245ff..8be6e9e 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.66 +Version: 0.1.67 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,11 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Wed Apr 12 2023 Matthew Burket - 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 - 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 diff --git a/sources b/sources index 90a355e..412097c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.66.tar.bz2) = 1eee044d7d160c6f271db9a2d5262de2a577e03e103fe697e341000c34bf5208037fc88e9f4d7bfdb0b04a46660c4244a7cba214a4fe949f94e3358b12f15cc3 +SHA512 (scap-security-guide-0.1.67.tar.bz2) = 31bc39f2ac04409962908ff4c0dacebfff397322f413012029c6c1bc9f7ad1f2b86d81fb22b005df5430f31983cdf4f5c304202be650aed740de868b05c19056 From c4259b4da9931fde0b29b546563fa3d743a3ddcb Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Wed, 12 Apr 2023 16:27:21 -0500 Subject: [PATCH 25/46] Rebase to 0.1.67 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c769772..813bef4 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /scap-security-guide-0.1.64.tar.bz2 /scap-security-guide-0.1.65.tar.bz2 /scap-security-guide-0.1.66.tar.bz2 +/scap-security-guide-0.1.67.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index bdb9efd..8219aeb 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.66 +Version: 0.1.67 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Wed Apr 12 2023 Matthew Burket - 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 + * Mon Feb 06 2023 Vojtech Polasek - 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 diff --git a/sources b/sources index 90a355e..412097c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.66.tar.bz2) = 1eee044d7d160c6f271db9a2d5262de2a577e03e103fe697e341000c34bf5208037fc88e9f4d7bfdb0b04a46660c4244a7cba214a4fe949f94e3358b12f15cc3 +SHA512 (scap-security-guide-0.1.67.tar.bz2) = 31bc39f2ac04409962908ff4c0dacebfff397322f413012029c6c1bc9f7ad1f2b86d81fb22b005df5430f31983cdf4f5c304202be650aed740de868b05c19056 From a8f8ac69c4a6132a26f55fdc78571ebeec7ed31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Wed, 31 May 2023 09:35:55 +0200 Subject: [PATCH 26/46] Use SPDX license identifier See https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_1 --- scap-security-guide.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 8be6e9e..68f958c 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -7,7 +7,7 @@ Name: scap-security-guide Version: 0.1.67 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats -License: BSD +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 From 073e61aac54514282e81bfed04e16985f37d5e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Thu, 15 Jun 2023 13:12:31 +0200 Subject: [PATCH 27/46] Update to the latest upstream release scap-security-guide-0.1.68 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dea9052..34d0a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /scap-security-guide-0.1.65.tar.bz2 /scap-security-guide-0.1.66.tar.bz2 /scap-security-guide-0.1.67.tar.bz2 +/scap-security-guide-0.1.68.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 68f958c..3a774a2 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.67 +Version: 0.1.68 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Thu Jun 15 2023 Jan Černý - 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 - 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 diff --git a/sources b/sources index 412097c..ffe864c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.67.tar.bz2) = 31bc39f2ac04409962908ff4c0dacebfff397322f413012029c6c1bc9f7ad1f2b86d81fb22b005df5430f31983cdf4f5c304202be650aed740de868b05c19056 +SHA512 (scap-security-guide-0.1.68.tar.bz2) = 9e12a467ffe080de952f86a2bdb33e55e567f9b87bb54bb6da7d3086a9e4408db97575ef7f0ad5f147eb1f1dacc53151d6116a838d247b1a3cf12be64e834655 From a5cb95db654a9b71260b678ca2b51896c6138304 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:08:42 +0000 Subject: [PATCH 28/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 3a774a2..b174da0 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.68 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.1.68-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Jan Černý - 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 From 3c3b3b80e50f7bdbfa130e460afc7dd312e35d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Thu, 3 Aug 2023 13:31:39 +0200 Subject: [PATCH 29/46] Update to the latest upstream release scap-security-guide-0.1.69 --- .gitignore | 1 + scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 34d0a8f..8574401 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /scap-security-guide-0.1.66.tar.bz2 /scap-security-guide-0.1.67.tar.bz2 /scap-security-guide-0.1.68.tar.bz2 +/scap-security-guide-0.1.69.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index b174da0..d45547b 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.68 -Release: 2%{?dist} +Version: 0.1.69 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Thu Aug 03 2023 Jan Černý - 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 - 0.1.68-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index ffe864c..b00e054 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.68.tar.bz2) = 9e12a467ffe080de952f86a2bdb33e55e567f9b87bb54bb6da7d3086a9e4408db97575ef7f0ad5f147eb1f1dacc53151d6116a838d247b1a3cf12be64e834655 +SHA512 (scap-security-guide-0.1.69.tar.bz2) = 224d308608c1254a74290f2967f39ba0cef2df199399d70cb1b90386836bb1da313bf699e488d15a308c0a6ea70c30a8f5cc4a6c0b58a863f2f8154f022dd7bb From 571bdd076ed983d92b360548a0ebf0c86f378c6b Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 12 Oct 2023 14:28:53 -0500 Subject: [PATCH 30/46] Update to the latest upstream release scap-security-guide-0.1.70 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8574401..8a33624 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /scap-security-guide-0.1.67.tar.bz2 /scap-security-guide-0.1.68.tar.bz2 /scap-security-guide-0.1.69.tar.bz2 +/scap-security-guide-0.1.70.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index d45547b..37499ef 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.69 +Version: 0.1.70 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Thu Oct 12 2023 Matthew Burket - 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ý - 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 diff --git a/sources b/sources index b00e054..ef57e6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.69.tar.bz2) = 224d308608c1254a74290f2967f39ba0cef2df199399d70cb1b90386836bb1da313bf699e488d15a308c0a6ea70c30a8f5cc4a6c0b58a863f2f8154f022dd7bb +SHA512 (scap-security-guide-0.1.70.tar.bz2) = fe4d9721b7f1e982306f48922348dbbfbb4a0380f7dc423e6bc167f809d51337b39508dcd5ac62be512644434c275da85972df41da53a9b52c1f5fcabf2f2afc From fa439a6850fc256d0240af4af58f5297c8875d57 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Tue, 19 Dec 2023 16:25:20 +0100 Subject: [PATCH 31/46] Update to the latest upstream release scap-security-guide-0.1.71 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8a33624..55c2059 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /scap-security-guide-0.1.68.tar.bz2 /scap-security-guide-0.1.69.tar.bz2 /scap-security-guide-0.1.70.tar.bz2 +/scap-security-guide-0.1.71.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 37499ef..3ea673a 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.70 +Version: 0.1.71 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Dec 19 2023 Vojtech Polasek - 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 - 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 diff --git a/sources b/sources index ef57e6e..677fd16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.70.tar.bz2) = fe4d9721b7f1e982306f48922348dbbfbb4a0380f7dc423e6bc167f809d51337b39508dcd5ac62be512644434c275da85972df41da53a9b52c1f5fcabf2f2afc +SHA512 (scap-security-guide-0.1.71.tar.bz2) = ff64266925e8f280283665b3f99dd14f9dc67a12d759224d787731c371946bfd579eef6dc7b6da4b5edc9d0bae7520b8dd4cfb1edf1d779e6a8ca30e26e4d02b From ad8e38c1ce58fbc2c33f6f0d502e6c87f3968528 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:13:01 +0000 Subject: [PATCH 32/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 3ea673a..eab4777 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.71 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.1.71-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 19 2023 Vojtech Polasek - 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 From 0e2a008939fac63fd2db74e17c01fc0ffff41652 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Fri, 9 Feb 2024 16:30:53 +0100 Subject: [PATCH 33/46] update to scap-security-guide 0.1.72 --- .gitignore | 1 + scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 55c2059..9b442ec 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /scap-security-guide-0.1.69.tar.bz2 /scap-security-guide-0.1.70.tar.bz2 /scap-security-guide-0.1.71.tar.bz2 +/scap-security-guide-0.1.72.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index eab4777..ff6409e 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.71 -Release: 2%{?dist} +Version: 0.1.72 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Fri Feb 09 2024 Vojtech Polasek - 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 - 0.1.71-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 677fd16..5ef0e99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.71.tar.bz2) = ff64266925e8f280283665b3f99dd14f9dc67a12d759224d787731c371946bfd579eef6dc7b6da4b5edc9d0bae7520b8dd4cfb1edf1d779e6a8ca30e26e4d02b +SHA512 (scap-security-guide-0.1.72.tar.bz2) = 2b3fb7ff4d7f69796968afc61049753bce9f2cd5bc57ecc41f9ea17dbd2bb8c278a6e02ef98e34b1561dd38e55498ba2ba92079dbdc4ef5848186964cefbd92a From d4ba75887d2dd2a1acf9316f6ba9f6581d1c13ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Wed, 22 May 2024 09:18:49 +0200 Subject: [PATCH 34/46] scap-security-guide-0.1.73 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9b442ec..3105ff4 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /scap-security-guide-0.1.70.tar.bz2 /scap-security-guide-0.1.71.tar.bz2 /scap-security-guide-0.1.72.tar.bz2 +/scap-security-guide-0.1.73.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index ff6409e..7f855f6 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.72 +Version: 0.1.73 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Wed May 22 2024 Jan Černý - 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 - 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 diff --git a/sources b/sources index 5ef0e99..ce6f37a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.72.tar.bz2) = 2b3fb7ff4d7f69796968afc61049753bce9f2cd5bc57ecc41f9ea17dbd2bb8c278a6e02ef98e34b1561dd38e55498ba2ba92079dbdc4ef5848186964cefbd92a +SHA512 (scap-security-guide-0.1.73.tar.bz2) = 8750aeb61378d7729e00e4bcfb17d1463d97192801ef6707593ec639dfef2abba6669b9d1b8f71958f7d24f6c66f308f1587d731dd4e63878f91266232883ad7 From afd5aedc48dc5a99300e75a92d9a0c2dc8ece3eb Mon Sep 17 00:00:00 2001 From: Milan Lysonek Date: Tue, 9 Jul 2024 09:06:18 +0200 Subject: [PATCH 35/46] Move smoke-test from tests/scap-security-guide repo and with that update also test plans and gating configurations. --- gating.yaml | 4 +- plans/fedora_tests.fmf | 3 +- tests/smoke-test/main.fmf | 27 +++++++++++++ tests/smoke-test/runtest.sh | 80 +++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 tests/smoke-test/main.fmf create mode 100755 tests/smoke-test/runtest.sh diff --git a/gating.yaml b/gating.yaml index 1d65cc1..46eab8d 100644 --- a/gating.yaml +++ b/gating.yaml @@ -17,6 +17,4 @@ product_versions: - rhel-* decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.ci-beaker.functional} - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation} + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/ci/tier1.functional} diff --git a/plans/fedora_tests.fmf b/plans/fedora_tests.fmf index 63d6437..3f21692 100644 --- a/plans/fedora_tests.fmf +++ b/plans/fedora_tests.fmf @@ -1,6 +1,5 @@ -summary: Run tests from scap-security-guide tests repository +summary: Run all tests in this repository discover: how: fmf - url: https://src.fedoraproject.org/tests/scap-security-guide execute: how: tmt diff --git a/tests/smoke-test/main.fmf b/tests/smoke-test/main.fmf new file mode 100644 index 0000000..6e01198 --- /dev/null +++ b/tests/smoke-test/main.fmf @@ -0,0 +1,27 @@ +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 +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 diff --git a/tests/smoke-test/runtest.sh b/tests/smoke-test/runtest.sh new file mode 100755 index 0000000..b356a60 --- /dev/null +++ b/tests/smoke-test/runtest.sh @@ -0,0 +1,80 @@ +#!/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 +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# 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 From fbf76d834e7f4125c1eb25c34290c81e65116b8a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 04:55:21 +0000 Subject: [PATCH 36/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 7f855f6..70008af 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.73 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.1.73-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed May 22 2024 Jan Černý - 0.1.73-1 - Update to latest upstream release https://github.com/ComplianceAsCode/content/releases/tag/v0.1.73 From 499e36d274bf87bc5a95eee0988a619952d8267b Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 12 Aug 2024 12:29:02 -0500 Subject: [PATCH 37/46] Update to version 0.1.74 --- .gitignore | 1 + scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3105ff4..329f996 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /scap-security-guide-0.1.71.tar.bz2 /scap-security-guide-0.1.72.tar.bz2 /scap-security-guide-0.1.73.tar.bz2 +/scap-security-guide-0.1.74.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 70008af..ff7cbbe 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.73 -Release: 2%{?dist} +Version: 0.1.74 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -99,6 +99,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Aug 12 2024 Matthew Burket - 0.1.74-1 +- Update to latest upstream release: + https://github.com/ComplianceAsCode/content/releases/tag/v0.1.74 + * Sat Jul 20 2024 Fedora Release Engineering - 0.1.73-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index ce6f37a..0ced6da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.73.tar.bz2) = 8750aeb61378d7729e00e4bcfb17d1463d97192801ef6707593ec639dfef2abba6669b9d1b8f71958f7d24f6c66f308f1587d731dd4e63878f91266232883ad7 +SHA512 (scap-security-guide-0.1.74.tar.bz2) = 773cc7fb72e8d24fe9b12bf58815e051db21ee474cd0c3aebd07c2026712a89e6174c00840b1fd56195c900a541ff9e656240ee6b5a1cf3f3fe9b119cbedc30f From b80e2207d82f9c3b9e14d06bdab1c1374bbfcb8d Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 12 Aug 2024 12:30:33 -0500 Subject: [PATCH 38/46] Remove /usr/bin/python3 from BuildRequires --- scap-security-guide.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index ff7cbbe..cebd293 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -16,8 +16,6 @@ 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 @@ -102,6 +100,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md * Mon Aug 12 2024 Matthew Burket - 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 - 0.1.73-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e311191a527db1cbaaab7af59d3c312f61c67ce7 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 14 Nov 2024 15:10:44 -0600 Subject: [PATCH 39/46] Update to 0.1.75 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 329f996..d1fdb0d 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /scap-security-guide-0.1.72.tar.bz2 /scap-security-guide-0.1.73.tar.bz2 /scap-security-guide-0.1.74.tar.bz2 +/scap-security-guide-0.1.75.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index cebd293..76ffc11 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.74 +Version: 0.1.75 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -97,6 +97,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Thu Nov 14 2024 Matthew Burket - 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 - 0.1.74-1 - Update to latest upstream release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.74 diff --git a/sources b/sources index 0ced6da..0f120bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.74.tar.bz2) = 773cc7fb72e8d24fe9b12bf58815e051db21ee474cd0c3aebd07c2026712a89e6174c00840b1fd56195c900a541ff9e656240ee6b5a1cf3f3fe9b119cbedc30f +SHA512 (scap-security-guide-0.1.75.tar.bz2) = ecab31c731612316b40d9e26ba81b7a44396bd6ef3cc616de27789cb75dec6f90cec69f1fd3186f20a03d46896e0d1231c79a31ced1c25dd6786c79c5baac416 From 02bb14b4e0855c2887a4fe8bfb704566e22b64fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:06:12 +0000 Subject: [PATCH 40/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 76ffc11..8536a6a 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.75 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -97,6 +97,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.1.75-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Nov 14 2024 Matthew Burket - 0.1.75-1 - Update to latest upstream release https://github.com/ComplianceAsCode/content/releases/tag/v0.1.75 From af3b67787cb8d42c7eb70fe64af2ec487a8932c7 Mon Sep 17 00:00:00 2001 From: Evgeny Kolesnikov Date: Tue, 25 Feb 2025 12:18:18 +0100 Subject: [PATCH 41/46] Update to 0.1.76 --- .gitignore | 62 +--------------------------------------- scap-security-guide.spec | 8 ++++-- sources | 2 +- 3 files changed, 8 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index d1fdb0d..14244dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,61 +1 @@ -/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 -/scap-security-guide-0.1.55.tar.bz2 -/scap-security-guide-0.1.56.tar.bz2 -/scap-security-guide-0.1.57.tar.bz2 -/scap-security-guide-0.1.58.tar.bz2 -/scap-security-guide-0.1.59.tar.bz2 -/scap-security-guide-0.1.60.tar.bz2 -/scap-security-guide-0.1.61.tar.bz2 -/scap-security-guide-0.1.62.tar.bz2 -/scap-security-guide-0.1.63.tar.bz2 -/scap-security-guide-0.1.64.tar.bz2 -/scap-security-guide-0.1.65.tar.bz2 -/scap-security-guide-0.1.66.tar.bz2 -/scap-security-guide-0.1.67.tar.bz2 -/scap-security-guide-0.1.68.tar.bz2 -/scap-security-guide-0.1.69.tar.bz2 -/scap-security-guide-0.1.70.tar.bz2 -/scap-security-guide-0.1.71.tar.bz2 -/scap-security-guide-0.1.72.tar.bz2 -/scap-security-guide-0.1.73.tar.bz2 -/scap-security-guide-0.1.74.tar.bz2 -/scap-security-guide-0.1.75.tar.bz2 +/scap-security-guide-0.1.76.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 8536a6a..d54f97b 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.75 -Release: 2%{?dist} +Version: 0.1.76 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -97,6 +97,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Tue Feb 25 2025 Evgenii Kolesnikov - 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 - 0.1.75-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 0f120bc..6b6e0c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.75.tar.bz2) = ecab31c731612316b40d9e26ba81b7a44396bd6ef3cc616de27789cb75dec6f90cec69f1fd3186f20a03d46896e0d1231c79a31ced1c25dd6786c79c5baac416 +SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c From cbff1763072aa44792c251fcd0e6c25f46938fd0 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Fri, 7 Mar 2025 14:59:14 -0600 Subject: [PATCH 42/46] Remove expat as BuildRequires as it no longer needed --- scap-security-guide.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index d54f97b..b268c7d 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.76 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -13,7 +13,6 @@ Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{versio BuildArch: noarch BuildRequires: libxslt -BuildRequires: expat BuildRequires: openscap-scanner >= 1.2.5 BuildRequires: cmake >= 2.8 BuildRequires: python%{python3_pkgversion} @@ -97,6 +96,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Fri Mar 07 2025 Matthew Burket - 0.1.76-2 +- Remove expat as a BuildRequires as it is no longer needed + * Tue Feb 25 2025 Evgenii Kolesnikov - 0.1.76-1 - Update to latest upstream release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.76 From bd79f797ab6b6f912c6ccc3e1b624043037b7608 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 2 Jun 2025 15:03:51 -0500 Subject: [PATCH 43/46] Update to 0.1.77 --- .gitignore | 2 +- scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 14244dd..3542a0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/scap-security-guide-0.1.76.tar.bz2 +/scap-security-guide-0.1.77.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index b268c7d..0891148 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.76 -Release: 2%{?dist} +Version: 0.1.77 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -96,6 +96,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Jun 02 2025 Matthew Burket - 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 - 0.1.76-2 - Remove expat as a BuildRequires as it is no longer needed diff --git a/sources b/sources index 6b6e0c4..513cdd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c +SHA512 (scap-security-guide-0.1.77.tar.bz2) = cc3bda1c7e3e40f58407b59d2c7222da7b1d3979f5411a2c12e5f12b73cfff4a71d04b3a51dcc84ca797486aca77ed6091977cb3f067ef3f63dc3d855b059b11 From bb5959df535f23283948ac55864879dc915c9c95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 17:59:15 +0000 Subject: [PATCH 44/46] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- scap-security-guide.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 0891148..fd07335 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -5,7 +5,7 @@ Name: scap-security-guide Version: 0.1.77 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -96,6 +96,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.1.77-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Matthew Burket - 0.1.77-1 - Update to latest upstream release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.77 From 1637063e419174e2b8588dc4f856a2a19cf58a24 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Mon, 8 Sep 2025 10:46:30 -0500 Subject: [PATCH 45/46] Update to 0.1.78 --- .gitignore | 2 +- scap-security-guide.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3542a0a..074f9f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/scap-security-guide-0.1.77.tar.bz2 +/scap-security-guide-0.1.78.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index fd07335..80172e4 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,8 +4,8 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.77 -Release: 2%{?dist} +Version: 0.1.78 +Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause URL: https://github.com/ComplianceAsCode/content/ @@ -96,6 +96,10 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Mon Sep 08 2025 Matthew Burket - 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 - 0.1.77-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 513cdd0..ebcceed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.77.tar.bz2) = cc3bda1c7e3e40f58407b59d2c7222da7b1d3979f5411a2c12e5f12b73cfff4a71d04b3a51dcc84ca797486aca77ed6091977cb3f067ef3f63dc3d855b059b11 +SHA512 (scap-security-guide-0.1.78.tar.bz2) = b84c549fe42799a6daffecf5720c5208f9946974f74193b9f6beb3fba04c35d9f073953c94b83c5ddf36855d59be1c66dafb011dde4427ab040dd1ec5048c063 From 8df1e2a9ea951cba8a30cb33975fa01f943aabd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Fri, 28 Nov 2025 15:34:00 +0100 Subject: [PATCH 46/46] scap-security-guide-0.1.79 --- .gitignore | 1 + scap-security-guide.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 074f9f7..c74915f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /scap-security-guide-0.1.78.tar.bz2 +/scap-security-guide-0.1.79.tar.bz2 diff --git a/scap-security-guide.spec b/scap-security-guide.spec index 80172e4..b9b927b 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -4,7 +4,7 @@ %global _vpath_builddir build Name: scap-security-guide -Version: 0.1.78 +Version: 0.1.79 Release: 1%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause @@ -96,6 +96,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md %endif %changelog +* Fri Nov 28 2025 Jan Černý - 0.1.79-1 +- Upgrade to the latest upstream release + * Mon Sep 08 2025 Matthew Burket - 0.1.78-1 - Update to latest upstream release: https://github.com/ComplianceAsCode/content/releases/tag/v0.1.78 diff --git a/sources b/sources index ebcceed..f88b2e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scap-security-guide-0.1.78.tar.bz2) = b84c549fe42799a6daffecf5720c5208f9946974f74193b9f6beb3fba04c35d9f073953c94b83c5ddf36855d59be1c66dafb011dde4427ab040dd1ec5048c063 +SHA512 (scap-security-guide-0.1.79.tar.bz2) = 57963e896aef6089523bb7165ece32dafeedc2caf0baac594c4d0d083ff00bd37c4fdc1c98357db1c70523bb67543c07b6a41b7d989ba1a8e97907218d954311