From 4f696fcce8f016a899aec12aae383e0b0becef78 Mon Sep 17 00:00:00 2001
From: Vojtech Polasek <vpolasek@redhat.com>
Date: Mon, 21 Sep 2020 09:07:57 +0200
Subject: [PATCH] scap-security-guide 0.1.52

---
 .gitignore                                   |  1 +
 scap-security-guide-0.1.48-xml_parsing.patch | 31 --------------------
 scap-security-guide.spec                     |  8 +++--
 sources                                      |  2 +-
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 scap-security-guide-0.1.48-xml_parsing.patch

diff --git a/.gitignore b/.gitignore
index 161793f..51dd6dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/scap-security-guide-0.1.48-xml_parsing.patch b/scap-security-guide-0.1.48-xml_parsing.patch
deleted file mode 100644
index 570d5ff..0000000
--- a/scap-security-guide-0.1.48-xml_parsing.patch
+++ /dev/null
@@ -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
-         )
- 
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 1a95d9f..3094fff 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -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
diff --git a/sources b/sources
index ee0a797..ed9f463 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scap-security-guide-0.1.51.tar.bz2) = 81173110520d51f9ef111d6f129932e1b5a5899286175a2a26171007520101976409af5969adba60d6165e8d858e2842bd50ecd2afc9e8747e4cc5192898db71
+SHA512 (scap-security-guide-0.1.52.tar.bz2) = 273eee746036ac58877e22d93c51ee30178fbe4f386e95af6f9ca61978b6748fb32acd9d5886403a178fdb4fc623635c15d2bf98f83e2123b2526c52a6da09a6