|
 |
f04235 |
From 989cb130cb7d03f27294313c3ee2f1f4d61568db Mon Sep 17 00:00:00 2001
|
|
|
f04235 |
From: Jan Lieskovsky <jlieskov@redhat.com>
|
|
|
f04235 |
Date: Tue, 28 Jun 2016 13:04:24 +0200
|
|
|
f04235 |
Subject: [PATCH 1/2] [Enhancement] [RHEL/6] [RHEL/7] Include the generated
|
|
|
f04235 |
HTML tables for RHEL-6 and RHEL-7 products into the produced RPM package
|
|
|
f04235 |
|
|
|
f04235 |
Part of #1297
|
|
|
f04235 |
---
|
|
|
f04235 |
RHEL/6/Makefile | 5 +++--
|
|
|
f04235 |
RHEL/7/Makefile | 2 ++
|
|
|
f04235 |
scap-security-guide.spec.in | 36 +++++++++++++++++++++++-------------
|
|
|
f04235 |
3 files changed, 28 insertions(+), 15 deletions(-)
|
|
|
f04235 |
|
|
|
f04235 |
diff --git a/RHEL/6/Makefile b/RHEL/6/Makefile
|
|
|
f04235 |
index 782d0f7..ac7d74e 100644
|
|
|
f04235 |
--- a/RHEL/6/Makefile
|
|
|
f04235 |
+++ b/RHEL/6/Makefile
|
|
|
f04235 |
@@ -69,8 +69,7 @@ table-stigs: $(OUT)/xccdf-unlinked-final.xml table-srgmap checks
|
|
|
f04235 |
$(TRANS)/xccdf-apply-overlay-stig.xslt $<
|
|
|
f04235 |
xsltproc -o $(OUT)/table-$(PROD)-stig.html $(TRANS)/xccdf2table-stig.xslt $(OUT)/unlinked-stig-$(PROD)-xccdf.xml
|
|
|
f04235 |
|
|
|
f04235 |
-tables: table-refs table-idents table-stigs
|
|
|
f04235 |
-#tables: table-refs table-idents table-srgmap table-stigs
|
|
|
f04235 |
+tables: table-refs table-idents table-srgmap table-stigs
|
|
|
f04235 |
|
|
|
f04235 |
content: $(OUT)/xccdf-unlinked-final.xml checks
|
|
|
f04235 |
cp $< $(OUT)/unlinked-$(PROD)-xccdf.xml
|
|
|
f04235 |
@@ -180,6 +179,8 @@ dist: tables guide content
|
|
|
f04235 |
cp $(OUT)/$(ID)-$(PROD)-cpe-dictionary.xml $(DIST)/content
|
|
|
f04235 |
cp $(OUT)/$(ID)-$(PROD)-cpe-oval.xml $(DIST)/content
|
|
|
f04235 |
cp $(OUT)/$(ID)-$(PROD)-ds.xml $(DIST)/content
|
|
|
f04235 |
+ mkdir -p $(DIST)/tables
|
|
|
f04235 |
+ cp $(OUT)/table-*.{x,}html $(DIST)/tables
|
|
|
f04235 |
mkdir -p $(DIST)/guide
|
|
|
f04235 |
cp $(OUT)/*-guide-*.html $(DIST)/guide
|
|
|
f04235 |
cp $(OUT)/$(ID)-centos6-xccdf.xml $(DIST)/content
|
|
|
f04235 |
diff --git a/RHEL/7/Makefile b/RHEL/7/Makefile
|
|
|
f04235 |
index fc9f284..0cafa7c 100644
|
|
|
f04235 |
--- a/RHEL/7/Makefile
|
|
|
f04235 |
+++ b/RHEL/7/Makefile
|
|
|
f04235 |
@@ -183,6 +183,8 @@ dist: tables guide content
|
|
|
f04235 |
cp $(OUT)/$(ID)-$(PROD)-cpe-dictionary.xml $(DIST)/content
|
|
|
f04235 |
cp $(OUT)/$(ID)-$(PROD)-cpe-oval.xml $(DIST)/content
|
|
|
f04235 |
cp $(OUT)/$(ID)-$(PROD)-ds.xml $(DIST)/content
|
|
|
f04235 |
+ mkdir -p $(DIST)/tables
|
|
|
f04235 |
+ cp $(OUT)/table-*.{x,}html $(DIST)/tables
|
|
|
f04235 |
mkdir -p $(DIST)/guide
|
|
|
f04235 |
cp $(OUT)/*-guide-*.html $(DIST)/guide
|
|
|
f04235 |
cp $(OUT)/$(ID)-centos7-xccdf.xml $(DIST)/content
|
|
|
f04235 |
diff --git a/scap-security-guide.spec.in b/scap-security-guide.spec.in
|
|
|
f04235 |
index ae3cc05..6fbb800 100644
|
|
|
f04235 |
--- a/scap-security-guide.spec.in
|
|
|
f04235 |
+++ b/scap-security-guide.spec.in
|
|
|
f04235 |
@@ -82,30 +82,40 @@ rm %{buildroot}%{_datadir}/xml/scap/ssg/content/*-cpe-dictionary.xml
|
|
|
f04235 |
# We do this after the filtering on Fedora because we don't ship JBossEAP5 datastreams
|
|
|
f04235 |
cp -a JBossEAP5/eap5-* %{buildroot}%{_datadir}/xml/scap/ssg/content/
|
|
|
f04235 |
|
|
|
f04235 |
-# Docs
|
|
|
f04235 |
-mkdir -p %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
-cp -a RHEL/6/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
-cp -a RHEL/7/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
-cp -a Firefox/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
-cp -a JRE/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
+# Add in HTML tables for selected products
|
|
|
f04235 |
+mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/tables
|
|
|
f04235 |
+cp -a RHEL/6/dist/tables/* %{buildroot}/%{_docdir}/%{name}-%{version}/tables
|
|
|
f04235 |
+cp -a RHEL/7/dist/tables/* %{buildroot}/%{_docdir}/%{name}-%{version}/tables
|
|
|
f04235 |
+
|
|
|
f04235 |
+# Add in LICENSE and README.md
|
|
|
f04235 |
+cp -a LICENSE README.md %{buildroot}/%{_docdir}/%{name}-%{version}
|
|
|
f04235 |
+
|
|
|
f04235 |
+# scap-security-guide-doc subpackage contains just HTML guides for supported products
|
|
|
f04235 |
+mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
+cp -a RHEL/6/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
+cp -a RHEL/7/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
+cp -a Firefox/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
+cp -a JRE/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
# outside of the normal build system, different guide
|
|
|
f04235 |
-cp -a JBossEAP5/docs/JBossEAP5_Guide.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
+cp -a JBossEAP5/docs/JBossEAP5_Guide.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
|
|
|
f04235 |
%if 0%{?fedora}
|
|
|
f04235 |
-cp -a Fedora/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
-cp -a Chromium/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}/guides
|
|
|
f04235 |
-#cp -a Webmin/output/*-guide-*.html %{buildroot}/%{_defaultdocdir}/%{name}/guides
|
|
|
f04235 |
+cp -a Fedora/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
+cp -a Chromium/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
+#cp -a Webmin/output/*-guide-*.html %{buildroot}/%{_defaultdocdir}/%{name}-%{version}/guides
|
|
|
f04235 |
%endif
|
|
|
f04235 |
|
|
|
f04235 |
%files
|
|
|
f04235 |
%{_datadir}/xml/scap
|
|
|
f04235 |
%{_datadir}/%{name}
|
|
|
f04235 |
%lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
|
|
|
f04235 |
-%doc LICENSE
|
|
|
f04235 |
-%doc README.md
|
|
|
f04235 |
+%doc %{_docdir}/%{name}-%{version}/tables/*.html
|
|
|
f04235 |
+%doc %{_docdir}/%{name}-%{version}/tables/*.xhtml
|
|
|
f04235 |
+%doc %{_docdir}/%{name}-%{version}/LICENSE
|
|
|
f04235 |
+%doc %{_docdir}/%{name}-%{version}/README.md
|
|
|
f04235 |
|
|
|
f04235 |
%files doc
|
|
|
f04235 |
-%doc %{_docdir}/%{name}/guides/*.html
|
|
|
f04235 |
+%doc %{_docdir}/%{name}-%{version}/guides/*.html
|
|
|
f04235 |
|
|
|
f04235 |
%changelog
|
|
|
f04235 |
* __DATE__ __REL_MANAGER__ <__REL_MANAGER_MAIL__> __VERSION__-__RELEASE__
|
|
|
f04235 |
|
|
|
f04235 |
From 33ea7d73d7a53b465c15ac6289fe8833749622dc Mon Sep 17 00:00:00 2001
|
|
|
f04235 |
From: Jan Lieskovsky <jlieskov@redhat.com>
|
|
|
f04235 |
Date: Tue, 28 Jun 2016 18:50:17 +0200
|
|
|
f04235 |
Subject: [PATCH 2/2] [Enhancement][RHEL/6][RHEL/7] Provide currently available
|
|
|
f04235 |
RHEL-6 and RHEL-7 kickstart files in the produced RPM package
|
|
|
f04235 |
|
|
|
f04235 |
Fixes (together with previous commit): #1297
|
|
|
f04235 |
---
|
|
|
f04235 |
scap-security-guide.spec.in | 7 ++++++-
|
|
|
f04235 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
f04235 |
|
|
|
f04235 |
diff --git a/scap-security-guide.spec.in b/scap-security-guide.spec.in
|
|
|
f04235 |
index 6fbb800..056e84c 100644
|
|
|
f04235 |
--- a/scap-security-guide.spec.in
|
|
|
f04235 |
+++ b/scap-security-guide.spec.in
|
|
|
f04235 |
@@ -90,6 +90,11 @@ cp -a RHEL/7/dist/tables/* %{buildroot}/%{_docdir}/%{name}-%{version}/tables
|
|
|
f04235 |
# Add in LICENSE and README.md
|
|
|
f04235 |
cp -a LICENSE README.md %{buildroot}/%{_docdir}/%{name}-%{version}
|
|
|
f04235 |
|
|
|
f04235 |
+# Add in kickstart files for selected products
|
|
|
f04235 |
+mkdir -p %{buildroot}%{_datadir}/%{name}/kickstart
|
|
|
f04235 |
+cp -a RHEL/6/kickstart/*-ks.cfg %{buildroot}%{_datadir}/%{name}/kickstart
|
|
|
f04235 |
+cp -a RHEL/7/kickstart/*-ks.cfg %{buildroot}%{_datadir}/%{name}/kickstart
|
|
|
f04235 |
+
|
|
|
f04235 |
# scap-security-guide-doc subpackage contains just HTML guides for supported products
|
|
|
f04235 |
mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
cp -a RHEL/6/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/guides
|
|
|
f04235 |
@@ -107,7 +112,7 @@ cp -a Chromium/output/*-guide-*.html %{buildroot}/%{_docdir}/%{name}-%{version}/
|
|
|
f04235 |
|
|
|
f04235 |
%files
|
|
|
f04235 |
%{_datadir}/xml/scap
|
|
|
f04235 |
-%{_datadir}/%{name}
|
|
|
f04235 |
+%{_datadir}/%{name}/kickstart
|
|
|
f04235 |
%lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
|
|
|
f04235 |
%doc %{_docdir}/%{name}-%{version}/tables/*.html
|
|
|
f04235 |
%doc %{_docdir}/%{name}-%{version}/tables/*.xhtml
|