From 9086dae6d7db5c39e19315991e4b393c600263b7 Mon Sep 17 00:00:00 2001 From: Michal Minar Date: Tue, 2 Jul 2013 13:54:38 +0200 Subject: added cimprovagt wrapper script for SELinux added missing group attribute to providers readded registration of 05_LMI_Qualifiers.mof to scripts --- mof/LMI_Software.reg | 46 ++++++++++++++++-------------- openlmi-providers.spec | 11 ++++++- src/software/pycmpiLMI_Software-cimprovagt | 24 ++++++++++++++++ 3 files changed, 59 insertions(+), 22 deletions(-) create mode 100644 src/software/pycmpiLMI_Software-cimprovagt diff --git a/mof/LMI_Software.reg b/mof/LMI_Software.reg index a629f0b..3ba064b 100644 --- a/mof/LMI_Software.reg +++ b/mof/LMI_Software.reg @@ -3,161 +3,165 @@ location: pyCmpiProvider type: instance namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SystemSoftwareCollection] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_HostedSoftwareCollection] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_MemberOfSoftwareCollection] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_InstalledSoftwareIdentity] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareIdentityResource] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider - type: instance + type: instance method namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_ResourceForSoftwareIdentity] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_HostedSoftwareIdentityResource] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareInstallationService] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance method namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareInstallationServiceCapabilities] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance method namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_AssociatedSoftwareInstallationServiceCapabilities] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_HostedSoftwareInstallationService] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareInstallationServiceAffectsElement] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareJob] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance method namespace: root/cimv2 + group: pycmpiLMI_Software [LMI_SoftwareInstallationJob] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance method namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareVerificationJob] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance method namespace: root/cimv2 + group: pycmpiLMI_Software [LMI_SoftwareMethodResult] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_AssociatedSoftwareJobMethodResult] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_OwningSoftwareJobElement] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_AffectedSoftwareJobElement] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareInstCreation] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: indication namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareInstModification] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: indication namespace: root/cimv2 - group: openlmi-software + group: pycmpiLMI_Software [LMI_SoftwareIdentityFileCheck] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance method namespace: root/cimv2 + group: pycmpiLMI_Software [LMI_SoftwareIdentityChecks] provider: /usr/lib/python2.7/site-packages/openlmi/software/cimom_entry.py location: pyCmpiProvider type: instance association namespace: root/cimv2 + group: pycmpiLMI_Software diff --git a/openlmi-providers.spec b/openlmi-providers.spec index 797900f..63058f1 100644 --- a/openlmi-providers.spec +++ b/openlmi-providers.spec @@ -1,6 +1,6 @@ Name: openlmi-providers Version: 0.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Set of basic CIM providers License: LGPLv2+ @@ -211,6 +211,8 @@ popd # src/python # for software providers pushd src/software %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +install -m 755 -d $RPM_BUILD_ROOT/%{_libexecdir}/pegasus +install -m 755 pycmpiLMI_Software-cimprovagt $RPM_BUILD_ROOT/%{_libexecdir}/pegasus/ popd # src/software cp mof/LMI_Software.reg $RPM_BUILD_ROOT/%{_datadir}/%{name}/ @@ -280,6 +282,7 @@ cp mof/LMI_Software.reg $RPM_BUILD_ROOT/%{_datadir}/%{name}/ %dir %{python_sitelib}/openlmi/software %{python_sitelib}/openlmi/software/* %{python_sitelib}/openlmi_software-* +%{_libexecdir}/pegasus/pycmpiLMI_Software-cimprovagt %{_datadir}/%{name}/60_LMI_Software.mof %{_datadir}/%{name}/70_LMI_SoftwareIndicationFilters.mof @@ -311,6 +314,7 @@ cp mof/LMI_Software.reg $RPM_BUILD_ROOT/%{_datadir}/%{name}/ # If upgrading, deregister old version if [ "$1" -gt 1 ]; then %{_bindir}/openlmi-mof-register --just-mofs unregister \ + %{_datadir}/%{name}/05_LMI_Qualifiers.mof \ %{_datadir}/%{name}/30_LMI_Jobs.mof \ > /dev/null 2>&1 || :; fi @@ -319,6 +323,7 @@ fi /sbin/ldconfig if [ "$1" -ge 1 ]; then %{_bindir}/openlmi-mof-register --just-mofs register \ + %{_datadir}/%{name}/05_LMI_Qualifiers.mof \ %{_datadir}/%{name}/30_LMI_Jobs.mof \ > /dev/null 2>&1 || :; fi @@ -327,6 +332,7 @@ fi # Deregister only if not upgrading if [ "$1" -eq 0 ]; then %{_bindir}/openlmi-mof-register --just-mofs unregister \ + %{_datadir}/%{name}/05_LMI_Qualifiers.mof \ %{_datadir}/%{name}/30_LMI_Jobs.mof \ > /dev/null 2>&1 || :; fi @@ -562,6 +568,9 @@ if [ "$1" -gt 1 ]; then fi %changelog +* Tue Jul 02 2013 Michal Minar 0.0.25-2 +- Added cimprovagt wrapper for SELinux for software providers. + * Mon Jun 03 2013 Roman Rakus - 0.0.25-1 - Release 0.0.25 diff --git a/src/software/pycmpiLMI_Software-cimprovagt b/src/software/pycmpiLMI_Software-cimprovagt new file mode 100644 index 0000000..a0317a1 --- /dev/null +++ b/src/software/pycmpiLMI_Software-cimprovagt @@ -0,0 +1,24 @@ +#!/bin/bash +# Copyright (C) 2013 Red Hat, Inc. All rights reserved. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Authors: Jan Safranek +# +# This is cimprovagt wrapper to have separate SELinux policy for the storage +# provider in Fedora linux. See README.RedHat.Security in tog-pegasus package +# for details how it's supposed to work. + +/usr/libexec/pegasus/cimprovagt "$@" -- cgit