[PATCH v#2] [RHEL/7, Fedora] Include SSG logo into generated HTML guide if underlying system oscap version supports it

[Jan Lieskovsky]

Hello folks,

this is the second version of the logo inclusion patches for RHEL-7 & Fedora
products.

Testing report:
---------------
Tested on both platforms for both scenarios oscap (not) / supporting <svg> elements
presence. The change returns expected results.

Please review.

Thank you && Regards, Jan.
--
Jan iankko Lieskovsky / Red Hat Security Technologies Team

[Shawn Wells]

On 8/5/14, 11:14 AM, Jan Lieskovsky wrote:
> Hello folks,
>
> this is the second version of the logo inclusion patches for RHEL-7 & Fedora
> products.
> Testing report:
>
> Tested on both platforms for both scenarios oscap (not) / supporting <svg> elements
> presence. The change returns expected results.
>
> Please review.
> Thank you && Regards, Jan.
>
> Jan iankko Lieskovsky / Red Hat Security Technologies Team
>
> 0001-RHEL-7-Fedora-Include-SSG-logo-into-generated-HTML-g.patch
>
> From 423c94c1a638658f8b2e8392f7c61036e9d12ba6 Mon Sep 17 00:00:00 2001
> From: Jan Lieskovsky
> Date: Tue, 5 Aug 2014 17:03:13 +0200
> Subject: [PATCH] [RHEL/7, Fedora] Include SSG logo into generated HTML guide
>   if underlying system oscap version supports it
> Signed-off-by: Jan Lieskovsky
>
> Fedora/Makefile                        | 7 +++++++
>   Fedora/transforms/includelogo.xslt     | 1 +
>   Fedora/transforms/oscapsupportssvg.py  | 1 +
>   Fedora/transforms/shorthand2xccdf.xslt | 2 +-
>   RHEL/7/Makefile                        | 7 +++++++
>   RHEL/7/transforms/includelogo.xslt     | 1 +
>   RHEL/7/transforms/oscapsupportssvg.py  | 1 +
>   RHEL/7/transforms/shorthand2xccdf.xslt | 2 +-
>   8 files changed, 20 insertions(+), 2 deletions(-)
>   create mode 120000 Fedora/transforms/includelogo.xslt
>   create mode 120000 Fedora/transforms/oscapsupportssvg.py
>   create mode 120000 RHEL/7/transforms/includelogo.xslt
>   create mode 120000 RHEL/7/transforms/oscapsupportssvg.py
>
> diff --git a/Fedora/Makefile b/Fedora/Makefile
> index 8705d6f..4efb41a 100644
> --- a/Fedora/Makefile
> +++ b/Fedora/Makefile
> @@ -7,10 +7,17 @@ DIST = dist
>   ID = ssg
>   PROD = fedora
>
> +OPENSCAP_SVG := $(shell $(TRANS)/oscapsupportssvg.py; echo $$?)
>
> all: shorthand2xccdf guide content dist
>
> shorthand-guide:
>
> +ifeq ($(OPENSCAP_SVG), 0)
> xsltproc -o $(OUT)/guide.xml $(TRANS)/includelogo.xslt $(IN)/guide.xml
> xsltproc -o $(OUT)/$(ID)-$(PROD)-shorthand.xml $(IN)/guide.xslt $(OUT)/guide.xml
>
> +else
>    xsltproc -o $(OUT)/$(ID)-$(PROD)-shorthand.xml $(IN)/guide.xslt $(IN)/guide.xml
> +endif
>    xmllint --format --output $(OUT)/$(ID)-$(PROD)-shorthand.xml $(OUT)/$(ID)-$(PROD)-shorthand.xml
>
> shorthand2xccdf: shorthand-guide
> diff --git a/Fedora/transforms/includelogo.xslt b/Fedora/transforms/includelogo.xslt
> new file mode 120000
> index 0000000..7dcbafd
> --- /dev/null
> +++ b/Fedora/transforms/includelogo.xslt
> @@ -0,0 +1 @@
> +../../shared/transforms/includelogo.xslt
> \ No newline at end of file
> diff --git a/Fedora/transforms/oscapsupportssvg.py b/Fedora/transforms/oscapsupportssvg.py
> new file mode 120000
> index 0000000..010f991
> --- /dev/null
> +++ b/Fedora/transforms/oscapsupportssvg.py
> @@ -0,0 +1 @@
> +../../shared/transforms/oscapsupportssvg.py
> \ No newline at end of file
> diff --git a/Fedora/transforms/shorthand2xccdf.xslt b/Fedora/transforms/shorthand2xccdf.xslt
> index c0f4546..b7e6bdf 100644
> --- a/Fedora/transforms/shorthand2xccdf.xslt
> +++ b/Fedora/transforms/shorthand2xccdf.xslt
> @@ -248,7 +248,7 @@
>     </xsl:template>
> <!-- put general formatting xhtml into xhtml namespace -->
> <xsl:template match="code | strong | b | em | i | pre | br | hr" >
> <xsl:template match="p | code | strong | b | em | i | pre | br | hr" >
>    <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml%22%3E
>      <xsl:apply-templates select="@*|node()"/>
>    </xsl:element>
>
> diff --git a/RHEL/7/Makefile b/RHEL/7/Makefile
> index 01aa717..06960bd 100644
> --- a/RHEL/7/Makefile
> +++ b/RHEL/7/Makefile
> @@ -7,10 +7,17 @@ DIST = dist
>
> ID = ssg
>
> +OPENSCAP_SVG := $(shell $(TRANS)/oscapsupportssvg.py; echo $$?)
>
> all: shorthand2xccdf tables guide content dist
>
> shorthand-guide:
>
> +ifeq ($(OPENSCAP_SVG), 0)
> xsltproc -o $(OUT)/guide.xml $(TRANS)/includelogo.xslt $(IN)/guide.xml
> xsltproc -o $(OUT)/rhel7-shorthand.xml $(IN)/guide.xslt $(OUT)/guide.xml
>
> +else
>    xsltproc -o $(OUT)/rhel7-shorthand.xml $(IN)/guide.xslt $(IN)/guide.xml
> +endif
>    xmllint --format --output $(OUT)/rhel7-shorthand.xml $(OUT)/rhel7-shorthand.xml
>
> shorthand2xccdf: shorthand-guide
> diff --git a/RHEL/7/transforms/includelogo.xslt b/RHEL/7/transforms/includelogo.xslt
> new file mode 120000
> index 0000000..3bdc4de
> --- /dev/null
> +++ b/RHEL/7/transforms/includelogo.xslt
> @@ -0,0 +1 @@
> +../../../shared/transforms/includelogo.xslt
> \ No newline at end of file
> diff --git a/RHEL/7/transforms/oscapsupportssvg.py b/RHEL/7/transforms/oscapsupportssvg.py
> new file mode 120000
> index 0000000..4dc7d58
> --- /dev/null
> +++ b/RHEL/7/transforms/oscapsupportssvg.py
> @@ -0,0 +1 @@
> +../../../shared/transforms/oscapsupportssvg.py
> \ No newline at end of file
> diff --git a/RHEL/7/transforms/shorthand2xccdf.xslt b/RHEL/7/transforms/shorthand2xccdf.xslt
> index 585f9df..aa5ad2b 100644
> --- a/RHEL/7/transforms/shorthand2xccdf.xslt
> +++ b/RHEL/7/transforms/shorthand2xccdf.xslt
> @@ -249,7 +249,7 @@
>     </xsl:template>
> <!-- put general formatting xhtml into xhtml namespace -->
> <xsl:template match="code | strong | b | em | i | pre | br | hr" >
> <xsl:template match="p | code | strong | b | em | i | pre | br | hr" >
>    <xsl:element name="{local-name()}" namespace="http://www.w3.org/1999/xhtml%22%3E
>      <xsl:apply-templates select="@*|node()"/>
>    </xsl:element>
>
> -- 1.8.3.1

ack