20524603 openscap doesn't build on s12-67 s11-update
authorJacob Varughese <jacob.varughese@oracle.com>
Tue, 24 Mar 2015 15:51:54 -0700
branchs11-update
changeset 4014 9dbd5dce19df
parent 4007 0b6c6e1c308f
child 4015 3592adaad446
20524603 openscap doesn't build on s12-67 20570264 upgrade openscap to 1.2.1 for OVAL schema 5.11 20528344 Compliance report should display benchmark name rather than URL
components/openscap/Makefile
components/openscap/openscap.p5m
components/openscap/patches/smf.c.patch
components/openscap/patches/xccdf-branding.xsl.patch
components/openscap/patches/xccdf-report-guide.xsl.patch
components/openscap/patches/xccdf-report-impl.xsl.patch
--- a/components/openscap/Makefile	Mon Mar 23 03:26:42 2015 -0700
+++ b/components/openscap/Makefile	Tue Mar 24 15:51:54 2015 -0700
@@ -27,16 +27,16 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openscap
-COMPONENT_VERSION=	1.2.0
+COMPONENT_VERSION=	1.2.1
 COMPONENT_PROJECT_URL=  http://www.open-scap.org
 COMPONENT_DOWNLOAD_URL= https://fedorahosted.org/releases/o/p/openscap
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:88329ebf23e7c7d063cdb5615fe1f68b18fb436a0df81307c5acc3b5963d7cec
+COMPONENT_ARCHIVE_HASH= sha256:6f7fdc579c4c27554cc3ec99a4f16381b719faa8c9b3ea09575d872a2c46eedb
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=        utility/openscap
 
-TPNO=			20626
+TPNO=			201175
 
 CFLAGS+=		-std=c99
 CFLAGS+=		-DNDEBUG
--- a/components/openscap/openscap.p5m	Mon Mar 23 03:26:42 2015 -0700
+++ b/components/openscap/openscap.p5m	Tue Mar 24 15:51:54 2015 -0700
@@ -70,12 +70,12 @@
 file path=usr/include/openscap/xccdf_benchmark.h
 file path=usr/include/openscap/xccdf_policy.h
 file path=usr/include/openscap/xccdf_session.h
-link path=usr/lib/libopenscap.so target=libopenscap.so.8.4.0
-link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.4.0
-file path=usr/lib/libopenscap.so.8.4.0
-link path=usr/lib/libopenscap_sce.so target=libopenscap_sce.so.8.4.0
-link path=usr/lib/libopenscap_sce.so.8 target=libopenscap_sce.so.8.4.0
-file path=usr/lib/libopenscap_sce.so.8.4.0
+link path=usr/lib/libopenscap.so target=libopenscap.so.8.4.1
+link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.4.1
+file path=usr/lib/libopenscap.so.8.4.1
+link path=usr/lib/libopenscap_sce.so target=libopenscap_sce.so.8.4.1
+link path=usr/lib/libopenscap_sce.so.8 target=libopenscap_sce.so.8.4.1
+file path=usr/lib/libopenscap_sce.so.8.4.1
 file path=usr/lib/openscap/probe_dnscache
 file path=usr/lib/openscap/probe_environmentvariable
 file path=usr/lib/openscap/probe_environmentvariable58
@@ -1141,7 +1141,7 @@
 file path=usr/share/openscap/schemas/oval/5.11/aix-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/aix-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/android-definitions-schema.xsd
-file path=usr/share/openscap/schemas/oval/5.11/android-system-characteristics.xsd
+file path=usr/share/openscap/schemas/oval/5.11/android-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/apache-definitions-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/apache-system-characteristics-schema.xsd
 file path=usr/share/openscap/schemas/oval/5.11/apple-ios-definitions-schema.xsd
--- a/components/openscap/patches/smf.c.patch	Mon Mar 23 03:26:42 2015 -0700
+++ b/components/openscap/patches/smf.c.patch	Tue Mar 24 15:51:54 2015 -0700
@@ -2,10 +2,9 @@
 service_state, exec_as_user from the smf repository for the fmri that is
 provided.
 This patch has not been contributed upstream, but is planned to be done by
