diff --git a/fix-missing-include.dif b/fix-missing-include.dif index 328a3be..48188a3 100644 --- a/fix-missing-include.dif +++ b/fix-missing-include.dif @@ -1,7 +1,7 @@ -Index: openscap-0.9.7/src/OVAL/probes/unix/linux/rpminfo.c +Index: openscap-1.2.6/src/OVAL/probes/unix/linux/rpminfo.c =================================================================== ---- openscap-0.9.7.orig/src/OVAL/probes/unix/linux/rpminfo.c -+++ openscap-0.9.7/src/OVAL/probes/unix/linux/rpminfo.c +--- openscap-1.2.6.orig/src/OVAL/probes/unix/linux/rpminfo.c ++++ openscap-1.2.6/src/OVAL/probes/unix/linux/rpminfo.c @@ -66,6 +66,7 @@ #include #include @@ -10,3 +10,15 @@ Index: openscap-0.9.7/src/OVAL/probes/unix/linux/rpminfo.c #ifndef HAVE_HEADERFORMAT # define HAVE_LIBRPM44 1 /* hack */ +Index: openscap-1.2.6/src/common/oscap_acquire.c +=================================================================== +--- openscap-1.2.6.orig/src/common/oscap_acquire.c ++++ openscap-1.2.6/src/common/oscap_acquire.c +@@ -36,6 +36,7 @@ + #include + + #include "oscap_acquire.h" ++#include "oscap_buffer.h" + #include "common/_error.h" + #include "oscap_string.h" + diff --git a/openscap-1.2.5.tar.gz b/openscap-1.2.5.tar.gz deleted file mode 100644 index ba859ae..0000000 --- a/openscap-1.2.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e0c56c108ff3042fd6a6650a808553de15e4dfc7ccc9fcdd6a839de827c47ed -size 14513153 diff --git a/openscap-1.2.5.tar.gz.sha1sum b/openscap-1.2.5.tar.gz.sha1sum deleted file mode 100644 index 0eaac5c..0000000 --- a/openscap-1.2.5.tar.gz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -16c8c27668d32831c7beddd4e1549dde75142695 openscap-1.2.5.tar.gz diff --git a/openscap-1.2.6.tar.gz b/openscap-1.2.6.tar.gz new file mode 100644 index 0000000..77676c2 --- /dev/null +++ b/openscap-1.2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95f2345e041e9ba838ad8065b68ce0ec4b0971d7afc72d601489236bbfc0c652 +size 15601491 diff --git a/openscap-1.2.6.tar.gz.sha1sum b/openscap-1.2.6.tar.gz.sha1sum new file mode 100644 index 0000000..fa059a3 --- /dev/null +++ b/openscap-1.2.6.tar.gz.sha1sum @@ -0,0 +1 @@ +1a2582cb9a75309316fa2e86169529a2b9eaa060 openscap-1.2.6.tar.gz diff --git a/openscap.changes b/openscap.changes index d9f7546..1916763 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Oct 5 11:45:28 UTC 2015 - meissner@suse.com + +- openscap 1.2.6 release + - New features + - introduced OpenSCAP user manual + - improved OVAL 5.11.1 support + - added OVAL 5.11.1 XSD schemas and schematrons + - support for core/platform schema versions + - support for check_existence attribute in state entities + - support for CIM datetime format + - amended behavior of mask attribute + - added support for remote .xml.bz2 files (use with --fetch-remote-resources) + - rewrote oscap-docker to python, deeper integration with Atomic Host + - introduced CPE name for Fedora 24 to the internal dictionary + - HTML report & guide + - results can be grouped by according to various aspects + - printing supported (interactive elements are now hidden when printing) + - table of content now shows only selected items (rule & groups) + - references to RHSA are presented as links to website (rhbz#1243808) + - Maintenance + - scap-as-rpm can now build source rpm packages (srpms) (trac#469) + - scap-as-rpm now supports python3 + - refactored oval processing into oval_session structure + - many smaller bugfixes and new tests +- new openscap-docker subpackage + ------------------------------------------------------------------- Mon Jul 6 11:40:29 UTC 2015 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 5552d61..5953e42 100644 --- a/openscap.spec +++ b/openscap.spec @@ -20,7 +20,7 @@ %define with_bindings 0 Name: openscap -Version: 1.2.5 +Version: 1.2.6 Release: 1.0 Source: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz Source5: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz.sha1sum @@ -74,6 +74,13 @@ Group: System/Libraries %description -n libopenscap%{soname} The OpenSCAP C Library for easy integration with SCAP. +%package docker +Summary: Docker plugin for OpenSCAP +Group: System/Libraries + +%description docker +This package contains the Docker support for OpenSCAP. + %package devel Requires: %{name} = %{version}-%{release} @@ -147,12 +154,12 @@ commonly used and require additional dependencies. %if 0%{?with_bindings} %configure --disable-silent-rules %else -%configure --disable-silent-rules --disable-bindings --disable-python +%configure --disable-silent-rules --disable-bindings --disable-python --disable-python3 %endif %__make %{?_smp_mflags} %check -# #%__make check %{?_smp_mflags} ||: +%__make check %{?_smp_mflags} ||: %install %__make install DESTDIR=%{buildroot} @@ -241,6 +248,11 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files docker +%defattr(-, root, root) +%{python_sitelib}/oscap_docker_python +%{_bindir}/oscap-docker + %if 0%{?with_bindings} %files -n python-openscap %defattr(-, root, root) @@ -258,7 +270,9 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %doc docs/oscap-scan.cron %{_initrddir}/oscap-scan %{_mandir}/man8/* -%{_bindir}/* +%{_bindir}/oscap +%{_bindir}/oscap-ssh +%{_bindir}/scap-as-rpm %config %{_sysconfdir}/bash_completion.d/* %files content