17859035 upgrade openscap-0.9.7 to openscap-1.0.0 s11-update
authorJacob Varughese <jacob.varughese@oracle.com>
Wed, 26 Feb 2014 12:49:08 -0800
branchs11-update
changeset 2971 5d740e74b68b
parent 2969 f8d4fd8116f7
child 2972 60456e7be821
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
components/openscap/Makefile
components/openscap/openscap-perl-512.p5m
components/openscap/openscap-python-26.p5m
components/openscap/openscap.license
components/openscap/openscap.p5m
components/openscap/patches/os-brand.patch
components/openscap/patches/port097.patch
components/openscap/patches/port1.0.0.patch
--- a/components/openscap/Makefile	Wed Feb 26 08:10:44 2014 -0800
+++ b/components/openscap/Makefile	Wed Feb 26 12:49:08 2014 -0800
@@ -19,24 +19,25 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		openscap
-COMPONENT_VERSION=	0.9.7
+COMPONENT_VERSION=	1.0.0
 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:0d9ae804026d69e60d44e27cf489e65dd1c2865895cde2cb174ff90fd7868a6a
+COMPONENT_ARCHIVE_HASH= sha256:47105500b8b3d80cdf07b277bfab59091de5eadb16d97d27ee663bfbee58cb76
 COMPONENT_ARCHIVE_URL=  $(COMPONENT_DOWNLOAD_URL)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=        utility/openscap
 
 COMPILER=		gcc3
 CFLAGS+=		-std=c99
 CFLAGS+=		-DNDEBUG
+CFLAGS+=		-DOSCAP_THREAD_SAFE
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/openscap/openscap-perl-512.p5m	Wed Feb 26 08:10:44 2014 -0800
+++ b/components/openscap/openscap-perl-512.p5m	Wed Feb 26 12:49:08 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -27,7 +27,7 @@
     value="Perl 5.12 bindings for the Open implementation of SCAP"
 set name=com.oracle.info.description \
     value="Perl 5.12 bindings for the Open implementation of SCAP"
-set name=com.oracle.info.tpno value=13530
+set name=com.oracle.info.tpno value=16560
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -37,4 +37,4 @@
 
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/_openscap_pm.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/openscap.pm
-license openscap.license license=LGPLv2.1
+license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
--- a/components/openscap/openscap-python-26.p5m	Wed Feb 26 08:10:44 2014 -0800
+++ b/components/openscap/openscap-python-26.p5m	Wed Feb 26 12:49:08 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -27,7 +27,7 @@
     value="Python 2.6 bindings for the Open implementation of SCAP"
 set name=com.oracle.info.description \
     value="the Python 2.6 bindings for the Open implementation of SCAP"
-set name=com.oracle.info.tpno value=13530
+set name=com.oracle.info.tpno value=16560
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -38,7 +38,7 @@
 file path=usr/lib/python2.6/vendor-packages/_openscap_py.so
 file path=usr/lib/python2.6/vendor-packages/openscap.py
 file path=usr/lib/python2.6/vendor-packages/openscap_api.py
-license openscap.license license=LGPLv2.1
+license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
 
 # force a dependency on the Python 2.6 runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