- 2013-Jul-12.
-
---- openscap-0.9.7/src/OVAL/probes/unix/solaris/smf.c.~1~	2013-04-23 06:21:51.479000001 -0700
-+++ openscap-0.9.7/src/OVAL/probes/unix/solaris/smf.c	2013-06-18 13:13:20.112012008 -0700
+ 2015-Mar-01.
+--- openscap-1.2.0/src/OVAL/probes/unix/solaris/smf.c.~1~	2013-03-21 08:27:20.051583517 -0700
++++ openscap-1.2.0/src/OVAL/probes/unix/solaris/smf.c	2015-02-18 10:06:03.709601923 -0800
 @@ -33,9 +33,240 @@
  #endif
  
@@ -145,8 +144,7 @@
 +collect_smf_info(char *fmri, probe_ctx *ctx)
 +{
 +	struct result_info r;
-+	int rc = 0, type;
-+	const char *service, *instance, *scope, *propgrp, *prop;
++	int rc = 0;
 +	char *tmp;
 +	scf_handle_t *scf_hdl = NULL;
 +	scf_instance_t *inst = NULL;
@@ -155,27 +153,11 @@
 +
 +	oscap_dlprintf(DBG_I, "In collect_smf_info.\n");
 +	memset(&r, 0, sizeof (r));
-+	r.service_name = strdup_check(fmri);
-+	tmp = r.service_name;
-+	scf_parse_fmri(r.service_name, &type, &scope, &service,
-+	    &instance, &propgrp, &prop);
-+	if (scf_error() == SCF_ERROR_INVALID_ARGUMENT) {
-+		rc = PROBE_EINVAL;
-+		goto cleanup;
-+	}
-+	if (instance == NULL)
-+		r.service_name = strdup(service);
-+	else /* service name is service:instance */
-+		asprintf(&r.service_name, "%s:%s", service, instance);
-+	if (r.service_name == NULL)
-+		exit(PROBE_ENOMEM);
-+	free(tmp);
 +	r.fmri = fmri;
 +	if ((scf_hdl = scf_handle_create(SCF_VERSION)) == NULL ||
 +	    scf_handle_bind(scf_hdl) != 0 ||
 +	    (svc = scf_service_create(scf_hdl)) == NULL ||
-+	    (instance != NULL &&
-+	    (inst = scf_instance_create(scf_hdl)) == NULL)) {
++	    (inst = scf_instance_create(scf_hdl)) == NULL) {
 +		rc = PROBE_EFATAL;
 +		goto cleanup;
 +	}
@@ -184,9 +166,8 @@
 +	    SCF_PROPERTY_STATE, &(r.service_state));
 +	if (scf_error() == SCF_ERROR_NOT_FOUND) {
 +		if (scf_handle_decode_fmri(scf_hdl, fmri, NULL, svc,
-+		    (instance == NULL ? NULL : inst),
-+		    NULL, NULL, SCF_DECODE_FMRI_EXACT) != 0 ||
-+			scf_error() == SCF_ERROR_NOT_FOUND) {
++		    inst, NULL, NULL, SCF_DECODE_FMRI_EXACT) != 0 || 
++		    scf_error() == SCF_ERROR_NOT_FOUND) {
 +			oscap_dlprintf(DBG_I,"decode_fmri failed.\n");
 +			goto cleanup;
 +		}
@@ -198,6 +179,24 @@
 +	    SCF_PROPERTY_EXEC, &(r.server_executable));
 +	get_smf_prop_val(scf_hdl, r.fmri, SCF_PG_START,
 +	    SCF_PROPERTY_USER, &(r.exec_as_user));
