trac#411: Remove references to docbook feature

Outs1d3r-Net · Oct 30, 2014 · 64c8004 · 64c8004
1 parent 7c2e5b6
commit 64c8004
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 28 deletions.
diff --git a/dist/bash_completion.d/oscap b/dist/bash_completion.d/oscap
@@ -75,7 +75,7 @@ function _oscap {
 				COMPREPLY=( $(compgen -W "`$prog cvss $cmd -h | sed -r -n -e "s:^\s+$prev=\[(.+)\].+$:\1:gp" | tr '|' ' '`" -- ${cur}) ) ;;
 			--results|-o|--output|--template|--oval-template) _filedir 'xml' ;;
             --report) _filedir 'html' ;;
-            --format) COMPREPLY=( $(compgen -W "docbook html" -- ${cur}) ) ;;
+            --format) COMPREPLY=( $(compgen -W "html" -- ${cur}) ) ;;
 		esac
 
 	elif [ "x${cur:0:1}" == "x-" ] || [ "${modpath:0:11}" == 'oscap:cvss:' ]; then

diff --git a/dist/solaris10/prototype b/dist/solaris10/prototype
@@ -83,10 +83,7 @@ f none share/openscap/xsl/xccdf-report.xsl 0644 root root
 f none share/openscap/xsl/oval-results-report.xsl 0644 root root
 f none share/openscap/xsl/oval-report.xsl 0644 root root
 f none share/openscap/xsl/oscap-share.xsl 0644 root root
-f none share/openscap/xsl/dc2docbook.xsl 0644 root root
-f none share/openscap/xsl/html2docbook.xsl 0644 root root
 f none share/openscap/xsl/dbout-html.xsl 0644 root root
-f none share/openscap/xsl/docbook-share.xsl 0644 root root
 f none share/openscap/xsl/fix.xsl 0644 root root
 f none share/openscap/xsl/fixtpl-bash.xml 0644 root root
 f none share/openscap/xsl/xccdf-tailor.xsl 0644 root root

diff --git a/tests/API/CPE/dict/dict-damaged.xml b/tests/API/CPE/dict/dict-damaged.xml
@@ -14523,13 +14523,6 @@
                 <meta:version value="8" />
                 <meta:version value="8.0" />
             </meta:product>
-            <meta:product value="docbook_stylesheets" part="a">
-                <meta:version value="1.54.13" />
-            </meta:product>
-            <meta:product value="docbook_utils" part="a">
-                <meta:version value="0.6.13" />
-                <meta:version value="0.6.9-2" />
-            </meta:product>
             <meta:product value="enterprise_linux" part="o">
                 <meta:version value="2.1">
                     <meta:update value="">

diff --git a/tests/API/CPE/dict/dict.xml b/tests/API/CPE/dict/dict.xml
@@ -19764,13 +19764,6 @@
                 <meta:version value="8" />
                 <meta:version value="8.0" />
             </meta:product>
-            <meta:product value="docbook_stylesheets" part="a">
-                <meta:version value="1.54.13" />
-            </meta:product>
-            <meta:product value="docbook_utils" part="a">
-                <meta:version value="0.6.13" />
-                <meta:version value="0.6.9-2" />
-            </meta:product>
             <meta:product value="enterprise_linux" part="o">
                 <meta:version value="2.1">
                     <meta:update value="">

diff --git a/tests/API/CPE/name/dict.xml b/tests/API/CPE/name/dict.xml
@@ -19773,13 +19773,6 @@
                 <meta:version value="8" />
                 <meta:version value="8.0" />
             </meta:product>
-            <meta:product value="docbook_stylesheets" part="a">
-                <meta:version value="1.54.13" />
-            </meta:product>
-            <meta:product value="docbook_utils" part="a">
-                <meta:version value="0.6.13" />
-                <meta:version value="0.6.9-2" />
-            </meta:product>
             <meta:product value="enterprise_linux" part="o">
                 <meta:version value="2.1">
                     <meta:update value="">

diff --git a/utils/oscap-xccdf.c b/utils/oscap-xccdf.c
@@ -193,7 +193,7 @@ static struct oscap_module XCCDF_REMEDIATE = {
 #define GEN_OPTS \
         "Generate options:\n" \
         "   --profile <profile-id>\r\t\t\t\t - Tailor XCCDF file with respect to a profile.\n" \
-        "   --format <fmt>\r\t\t\t\t - Select output format. Can be html or docbook.\n"
+        "   --format <fmt>\r\t\t\t\t - Select output format. Can be html.\n"
 
 static struct oscap_module XCCDF_GENERATE = {
     .name = "generate",

diff --git a/utils/oscap.8 b/utils/oscap.8
@@ -261,7 +261,7 @@ Generate another document form an XCCDF file such as security guide or result re
 Apply profile with given ID to the Benchmark before further processing takes place.
 .TP
 \fB\-\-format FMT\fR
-Specify output format. This option applies only on document generators (i.e. guide, report). Available formats: \fIhtml\fR (default), \fIdocbook\fR.
+Specify output format. This option applies only on document generators (i.e. guide, report). Available formats: \fIhtml\fR (default).
 .TP
 Available submodules:
 .TP

diff --git a/xsl/legacy-xccdf-share.xsl b/xsl/legacy-xccdf-share.xsl
@@ -23,7 +23,6 @@ Authors:
 
 <xsl:stylesheet version="1.1"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:db="http://docbook.org/ns/docbook"
     xmlns:htm="http://www.w3.org/1999/xhtml"
     xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:h="http://www.w3.org/1999/xhtml"