--- a/components/openscap/openscap.license	Wed Feb 26 08:10:44 2014 -0800
+++ b/components/openscap/openscap.license	Wed Feb 26 12:49:08 2014 -0800
@@ -1,5 +1,33 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+Copyright ® 2002-2014, The MITRE Corporation.
+Except as permitted below, all rights reserved.
+Open Vulnerability and Assessment Language (OVAL®) License
+
+Your use of OVAL is conditioned upon acceptance of the following terms and conditions:
+
+OVAL is comprised of the OVAL Language, OVAL Content, and the OVAL Repository each is defined below:
+
+    The OVAL Language serves as the framework and vocabulary of OVAL. The Language covers the three steps of the assessment process: an OVAL System Characteristics schema for representing system information, an OVAL Definition schema for expressing a specific machine state, and an OVAL Results schema for reporting the results of an assessment.
+    OVAL Content is content written in the OVAL Language. All content written in the OVAL Language is considered OVAL Content.
+    The OVAL Repository is a collection of OVAL Content hosted by The MITRE Corporation. It is the central meeting place for the OVAL Community to discuss, analyze, store, and disseminate OVAL Definitions. Each definition in the OVAL Repository determines whether a specified software vulnerability, configuration issue, program, or patch is present on a system.
+
+The MITRE Corporation (MITRE) hereby grants you a non-exclusive, royalty-free license to use OVAL for research, development, and commercial purposes. Any copy you make for such purposes is authorized provided that you reproduce MITRE’s copyright designation and this license in any such copy.
+
+The OVAL Language is the copyrighted work of MITRE. No ownership or other proprietary interest in the OVAL Language is granted to you other than what is granted in this license.
+
+OVAL Content, whether already in the OVAL Repository hosted by MITRE or developed by you and sent to MITRE via the discussion forums or any other means to be deposited into the OVAL Repository, is fully available for public use free of charge. In addition, to the extent that contributed OVAL Content involves pre-existing copyrighted works, you hereby grant to MITRE an irrevocable, worldwide, royalty-free, non-exclusive, license, for the duration of the copyright, to do the following:
+
+    to reproduce such OVAL Content, either alone or as part of a collective work;
+    to translate, adapt, alter, transform, modify, or arrange such OVAL Content, thereby creating derivative works ("Derivative Works"); and
+    to distribute, display, or communicate copies of such OVAL Content to the public free of charge.
+
+ALL DOCUMENTS AND THE INFORMATION CONTAINED THEREIN ARE PROVIDED ON AN "AS IS" BASIS AND THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS OR IS SPONSORED BY (IF ANY), THE MITRE CORPORATION, ITS BOARD OF TRUSTEES, OFFICERS, AGENTS, AND EMPLOYEES, DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION THEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+You understand that any export of the OVAL Language, OVAL Content, or OVAL Repository may require an export license and you assume full responsibility for obtaining such license.
+
+This License shall be construed, governed, interpreted and applied in accordance with the laws of the Commonwealth of Virginia without regard to Virginia conflict of law rules and you agree to submit to the exclusive jurisdiction of the Virginia courts.
+
+      GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +38,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +140,7 @@
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +174,7 @@
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +460,7 @@
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +483,7 @@
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -501,4 +529,68 @@
 
 That's all there is to it!
 
+GNU LESSER GENERAL PUBLIC LICENSE
 
+Version 3, 29 June 2007
+
+Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
+0. Additional Definitions.
+
+As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.
+
+“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+
+An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+
+A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.
+
+The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+
+The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+1. Exception to Section 3 of the GNU GPL.
+
+You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+2. Conveying Modified Versions.
+
+If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+
+    a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+    b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+
+3. Object Code Incorporating Material from Library Header Files.
+
+The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+
+    a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+    b) Accompany the object code with a copy of the GNU GPL and this license document.
+
+4. Combined Works.
+
+You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+
+    a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+    b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+    c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+    d) Do one of the following:
+        0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+        1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+    e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+
+5. Combined Libraries.
+
+You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+
+    a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+    b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+
+6. Revised Versions of the GNU Lesser General Public License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.
--- a/components/openscap/openscap.p5m	Wed Feb 26 08:10:44 2014 -0800
+++ b/components/openscap/openscap.p5m	Wed Feb 26 12:49:08 2014 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,7 +28,7 @@
 set name=pkg.summary \
     value="Open implementation of SCAP; a line of standards managed by NIST"
 set name=com.oracle.info.description value="the Open implementation of SCAP"
-set name=com.oracle.info.tpno value=13530
+set name=com.oracle.info.tpno value=16560
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -63,9 +63,12 @@
 file path=usr/include/openscap/sce_engine_api.h
 file path=usr/include/openscap/xccdf_benchmark.h
 file path=usr/include/openscap/xccdf_policy.h
-link path=usr/lib/libopenscap.so target=libopenscap.so.3.2.1
-link path=usr/lib/libopenscap.so.3 target=libopenscap.so.3.2.1
-file path=usr/lib/libopenscap.so.3.2.1
+link path=usr/lib/libopenscap.so target=libopenscap.so.8.0.1
+link path=usr/lib/libopenscap.so.8 target=libopenscap.so.8.0.1
+file path=usr/lib/libopenscap.so.8.0.1
+link path=usr/lib/libopenscap_sce.so target=libopenscap_sce.so.8.0.1
+link path=usr/lib/libopenscap_sce.so.8 target=libopenscap_sce.so.8.0.1
+file path=usr/lib/libopenscap_sce.so.8.0.1
 file path=usr/lib/openscap/probe_dnscache
 file path=usr/lib/openscap/probe_environmentvariable
 file path=usr/lib/openscap/probe_environmentvariable58
