diff --git a/.gitignore b/.gitignore index e954cd5..5c322f6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ openscap-0.6.0.tar.gz /openscap-0.7.2.tar.gz /openscap-0.7.3.tar.gz /openscap-0.7.4.tar.gz +/openscap-0.8.0.tar.gz diff --git a/openscap-0.8.0-example.patch b/openscap-0.8.0-example.patch new file mode 100644 index 0000000..87eaebf --- /dev/null +++ b/openscap-0.8.0-example.patch @@ -0,0 +1,70 @@ +diff --git a/dist/fedora/scap-fedora14-xccdf.xml b/dist/fedora/scap-fedora14-xccdf.xml +index 91080aa..ee63a51 100644 +--- a/dist/fedora/scap-fedora14-xccdf.xml ++++ b/dist/fedora/scap-fedora14-xccdf.xml +@@ -11,10 +11,11 @@ + resolved="1" + id="scap-fedora14-xccdf.xml" + xml:lang="en"> +- draft +- Guide to the Secure Configuration of Fedora Linux +- This guide has been created to assist IT professionals, in effectively securing systems with Fedora Linux. +- 0.6.3 ++ draft ++ Example of SCAP Security Guidance ++ This example security guidance has been created to demonstrate SCAP functionality ++on Linux. ++ 0.1 + + + +@@ -25,9 +26,11 @@ + + + +- +- Fedora 14 desktop settings +- This profile selects security controls that conform to default Fedora 14 configuration. ++ ++ Default install settings ++ This profile is an example policy that simply checks if some of Fedora 14 default ++install settings have been modified. It is not comprehensive nor checks security hardening. It is just for testing ++purposes. + + + diff --git a/openscap.spec b/openscap.spec index 8007642..eb35fb0 100644 --- a/openscap.spec +++ b/openscap.spec @@ -2,7 +2,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: openscap -Version: 0.7.4 +Version: 0.8.0 Release: 1%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries @@ -10,13 +10,15 @@ License: LGPLv2+ URL: http://www.open-scap.org/ Source0: http://www.open-scap.org/download/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: openscap-0.8.0-example.patch BuildRequires: swig libxml2-devel libxslt-devel perl-XML-Parser BuildRequires: rpm-devel BuildRequires: libgcrypt-devel BuildRequires: pcre-devel BuildRequires: libacl-devel -BuildRequires: libselinux-devel +BuildRequires: libselinux-devel libcap-devel BuildRequires: libblkid-devel +BuildRequires: libnl-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -76,7 +78,8 @@ Group: Applications/System Requires: %{name} = %{version}-%{release} %description content -SCAP content for Fedora delivered by Open-SCAP project. +Example of SCAP content for Fedora. Please note that this content +is for testing purposes only. %package extra-probes @@ -84,6 +87,7 @@ Summary: SCAP probes Group: Applications/System Requires: %{name} = %{version}-%{release} BuildRequires: openldap-devel +BuildRequires: GConf2-devel #BuildRequires: opendbx - for sql %description extra-probes @@ -93,6 +97,7 @@ commonly used and require additional dependencies. %prep %setup -q +%patch1 -p1 -b .example %build %ifarch sparc64 @@ -110,6 +115,11 @@ make %{?_smp_mflags} # Remove shebang from bash-completion script sed -i '/^#!.*bin/,+1 d' dist/bash_completion.d/oscap +%check +#to run make check use "--with check" +%if %{?_with_check:1}%{!?_with_check:0} +make check +%endif %install rm -rf $RPM_BUILD_ROOT @@ -162,16 +172,22 @@ fi %{_libexecdir}/openscap/probe_environmentvariable58 %{_libexecdir}/openscap/probe_family %{_libexecdir}/openscap/probe_file +%{_libexecdir}/openscap/probe_fileextendedattribute %{_libexecdir}/openscap/probe_filehash %{_libexecdir}/openscap/probe_filehash58 +%{_libexecdir}/openscap/probe_iflisteners %{_libexecdir}/openscap/probe_inetlisteningservers %{_libexecdir}/openscap/probe_interface %{_libexecdir}/openscap/probe_partition %{_libexecdir}/openscap/probe_password %{_libexecdir}/openscap/probe_process +%{_libexecdir}/openscap/probe_process58 +%{_libexecdir}/openscap/probe_routingtable %{_libexecdir}/openscap/probe_rpminfo +%{_libexecdir}/openscap/probe_rpmverify %{_libexecdir}/openscap/probe_runlevel %{_libexecdir}/openscap/probe_selinuxboolean +%{_libexecdir}/openscap/probe_selinuxsecuritycontext %{_libexecdir}/openscap/probe_shadow %{_libexecdir}/openscap/probe_sysctl %{_libexecdir}/openscap/probe_system_info @@ -221,8 +237,12 @@ fi %files extra-probes %{_libexecdir}/openscap/probe_ldap57 +%{_libexecdir}/openscap/probe_gconf %changelog +* Tue Oct 11 2011 Peter Vrabec 0.8.0-1 +- upgrade + * Mon Jul 25 2011 Peter Vrabec 0.7.4-1 - upgrade diff --git a/sources b/sources index 9efca34..f0e8563 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bd74ac9358e5ec3f858d3a082e9eb41 openscap-0.7.4.tar.gz +7d98c3afb062804849fa8ba7e040e3f9 openscap-0.8.0.tar.gz