++	/*
++	 * At this point the fmri we have is valid because
++	 * we were able to locate it and get info on the
++	 * above listed properties. Now trying to parse
++	 * the fmri to only get the service:instance name.
++	 * So skipping the scope and service prefix. If we
++	 * did not find the scope and service prefix, we
++	 * return the full fmri that was passed in.
++	 */
++	if ((tmp = strstr(fmri, SCF_FMRI_SCOPE_PREFIX)) != NULL) 
++		tmp += sizeof(SCF_FMRI_SCOPE_PREFIX) - 1;
++	else
++		tmp = fmri;
++	if ((tmp = strstr(tmp, SCF_FMRI_SERVICE_PREFIX)) != NULL)
++		tmp += sizeof(SCF_FMRI_SERVICE_PREFIX) - 1;
++	else
++		tmp = fmri;
++	asprintf(&r.service_name, "%s", tmp);
 +	report_finding(&r, ctx);
 +	free(r.protocol);
 +	free(r.service_state);
--- a/components/openscap/patches/xccdf-branding.xsl.patch	Mon Mar 23 03:26:42 2015 -0700
+++ b/components/openscap/patches/xccdf-branding.xsl.patch	Tue Mar 24 15:51:54 2015 -0700
@@ -1,72 +1,68 @@
-This patch is required to generated oracle branded reports using
-openscap.
-This patch is not intended for upstream.
+This patch is specific to Oracle branding and will not be submitted upstream.
 
---- openscap-1.2.0/xsl/xccdf-branding.xsl.~1~	2014-10-21 10:40:31.095336311 -0700
-+++ openscap-1.2.0/xsl/xccdf-branding.xsl	2014-10-21 10:43:10.657535998 -0700
[email protected]@ -44,30 +44,76 @@
+--- openscap-1.2.1/xsl/xccdf-branding.xsl.~1~	2015-01-10 03:44:55.684466847 -0800
++++ openscap-1.2.1/xsl/xccdf-branding.xsl	2015-01-14 09:35:05.077056778 -0800
[email protected]@ -43,24 +43,67 @@
+     1) Round all positions to 1 decimal place
      2) Remove inkscape, RDF, DC and other metadata
-     3) Move repeated style declarations into CSS classes
      -->