@@ -535,7 +538,7 @@
 file path=usr/share/openscap/xsl/xccdf-substitute.xsl
 file path=usr/share/openscap/xsl/xccdf-tailor.xsl
 file path=usr/share/openscap/xsl/xccdf_1.1_to_1.2.xsl
-license openscap.license license=LGPLv2.1
+license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
 
 # Bring in the language bindings if the language platforms are installed.
 depend type=conditional \
--- a/components/openscap/patches/os-brand.patch	Wed Feb 26 08:10:44 2014 -0800
+++ b/components/openscap/patches/os-brand.patch	Wed Feb 26 12:49:08 2014 -0800
@@ -24,45 +24,6 @@
 +             xccdf-share.xsl \
 +             os-brand.xsl
 
---- openscap-0.9.7/xsl/xccdf-report.xsl.~1~	2013-04-23 06:21:53.014000001 -0700
-+++ openscap-0.9.7/xsl/xccdf-report.xsl	2013-10-17 20:37:01.886707203 -0700
[email protected]@ -40,6 +40,7 @@
- <xsl:import href="security-guide.xsl" />
- <xsl:import href="oval-report.xsl" />
- <xsl:import href="sce-report.xsl" />
-+<xsl:import href="os-brand.xsl" />
- 
- <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
- 
[email protected]@ -134,7 +135,14 @@
-         id='{@id}'
-     >
-     <info>
--        <title>XCCDF test result</title>
-+	<xsl:choose>
-+	  <xsl:when test="$branded='yes'" >
-+	    <title>XCCDF Assessment Report</title>
-+	  </xsl:when>
-+	  <xsl:otherwise>
-+	    <title>XCCDF Test Report</title>
-+	  </xsl:otherwise>
-+	</xsl:choose>
-         <xsl:call-template name='footerinfo'/>
-     </info>
- 
[email protected]@ -348,8 +356,10 @@
-     <xsl:call-template name='idents'/>
-     <!-- overrides (n) -->
-     <!-- messages (n) -->
--    <xsl:apply-templates select='$rule/cdf:fixtext[1]'/>
--    <xsl:apply-templates select='($rule/cdf:fix|cdf:fix)[last()]'/>
-+	<xsl:if test="cdf:result='fail'" >
-+	  <xsl:apply-templates select='$rule/cdf:fixtext[1]'/>
-+	  <xsl:apply-templates select='($rule/cdf:fix|cdf:fix)[last()]'/>
-+        </xsl:if>
-     <xsl:apply-templates select='.' mode='engine-results'/>
-     <xsl:call-template name='references'/>
-   </section>
 --- /dev/null	2013-10-17 20:38:34.000000000 -0700
 +++ openscap-0.9.7/xsl/os-brand.xsl.in	2013-10-17 20:57:48.565359270 -0700
 @@ -0,0 +1,5 @@
@@ -181,51 +142,75 @@
      a, a:visited { color:blue; text-decoration:underline; }
      div#content p.link { text-align:right; font-size:.8em; }
      div#footer a { color:white; }
---- openscap-0.9.7/xsl/oval-results-report.xsl.~1~	2013-04-23 06:21:53.012000001 -0700
-+++ openscap-0.9.7/xsl/oval-results-report.xsl	2013-10-21 11:48:29.340966226 -0700
[email protected]@ -63,6 +63,8 @@
- 	xmlns:ind-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" xmlns:windows-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows"
- 	xmlns:unix-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" xmlns:linux-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
- 	<xsl:output method="html" indent="yes" omit-xml-declaration="yes"/>
-+       
-+        <xsl:include href='os-brand.xsl'/>
+--- openscap-1.0.0/xsl/oval-results-report.xsl.~1~	2013-11-09 23:53:15.704238495 -0800
++++ openscap-1.0.0/xsl/oval-results-report.xsl	2013-11-25 09:52:24.057654433 -0800
[email protected]@ -79,6 +79,8 @@
+ 	<xsl:output method="xml" indent="yes" omit-xml-declaration="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+ 	<xsl:key name="definition-index" use="@id" match="//oval-def:oval_definitions/oval-def:definitions/oval-def:definition"/>
  
