[PATCH] [Fedora] Include RHEL-6 and RHEL-7 datastreams into Fedora RPM package [Fedora] Bump version to 0.1.5

Shawn Wells shawn at redhat.com
Wed Feb 26 17:23:09 UTC 2014


On 2/26/14, 12:11 PM, Jan Lieskovsky wrote:
> This patch enhances the Fedora scap-security-guide RPM with
> RHEL-6 and RHEL-7 benchmarks shipped in datastream format,
> so it would be possible to remotely scan RHEL-6 and RHEL-7 Beta
> systems (either physical or virtual) from Fedora system.
>
> The remote RHEL-6 and RHEL-7 Beta system scans functionality
> has been tested, and seems to be working properly.
>
> Please review.
>
> Thank you && Regards, Jan.
> --
> Jan iankko Lieskovsky / Red Hat Security Technologies Team
>
> 0001-Fedora-Include-RHEL-6-and-RHEL-7-datastreams-into-Fe.patch
>
>
>  From 58a00623fb59017a902ea8c5ff717566a1f77577 Mon Sep 17 00:00:00 2001
> From: Jan Lieskovsky<jlieskov at redhat.com>
> Date: Wed, 26 Feb 2014 18:00:35 +0100
> Subject: [PATCH] [Fedora] Include RHEL-6 and RHEL-7 datastreams into Fedora
>   RPM package          (so it would be possible to remotely scan RHEL systems
>   from Fedora) [Fedora] Bump version to 0.1.5
>
> Signed-off-by: Jan Lieskovsky<jlieskov at redhat.com>
> ---
>   Fedora/scap-security-guide.spec | 41 +++++++++++++++++++++++++++++++++--------
>   1 file changed, 33 insertions(+), 8 deletions(-)
>
> diff --git a/Fedora/scap-security-guide.spec b/Fedora/scap-security-guide.spec
> index ac1be96..4bb4a37 100644
> --- a/Fedora/scap-security-guide.spec
> +++ b/Fedora/scap-security-guide.spec
> @@ -5,7 +5,12 @@
>   # file one level up - in the main scap-security-guide directory (instead of
>   # this one).
>   
> -%global	fedorassgversion	5.rc1
> +# Used for Fedora scap-security-guide RPM package versioning
> +%global	fedorassgversion	5
> +
> +# Used to specify RHEL scap-security-guide tarball source
> +# (needs to match latest EPEL-6 scap-security-guide RPM release)
> +%global	rhelssgsource		0.1-16
>   
>   Name:		scap-security-guide
>   Version:	0.1.%{fedorassgversion}
> @@ -15,6 +20,7 @@ Group:		Applications/System
>   License:	Public Domain
>   URL:		https://fedorahosted.org/scap-security-guide/
>   Source0:	http://fedorapeople.org/~jlieskov/%{name}-%{version}.tar.gz
> +Source1:	http://repos.ssgproject.org/sources/%{name}-%{rhelssgsource}.tar.gz
>   BuildArch:	noarch
>   BuildRequires:	libxslt, expat, python, openscap-utils >= 0.9.1, python-lxml
>   Requires:	xml-common, openscap-utils >= 0.9.1
> @@ -34,21 +40,39 @@ conforms to provided guideline. Refer to scap-security-guide(8) manual page for
>   further information.
>   
>   %prep
> -%setup -q -n %{name}-%{version}
> +%setup -q -T -D -n %{name}-%{version} -a1
>   
>   %build
> -cd Fedora && make dist
> +# Build Fedora distribution content
> +(cd Fedora && make dist)
> +# Change CWD to point to RHEL content. Build RHEL content
> +pushd %{name}-%{rhelssgsource}
> +(cd RHEL/6 && make dist)
> +(cd RHEL/7 && make dist)
> +# Restore CWD to old value
> +popd
>   
>   %install
> +# Create required directory structure
>   mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/fedora
> +mkdir -p %{buildroot}%{_datadir}/xml/scap/ssg/rhel{6,7}
>   mkdir -p %{buildroot}%{_mandir}/en/man8/
>   
> -# Add in core content (SCAP XCCDF and OVAL content)
> +# Add in core Fedora content (SCAP XCCDF and OVAL)
>   cp -a Fedora/dist/content/* %{buildroot}%{_datadir}/xml/scap/ssg/fedora
> -
> -# Add in manpage
> +# Add in Fedora manpage
>   cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man8/scap-security-guide.8
>   
> +# Change CWD to point to RHEL content. Copy
> +# datastreams to appropriate buildroot places
> +pushd %{name}-%{rhelssgsource}
> +# Add in datastream form of RHEL-6 benchmark
> +cp -a RHEL/6/dist/content/ssg-rhel6-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/rhel6
> +# Add in datastream form of RHEL-7 benchmark
> +cp -a RHEL/7/dist/content/ssg-rhel7-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/rhel7
> +# Restore CWD to old value
> +popd
> +
>   %files
>   %{_datadir}/xml/scap
>   %lang(en) %{_mandir}/en/man8/scap-security-guide.8.*
> @@ -56,9 +80,10 @@ cp -a Fedora/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man
>   
>   
>   %changelog
> -* Thu Feb 20 2014 Jan iankko Lieskovsky<jlieskov at redhat.com>  0.1.5.rc1-1
> +* Wed Feb 26 2014 Jan iankko Lieskovsky<jlieskov at redhat.com>  0.1.5-1
> +- Include RHEL-6 and RHEL-7 datastream files to support remote RHEL system scans
>   - EOL for Fedora 18 support
> -- Include datastream file (for remote system scans) into RPM package too
> +- Include Fedora datastream file for remote Fedora system scans
>   
>   * Mon Jan 06 2014 Jan iankko Lieskovsky<jlieskov at redhat.com>  0.1.4-2
>   - Drop -compat package, provide openscap-content directly (RH BZ#1040335#c14)
> -- 1.8.3.1
ack (most welcome change!)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.fedorahosted.org/pipermail/scap-security-guide/attachments/20140226/31c37cf4/attachment-0001.html>


More information about the scap-security-guide mailing list