diff --git a/.gitignore b/.gitignore index 5c322f6..5233335 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ openscap-0.6.0.tar.gz /openscap-0.7.3.tar.gz /openscap-0.7.4.tar.gz /openscap-0.8.0.tar.gz +/openscap-0.8.1.tar.gz diff --git a/openscap-0.8.0-example.patch b/openscap-0.8.0-example.patch deleted file mode 100644 index 87eaebf..0000000 --- a/openscap-0.8.0-example.patch +++ /dev/null @@ -1,70 +0,0 @@ -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 f9f6a24..7149445 100644 --- a/openscap.spec +++ b/openscap.spec @@ -2,15 +2,14 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: openscap -Version: 0.8.0 -Release: 3%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries 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 @@ -65,8 +64,6 @@ libraries can be used by perl. Summary: Openscap utilities Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires(post): chkconfig -Requires(preun): chkconfig initscripts %description utils The %{name}-utils package contains various utilities based on %{name} library. @@ -81,6 +78,13 @@ Requires: %{name} = %{version}-%{release} Example of SCAP content for Fedora. Please note that this content is for testing purposes only. +%package content-sectool +Summary: Sectool content +Group: Applications/System +Requires: %{name} = %{version}-%{release} + +%description content-sectool +SCAP/SCE content that conforms to sectool checks. %package extra-probes Summary: SCAP probes @@ -97,7 +101,6 @@ commonly used and require additional dependencies. %prep %setup -q -%patch1 -p1 -b .example %build %ifarch sparc64 @@ -109,7 +112,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fpie" export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" %endif -%configure +%configure --enable-sce make %{?_smp_mflags} # Remove shebang from bash-completion script @@ -126,11 +129,6 @@ rm -rf $RPM_BUILD_ROOT make install INSTALL='install -p' DESTDIR=$RPM_BUILD_ROOT -install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} -install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -install -p -m 755 dist/fedora/oscap-scan.init $RPM_BUILD_ROOT%{_initrddir}/oscap-scan -install -p -m 644 dist/fedora/oscap-scan.sys $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/oscap-scan - # create symlinks to default content ln -s %{_datadir}/openscap/scap-fedora14-oval.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-oval.xml ln -s %{_datadir}/openscap/scap-fedora14-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-xccdf.xml @@ -153,16 +151,6 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig -%post utils -/sbin/chkconfig --add oscap-scan - -%preun utils -if [ $1 -eq 0 ]; then - /sbin/service oscap-scan stop > /dev/null 2>&1 - /sbin/chkconfig --del oscap-scan -fi - - %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README @@ -221,9 +209,7 @@ fi %files utils %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/sysconfig/oscap-scan %doc docs/oscap-scan.cron -%{_initrddir}/oscap-scan %{_mandir}/man8/* %{_bindir}/* %{_sysconfdir}/bash_completion.d @@ -235,11 +221,18 @@ fi %{_datadir}/openscap/scap-fedora14-oval.xml %{_datadir}/openscap/scap-fedora14-xccdf.xml +%files content-sectool +%defattr(-,root,root,-) +%{_datadir}/openscap/sectool-sce + %files extra-probes %{_libexecdir}/openscap/probe_ldap57 %{_libexecdir}/openscap/probe_gconf %changelog +* Tue Feb 21 2012 Peter Vrabec 0.8.1-1 +- upgrade + * Fri Feb 10 2012 Petr Pisar - 0.8.0-3 - Rebuild against PCRE 8.30 diff --git a/sources b/sources index f0e8563..f76e1e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d98c3afb062804849fa8ba7e040e3f9 openscap-0.8.0.tar.gz +e2c5565959a87b8d66da2b80c5c0ac40 openscap-0.8.1.tar.gz