rpms
/
scap-security-guide
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix issue with getting STIG items in create_scap_delta_tailoring.py. 

Resolves: rhbz#2014561
This commit is contained in:
Gabriel Becker 2022-02-21 18:33:47 +01:00
parent 3afe98eab5
commit 517528cda1
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scap-security-guide-0.1.61-fix_bug_in_delta_tailering_script-PR_8245.patch Normal file
View File

@ -0,0 +1,22 @@
From 50eb163d9e9751c2e8cf8129523a8cf7e07a5930 Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Thu, 17 Feb 2022 12:49:32 -0600
Subject: [PATCH] get_implemented_stigs in utils/create_scap_delta_tailoring.py
should return the implemented stig items
---
utils/create_scap_delta_tailoring.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/utils/create_scap_delta_tailoring.py b/utils/create_scap_delta_tailoring.py
index 2c3c5d0df32..25ad1aef66e 100755
--- a/utils/create_scap_delta_tailoring.py
+++ b/utils/create_scap_delta_tailoring.py
@@ -127,6 +127,7 @@ def get_implemented_stigs(product, root_path, build_config_yaml_path,
known_rules[ref].append(rule['id'])
else:
known_rules[ref] = [rule['id']]
+ return known_rules
get_implemented_stigs.__annotations__ = {'product': str, 'root_path': str,

2
scap-security-guide.spec
View File

@ -61,6 +61,7 @@ Patch43: scap-security-guide-0.1.61-fix-ansible-service-disabled-task-PR_8226.pa
Patch44: scap-security-guide-0.1.61-update-ospp-description-PR_8232.patch
Patch45: scap-security-guide-0.1.61-add-rule-page_alloc_shuffle_argument-PR_8234.patch
Patch46: scap-security-guide-0.1.61-remove_tmux_process_running_check-PR_8246.patch
Patch47: scap-security-guide-0.1.61-fix_bug_in_delta_tailering_script-PR_8245.patch
BuildRequires: libxslt
BuildRequires: expat
@ -149,6 +150,7 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
%changelog
* Mon Feb 21 2022 Gabriel Becker <ggasparb@redhat.com> - 0.1.60-5
- Remove tmux process runinng check in configure_bashrc_exec_tmux (RHBZ#2056847)
- Fix issue with getting STIG items in create_scap_delta_tailoring.py (RHBZ#2014561)
* Tue Feb 15 2022 Watson Sato <wsato@redhat.com> - 0.1.60-4
- Fix Ansible service disabled tasks (RHBZ#2014561)