- 	<xsl:key name="definition-index" use="@id" match="/oval-res:oval_results/oval-def:oval_definitions/oval-def:definitions/oval-def:definition"/>
- 
[email protected]@ -70,7 +72,15 @@
++        <xsl:include href='os-brand.xsl' />
++
+ 	<!-- Style declarations for pretty formatting -->
  	<xsl:template name="oval_res_style">
  		<style type="text/css">
- 
-+<xsl:choose>
-+    <xsl:when test="$branded='yes'" >
-+TD.title {BACKGROUND-COLOR: #FF0000; COLOR: #ffc; TEXT-ALIGN: left; font: bold 12pt/14pt "Arial"}
-+DIV.header { background-color: red }
-+    </xsl:when>
-+    <xsl:otherwise>
- TD.title {BACKGROUND-COLOR: #000000; COLOR: #ffc; TEXT-ALIGN: left; font: bold 12pt/14pt "Arial"} 
-+    </xsl:otherwise>
-+  </xsl:choose>
- TD.label {BACKGROUND-COLOR: #99cc99; font: 10pt/12pt "Arial"}
- TD.label2 {font: bold 10pt/14pt "Arial"}
- TD.text {font: 10pt/12pt "Arial"}
[email protected]@ -173,6 +183,20 @@
[email protected]@ -202,6 +204,21 @@
  				<xsl:call-template name="oval_res_style"/>
  			</head>
  			<body>
 +                               <xsl:choose>
 +                                 <xsl:when test="$branded='yes'" >
-+				   <div class="header">
-+				      <table width="100%" background-color="red">
-+					  <tr>
-+					      <td>
-+					      <xsl:call-template name='operating-system-logo'/>
-+					      </td>
-+					  </tr>
-+				      </table>
-+				   </div>
-+				   <br/>
++                                  <div class="header">
++                                     <table width="100%" background-color="red">
++                                         <tr>
++                                             <td>
++                                             <xsl:call-template name='operating-system-logo'/>
++                                             </td>
++                                         </tr>
++                                     </table>
++                                  </div>
++                                  <br/>
 +                                 </xsl:when>
 +                               </xsl:choose>
- 								
++
  				<!-- display results and definition generator information -->
- 				<table border="1" cellpadding="0" cellspacing="0" width="100%">
+ 				<table class="noborder nomargin">
+ 					<tr>
+--- openscap-1.0.0/xsl/xccdf-report.xsl.~1~	2013-11-09 23:53:15.704238495 -0800
++++ openscap-1.0.0/xsl/xccdf-report.xsl	2013-12-11 08:28:42.382923806 -0800
[email protected]@ -40,6 +40,7 @@
+ <xsl:import href="security-guide.xsl" />
+ <xsl:import href="oval-report.xsl" />
+ <xsl:import href="sce-report.xsl" />
++<xsl:import href="os-brand.xsl" />
+ 
+ <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+ 
[email protected]@ -134,7 +135,14 @@
+         id='{@id}'
+     >
+     <info>
+-        <title>XCCDF Test Result</title>
++        <xsl:choose>
++          <xsl:when test="$branded='yes'" >
++            <title>Compliance Report</title>
++          </xsl:when>
++          <xsl:otherwise>
++            <title>XCCDF Test Report</title>
++          </xsl:otherwise>
++        </xsl:choose>
+         <xsl:call-template name='footerinfo'/>
+     </info>
+ 
[email protected]@ -348,8 +356,10 @@
+     <xsl:call-template name='idents'/>
+     <!-- overrides (n) -->
+     <!-- messages (n) -->
+-    <xsl:apply-templates select='$rule/cdf:fixtext[1]'/>
+-    <xsl:apply-templates select='($rule/cdf:fix|cdf:fix)[last()]'/>
++        <xsl:if test="cdf:result='fail'" >
++          <xsl:apply-templates select='$rule/cdf:fixtext[1]'/>
++          <xsl:apply-templates select='($rule/cdf:fix|cdf:fix)[last()]'/>
++        </xsl:if>
+     <xsl:apply-templates select='.' mode='engine-results'/>
+     <xsl:call-template name='references'/>
+   </section>
--- a/components/openscap/patches/port097.patch	Wed Feb 26 08:10:44 2014 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-This patch provides ports for oscap-info.c, sce_engince.c,
-xccdf_policy.c for solaris.
-This patch has not been contributed upstream, but is planned to be done by
- 2013-Jul-12.
-
---- openscap-0.9.7/utils/oscap-info.c.~1~	2012-12-14 02:13:18.113881933 -0800
-+++ openscap-0.9.7/utils/oscap-info.c	2013-01-16 09:55:13.348770490 -0800
[email protected]@ -34,7 +34,11 @@
- #include <time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#if defined(__SVR4) && defined (__sun)
-+#include <limits.h>
-+#else
- #include <linux/limits.h>
-+#endif
- 
- #include <oscap.h>
- #include <oval_results.h>
---- openscap-0.9.7/src/SCE/sce_engine.c.~1~	2013-02-25 06:14:51.840092360 -0800
-+++ openscap-0.9.7/src/SCE/sce_engine.c	2013-04-03 15:31:16.479290382 -0700
[email protected]@ -52,7 +52,11 @@
- {
- 	char* href;
- 	char* basename;
-+#if defined(__SVR4) && defined(__sun)
-+	char* std_out;
-+#else
- 	char* stdout;
-+#endif
- 	int exit_code;
- 	struct oscap_stringlist* environment_variables;
- 	xccdf_test_result_type_t xccdf_result;
[email protected]@ -63,7 +67,11 @@
- 	struct sce_check_result* ret = oscap_alloc(sizeof(struct sce_check_result));
- 	ret->href = NULL;
- 	ret->basename = NULL;
-+#if defined(__SVR4) && defined(__sun)
-+	ret->std_out = NULL;
-+#else
- 	ret->stdout = NULL;
-+#endif
- 	ret->environment_variables = oscap_stringlist_new();
- 	ret->xccdf_result = XCCDF_RESULT_UNKNOWN;
- 
[email protected]@ -79,8 +87,13 @@
- 		oscap_free(v->href);
- 	if (v->basename)
- 		oscap_free(v->basename);
-+#if defined(__SVR4) && defined(__sun)
-+	if (v->std_out)
-+		oscap_free(v->std_out);
-+#else
- 	if (v->stdout)
- 		oscap_free(v->stdout);
-+#endif
- 
- 	oscap_stringlist_free(v->environment_variables);
- 
[email protected]@ -115,15 +128,24 @@
- 
- void sce_check_result_set_stdout(struct sce_check_result* v, const char* _stdout)
- {
-+#if defined(__SVR4) && defined(__sun)
-+	if (v->std_out)
-+		oscap_free(v->std_out);
-+	v->std_out = oscap_strdup(_stdout);
-+#else
- 	if (v->stdout)
- 		oscap_free(v->stdout);
--
- 	v->stdout = oscap_strdup(_stdout);
-+#endif
- }
- 
- const char* sce_check_result_get_stdout(struct sce_check_result* v)
- {
-+#if defined(__SVR4) && defined(__sun)
-+	return v->std_out;
-+#else
- 	return v->stdout;
-+#endif
- }
- 
- void sce_check_result_set_exit_code(struct sce_check_result* v, int exit_code)
[email protected]@ -178,7 +200,11 @@
- 	oscap_string_iterator_free(it);
- 	fprintf(f, "\t</sceres:environment>\n");
- 	fprintf(f, "\t<sceres:stdout><![CDATA[\n");
-+#if defined(__SVR4) && defined(__sun)
-+	fwrite(v->std_out, 1, strlen(v->std_out), f);
-+#else
- 	fwrite(v->stdout, 1, strlen(v->stdout), f);
-+#endif
- 	fprintf(f, "\t]]></sceres:stdout>\n");
- 	fprintf(f, "\t<sceres:exit_code>%i</sceres:exit_code>\n", sce_check_result_get_exit_code(v));
- 	fprintf(f, "\t<sceres:result>%s</sceres:result>\n", xccdf_test_result_type_get_text(sce_check_result_get_xccdf_result(v)));
---- openscap-0.9.7/src/XCCDF_POLICY/xccdf_policy.c.~1~	2013-03-19 07:58:22.307735235 -0700
-+++ openscap-0.9.7/src/XCCDF_POLICY/xccdf_policy.c	2013-04-03 15:35:39.100347346 -0700
[email protected]@ -521,7 +521,11 @@
-             if (r_value != NULL) {
-                 selector = xccdf_refine_value_get_selector(r_value);
-                 /* This refine value changes the value content */
-+#if defined(__SVR4) && defined(__sun)
-+                if (!isnan((double)xccdf_refine_value_get_oper(r_value))) {
-+#else
-                 if (!isnan(xccdf_refine_value_get_oper(r_value))) {
-+#endif
-                     binding->operator = xccdf_refine_value_get_oper(r_value);
-                 } else binding->operator = xccdf_value_get_oper(value);
- 
[email protected]@ -2142,9 +2146,17 @@
-                 
-             } else if (xccdf_item_get_type(item) == XCCDF_RULE) {
-                 /* Perform all changes in rule */
-+#if defined(__SVR4) && defined(__sun)
-+                if (!isnan((double)xccdf_refine_rule_get_role(r_rule)))
-+#else
-                 if (!isnan(xccdf_refine_rule_get_role(r_rule)))
-+#endif
-                     xccdf_rule_set_role((struct xccdf_rule *) item, xccdf_refine_rule_get_role(r_rule));
-+#if defined(__SVR4) && defined(__sun)
-+                if (!isnan((double)xccdf_refine_rule_get_severity(r_rule)))
-+#else
-                 if (!isnan(xccdf_refine_rule_get_severity(r_rule)))
-+#endif
-                     xccdf_rule_set_severity((struct xccdf_rule *) item, xccdf_refine_rule_get_severity(r_rule));
- 
-             } else {}/* TODO oscap_err ? */;
[email protected]@ -2201,7 +2213,11 @@
-     const struct xccdf_version_info* version_info = xccdf_benchmark_get_schema_version(benchmark);
-     doc_version = xccdf_version_info_get_version(version_info);
- 
-+#ifdef __USE_GNU
-     if (strverscmp("1.2", doc_version) >= 0)
-+#else
-+    if (strcmp("1.2", doc_version) >= 0)
-+#endif
-     {
-         // we have to enforce a certain type of ids for XCCDF 1.2+
- 
[email protected]@ -2376,9 +2392,17 @@
-             if (r_rule == NULL) return item;
- 
-             new_item = (struct xccdf_item *) xccdf_rule_clone((struct xccdf_rule *) item);
-+#if defined(__SVR4) && defined(__sun)
-+            if (!isnan((double)xccdf_refine_rule_get_role(r_rule)))
-+#else
-             if (!isnan(xccdf_refine_rule_get_role(r_rule)))
-+#endif
-                 xccdf_rule_set_role((struct xccdf_rule *) new_item, xccdf_refine_rule_get_role(r_rule));
-+#if defined(__SVR4) && defined(__sun)
-+            if (!isnan((double)xccdf_refine_rule_get_severity(r_rule)))
-+#else
-             if (!isnan(xccdf_refine_rule_get_severity(r_rule)))
-+#endif
-                 xccdf_rule_set_severity((struct xccdf_rule *) new_item, xccdf_refine_rule_get_severity(r_rule));
-             if (xccdf_refine_rule_weight_defined(r_rule))
-                 xccdf_rule_set_weight((struct xccdf_rule *) new_item, xccdf_refine_rule_get_weight(r_rule));
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/patches/port1.0.0.patch	Wed Feb 26 12:49:08 2014 -0800
@@ -0,0 +1,178 @@
+This patch provides ports for oscap-info.c, sce_engince.c,
+xccdf_policy.c, tailoring.c for solaris.
+
+--- openscap-1.0.0/src/XCCDF_POLICY/xccdf_policy.c.~1~	2013-11-09 23:54:47.459067475 -0800
++++ openscap-1.0.0/src/XCCDF_POLICY/xccdf_policy.c	2013-11-25 11:16:50.271326192 -0800
[email protected]@ -519,7 +519,11 @@
+             if (r_value != NULL) {
+                 selector = xccdf_refine_value_get_selector(r_value);
+                 /* This refine value changes the value content */
++#if defined(__SVR4) && defined(__sun)
++                if (((unsigned int)xccdf_refine_value_get_oper(r_value)) > 0) {
++#else
+                 if (xccdf_refine_value_get_oper(r_value) > 0) {
++#endif
+                     binding->operator = xccdf_refine_value_get_oper(r_value);
+                 } else binding->operator = xccdf_value_get_oper(value);
+ 
[email protected]@ -2158,9 +2162,17 @@
+                 
+             } else if (xccdf_item_get_type(item) == XCCDF_RULE) {
+                 /* Perform all changes in rule */
++#if defined(__SVR4) && defined(__sun)
++                if (((unsigned int)xccdf_refine_rule_get_role(r_rule)) > 0)
++#else
+                 if (xccdf_refine_rule_get_role(r_rule) > 0)
++#endif
+                     xccdf_rule_set_role((struct xccdf_rule *) item, xccdf_refine_rule_get_role(r_rule));
++#if defined(__SVR4) && defined(__sun)
++                if (!(unsigned int)xccdf_refine_rule_get_severity(r_rule) > 0)
++#else
+                 if (!xccdf_refine_rule_get_severity(r_rule) > 0)
++#endif
+                     xccdf_rule_set_severity((struct xccdf_rule *) item, xccdf_refine_rule_get_severity(r_rule));
+ 
+             } else {}/* TODO oscap_err ? */;
[email protected]@ -2384,7 +2396,11 @@
+             if (r_rule == NULL) return item;
+ 
+             new_item = (struct xccdf_item *) xccdf_rule_clone((struct xccdf_rule *) item);
++#if defined(__SVR4) && defined(__sun)
++            if (((unsigned int)xccdf_refine_rule_get_role(r_rule)) > 0)
++#else
+             if (xccdf_refine_rule_get_role(r_rule) > 0)
++#endif
+                 xccdf_rule_set_role((struct xccdf_rule *) new_item, xccdf_refine_rule_get_role(r_rule));
+             if (xccdf_refine_rule_get_severity(r_rule) > 0)
+                 xccdf_rule_set_severity((struct xccdf_rule *) new_item, xccdf_refine_rule_get_severity(r_rule));
+--- openscap-1.0.0/src/OVAL/probes/probe/signal_handler.c.~1~	2013-11-09 23:53:15.634238625 -0800
++++ openscap-1.0.0/src/OVAL/probes/probe/signal_handler.c	2013-11-25 11:36:03.599412046 -0800
[email protected]@ -125,9 +125,9 @@
+ 			 * cancelability), but at most 60 seconds per thread.
+ 			 */
+ 			for (; coll.cnt > 0; --coll.cnt) {
++				probe_worker_t *thr = coll.thr[coll.cnt - 1];
+ #if defined(HAVE_PTHREAD_TIMEDJOIN_NP) && defined(HAVE_CLOCK_GETTIME)
+ 				struct timespec j_tm;
+-				probe_worker_t *thr = coll.thr[coll.cnt - 1];
+ 
+ 				if (clock_gettime(CLOCK_REALTIME, &j_tm) == -1) {
+ 					dE("clock_gettime(CLOCK_REALTIME): %d, %s.\n", errno, strerror(errno));
+--- openscap-1.0.0/src/XCCDF/tailoring.c.~1~	2013-11-25 11:57:25.181799219 -0800
++++ openscap-1.0.0/src/XCCDF/tailoring.c	2013-11-25 11:55:59.919560234 -0800
[email protected]@ -197,7 +197,11 @@
+ 	xmlNode *tailoring_node = xmlNewNode(ns_xccdf, BAD_CAST "Tailoring");
+ 
+ 	const char *xccdf_version = xccdf_version_info_get_version(version_info);
++#ifdef __USE_GNU
+ 	if (strverscmp(xccdf_version, "1.1") >= 0 && strverscmp(xccdf_version, "1.2") < 0) {
++#else
++	if (strcmp(xccdf_version, "1.1") >= 0 && strcmp(xccdf_version, "1.2") < 0) {
++#endif
+ 		// XCCDF 1.1 does not support Tailoring!
+ 		// However we will allow Tailoring export if it is done to an external
+ 		// file. The namespace will be our custom xccdf-1.1-tailoring extension
[email protected]@ -214,7 +218,11 @@
+ 			BAD_CAST "cdf-11-tailoring"
+ 		);
+ 	}
++#ifdef __USE_GNU
+ 	else if (strverscmp(xccdf_version, "1.1") < 0) {
++#else
++	else if (strcmp(xccdf_version, "1.1") < 0) {
++#endif
+ 		oscap_seterr(OSCAP_EFAMILY_XML, "XCCDF Tailoring isn't supported in XCCDF version '%s',"
+ 			"nor does openscap have a custom extension for this scenario. "
+ 			"XCCDF Tailoring requires XCCDF 1.1 and higher, 1.2 is recommended.");
+--- openscap-1.0.0/src/SCE/sce_engine.c.~1~	2013-11-09 23:54:47.457067482 -0800
++++ openscap-1.0.0/src/SCE/sce_engine.c	2013-11-25 13:27:10.564328563 -0800
[email protected]@ -52,7 +52,11 @@
+ {
+ 	char* href;
+ 	char* basename;
++#if defined(__SVR4) && defined(__sun)
++	char* std_out;
++#else
+ 	char* stdout;
++#endif
+ 	int exit_code;
+ 	struct oscap_stringlist* environment_variables;
+ 	xccdf_test_result_type_t xccdf_result;
[email protected]@ -63,7 +67,11 @@
+ 	struct sce_check_result* ret = oscap_alloc(sizeof(struct sce_check_result));
+ 	ret->href = NULL;
+ 	ret->basename = NULL;
++#if defined(__SVR4) && defined(__sun)
++	ret->std_out = NULL;
++#else
+ 	ret->stdout = NULL;
++#endif
+ 	ret->environment_variables = oscap_stringlist_new();
+ 	ret->xccdf_result = XCCDF_RESULT_UNKNOWN;
+ 
[email protected]@ -79,8 +87,13 @@
+ 		oscap_free(v->href);
+ 	if (v->basename)
+ 		oscap_free(v->basename);
++#if defined(__SVR4) && defined(__sun)
++	if (v->std_out)
++		oscap_free(v->std_out);
++#else
+ 	if (v->stdout)
+ 		oscap_free(v->stdout);
++#endif
+ 
+ 	oscap_stringlist_free(v->environment_variables);
+ 
[email protected]@ -115,15 +128,25 @@
+ 
+ void sce_check_result_set_stdout(struct sce_check_result* v, const char* _stdout)
+ {
++#if defined(__SVR4) && defined(__sun)
++	if (v->std_out)
++               oscap_free(v->std_out);
++	v->std_out = strdup(_stdout);
++#else
+ 	if (v->stdout)
+ 		oscap_free(v->stdout);
+ 
+ 	v->stdout = strdup(_stdout);
++#endif
+ }
+ 
+ const char* sce_check_result_get_stdout(struct sce_check_result* v)
+ {
++#if defined(__SVR4) && defined(__sun)
++	return v->std_out;
++#else
+ 	return v->stdout;
++#endif
+ }
+ 
+ void sce_check_result_set_exit_code(struct sce_check_result* v, int exit_code)
[email protected]@ -178,7 +201,11 @@
+ 	oscap_string_iterator_free(it);
+ 	fprintf(f, "\t</sceres:environment>\n");
+ 	fprintf(f, "\t<sceres:stdout><![CDATA[\n");
++#if defined(__SVR4) && defined(__sun)
++	fwrite(v->std_out, 1, strlen(v->std_out), f);
++#else
+ 	fwrite(v->stdout, 1, strlen(v->stdout), f);
++#endif
+ 	fprintf(f, "\t]]></sceres:stdout>\n");
+ 	fprintf(f, "\t<sceres:exit_code>%i</sceres:exit_code>\n", sce_check_result_get_exit_code(v));
+ 	fprintf(f, "\t<sceres:result>%s</sceres:result>\n", xccdf_test_result_type_get_text(sce_check_result_get_xccdf_result(v)));
+--- openscap-1.0.0/utils/oscap-info.c.~1~	2012-12-14 02:13:18.113881933 -0800
++++ openscap-1.0.0/utils/oscap-info.c	2013-01-16 09:55:13.348770490 -0800
[email protected]@ -34,7 +34,11 @@
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#if defined(__SVR4) && defined (__sun)
++#include <limits.h>
++#else
+ #include <linux/limits.h>
++#endif
+ 
+ #include <oscap.h>
+ #include <oval_results.h>