scap-security-guide 0.1.52

This commit is contained in:
Vojtech Polasek 2020-09-21 09:07:57 +02:00
parent 53abd55a48
commit 4f696fcce8
4 changed files with 8 additions and 34 deletions

1
.gitignore vendored
View File

@ -35,3 +35,4 @@
/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

View File

@ -1,31 +0,0 @@
From 174293162e5840684d967e36840fc1f9f57c90be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= <matyc@redhat.com>
Date: Thu, 5 Dec 2019 15:02:05 +0100
Subject: [PATCH] Fix XML "parsing" of the remediation functions file.
A proper fix is not worth the effort, as we aim to kill shared Bash remediation
with Jinja2 macros.
---
ssg/build_remediations.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ssg/build_remediations.py b/ssg/build_remediations.py
index 7da807bd68..13e90f7327 100644
--- a/ssg/build_remediations.py
+++ b/ssg/build_remediations.py
@@ -56,11 +56,11 @@ def get_available_functions(build_dir):
remediation_functions = []
with codecs.open(xmlfilepath, "r", encoding="utf-8") as xmlfile:
filestring = xmlfile.read()
- # This regex looks implementation dependent but we can rely on
- # ElementTree sorting XML attrs alphabetically. Hidden is guaranteed
- # to be the first attr and ID is guaranteed to be second.
+ # This regex looks implementation dependent but we can rely on the element attributes
+ # being present on one line.
+ # We can't rely on ElementTree sorting XML attrs in any way since Python 3.7.
remediation_functions = re.findall(
- r'<Value hidden=\"true\" id=\"function_(\S+)\"',
+ r'<Value[^>]*id=\"function_(\S+)\"',
filestring, re.DOTALL
)

View File

@ -1,6 +1,6 @@
Name: scap-security-guide
Version: 0.1.51
Release: 4%{?dist}
Version: 0.1.52
Release: 1%{?dist}
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
URL: https://github.com/ComplianceAsCode/content/
@ -64,6 +64,10 @@ present in %{name} package.
%doc %{_docdir}/%{name}/tables/*.html
%changelog
* Mon Sep 21 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.52-1
- Update to latest upstream SCAP-Security-Guide-0.1.52 release:
https://github.com/ComplianceAsCode/content/releases/tag/v0.1.52
* Tue Aug 04 2020 Jan Černý <jcerny@redhat.com> - 0.1.51-4
- Update for new CMake out of source builds
https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds

View File

@ -1 +1 @@
SHA512 (scap-security-guide-0.1.51.tar.bz2) = 81173110520d51f9ef111d6f129932e1b5a5899286175a2a26171007520101976409af5969adba60d6165e8d858e2842bd50ecd2afc9e8747e4cc5192898db71
SHA512 (scap-security-guide-0.1.52.tar.bz2) = 273eee746036ac58877e22d93c51ee30178fbe4f386e95af6f9ca61978b6748fb32acd9d5886403a178fdb4fc623635c15d2bf98f83e2123b2526c52a6da09a6