--    <svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="240" height="55"><style>.style0{fill:#38393f;}.style1{fill:#12497f;}</style><defs/><g transform="matrix(0.75266991,0,0,0.75266991,-16.573637,-103.09218)"><g><g><path d="m 112.6 173.8 c 0 -11.6 3 -18.2 13.9 -18.2 10.9 0 13.9 6.6 13.9 18.2 0 12.1 -3 17.9 -13.9 17.9 -10.9 0 -13.9 -6.2 -13.9 -17.9 z m 23.7 0 c 0 -9.5 -1.8 -14.8 -9.9 -14.8 -8.1 0 -9.9 5.2 -9.9 14.8 0 9.6 1.7 14.5 9.9 14.5 8.2 0 9.9 -4.6 9.9 -14.5 z" class="style0"/><path d="m 146.9 165.8 h 3.8 v 1.8 c 0 0 3.9 -2.3 7.6 -2.3 6.4 0 9.2 3.9 9.2 12.9 0 10 -3.3 13.5 -11.1 13.5 -2.4 0 -5 -0.4 -5.7 -0.6 v 11.3 h -3.8 v -36.7 z m 3.8 4.9 v 17.1 c 0.7 0.1 3.3 0.6 5.5 0.6 5.6 0 7.4 -2.9 7.4 -10.2 0 -7 -2.2 -9.5 -5.9 -9.5 -3.5 0 -7 2 -7 2 z" class="style0"/><path d="m 192.5 187.9 0.1 3 c 0 0 -5.8 0.8 -9.9 0.8 -7.6 0 -10.1 -4.4 -10.1 -13.1 0 -9.7 4.2 -13.4 10.6 -13.4 6.8 0 10.2 3.6 10.2 11.9 l -0.2 2.9 h -16.8 c 0 5.4 1.7 8.3 6.7 8.3 3.8 -0 9.4 -0.5 9.4 -0.5 z m -2.8 -10.9 c 0 -6.3 -1.9 -8.5 -6.4 -8.5 -4.3 0 -6.8 2.4 -6.8 8.5 h 13.2 z" class="style0"/><path d="m 199.4 191.2 v -25.4 h 3.8 v 1.8 c 0 0 4.1 -2.3 7.9 -2.3 7 0 8.6 3.5 8.6 12.5 v 13.4 h -3.8 v -13.3 c 0 -6.7 -0.8 -9.2 -5.5 -9.2 -3.7 0 -7.2 1.9 -7.2 1.9 v 20.6 l -3.8 0 0 0 z" class="style0"/></g><g><path d="m 246.7 159.8 c 0 0 -7.1 -0.9 -10 -0.9 -5 0 -7.6 1.8 -7.6 5.7 0 4.6 2.4 5.3 8.6 6.7 7 1.6 10.1 3.3 10.1 9.5 0 7.8 -4.3 10.8 -11.2 10.8 -4.2 0 -11.1 -1.1 -11.1 -1.1 l 0.4 -3.3 c 0 0 6.9 0.9 10.5 0.9 5 0 7.5 -2.2 7.5 -7.1 0 -4 -2.1 -5.1 -7.8 -6.2 -7.3 -1.6 -10.9 -3.3 -10.9 -10 0 -6.8 4.5 -9.5 11.3 -9.5 4.2 0 10.6 1 10.6 1 l -0.4 3.3 z" class="style0"/><path d="m 275.8 190.7 c -2.5 0.5 -6.4 1.1 -9.7 1.1 -10.5 0 -12.9 -6.4 -12.9 -18 0 -11.9 2.3 -18.2 12.9 -18.2 3.6 0 7.5 0.7 9.7 1.1 l -0.2 3.3 c -2.3 -0.4 -6.4 -0.9 -9.1 -0.9 -7.8 0 -9.2 4.7 -9.2 14.7 0 9.8 1.3 14.5 9.3 14.5 2.8 0 6.6 -0.5 9 -0.9 l 0.2 3.4 z" class="style0"/><path d="m 288.8 156.1 h 8.5 l 9.7 35.2 h -3.9 l -2.5 -9.1 h -15 l -2.5 9.1 h -3.9 l 9.7 -35.2 z m -2.4 22.6 h 13.3 l -5.3 -19.3 h -2.6 l -5.3 19.3 z" class="style0"/><path d="m 316.4 179.4 v 11.8 h -3.9 V 156.1 h 12.9 c 7.7 0 11.2 3.7 11.2 11.3 0 7.7 -3.6 12 -11.2 12 h -8.9 z m 8.9 -3.5 c 5.1 0 7.3 -3.1 7.3 -8.5 0 -5.4 -2.1 -7.9 -7.3 -7.9 h -8.9 v 16.4 h 8.9 z" class="style0"/></g></g><g><path d="m 24.7 173.5 c 0 -9 3.5 -17.5 9.9 -23.9 6.8 -6.8 15.7 -10.4 25 -10 8.6 0.3 16.9 3.9 22.9 9.8 6.4 6.4 9.9 14.9 10 23.8 0.1 9.1 -3.5 17.8 -10 24.3 -13.2 13.2 -34.7 13.1 -48 -0.1 -1.5 -1.5 -1.9 -4.2 0.2 -6.2 l 9 -9 c -2 -3.6 -4.9 -13.1 2.6 -20.7 7.6 -7.6 18.6 -6 24.4 -0.2 3.3 3.3 5.1 7.6 5.1 12.1 0.1 4.6 -1.8 9.1 -5.3 12.5 -4.2 4.2 -10.2 5.8 -16.1 4.4 -1.5 -0.4 -2.4 -1.9 -2.1 -3.4 0.4 -1.5 1.9 -2.4 3.4 -2.1 4.1 1 8 -0.1 10.9 -2.9 2.3 -2.3 3.6 -5.3 3.6 -8.4 0 -0 0 -0.1 0 -0.1 -0 -3 -1.3 -5.9 -3.5 -8.2 -3.9 -3.9 -11.3 -4.9 -16.5 0.2 -6.3 6.3 -1.6 14.1 -1.6 14.2 1.5 2.4 0.7 5 -0.9 6.3 l -8.4 8.4 c 9.9 8.9 27.2 11.2 39.1 -0.8 5.4 -5.4 8.4 -12.5 8.4 -20 0 -0.1 0 -0.2 -0 -0.3 -0.1 -7.5 -3 -14.6 -8.4 -19.9 -5 -5 -11.9 -8 -19.1 -8.2 -7.8 -0.3 -15.2 2.7 -20.9 8.4 -8.7 8.7 -8.7 19 -7.9 24.3 0.3 2.4 1.1 4.9 2.2 7.3 0.6 1.4 0 3.1 -1.4 3.7 -1.4 0.6 -3.1 0 -3.7 -1.4 -1.3 -2.9 -2.2 -5.8 -2.6 -8.7 -0.3 -1.7 -0.4 -3.5 -0.4 -5.2 z" class="style1"/></g></g></svg>
-+<svg 
-+     version="1.1" 
-+     xmlns="http://www.w3.org/2000/svg" 
-+     xmlns:xlink="http://www.w3.org/1999/xlink" 
-+     width="100px" height="49px" 
-+     viewBox="0 0 100 49" preserveAspectRatio="none"> 
-+   <g> 
-+<image width="100" height="49" xlink:href="data:image/png;base64, 
-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
-+"/> 
-+   </g> 
-+</svg>	
-+
+-
+-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="52" height="52" id="svg2"><g transform="matrix(0.75266991,0,0,0.75266991,-17.752968,-104.57468)" id="g32"><path d="m 24.7,173.5 c 0,-9 3.5,-17.5 9.9,-23.9 6.8,-6.8 15.7,-10.4 25,-10 8.6,0.3 16.9,3.9 22.9,9.8 6.4,6.4 9.9,14.9 10,23.8 0.1,9.1 -3.5,17.8 -10,24.3 -13.2,13.2 -34.7,13.1 -48,-0.1 -1.5,-1.5 -1.9,-4.2 0.2,-6.2 l 9,-9 c -2,-3.6 -4.9,-13.1 2.6,-20.7 7.6,-7.6 18.6,-6 24.4,-0.2 3.3,3.3 5.1,7.6 5.1,12.1 0.1,4.6 -1.8,9.1 -5.3,12.5 -4.2,4.2 -10.2,5.8 -16.1,4.4 -1.5,-0.4 -2.4,-1.9 -2.1,-3.4 0.4,-1.5 1.9,-2.4 3.4,-2.1 4.1,1 8,-0.1 10.9,-2.9 2.3,-2.3 3.6,-5.3 3.6,-8.4 0,0 0,-0.1 0,-0.1 0,-3 -1.3,-5.9 -3.5,-8.2 -3.9,-3.9 -11.3,-4.9 -16.5,0.2 -6.3,6.3 -1.6,14.1 -1.6,14.2 1.5,2.4 0.7,5 -0.9,6.3 l -8.4,8.4 c 9.9,8.9 27.2,11.2 39.1,-0.8 5.4,-5.4 8.4,-12.5 8.4,-20 0,-0.1 0,-0.2 0,-0.3 -0.1,-7.5 -3,-14.6 -8.4,-19.9 -5,-5 -11.9,-8 -19.1,-8.2 -7.8,-0.3 -15.2,2.7 -20.9,8.4 -8.7,8.7 -8.7,19 -7.9,24.3 0.3,2.4 1.1,4.9 2.2,7.3 0.6,1.4 0,3.1 -1.4,3.7 -1.4,0.6 -3.1,0 -3.7,-1.4 -1.3,-2.9 -2.2,-5.8 -2.6,-8.7 -0.3,-1.7 -0.4,-3.5 -0.4,-5.2 z" id="path34" style="fill:#12497f"/></g></svg>
++<svg
++     version="1.1"
++     xmlns="http://www.w3.org/2000/svg"
++     xmlns:xlink="http://www.w3.org/1999/xlink"
++     width="100px" height="49px"
++     viewBox="0 0 100 49" preserveAspectRatio="none">
++   <g>
++<image alt="Oracle Solaris" width="100" height="49"
++ xlink:href="data:image/png;base64,
++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"/> </g> </svg>
  </xsl:template>
  
  <xsl:template name="xccdf-report-header">
      <nav class="navbar navbar-default" role="navigation">
--        <div class="navbar-header">
-+        <div class="navbar-header" style="width:100%; height:100%; padding-bottom:5px;">
+-        <div class="navbar-header" style="float: none">
++	 <div class="navbar-header" style="width:100%; height:100%; padding-bottom:5px; float:none">
              <a class="navbar-brand" href="#">
                  <xsl:call-template name="xccdf-branding-logo"/>
              </a>
--            <div style="padding-left: 270px !important"><h1>Evaluation Report</h1></div>
-+            <div style="padding-left:30px; text-align:left;"><h2>Compliance Report</h2></div>
+-            <div><h1>OpenSCAP Evaluation Report</h1></div>
++	<div style="padding-left:30px; text-align:left;"><h2>Compliance Report</h2></div>
          </div>
      </nav>
  </xsl:template>
@@ -74,15 +70,43 @@
  <xsl:template name="xccdf-report-footer">
      <footer id="footer">
 -        <div class="container">
-+        <!--<div class="container">
++        <!--
++	 <div class="container">
              <p class="muted credit">
                  Generated using <a href="http://open-scap.org">OpenSCAP</a>
                  <xsl:if test="$oscap-version">
-                     <xsl:value-of select="concat(' ', $oscap-version)"/>
[email protected]@ -68,22 +110,24 @@
                  </xsl:if>
              </p>
--        </div>
-+        </div> -->
+         </div>
++	 -->
      </footer>
  </xsl:template>
  
+ <xsl:template name="xccdf-guide-header">
+     <nav class="navbar navbar-default" role="navigation">
+-        <div class="navbar-header" style="float: none">
++	 <div class="navbar-header" style="width:100%; height:100%; padding-bottom:5px;float:none">
+             <a class="navbar-brand" href="#">
+                 <xsl:call-template name="xccdf-branding-logo"/>
+             </a>
+-            <div><h1>OpenSCAP Security Guide</h1></div>
++	<div style="padding-left:30px; text-align:left;"><h2>Security Guide</h2></div>
+         </div>
+     </nav>
+ </xsl:template>
+ 
+ <xsl:template name="xccdf-guide-footer">
+     <footer id="footer">
++	<!--
+         <div class="container">
+             <p class="muted credit">
+                 Generated using <a href="http://open-scap.org">OpenSCAP</a>
[email protected]@ -92,6 +136,7 @@
+                 </xsl:if>
+             </p>
+         </div>
++	 -->
+     </footer>
+ </xsl:template>
+ 
--- a/components/openscap/patches/xccdf-report-guide.xsl.patch	Mon Mar 23 03:26:42 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-This patch fixes an issue that was found in openscap 1.1.1+ when
-libxml2 is upgraded to ver 2.9.2. It fixes the errors, that were
-reported as entities already defined, showing up in the report
-and guide generation.
-This patch has not been contributed upstream, but is planned to be
-done by 2015-Jan-31.
-
---- openscap-1.2.0/xsl/xccdf-report-impl.xsl.~1~	2014-09-26 01:41:04.068164604 -0700
-+++ openscap-1.2.0/xsl/xccdf-report-impl.xsl	2014-12-10 10:51:48.443071716 -0800
[email protected]@ -49,7 +49,7 @@
-     <xsl:param name="testresult"/>
-     <xsl:param name="benchmark"/>
- 
--    <div id="characteristics"><a name="characteristics"></a>
-+    <div id="characteristics">
-         <h2>Evaluation Characteristics</h2>
-         <div class="row">
-             <div class="col-md-5 well well-lg">
[email protected]@ -172,7 +172,7 @@
- <xsl:template name="compliance-and-scoring">
-     <xsl:param name="testresult"/>
- 
--    <div id="compliance-and-scoring"><a name="compliance-and-scoring"></a>
-+    <div id="compliance-and-scoring">
-         <h2>Compliance and Scoring</h2>
- 
-         <xsl:variable name="total_rules_count" select="count($testresult/cdf:rule-result[cdf:result])"/>
[email protected]@ -376,7 +376,7 @@
-     <xsl:param name="benchmark"/>
-     <xsl:param name="profile"/>
- 
--    <div id="rule-overview"><a name="rule-overview"></a>
-+    <div id="rule-overview">
-         <h2>Rule Overview</h2>
- 
-         <div class="form-group js-only">
[email protected]@ -589,7 +589,6 @@
-             </xsl:for-each>
-         </div>
-         <div class="panel-heading">
--            <a name="rule-detail-{generate-id($ruleresult)}"></a>
-             <h3 class="panel-title">
-                 <xsl:call-template name="item-title">
-                     <xsl:with-param name="item" select="$item"/>
[email protected]@ -695,7 +694,7 @@
-     <div class="js-only">
-         <button type="button" class="btn btn-info" onclick="return toggleResultDetails(this)">Show all result details</button>
-     </div>
--    <div id="result-details"><a name="result-details"></a>
-+    <div id="result-details">
-         <h2>Result Details</h2>
- 
-         <xsl:call-template name="result-details-inner-node">
---- openscap-1.2.0/xsl/xccdf-guide-impl.xsl.~1~	2014-09-26 01:41:04.067164602 -0700
-+++ openscap-1.2.0/xsl/xccdf-guide-impl.xsl	2014-12-10 10:49:08.479661674 -0800
[email protected]@ -47,7 +47,7 @@
-     <xsl:param name="benchmark"/>
-     <xsl:param name="profile"/>
- 
--    <div id="introduction"><a name="introduction"></a>
-+    <div id="introduction">
-         <div class="row">
-             <div class="col-md-8 well well-lg">
-                 <h2>
[email protected]@ -415,7 +415,7 @@
-     <xsl:param name="benchmark"/>
-     <xsl:param name="profile"/>
- 
--    <div id="guide-tree"><a name="guide-tree"></a>
-+    <div id="guide-tree">
-         <h2>Checklist</h2>
- 
-         <table class="treetable table table-bordered">
[email protected]@ -434,7 +434,7 @@
-     <xsl:param name="benchmark"/>
-     <xsl:param name="profile"/>
- 
--    <div id="rear-matter"><a name="rear-matter"></a>
-+    <div id="rear-matter">
-         <div class="row">
-             <div class="col-md-12 well well-lg">
-                 <xsl:if test="$benchmark/cdf:rear-matter">
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/patches/xccdf-report-impl.xsl.patch	Tue Mar 24 15:51:54 2015 -0700
@@ -0,0 +1,33 @@
+This patch fixes the report to show the benchmark title, description
+and version. This patch will be submitted upstream by 2015-Mar-01.
+
+--- openscap-1.2.1/xsl/xccdf-report-impl.xsl.~1~	2015-02-19 13:30:29.206052042 -0800
++++ openscap-1.2.1/xsl/xccdf-report-impl.xsl	2015-02-19 13:30:47.352544165 -0800
[email protected]@ -60,15 +60,21 @@
+                             <xsl:value-of select="$testresult/cdf:target/text()"/>
+                         </td>
+                     </tr>
+-                    <xsl:if test="$testresult/cdf:benchmark">
++                    <xsl:if test="$benchmark/cdf:title">
+                         <tr>
+-                            <th>Benchmark URL</th>
+-                            <td><xsl:value-of select="$testresult/cdf:benchmark/@href"/></td>
++                            <th>Benchmark Title</th>
++                            <td><xsl:value-of select="$benchmark/cdf:title"/></td>
+                         </tr>
+-                        <xsl:if test="$testresult/cdf:benchmark/@id">
++                        <xsl:if test="$benchmark/cdf:version">
+                             <tr>
+-                                <th>Benchmark ID</th>
+-                                <td><xsl:value-of select="$testresult/cdf:benchmark/@id"/></td>
++                                <th>Benchmark Version</th>
++                                <td><xsl:value-of select="$benchmark/cdf:version"/></td>
++                            </tr>
++                        </xsl:if>
++                        <xsl:if test="$benchmark/cdf:description">
++                            <tr>
++                                <th>Benchmark Description</th>
++                                <td><xsl:value-of select="$benchmark/cdf:description"/></td>
+                             </tr>
+                         </xsl:if>
+                     </xsl:if>