From 18ccbcf5a51845a672b6b6c096504e5ebe01d140 Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 6 Feb 2023 13:07:21 +0100 Subject: [PATCH 1/5] rebase to 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 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-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 ef667e6..6819e18 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 1a4a920fb44243dab072e12a0a73dd1b4e77ed74 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Wed, 12 Apr 2023 16:34:23 -0500 Subject: [PATCH 2/5] 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 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 6819e18..65baad2 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 01a6cbc8ad3a8a714313f1bf775c22d15bc2bee7 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 3/5] 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 65baad2..4afc8de 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 @@ -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 95b76bd50af69afef5dfe8999567e45906cde3dc 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 4/5] Update to the latest upstream release scap-security-guide-0.1.69 --- .gitignore | 1 + scap-security-guide.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 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 4afc8de..791e907 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.68 +Version: 0.1.69 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 +* 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 + * 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 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 4527b1f76a4eb72d976e76040895d6aa6f24aebc Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 12 Oct 2023 14:28:53 -0500 Subject: [PATCH 5/5] 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 791e907..fcdf414 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 @@ -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