scap-security-guide 0.1.55

.gitignore

@@ -34,3 +34,9 @@
 /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.50.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.48-xml_parsing.patch

@@ -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
-         )
- 

scap-security-guide.spec

@@ -1,5 +1,5 @@
 Name:		scap-security-guide
-Version:	0.1.49
+Version:	0.1.55
 Release:	1%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 License:	BSD-3-Clause
@@ -61,6 +61,33 @@ cd build
 %doc %{_docdir}/%{name}/tables/*.html
 
 %changelog
+* Fri Mar 19 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.55-1
+- Update to latest upstream SCAP-Security-Guide-0.1.55 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.55
+
+* Fri Feb 05 2021 Vojtech Polasek <vpolasek@redhat.com> - 0.1.54-1
+- Update to latest upstream SCAP-Security-Guide-0.1.54 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.54
+
+* Wed Nov 18 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.53-1
+- Update to latest upstream SCAP-Security-Guide-0.1.53 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.53
+
+* 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
+
+* Mon Jul 20 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.51-1
+- Update to latest upstream SCAP-Security-Guide-0.1.51 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.51
+
+* Wed Jun 03 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.50-2
+- fix incorrectly included source files
+
+* Mon Jun 01 2020 Vojtech Polasek <vpolasek@redhat.com> - 0.1.50-1
+- Update to latest upstream SCAP-Security-Guide-0.1.50 release:
+  https://github.com/ComplianceAsCode/content/releases/tag/v0.1.50
+
 * Mon Mar 23 2020 Watson Sato <wsato@redhat.com> - 0.1.49-1
 - Update to latest upstream SCAP-Security-Guide-0.1.49 release:
   https://github.com/ComplianceAsCode/content/releases/tag/v0.1.49

sources

@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.49.tar.bz2) = 888f3a3a190e69448058fe3beda5c28ecb99704cc7b5bbea3b48d16ed4414960495059854bef685472996763ff81c10fbf8258ff82d2f235b3aeac2ebb051b4b
+SHA512 (scap-security-guide-0.1.55.tar.bz2) = 3e1e3c16dac2b4ea07f164f488c2e7d0690efd64a185c9c1fb0cfe4875a4076cb207144c9232c33f9f08cc999f5284f1a221065100d699dc84168e86631912f8

tests/tests.yml

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