components/openscap/patches/xccdf-report-guide.xsl.patch
author Jacob Varughese <jacob.varughese@oracle.com>
Fri, 13 Feb 2015 12:30:50 -0800
branchs11-update
changeset 3806 bdc70b98921a
permissions -rw-r--r--
PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC 20002615 upgrade openscap to latest version 1.2.0 20465100 openscap needs to have ASLR enabled
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3806
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     1
This patch fixes an issue that was found in openscap 1.1.1+ when
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     2
libxml2 is upgraded to ver 2.9.2. It fixes the errors, that were
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     3
reported as entities already defined, showing up in the report
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     4
and guide generation.
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     5
This patch has not been contributed upstream, but is planned to be
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     6
done by 2015-Jan-31.
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     7
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     8
--- openscap-1.2.0/xsl/xccdf-report-impl.xsl.~1~	2014-09-26 01:41:04.068164604 -0700
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
     9
+++ openscap-1.2.0/xsl/xccdf-report-impl.xsl	2014-12-10 10:51:48.443071716 -0800
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    10
@@ -49,7 +49,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    11
     <xsl:param name="testresult"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    12
     <xsl:param name="benchmark"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    13
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    14
-    <div id="characteristics"><a name="characteristics"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    15
+    <div id="characteristics">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    16
         <h2>Evaluation Characteristics</h2>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    17
         <div class="row">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    18
             <div class="col-md-5 well well-lg">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    19
@@ -172,7 +172,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    20
 <xsl:template name="compliance-and-scoring">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    21
     <xsl:param name="testresult"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    22
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    23
-    <div id="compliance-and-scoring"><a name="compliance-and-scoring"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    24
+    <div id="compliance-and-scoring">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    25
         <h2>Compliance and Scoring</h2>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    26
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    27
         <xsl:variable name="total_rules_count" select="count($testresult/cdf:rule-result[cdf:result])"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    28
@@ -376,7 +376,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    29
     <xsl:param name="benchmark"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    30
     <xsl:param name="profile"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    31
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    32
-    <div id="rule-overview"><a name="rule-overview"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    33
+    <div id="rule-overview">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    34
         <h2>Rule Overview</h2>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    35
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    36
         <div class="form-group js-only">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    37
@@ -589,7 +589,6 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    38
             </xsl:for-each>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    39
         </div>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    40
         <div class="panel-heading">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    41
-            <a name="rule-detail-{generate-id($ruleresult)}"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    42
             <h3 class="panel-title">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    43
                 <xsl:call-template name="item-title">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    44
                     <xsl:with-param name="item" select="$item"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    45
@@ -695,7 +694,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    46
     <div class="js-only">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    47
         <button type="button" class="btn btn-info" onclick="return toggleResultDetails(this)">Show all result details</button>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    48
     </div>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    49
-    <div id="result-details"><a name="result-details"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    50
+    <div id="result-details">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    51
         <h2>Result Details</h2>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    52
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    53
         <xsl:call-template name="result-details-inner-node">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    54
--- openscap-1.2.0/xsl/xccdf-guide-impl.xsl.~1~	2014-09-26 01:41:04.067164602 -0700
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    55
+++ openscap-1.2.0/xsl/xccdf-guide-impl.xsl	2014-12-10 10:49:08.479661674 -0800
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    56
@@ -47,7 +47,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    57
     <xsl:param name="benchmark"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    58
     <xsl:param name="profile"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    59
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    60
-    <div id="introduction"><a name="introduction"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    61
+    <div id="introduction">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    62
         <div class="row">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    63
             <div class="col-md-8 well well-lg">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    64
                 <h2>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    65
@@ -415,7 +415,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    66
     <xsl:param name="benchmark"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    67
     <xsl:param name="profile"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    68
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    69
-    <div id="guide-tree"><a name="guide-tree"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    70
+    <div id="guide-tree">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    71
         <h2>Checklist</h2>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    72
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    73
         <table class="treetable table table-bordered">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    74
@@ -434,7 +434,7 @@
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    75
     <xsl:param name="benchmark"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    76
     <xsl:param name="profile"/>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    77
 
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    78
-    <div id="rear-matter"><a name="rear-matter"></a>
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    79
+    <div id="rear-matter">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    80
         <div class="row">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    81
             <div class="col-md-12 well well-lg">
bdc70b98921a PSARC/2014/441 OpenSCAP update to 1.2.0 and 3PSC
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff changeset
    82
                 <xsl:if test="$benchmark/cdf:rear-matter">