From 2593aea15decfc0924637594dab6f671b717e387b9620ff943b31e0bbf62c2be Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 5 Oct 2015 11:46:16 +0000 Subject: [PATCH 1/8] - 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 OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=132 --- openscap-1.2.5.tar.gz | 3 --- openscap-1.2.5.tar.gz.sha1sum | 1 - openscap-1.2.6.tar.gz | 3 +++ openscap-1.2.6.tar.gz.sha1sum | 1 + openscap.changes | 26 ++++++++++++++++++++++++++ openscap.spec | 2 +- 6 files changed, 31 insertions(+), 5 deletions(-) delete mode 100644 openscap-1.2.5.tar.gz delete mode 100644 openscap-1.2.5.tar.gz.sha1sum create mode 100644 openscap-1.2.6.tar.gz create mode 100644 openscap-1.2.6.tar.gz.sha1sum 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..dd885d8 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Mon Jul 6 11:40:29 UTC 2015 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 5552d61..6cd99c2 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 From d9711fcd1b5420a117db9362912ba01e85b1e527298925c7b7d7a054fec0ee58 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 5 Oct 2015 12:24:09 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=133 --- openscap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openscap.spec b/openscap.spec index 6cd99c2..dead38a 100644 --- a/openscap.spec +++ b/openscap.spec @@ -147,12 +147,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} From 517cb9d0f10b86ecf5ad794d098408c36e735d1bce027805c7045bde06b18f59 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Oct 2015 14:33:06 +0000 Subject: [PATCH 3/8] u M openscap.spec Diff for working copy: . Index: openscap.spec =================================================================== --- openscap.spec (revision c86548ec47e882d642c97e427035b5b3) +++ openscap.spec (working copy) @@ -74,6 +74,13 @@ %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} @@ -241,10 +248,14 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files docker +%defattr(-, root, root) +%{python_sitearch}/* + %if 0%{?with_bindings} %files -n python-openscap %defattr(-, root, root) -%{python_sitearch}/* +%{python_sitearch}/oscap_docker_python %files -n perl-openscap %defattr(-, root, root) OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=134 --- openscap.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/openscap.spec b/openscap.spec index dead38a..131a3e4 100644 --- a/openscap.spec +++ b/openscap.spec @@ -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} @@ -241,10 +248,14 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files docker +%defattr(-, root, root) +%{python_sitearch}/* + %if 0%{?with_bindings} %files -n python-openscap %defattr(-, root, root) -%{python_sitearch}/* +%{python_sitearch}/oscap_docker_python %files -n perl-openscap %defattr(-, root, root) From 069487e38855332f67e5b351077e57159ca6e2357359a0c1ac762dfc5c950965 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Oct 2015 14:34:37 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=135 --- openscap.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openscap.spec b/openscap.spec index 131a3e4..7208543 100644 --- a/openscap.spec +++ b/openscap.spec @@ -251,6 +251,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %files docker %defattr(-, root, root) %{python_sitearch}/* +%{_bindir}/oscap-docker %if 0%{?with_bindings} %files -n python-openscap @@ -269,7 +270,8 @@ 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}/scap-as-rpm %config %{_sysconfdir}/bash_completion.d/* %files content From 0f07ed8cf6b996a626808fdb61de9147f14e70cc8c2e50eed6db12eb83df7246 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Oct 2015 14:40:50 +0000 Subject: [PATCH 5/8] - new openscap-docker subpackage OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=136 --- openscap.changes | 1 + openscap.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openscap.changes b/openscap.changes index dd885d8..1916763 100644 --- a/openscap.changes +++ b/openscap.changes @@ -23,6 +23,7 @@ Mon Oct 5 11:45:28 UTC 2015 - meissner@suse.com - 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 7208543..1938d3f 100644 --- a/openscap.spec +++ b/openscap.spec @@ -250,13 +250,13 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %files docker %defattr(-, root, root) -%{python_sitearch}/* +%{python_sitelib}/oscap_docker_python %{_bindir}/oscap-docker %if 0%{?with_bindings} %files -n python-openscap %defattr(-, root, root) -%{python_sitearch}/oscap_docker_python +%{python_sitearch}/* %files -n perl-openscap %defattr(-, root, root) From 8715e38cfc18e347a12961bf7f832427da2e48436f5bb1dc4dee7fec3e6165fa Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Oct 2015 14:54:11 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=137 --- openscap.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openscap.spec b/openscap.spec index 1938d3f..5953e42 100644 --- a/openscap.spec +++ b/openscap.spec @@ -271,6 +271,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %{_initrddir}/oscap-scan %{_mandir}/man8/* %{_bindir}/oscap +%{_bindir}/oscap-ssh %{_bindir}/scap-as-rpm %config %{_sysconfdir}/bash_completion.d/* From 4b4f421f42f676c54f2b5dfe47a57adaefde9f9b88583edf57daff4bf831ba85 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Oct 2015 14:59:25 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=138 --- fix-missing-include.dif | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fix-missing-include.dif b/fix-missing-include.dif index 328a3be..98edbf8 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 From bffb547538221b4f38543a0679ea9d02047da623c9cb7d6d00f2d2f201dcfd1b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 7 Oct 2015 15:00:34 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=139 --- fix-missing-include.dif | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fix-missing-include.dif b/fix-missing-include.dif index 98edbf8..48188a3 100644 --- a/fix-missing-include.dif +++ b/fix-missing-include.dif @@ -10,3 +10,15 @@ Index: openscap-1.2.6/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" +