From e515fc9694efb8703f6c55782094e0273c0dec9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Fri, 25 Jun 2021 13:59:59 +0200
Subject: [PATCH] Workaround rpminspect problem

rpminspect produces this problem:

xml-files:
----------
1) File /usr/share/openscap/xsl/oval-results-report.xsl is a malformed XML file on x86_64
Result: VERIFY
Waiver Authorization: Anyone

Details:
No declaration for element stylesheet

Suggested Remedy: Correct the reported errors in the XML document

I assume that it's caused by mixing the DTD and schema - it probably
expects that the DTD will contain a declaration of the root element
as well. The workaround simply expands both entities by substituting
them by their contents.
---
 xsl/oval-results-report.xsl | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/xsl/oval-results-report.xsl b/xsl/oval-results-report.xsl
index fe50717795..744540c8f8 100644
--- a/xsl/oval-results-report.xsl
+++ b/xsl/oval-results-report.xsl
@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xsl:stylesheet [
-<!-- check symbol -->
-<!ENTITY resultgood "&#x2713;">
-<!-- x symbol -->
-<!ENTITY resultbad "&#x2715;">
-]>
 <!--
 
 ****************************************************************************************
@@ -129,7 +123,7 @@
 						<tr class="LightRow">
 							<td class="resultbadA ColorBox"/>
 							<td class="resultbadB ColorBox"/>
-							<td class="Text" title="Non-Compliant/Vulnerable/Unpatched">&resultbad;</td>
+							<td class="Text" title="Non-Compliant/Vulnerable/Unpatched">&#x2715;</td>
 						</tr>
 					</table>
 				</td>
@@ -138,7 +132,7 @@
 						<tr class="LightRow">
 							<td class="resultgoodA ColorBox"/>
 							<td class="resultgoodB ColorBox"/>
-							<td class="Text" title="Compliant/Non-Vulnerable/Patched">&resultgood;</td>
+							<td class="Text" title="Compliant/Non-Vulnerable/Patched">&#x2713;</td>
 						</tr>
 					</table>
 				</td>
@@ -227,8 +221,8 @@
 					<table border="1">
 						<tr class="Title">
 							<td class="TitleLabel" align="center">Systems Analyzed</td>
-							<td class="TitleLabel" align="center" title="Non-Compliant/Vulnerable/Unpatched">&resultbad;</td>
-							<td class="TitleLabel" align="center" title="Compliant/Non-Vulnerable/Patched">&resultgood;</td>
+							<td class="TitleLabel" align="center" title="Non-Compliant/Vulnerable/Unpatched">&#x2715;</td>
+							<td class="TitleLabel" align="center" title="Compliant/Non-Vulnerable/Patched">&#x2713;</td>
 							<td class="TitleLabel" align="center">Errors</td>
 							<td class="TitleLabel" align="center">Unknown</td>
 							<td class="TitleLabel" align="center" title="Inventory/Miscellaneous class, or Not Applicable/Not Evaluated result">Other</td>
@@ -497,8 +491,8 @@
     <xsl:template name="GeneratorResTotals">
         <xsl:param name="resultsElm"/>
         <tr class="DarkRow Center">
-        	<td class="SmallLabel" style="width: 20%;" title="Non-Compliant/Vulnerable/Unpatched">#&resultbad;</td>
-        	<td class="SmallLabel" style="width: 20%;" title="Compliant/Non-Vulnerable/Patched">#&resultgood;</td>
+        	<td class="SmallLabel" style="width: 20%;" title="Non-Compliant/Vulnerable/Unpatched">#&#x2715;</td>
+        	<td class="SmallLabel" style="width: 20%;" title="Compliant/Non-Vulnerable/Patched">#&#x2713;</td>
         	<td class="SmallLabel" style="width: 20%;" title="Error">#Error</td>
         	<td class="SmallLabel" style="width: 20%;" title="Unknown">#Unknown</td>
         	<td class="SmallLabel" style="width: 20%;" title="Inventory/Miscellaneous class, or Not Applicable/Not Evaluated result">#Other</td>