From bc955772b86daccd24d2c38aefd8825055407fda70165090e79d906610a1cfda Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 23 Mar 2016 10:24:34 +0000 Subject: [PATCH 1/4] - enable the SCE (script checking engine) - enable the CCE (Common Configuration Enumeration) OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=151 --- openscap.changes | 6 ++++++ openscap.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openscap.changes b/openscap.changes index 0772192..0b96a86 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 23 10:21:27 UTC 2016 - meissner@suse.com + +- enable the SCE (script checking engine) +- enable the CCE (Common Configuration Enumeration) + ------------------------------------------------------------------- Tue Jan 19 10:22:08 UTC 2016 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 1374568..5ad31a0 100644 --- a/openscap.spec +++ b/openscap.spec @@ -153,9 +153,9 @@ commonly used and require additional dependencies. %build %if 0%{?with_bindings} -%configure --disable-silent-rules +%configure --disable-silent-rules --enable-sce --enable-cce %else -%configure --disable-silent-rules --disable-bindings --disable-python --disable-python3 +%configure --disable-silent-rules --enable-sce --enable-cce --disable-bindings --disable-python --disable-python3 %endif %__make %{?_smp_mflags} From 8120fab2102009f2032dcde9db753832e44969a3e59481fee2614b6394999642 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 23 Mar 2016 10:43:09 +0000 Subject: [PATCH 2/4] packaged in "openscap-engine-sce" subpackage. OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=152 --- openscap.changes | 2 ++ openscap.spec | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/openscap.changes b/openscap.changes index 0b96a86..3620c68 100644 --- a/openscap.changes +++ b/openscap.changes @@ -2,8 +2,10 @@ Wed Mar 23 10:21:27 UTC 2016 - meissner@suse.com - enable the SCE (script checking engine) + packaged in "openscap-engine-sce" subpackage. - enable the CCE (Common Configuration Enumeration) + ------------------------------------------------------------------- Tue Jan 19 10:22:08 UTC 2016 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 5ad31a0..8c9823f 100644 --- a/openscap.spec +++ b/openscap.spec @@ -83,6 +83,13 @@ Group: System/Libraries This package contains the Docker support for OpenSCAP. +%package engine-sce +Summary: Script Checking Engine for OpenSCAP +Group: System/Libraries + +%description engine-sce +This package contains the Script Checking Engine (SCE) support for OpenSCAP. + %package devel Requires: %{name} = %{version}-%{release} Requires: libopenscap%{soname} = %{version} @@ -281,6 +288,13 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %defattr(-,root,root,-) %{_datadir}/openscap/scap*.xml +%files engine-sce +%defattr(-,root,root,-) +%{_libdir}/libopenscap_sce.so.* +%dir %{_datadir}/openscap +%dir %{_datadir}/openscap/sectool-sce/ +%{_datadir}/openscap/sectool-sce/* + %files extra-probes %defattr(-,root,root,-) %{_libexecdir}/openscap/probe_ldap57 From 66ad6c208876406005e0055d601b67949b67d0394e8ee36bf8d197b1707783f3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 23 Mar 2016 10:50:27 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=153 --- openscap.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/openscap.spec b/openscap.spec index 8c9823f..876069a 100644 --- a/openscap.spec +++ b/openscap.spec @@ -90,6 +90,13 @@ Group: System/Libraries %description engine-sce This package contains the Script Checking Engine (SCE) support for OpenSCAP. +%package -n libopenscap_sce%{soname} +Summary: Script Checking Engine Library for OpenSCAP +Group: System/Libraries + +%description -n libopenscap_sce%{soname} +This package contains the Script Checking Engine Library (SCE) for OpenSCAP. + %package devel Requires: %{name} = %{version}-%{release} Requires: libopenscap%{soname} = %{version} @@ -186,8 +193,10 @@ ln -s %{_datadir}/openscap/scap-yast2sec-oval.xml $RPM_BUILD_ROOT/%{_datadir}/o ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-xccdf.xml %post -n libopenscap%{soname} -p /sbin/ldconfig +%post -n libopenscap_sce%{soname} -p /sbin/ldconfig %postun -n libopenscap%{soname} -p /sbin/ldconfig +%postun -n libopenscap_sce%{soname} -p /sbin/ldconfig %preun utils %{stop_on_removal oscap-scan} @@ -290,11 +299,14 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %files engine-sce %defattr(-,root,root,-) -%{_libdir}/libopenscap_sce.so.* %dir %{_datadir}/openscap %dir %{_datadir}/openscap/sectool-sce/ %{_datadir}/openscap/sectool-sce/* +%files -n libopenscap_sce%{soname} +%defattr(-,root,root,-) +%{_libdir}/libopenscap_sce.so.* + %files extra-probes %defattr(-,root,root,-) %{_libexecdir}/openscap/probe_ldap57 From 14b3c5ae9680ff483438b51fd8e9854dc1f7d94d19a17145a6c81dc86e71a3c8 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 23 Mar 2016 11:00:47 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=154 --- openscap.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/openscap.spec b/openscap.spec index 876069a..cdedabf 100644 --- a/openscap.spec +++ b/openscap.spec @@ -93,6 +93,7 @@ This package contains the Script Checking Engine (SCE) support for OpenSCAP. %package -n libopenscap_sce%{soname} Summary: Script Checking Engine Library for OpenSCAP Group: System/Libraries +Recommends: openscap-engine-sce %description -n libopenscap_sce%{soname} This package contains the Script Checking Engine Library (SCE) for OpenSCAP.