Blame SOURCES/openscap-1.3.6-rpminspect-xml-pr-1773.patch
|
 |
02a573 |
From e515fc9694efb8703f6c55782094e0273c0dec9d Mon Sep 17 00:00:00 2001
|
|
|
02a573 |
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
|
|
02a573 |
Date: Fri, 25 Jun 2021 13:59:59 +0200
|
|
|
02a573 |
Subject: [PATCH] Workaround rpminspect problem
|
|
|
02a573 |
|
|
|
02a573 |
rpminspect produces this problem:
|
|
|
02a573 |
|
|
|
02a573 |
xml-files:
|
|
|
02a573 |
----------
|
|
|
02a573 |
1) File /usr/share/openscap/xsl/oval-results-report.xsl is a malformed XML file on x86_64
|
|
|
02a573 |
Result: VERIFY
|
|
|
02a573 |
Waiver Authorization: Anyone
|
|
|
02a573 |
|
|
|
02a573 |
Details:
|
|
|
02a573 |
No declaration for element stylesheet
|
|
|
02a573 |
|
|
|
02a573 |
Suggested Remedy: Correct the reported errors in the XML document
|
|
|
02a573 |
|
|
|
02a573 |
I assume that it's caused by mixing the DTD and schema - it probably
|
|
|
02a573 |
expects that the DTD will contain a declaration of the root element
|
|
|
02a573 |
as well. The workaround simply expands both entities by substituting
|
|
|
02a573 |
them by their contents.
|
|
|
02a573 |
---
|
|
|
02a573 |
xsl/oval-results-report.xsl | 18 ++++++------------
|
|
|
02a573 |
1 file changed, 6 insertions(+), 12 deletions(-)
|
|
|
02a573 |
|
|
|
02a573 |
diff --git a/xsl/oval-results-report.xsl b/xsl/oval-results-report.xsl
|
|
|
02a573 |
index fe50717795..744540c8f8 100644
|
|
|
02a573 |
--- a/xsl/oval-results-report.xsl
|
|
|
02a573 |
+++ b/xsl/oval-results-report.xsl
|
|
|
02a573 |
@@ -1,10 +1,4 @@
|
|
|
02a573 |
|
|
|
02a573 |
-
|
|
|
02a573 |
-
|
|
|
02a573 |
-
|
|
|
02a573 |
-
|
|
|
02a573 |
-
|
|
|
02a573 |
-]>
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
****************************************************************************************
|
|
|
02a573 |
@@ -129,7 +123,7 @@
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
- &resultbad;
|
|
|
02a573 |
+ ✕
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
@@ -138,7 +132,7 @@
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
- &resultgood;
|
|
|
02a573 |
+ ✓
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
@@ -227,8 +221,8 @@
|
|
|
02a573 |
|
|
|
02a573 |
|
|
|
02a573 |
Systems Analyzed
|
|
|
02a573 |
- &resultbad;
|
|
|
02a573 |
- &resultgood;
|
|
|
02a573 |
+ ✕
|
|
|
02a573 |
+ ✓
|
|
|
02a573 |
Errors
|
|
|
02a573 |
Unknown
|
|
|
02a573 |
Other
|
|
|
02a573 |
@@ -497,8 +491,8 @@
|
|
|
02a573 |
<xsl:template name="GeneratorResTotals">
|
|
|
02a573 |
<xsl:param name="resultsElm"/>
|
|
|
02a573 |
|
|
|
02a573 |
- #&resultbad;
|
|
|
02a573 |
- #&resultgood;
|
|
|
02a573 |
+ #✕
|
|
|
02a573 |
+ #✓
|
|
|
02a573 |
#Error
|
|
|
02a573 |
#Unknown
|
|
|
02a573 |
#Other
|