vcrhonek pushed to tog-pegasus (master). "Update to upstream version 2.14.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 11:22:57 UTC 2015
>From dfde10b829261ccd9189a35756e4592f09f0a3e4 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Wed, 8 Apr 2015 13:11:12 +0200
Subject: Update to upstream version 2.14.1
diff --git a/pegasus-2.10.0-dont-strip.patch b/pegasus-2.10.0-dont-strip.patch
index fc0e4d9..e485ade 100644
--- a/pegasus-2.10.0-dont-strip.patch
+++ b/pegasus-2.10.0-dont-strip.patch
@@ -1,12 +1,11 @@
diff -up pegasus/mak/config-linux.mak.orig pegasus/mak/config-linux.mak
---- pegasus/mak/config-linux.mak.orig 2013-08-27 15:22:41.313769266 +0200
-+++ pegasus/mak/config-linux.mak 2013-08-27 15:23:45.137019051 +0200
-@@ -125,7 +125,7 @@ else
+--- pegasus/mak/config-linux.mak.orig 2015-03-31 15:25:23.735154221 +0200
++++ pegasus/mak/config-linux.mak 2015-03-31 15:26:29.349434918 +0200
+@@ -127,6 +127,7 @@ else
# appeared in the 3.0 series of compilers.
#
ifeq ($(COMPILER), gnu)
-- FLAGS += -s
+ FLAGS += -g
+ # disable the strict aliasing
ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
- EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
- endif
+ PEGASUS_EXTRA_CXX_FLAGS += -fno-enforce-eh-specs -fno-strict-aliasing
diff --git a/pegasus-2.12.0-cimmofl-allow-experimental.patch b/pegasus-2.12.0-cimmofl-allow-experimental.patch
index db0e79f..2da15c2 100644
--- a/pegasus-2.12.0-cimmofl-allow-experimental.patch
+++ b/pegasus-2.12.0-cimmofl-allow-experimental.patch
@@ -1,7 +1,7 @@
diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/Internal/Makefile
---- pegasus/Schemas/Pegasus/Internal/Makefile.orig 2009-02-16 20:13:41.000000000 +0100
-+++ pegasus/Schemas/Pegasus/Internal/Makefile 2013-09-02 16:57:30.952364556 +0200
-@@ -48,12 +48,12 @@ all:
+--- pegasus/Schemas/Pegasus/Internal/Makefile.orig 2015-04-02 12:28:55.974227490 +0200
++++ pegasus/Schemas/Pegasus/Internal/Makefile 2015-04-02 12:47:48.912641222 +0200
+@@ -48,12 +48,13 @@ all:
repository:
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(INTERNALNS) namespace ...
@@ -13,13 +13,14 @@ diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/
ifeq ($(PEGASUS_ENABLE_SLP),true)
@ $(ECHO) +++++ Loading PG_SLPTemplate.mof into $(INTERNALNS) namespace...
- @ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof"
++ @ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof"
+ @ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof"
endif
diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/InterOp/Makefile
---- pegasus/Schemas/Pegasus/InterOp/Makefile.orig 2009-09-07 15:43:46.000000000 +0200
-+++ pegasus/Schemas/Pegasus/InterOp/Makefile 2013-09-02 16:57:30.953364560 +0200
+--- pegasus/Schemas/Pegasus/InterOp/Makefile.orig 2015-04-02 12:48:17.347745936 +0200
++++ pegasus/Schemas/Pegasus/InterOp/Makefile 2015-04-02 12:51:35.167484347 +0200
@@ -44,30 +44,30 @@ all:
repository:
@@ -33,7 +34,7 @@ diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/I
ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
@$(ECHO) +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ...
- @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof"
-+ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof"
++ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof"
endif
#
@$(ECHO) +++++ Loading PG_InterOpSchema$(PG_INTEROP_SCHEMA_VER).mof into $(INTEROPNS) namespace...
@@ -46,7 +47,7 @@ diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/I
ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true)
@$(ECHO) +++++ Loading PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER) into $(INTEROPNS) namespace ...
- @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER).mof"
-+ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER).mof"
++ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER).mof"
@$(ECHO) +++++ Loading PG_Namespace$(PG_INTEROP_SCHEMA_VER) into $(INTEROPNS) namespace ...
- @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_Namespace$(PG_INTEROP_SCHEMA_VER).mof"
+ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_Namespace$(PG_INTEROP_SCHEMA_VER).mof"
@@ -60,8 +61,8 @@ diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/I
endif
diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Pegasus/ManagedSystem/Makefile
---- pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig 2010-07-09 13:24:49.000000000 +0200
-+++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2013-09-02 16:57:30.953364560 +0200
+--- pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig 2015-04-02 12:51:58.257571054 +0200
++++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2015-04-02 12:54:31.759930745 +0200
@@ -66,33 +66,33 @@ endif
ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true)
repository:
@@ -107,8 +108,8 @@ diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Peg
repositoryServer:
diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Clients/benchmarkTest/Load/Makefile
---- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2009-02-16 20:13:43.000000000 +0100
-+++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2013-09-02 16:57:30.953364560 +0200
+--- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2015-04-02 12:54:48.848927271 +0200
++++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2015-04-02 12:56:27.679228240 +0200
@@ -46,12 +46,12 @@ CIMMOFL = cimmofl
repository:
@@ -126,8 +127,8 @@ diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Client
repositoryServer:
@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(PROVIDERNS) namespace ...
diff -up pegasus/src/Providers/sample/Load/Makefile.orig pegasus/src/Providers/sample/Load/Makefile
---- pegasus/src/Providers/sample/Load/Makefile.orig 2009-02-16 20:14:13.000000000 +0100
-+++ pegasus/src/Providers/sample/Load/Makefile 2013-09-02 16:57:30.953364560 +0200
+--- pegasus/src/Providers/sample/Load/Makefile.orig 2015-04-02 12:56:41.488278412 +0200
++++ pegasus/src/Providers/sample/Load/Makefile 2015-04-02 13:01:24.078286449 +0200
@@ -44,52 +44,52 @@ SAMPLEPROVIDERNS=root/SampleProvider
# Load the sample MOF with the local compiler.
repository:
@@ -203,9 +204,9 @@ diff -up pegasus/src/Providers/sample/Load/Makefile.orig pegasus/src/Providers/s
# Load the sample mof through the Client interface compiler.
diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Providers/TestProviders/Load/Makefile
---- pegasus/src/Providers/TestProviders/Load/Makefile.orig 2012-08-02 14:18:17.000000000 +0200
-+++ pegasus/src/Providers/TestProviders/Load/Makefile 2013-09-02 16:57:30.954364563 +0200
-@@ -67,155 +67,155 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded
+--- pegasus/src/Providers/TestProviders/Load/Makefile.orig 2015-04-02 13:01:53.265389867 +0200
++++ pegasus/src/Providers/TestProviders/Load/Makefile 2015-04-02 13:18:57.613079600 +0200
+@@ -67,160 +67,160 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded
##
repository:
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTPROVIDERNS) namespace ...
@@ -278,7 +279,8 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationTestProvider.mof
+ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationTestProvider.mof
@ $(ECHO) +++++ Registering IndicationTestProvider ...
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof
+- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof
++ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof
@ $(ECHO) +++++ Loading MethodTestProvider class definitions into $(TESTPROVIDERNS) namespace ...
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" MethodTestProvider.mof
@@ -335,6 +337,13 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" LocalizedProviderR.mof
+ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" LocalizedProviderR.mof
+ @ $(ECHO) +++++ Loading ResponseStressTest class definitions into $(TESTPROVIDERNS) namespace ...
+- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" ResponseStressTest.mof
++ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" ResponseStressTest.mof
+ @ $(ECHO) +++++ Registering ResponseStressTestProvider ...
+- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" ResponseStressTestProviderRegistration.mof
++ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" ResponseStressTestProviderRegistration.mof
+
ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
@ $(ECHO) +++++ Loading TestCMPI_ProviderSchema class definitions into $(TESTPROVIDERNS) namespace ...
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCMPI_ProviderSchema.mof
@@ -427,7 +436,7 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
# create remote namespace for Remote CMPI test providers
ifdef PEGASUS_ENABLE_REMOTE_CMPI
@ echo +++++ Creating remote namespace ...
-@@ -226,28 +226,28 @@ endif
+@@ -231,28 +231,28 @@ endif
## Indication filter source namespaces testing
##
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTINDSRCNS1) namespace ...
@@ -467,8 +476,8 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/static/Load/Makefile
---- pegasus/test/wetest/static/Load/Makefile.orig 2009-02-16 20:14:20.000000000 +0100
-+++ pegasus/test/wetest/static/Load/Makefile 2013-09-02 16:57:30.954364563 +0200
+--- pegasus/test/wetest/static/Load/Makefile.orig 2015-04-02 13:19:28.925192771 +0200
++++ pegasus/test/wetest/static/Load/Makefile 2015-04-02 13:20:21.994384585 +0200
@@ -42,14 +42,14 @@ STATICTESTNS=test/static
repository:
@@ -489,8 +498,8 @@ diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/stati
repositoryServer:
@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(STATICTESTNS) namespace ...
diff -up pegasus/test/wetest/wsman/Load/Makefile.orig pegasus/test/wetest/wsman/Load/Makefile
---- pegasus/test/wetest/wsman/Load/Makefile.orig 2013-09-02 16:57:40.263396410 +0200
-+++ pegasus/test/wetest/wsman/Load/Makefile 2013-09-02 17:00:13.685926532 +0200
+--- pegasus/test/wetest/wsman/Load/Makefile.orig 2015-04-02 13:40:54.714859175 +0200
++++ pegasus/test/wetest/wsman/Load/Makefile 2015-04-02 13:41:33.960003910 +0200
@@ -46,9 +46,9 @@ WSM_TEST_NS=test/WsmTest
# NOTE: I believe that the remove is duplicated for some reason.
repository:
diff --git a/pegasus-2.12.0-empty_arrays.patch b/pegasus-2.12.0-empty_arrays.patch
index 6e94c8a..19cc7c2 100644
--- a/pegasus-2.12.0-empty_arrays.patch
+++ b/pegasus-2.12.0-empty_arrays.patch
@@ -1,7 +1,7 @@
-diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp
---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test 2012-12-03 16:48:34.469370334 +0100
-+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 2012-12-03 16:47:41.000000000 +0100
-@@ -358,12 +358,6 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
+diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.orig pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp
+--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.orig 2015-03-31 15:28:05.958848322 +0200
++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 2015-03-31 15:29:13.253136407 +0200
+@@ -349,13 +349,6 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
data->value.uint64 = 0;
data->state = CMPI_goodValue;
@@ -11,10 +11,11 @@ diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test pe
- data->state = CMPI_nullValue;
- return CMPI_RC_OK;
- }
-
+-
if (type & CMPI_ARRAY)
{
-@@ -398,6 +392,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
+ // Get the type of the element of the CMPIArray
+@@ -389,6 +382,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
}
else
{
diff --git a/pegasus-2.12.0-schema-version-and-includes.patch b/pegasus-2.12.0-schema-version-and-includes.patch
index f847a80..95c064b 100644
--- a/pegasus-2.12.0-schema-version-and-includes.patch
+++ b/pegasus-2.12.0-schema-version-and-includes.patch
@@ -1,18 +1,6 @@
-diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
---- pegasus/env_var_Linux.status.orig 2013-09-05 15:12:45.728086855 +0200
-+++ pegasus/env_var_Linux.status 2013-09-05 15:12:45.750086927 +0200
-@@ -28,7 +28,7 @@ PEGASUS_PAM_AUTHENTICATION=true
- PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
- PEGASUS_USE_RELEASE_DIRS=true
- PEGASUS_USE_SYSLOGS=true
--PEGASUS_CIM_SCHEMA=CIM236
-+PEGASUS_CIM_SCHEMA=CIM238
- PEGASUS_USE_NET_SNMP=true
- PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
-
diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Core.mof
---- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2013-09-05 15:12:45.713086805 +0200
-+++ pegasus/Schemas/CIM238/CIM_Core.mof 2013-09-05 15:12:45.750086927 +0200
+--- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2015-04-07 15:24:25.280804943 +0200
++++ pegasus/Schemas/CIM238/CIM_Core.mof 2015-04-07 15:24:25.321805120 +0200
@@ -146,11 +146,14 @@
#pragma include ("DMTF/Core/CIM_SpareGroup.mof")
#pragma include ("DMTF/Core/CIM_StatusCollection.mof")
@@ -69,8 +57,8 @@ diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Cor
#pragma include ("DMTF/Core/CIM_SystemFCPort.mof")
diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Event.mof
---- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2013-09-05 15:12:45.716086815 +0200
-+++ pegasus/Schemas/CIM238/CIM_Event.mof 2013-09-05 15:12:45.750086927 +0200
+--- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2015-04-07 15:24:25.283804956 +0200
++++ pegasus/Schemas/CIM238/CIM_Event.mof 2015-04-07 15:24:25.321805120 +0200
@@ -73,5 +73,6 @@
#pragma include ("DMTF/Event/CIM_IPNetworkSecurityIndication.mof")
#pragma include ("DMTF/Event/CIM_IPPacketFilterIndication.mof")
@@ -79,8 +67,8 @@ diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Ev
#pragma include ("DMTF/Event/CIM_LogOfIndication.mof")
diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_Interop.mof
---- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2013-09-05 15:12:45.718086822 +0200
-+++ pegasus/Schemas/CIM238/CIM_Interop.mof 2013-09-05 15:12:45.750086927 +0200
+--- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2015-04-07 15:24:25.285804965 +0200
++++ pegasus/Schemas/CIM238/CIM_Interop.mof 2015-04-07 15:24:25.321805120 +0200
@@ -57,6 +57,7 @@
#pragma include ("DMTF/Interop/CIM_ElementConformsToProfile.mof")
#pragma include ("DMTF/Interop/CIM_ReferencedProfile.mof")
@@ -90,8 +78,8 @@ diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_
#pragma include ("DMTF/Interop/CIM_WSManagementCapabilities.mof")
#pragma include ("DMTF/Interop/CIM_CIMXMLCapabilities.mof")
diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_System.mof
---- pegasus/Schemas/CIM238/CIM_System.mof.orig 2013-09-05 15:12:45.722086835 +0200
-+++ pegasus/Schemas/CIM238/CIM_System.mof 2013-09-05 15:31:32.383754011 +0200
+--- pegasus/Schemas/CIM238/CIM_System.mof.orig 2015-04-07 15:24:25.290804986 +0200
++++ pegasus/Schemas/CIM238/CIM_System.mof 2015-04-07 15:24:25.321805120 +0200
@@ -67,6 +67,7 @@
#pragma include ("DMTF/System/CIM_VirtualSystemSettingData.mof")
#pragma include ("DMTF/System/CIM_AttachedElement.mof")
@@ -124,7 +112,7 @@ diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_S
#pragma include ("DMTF/System/CIM_HelpServiceAvailableToFile.mof")
diff -up pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig pegasus/Schemas/CIM238/DMTF/qualifiers.mof
--- pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig 2013-08-12 11:34:14.000000000 +0200
-+++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2013-09-05 15:12:45.751086931 +0200
++++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2015-04-07 15:24:25.321805120 +0200
@@ -152,8 +152,8 @@ Qualifier PUnit : string = null,
Qualifier Read : boolean = true,
Scope(property);
diff --git a/pegasus-2.13.0-CMGetKey-data-type-fix.patch b/pegasus-2.13.0-CMGetKey-data-type-fix.patch
deleted file mode 100644
index 794191f..0000000
--- a/pegasus-2.13.0-CMGetKey-data-type-fix.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp
-===================================================================
-RCS file: /cvs/MSB/pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 13 Feb 2013 11:40:04 -0000 1.4
-+++ src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 7 Apr 2014 09:52:59 -0000 1.5
-@@ -266,28 +266,14 @@
- data->value.boolean=scmoValue->simple.val.bin;
- data->type=CMPI_keyBoolean;
- break;
--
- case CMPI_real32:
-- {
-- char buffer[128];
-- Uint32 size=0;
-- Real32ToString(buffer, scmoValue->simple.val.r32, size);
-- data->value.string = reinterpret_cast<CMPIString*>(
-- new CMPI_Object(buffer));
-- data->type=CIMKeyBinding::STRING;
-- break;
-- }
--
-+ data->value.real32=(CMPIReal32)scmoValue->simple.val.r32;
-+ data->type=CMPI_real32;
-+ break;
- case CMPI_real64:
-- {
-- char buffer[128];
-- Uint32 size=0;
-- Real64ToString(buffer, scmoValue->simple.val.r64, size);
-- data->value.string = reinterpret_cast<CMPIString*>(
-- new CMPI_Object(buffer));
-- data->type=CIMKeyBinding::STRING;
-- break;
-- }
-+ data->value.real64=(CMPIReal64)scmoValue->simple.val.r64;
-+ data->type=CMPI_real64;
-+ break;
-
- case CMPI_charsptr:
- case CMPI_chars:
-@@ -309,11 +295,11 @@
-
- case CMPI_dateTime:
- {
-- char buffer[26];
-- _DateTimetoCStr(scmoValue->dateTimeValue, buffer);
-- data->value.string = reinterpret_cast<CMPIString*>(
-- new CMPI_Object(buffer));
-- data->type=CIMKeyBinding::STRING;
-+ CIMDateTime* cimdt =
-+ new CIMDateTime(&scmoValue->dateTimeValue);
-+ data->value.dateTime = reinterpret_cast<CMPIDateTime*>
-+ (new CMPI_Object(cimdt));
-+ data->type=CMPI_dateTime;
- break;
- }
-
diff --git a/pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch b/pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch
deleted file mode 100644
index ffda224..0000000
--- a/pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp
-===================================================================
-RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp,v
-retrieving revision 1.16
-diff -u -b -w -r1.16 ComputerSystem.cpp
---- src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp 16 Dec 2008 18:57:17 -0000 1.16
-+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp 16 Oct 2013 13:13:10 -0000
-@@ -27,12 +27,6 @@
- //
- //////////////////////////////////////////////////////////////////////////
- //
--// Author: Mike Brasher (mbrasher at bmc.com)
--//
--// Modified By: Rudy Schuet (rudy.schuet at compaq.com) 11/12/01
--// added nsk platform support
--// Sean Keenan Hewlett-Packard Company (sean.keenan at hp.com)
--//
- //%/////////////////////////////////////////////////////////////////////////////
-
- #include "ComputerSystem.h"
-Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp
-===================================================================
-RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp,v
-retrieving revision 1.24
-diff -u -b -w -r1.24 ComputerSystemProvider.cpp
---- src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp 2 Dec 2008 09:02:26 -0000 1.24
-+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp 16 Oct 2013 13:13:10 -0000
-@@ -37,9 +37,9 @@
- // This provider is registered to support operations at
- // several class levels:
- //
--// CIM_ComputerSystem
--// CIM_UnitaryComputerSystem
- // <platform>_ComputerSustem
-+// CIM_UnitaryComputerSystem
-+// CIM_ComputerSystem
- //
- // Enumeration operations always return instances from the
- // deepest class available. All other
-@@ -95,17 +95,22 @@
- String keyValue;
-
- if (keys.size() != keyCount)
-+ {
- throw CIMInvalidParameterException("Wrong number of keys");
-+ }
-
- for (unsigned int ii = 0; ii < keys.size(); ii++)
- {
- keyName = keys[ii].getName();
- keyValue = keys[ii].getValue();
-
-+ //Put CLASS_EXTENDED_COMPUTER_SYSTEM in front CLASS_CIM_COMPUTER_SYSTEM
-+ //to prefer CLASS_EXTENDED_COMPUTER_SYSTEM as class being served first
-+ //followed by CLASS_CIM_UNITARY_COMPUTER_SYSTEM
- if (keyName.equal(PROPERTY_CREATION_CLASS_NAME) &&
-- (String::equalNoCase(keyValue,CLASS_CIM_COMPUTER_SYSTEM) ||
-+ (String::equalNoCase(keyValue,CLASS_EXTENDED_COMPUTER_SYSTEM) ||
- String::equalNoCase(keyValue,CLASS_CIM_UNITARY_COMPUTER_SYSTEM) ||
-- String::equalNoCase(keyValue,CLASS_EXTENDED_COMPUTER_SYSTEM) ||
-+ String::equalNoCase(keyValue,CLASS_CIM_COMPUTER_SYSTEM) ||
- String::equalNoCase(keyValue,String::EMPTY)))
- {
- keyCount--;
-@@ -189,7 +194,7 @@
-
- keys.append(CIMKeyBinding(
- PROPERTY_CREATION_CLASS_NAME,
-- CLASS_CIM_COMPUTER_SYSTEM,
-+ CLASS_EXTENDED_COMPUTER_SYSTEM,
- CIMKeyBinding::STRING));
- keys.append(CIMKeyBinding(
- PROPERTY_NAME,
-@@ -250,9 +255,9 @@
-
- void ComputerSystemProvider::_checkClass(CIMName& className)
- {
-- if (!className.equal(CLASS_CIM_COMPUTER_SYSTEM) &&
-+ if (!className.equal(CLASS_EXTENDED_COMPUTER_SYSTEM) &&
- !className.equal(CLASS_CIM_UNITARY_COMPUTER_SYSTEM) &&
-- !className.equal(CLASS_EXTENDED_COMPUTER_SYSTEM))
-+ !className.equal(CLASS_CIM_COMPUTER_SYSTEM))
- {
- throw CIMNotSupportedException(String::EMPTY);
- }
-Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp
-===================================================================
-RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp,v
-retrieving revision 1.14
-diff -u -b -w -r1.14 ComputerSystemProviderMain.cpp
---- src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp 16 Dec 2008 18:57:17 -0000 1.14
-+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp 16 Oct 2013 13:13:10 -0000
-@@ -27,14 +27,6 @@
- //
- //////////////////////////////////////////////////////////////////////////
- //
--// Author: Christopher Neufeld <neufeld at linuxcare.com>
--// David Kennedy <dkennedy at linuxcare.com>
--//
--// Modified By: David Kennedy <dkennedy at linuxcare.com>
--// Christopher Neufeld <neufeld at linuxcare.com>
--// Al Stone <ahs3 at fc.hp.com>
--// Mike Glantz <michael_glantz at hp.com>
--//
- //%////////////////////////////////////////////////////////////////////////////
-
- //
-Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp
-===================================================================
-RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp,v
-retrieving revision 1.24
-diff -u -b -w -r1.24 ComputerSystem_Linux.cpp
---- src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 16 Dec 2008 18:57:17 -0000 1.24
-+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 16 Oct 2013 13:13:10 -0000
-@@ -43,8 +43,6 @@
- PEGASUS_USING_STD;
- PEGASUS_USING_PEGASUS;
-
--static String _hostName;
--
- ComputerSystem::ComputerSystem()
- {
- }
-@@ -304,48 +302,14 @@
- }
-
- /**
-- * initialize primarily functions to initialize static global variables
-- * that will not be changed frequently. These variables are currently
-- * _hostName.
-- *
-+ * This is empty as we get the hostname through
-+ * System class
- */
- void ComputerSystem::initialize()
- {
-- char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
-- struct hostent *hostEntry;
--
-- if (gethostname(hostName, sizeof(hostName)) != 0)
-- {
-- _hostName.assign("Not initialized");
-- }
-- hostName[sizeof(hostName)-1] = 0;
--
-- // Now get the official hostname. If this call fails then return
-- // the value from gethostname().
--
-- char hostEntryBuffer[8192];
-- struct hostent hostEntryStruct;
-- int hostEntryErrno;
--
-- gethostbyname_r(
-- hostName,
-- &hostEntryStruct,
-- hostEntryBuffer,
-- sizeof(hostEntryBuffer),
-- &hostEntry,
-- &hostEntryErrno);
--
-- if (hostEntry)
-- {
-- _hostName.assign(hostEntry->h_name);
-- }
-- else
-- {
-- _hostName.assign(hostName);
-- }
- }
-
- String ComputerSystem::getHostName()
- {
-- return _hostName;
-+ return System::getFullyQualifiedHostName();
- }
diff --git a/pegasus-2.13.0-SSLGeneration.patch b/pegasus-2.13.0-SSLGeneration.patch
deleted file mode 100644
index db27d9c..0000000
--- a/pegasus-2.13.0-SSLGeneration.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 75b27360143b05626e3962a74b17ddba919c080b Mon Sep 17 00:00:00 2001
-From: Stephen Gallagher <sgallagh at redhat.com>
-Date: Mon, 18 Aug 2014 16:40:46 -0400
-Subject: [PATCH] Update SSL certificate generation
-
-We will now generate x509v3 certificates with the CA:FALSE
-constraint. This will allow us to automatically load it into a
-local trust store safely. In order to do this, instead of creating
-a true self-signed certificate, we will generate a private CA
-certificate and sign the service with that.
----
- rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec | 136 +++++++++++++++++++------
- 1 file changed, 107 insertions(+), 29 deletions(-)
-
-diff --git a/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec b/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec
-index 81e6635936b77ddc486b217260fba59b23cf2a20..377b82d7a0bd3f42b1e58b0a795b2e628365dd36 100644
---- a/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec
-+++ b/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec
-@@ -4,22 +4,31 @@
- # Creates a default ssl.cnf file.
- # Generates a self-signed certificate for use by the cimserver.
- #
--cnfChanged=0;
--if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
-- mkdir -p ${PEGASUS_INSTALL_LOG%/*}
-- mkdir -p $PEGASUS_CONFIG_DIR
-- echo "[ req ]" > $PEGASUS_CONFIG_DIR/ssl.cnf
-+
-+function create_ssl_cnf #(config_file, CN)
-+{
-+ SSL_CFG=$1
-+ CA=$2 # Add a second argument to differentiate issuer from subject
-+
-+ # Create OpenSSL configuration files for generating certificates
-+ echo "[ req ]" > $PEGASUS_CONFIG_DIR/$SSL_CFG
- echo "distinguished_name = req_distinguished_name" >> \
-- $PEGASUS_CONFIG_DIR/ssl.cnf
-- echo "prompt = no" >> $PEGASUS_CONFIG_DIR/ssl.cnf
-- echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/ssl.cnf
-- echo "C = UK" >> $PEGASUS_CONFIG_DIR/ssl.cnf
-- echo "ST = Berkshire" >> $PEGASUS_CONFIG_DIR/ssl.cnf
-- echo "L = Reading" >> $PEGASUS_CONFIG_DIR/ssl.cnf
-+ $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "prompt = no" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+
-+ # Include support for x509v3 so we can differentiate CA certificates
-+ # from service certificates
-+ echo "req_extensions = v3_req" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "x509_extensions = v3_ca" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+
-+ echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "C = UK" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "ST = Berkshire" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "L = Reading" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
- echo "O = The Open Group" >> \
-- $PEGASUS_CONFIG_DIR/ssl.cnf
-+ $PEGASUS_CONFIG_DIR/$SSL_CFG
- echo "OU = The OpenPegasus Project" >> \
-- $PEGASUS_CONFIG_DIR/ssl.cnf
-+ $PEGASUS_CONFIG_DIR/$SSL_CFG
- DN=`hostname`;
- if [ -z "$DN" ] || [ "$DN" = "(none)" ]; then
- DN='localhost.localdomain';
-@@ -30,30 +39,99 @@ if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
- FQDN="$DN";
- fi;
- # cannot use 'hostname --fqdn' because this can hang indefinitely
-- echo "CN = $FQDN" >> $PEGASUS_CONFIG_DIR/ssl.cnf
-- chmod 400 $PEGASUS_CONFIG_DIR/ssl.cnf
-- chown root $PEGASUS_CONFIG_DIR/ssl.cnf
-- chgrp root $PEGASUS_CONFIG_DIR/ssl.cnf
-+ # Hack the $CA onto the end of the CN so we differentiate the issuer
-+ # of the signature from the subject
-+ echo "CN = $FQDN$CA" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+
-+ # Add x509v3 extensions
-+ echo "[ v3_req ]" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "basicConstraints = CA:FALSE" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "[ v3_ca ]" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "subjectKeyIdentifier=hash" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "authorityKeyIdentifier=keyid:always,issuer" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+ echo "basicConstraints = CA:TRUE" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
-+}
-+
-+cnfChanged=0;
-+if [ ! -e $PEGASUS_CONFIG_DIR/ssl-ca.cnf ] ||
-+ [ ! -e $PEGASUS_CONFIG_DIR/ssl-service.cnf ] ||
-+ [ ! -e $PEGASUS_CONFIG_DIR/server.pem ] ||
-+ [ ! -e $PEGASUS_CONFIG_DIR/file.pem ] ||
-+ [ ! -e $PEGASUS_CONFIG_DIR/client.pem ]; then
-+
-+ mkdir -p ${PEGASUS_INSTALL_LOG%/*}
-+ mkdir -p $PEGASUS_CONFIG_DIR
-+
-+ create_ssl_cnf ssl-ca.cnf CA
-+ create_ssl_cnf ssl-service.cnf
-+
-+ chmod 400 $PEGASUS_CONFIG_DIR/ssl-*.cnf
-+ chown root $PEGASUS_CONFIG_DIR/ssl-*.cnf
-+ chgrp root $PEGASUS_CONFIG_DIR/ssl-*.cnf
- cnfChanged=1;
- fi
- if [ $cnfChanged -eq 1 ] || \
- [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE ] || \
- [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE ]; then
-- /usr/bin/openssl req -x509 -days 3650 -newkey rsa:2048 \
-- -nodes -config $PEGASUS_CONFIG_DIR/ssl.cnf \
-- -keyout $PEGASUS_PEM_DIR/key.pem \
-- -out $PEGASUS_PEM_DIR/cert.pem 2>>$PEGASUS_INSTALL_LOG
-- chmod 700 $PEGASUS_PEM_DIR/*.pem
-- cp -fp $PEGASUS_PEM_DIR/cert.pem \
-- $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
-- cp -fp $PEGASUS_PEM_DIR/key.pem \
-- $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
-+
-+ # Restrict access of the key to root
-+ OLDUMASK=`umask`
-+ umask 0077
-+
-+ # Create private key for the CA certificate
-+ TMPKEY=`mktemp --tmpdir=$PEGASUS_PEM_DIR XXXXXXXXXXXX`
-+
-+ /usr/bin/openssl genrsa -out $TMPKEY 2048
-+
-+ # Restore the umask for the other files
-+ umask $OLDUMASK
-+
-+ # Create CA certificate:
-+ /usr/bin/openssl req -new -x509 -days 3650 \
-+ -config $PEGASUS_CONFIG_DIR/ssl-ca.cnf \
-+ -key $TMPKEY \
-+ -out $PEGASUS_PEM_DIR/ca.crt \
-+
-+ # Create private key for the service certificate
-+ /usr/bin/openssl genrsa -out $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE 2048
-+
-+ # Create a signing request for the service certificate
-+ /usr/bin/openssl req -new \
-+ -config $PEGASUS_CONFIG_DIR/ssl-service.cnf \
-+ -key $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE \
-+ -out $PEGASUS_PEM_DIR/server.csr
-+
-+ # Sign the request with the CA certificate
-+ /usr/bin/openssl x509 -req -days 3650 \
-+ -in $PEGASUS_PEM_DIR/server.csr \
-+ -CA $PEGASUS_PEM_DIR/ca.crt \
-+ -CAkey $TMPKEY \
-+ -CAcreateserial \
-+ -out $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
-+ -extfile $PEGASUS_CONFIG_DIR/ssl-ca.cnf
-+
-+ # Set file permissions appropriately
- chmod 400 $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
-- chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
-- rm -f $PEGASUS_PEM_DIR/key.pem $PEGASUS_PEM_DIR/cert.pem
-+ chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
-+
-+ # Remove the certificate signing request
-+ # It is not needed after the signature is complete
-+ rm -f $PEGASUS_PEM_DIR/server.csr
-+
-+ # Remove the private key for the CA certificate
-+ # This will ensure that it cannot be used to sign any other
-+ # (possibly suspicious) certificates
-+ # This does mean that generating a new certificate for this
-+ # service will need a new CA cert, but most real deployments
-+ # will use real infrastructure.
-+ # This does not impart perfect security; there is a fairly
-+ # long race here between the key generation and its deletion.
-+ # The random filename should significantly mitigate this.
-+ rm -f $TMPKEY
-+
- fi;
- if [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE ]; then
-- cp -fp $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
-+ cp -fp $PEGASUS_PEM_DIR/ca.crt \
- $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE
- chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE;
- fi;
---
-2.1.0
-
diff --git a/pegasus-2.13.0-build-fix.patch b/pegasus-2.13.0-build-fix.patch
deleted file mode 100644
index 380a2bb..0000000
--- a/pegasus-2.13.0-build-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up pegasus/src/slp/slp_agent/peg_slp_agent.cpp.orig pegasus/src/slp/slp_agent/peg_slp_agent.cpp
---- pegasus/src/slp/slp_agent/peg_slp_agent.cpp.orig 2013-08-27 16:04:10.154370312 +0200
-+++ pegasus/src/slp/slp_agent/peg_slp_agent.cpp 2013-08-27 16:06:20.281855366 +0200
-@@ -584,7 +584,6 @@ PEGASUS_THREAD_CDECL slp_service_agent::
-
- agent->_should_listen = 1;
-
-- lslpMsg msg_list;
- while (agent->_should_listen.get())
- {
- Uint32 now, msec;
-@@ -675,6 +674,7 @@ PEGASUS_THREAD_CDECL slp_service_agent::
- {
- }
- #else
-+ lslpMsg msg_list;
- agent->_rep->service_listener(agent->_rep, 0, &msg_list);
- _LSLP_SLEEP(1);
- if (agent->_update_reg_count.get() && agent->_should_listen.get())
diff --git a/pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch b/pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch
deleted file mode 100644
index 822bb96..0000000
--- a/pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch
+++ /dev/null
@@ -1,1387 +0,0 @@
-commit bbcc9985fc6935b319571c967438ba457082da75
-Author: Jan Safranek <jsafrane at redhat.com>
-Date: Wed Dec 4 08:49:18 2013 +0100
-
- [v3] Fixed deserialization of EmbeddedInstances
-
-diff --git a/src/Pegasus/Common/SCMOStreamer.cpp b/src/Pegasus/Common/SCMOStreamer.cpp
-index 811dbb4..7b8c906 100644
---- a/src/Pegasus/Common/SCMOStreamer.cpp
-+++ b/src/Pegasus/Common/SCMOStreamer.cpp
-@@ -418,7 +418,6 @@ bool SCMOStreamer::_getInstances()
-
- // Instance references resolution table
- SCMOResolutionTable *extRefArray = new SCMOResolutionTable[numExtRefs];
-- Uint32 extRefIndex=0;
- if (numExtRefs > 0)
- {
- if(!_buf.getBytes(extRefArray, numExtRefs*sizeof(SCMOResolutionTable)))
-@@ -465,23 +464,6 @@ bool SCMOStreamer::_getInstances()
-
- SCMOInstance* scmoInstPtr = new SCMOInstance(scmbInstPtr);
-
-- if (numExtRefs > 0)
-- {
-- // Handle the external references to other SCMOInstances
-- Uint32 numExtRefs = scmoInstPtr->numberExtRef();
-- for (Uint32 i=0; i < numExtRefs; i++)
-- {
-- Uint32 extRefPos = extRefArray[extRefIndex].index;
-- SCMOInstance* extRefPtr = instArray[extRefPos].scmbptr.scmoInst;
-- scmoInstPtr->putExtRef(i,extRefPtr);
--
-- // Mark instance as already consumed
-- instArray[extRefPos].scmbptr.uint64 = 0;
--
-- extRefIndex++;
-- }
-- }
--
- instArray[x].scmbptr.scmoInst = scmoInstPtr;
-
- #ifdef PEGASUS_DEBUG
-@@ -489,6 +471,32 @@ bool SCMOStreamer::_getInstances()
- #endif
- }
-
-+ // resolve all references in all instances
-+ if (numExtRefs > 0)
-+ {
-+ for (Uint32 x = 0; x < numInst; x++)
-+ {
-+ SCMOInstance* inst = (SCMOInstance*)instArray[x].scmbptr.scmoInst;
-+ // resolve all references in this instance
-+ for (Uint32 ref = 0; ref < inst->numberExtRef(); ref++)
-+ {
-+ SCMOInstance* oldPtr = inst->getExtRef(ref);
-+ /* find the instance for given reference*/
-+ for (Uint32 y = 0; y < numExtRefs; y++)
-+ {
-+ if (extRefArray[y].scmbptr.scmoInst == oldPtr) {
-+ Uint64 index = extRefArray[y].index;
-+ SCMOInstance *newPtr = instArray[index].scmbptr.scmoInst;
-+ inst->putExtRef(ref, newPtr);
-+ // consume the instance
-+ instArray[index].scmbptr.uint64 = 0;
-+ break;
-+ }
-+ }
-+ }
-+ }
-+ }
-+
- // Append all non-referenced instances to output array
- for (Uint32 x=0; x < numInst; x++)
- {
-diff --git a/src/Pegasus/Common/tests/Makefile b/src/Pegasus/Common/tests/Makefile
-index 8318bf9..43ac8db 100644
---- a/src/Pegasus/Common/tests/Makefile
-+++ b/src/Pegasus/Common/tests/Makefile
-@@ -78,6 +78,7 @@ DIRS = \
- Resolve \
- Scope \
- SCMO \
-+ SCMOStreamer \
- SpinLock \
- Stack \
- StrToInstName \
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/CIM_Error.xml b/src/Pegasus/Common/tests/SCMOStreamer/CIM_Error.xml
-new file mode 100644
-index 0000000..671ac43
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/CIM_Error.xml
-@@ -0,0 +1,557 @@
-+<CLASS NAME="CIM_Error" SUPERCLASS="CIM_Message" >
-+<QUALIFIER NAME="INDICATION" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Version" TYPE="string" TOSUBCLASS="false" TRANSLATABLE="true">
-+<VALUE>2.30.0</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Exception" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="UMLPackagePath" TYPE="string">
-+<VALUE>CIM::Interop</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>CIM_Error is a specialized class that contains information about the severity, cause, recommended actions and other data related to the failure of a CIM Operation. Instances of this type MAY be included as part of the response to a CIM Operation.</VALUE>
-+</QUALIFIER>
-+<PROPERTY NAME="ErrorType" CLASSORIGIN="CIM_Error" TYPE="uint16">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>Primary classification of the error. The following values are defined: 2 - Communications Error. Errors of this type are principally associated with the procedures and/or processes required to convey information from one point to another. 3 - Quality of Service Error. Errors of this type are principally associated with failures that result in reduced functionality or performance. 4 - Software Error. Error of this type are principally associated with a software or processing fault. 5 - Hardware Error. Errors of this type are principally associated with an equipment or hardware failure. 6 - Environmental Error. Errors of this type are principally associated with a failure condition relating the to facility, or other environmental considerations. 7 - Security Error. Errors of this type are associated with security violations, detection of viruses, and similar issues. 8 - Oversubscription Error. Errors of this type are principally associated wi
th the failure to allocate sufficient resources to complete the operation. 9 - Unavailable Resource Error. Errors of this type are principally associated with the failure to access a required resource. 10 -Unsupported Operation Error. Errors of this type are principally associated with requests that are not supported.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>0</VALUE>
-+<VALUE>1</VALUE>
-+<VALUE>2</VALUE>
-+<VALUE>3</VALUE>
-+<VALUE>4</VALUE>
-+<VALUE>5</VALUE>
-+<VALUE>6</VALUE>
-+<VALUE>7</VALUE>
-+<VALUE>8</VALUE>
-+<VALUE>9</VALUE>
-+<VALUE>10</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>Unknown</VALUE>
-+<VALUE>Other</VALUE>
-+<VALUE>Communications Error</VALUE>
-+<VALUE>Quality of Service Error</VALUE>
-+<VALUE>Software Error</VALUE>
-+<VALUE>Hardware Error</VALUE>
-+<VALUE>Environmental Error</VALUE>
-+<VALUE>Security Error</VALUE>
-+<VALUE>Oversubscription Error</VALUE>
-+<VALUE>Unavailable Resource Error</VALUE>
-+<VALUE>Unsupported Operation Error</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.OtherErrorType</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="OtherErrorType" CLASSORIGIN="CIM_Error" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A free-form string describing the ErrorType when 1, "Other", is specified as the ErrorType.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.ErrorType</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="PerceivedSeverity" CLASSORIGIN="CIM_Error" TYPE="uint16">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An enumerated value that describes the severity of the Indication from the notifier's point of view: 0 - the Perceived Severity of the indication is unknown or indeterminate. 1 - Other, by CIM convention, is used to indicate that the Severity's value can be found in the OtherSeverity property. 2 - Information should be used when providing an informative response. 3 - Degraded/Warning should be used when its appropriate to let the user decide if action is needed. 4 - Minor should be used to indicate action is needed, but the situation is not serious at this time. 5 - Major should be used to indicate action is needed NOW. 6 - Critical should be used to indicate action is needed NOW and the scope is broad (perhaps an imminent outage to a critical resource will result). 7 - Fatal/NonRecoverable should be used to indicate an error occurred, but it's too late to take remedial action. 2 and 0 - Information and Unknown (res
pectively) follow common usage. Literally, the Error is purely informational or its severity is simply unknown.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>0</VALUE>
-+<VALUE>1</VALUE>
-+<VALUE>2</VALUE>
-+<VALUE>3</VALUE>
-+<VALUE>4</VALUE>
-+<VALUE>5</VALUE>
-+<VALUE>6</VALUE>
-+<VALUE>7</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>Unknown</VALUE>
-+<VALUE>Other</VALUE>
-+<VALUE>Information</VALUE>
-+<VALUE>Degraded/Warning</VALUE>
-+<VALUE>Minor</VALUE>
-+<VALUE>Major</VALUE>
-+<VALUE>Critical</VALUE>
-+<VALUE>Fatal/NonRecoverable</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>Recommendation.ITU|X733.Perceived severity</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="ProbableCause" CLASSORIGIN="CIM_Error" TYPE="uint16">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An enumerated value that describes the probable cause of the error.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>0</VALUE>
-+<VALUE>1</VALUE>
-+<VALUE>2</VALUE>
-+<VALUE>3</VALUE>
-+<VALUE>4</VALUE>
-+<VALUE>5</VALUE>
-+<VALUE>6</VALUE>
-+<VALUE>7</VALUE>
-+<VALUE>8</VALUE>
-+<VALUE>9</VALUE>
-+<VALUE>10</VALUE>
-+<VALUE>11</VALUE>
-+<VALUE>12</VALUE>
-+<VALUE>13</VALUE>
-+<VALUE>14</VALUE>
-+<VALUE>15</VALUE>
-+<VALUE>16</VALUE>
-+<VALUE>17</VALUE>
-+<VALUE>18</VALUE>
-+<VALUE>19</VALUE>
-+<VALUE>20</VALUE>
-+<VALUE>21</VALUE>
-+<VALUE>22</VALUE>
-+<VALUE>23</VALUE>
-+<VALUE>24</VALUE>
-+<VALUE>25</VALUE>
-+<VALUE>26</VALUE>
-+<VALUE>27</VALUE>
-+<VALUE>28</VALUE>
-+<VALUE>29</VALUE>
-+<VALUE>30</VALUE>
-+<VALUE>31</VALUE>
-+<VALUE>32</VALUE>
-+<VALUE>33</VALUE>
-+<VALUE>34</VALUE>
-+<VALUE>35</VALUE>
-+<VALUE>36</VALUE>
-+<VALUE>37</VALUE>
-+<VALUE>38</VALUE>
-+<VALUE>39</VALUE>
-+<VALUE>40</VALUE>
-+<VALUE>41</VALUE>
-+<VALUE>42</VALUE>
-+<VALUE>43</VALUE>
-+<VALUE>44</VALUE>
-+<VALUE>45</VALUE>
-+<VALUE>46</VALUE>
-+<VALUE>47</VALUE>
-+<VALUE>48</VALUE>
-+<VALUE>49</VALUE>
-+<VALUE>50</VALUE>
-+<VALUE>51</VALUE>
-+<VALUE>52</VALUE>
-+<VALUE>53</VALUE>
-+<VALUE>54</VALUE>
-+<VALUE>55</VALUE>
-+<VALUE>56</VALUE>
-+<VALUE>57</VALUE>
-+<VALUE>58</VALUE>
-+<VALUE>59</VALUE>
-+<VALUE>60</VALUE>
-+<VALUE>61</VALUE>
-+<VALUE>62</VALUE>
-+<VALUE>63</VALUE>
-+<VALUE>64</VALUE>
-+<VALUE>65</VALUE>
-+<VALUE>66</VALUE>
-+<VALUE>67</VALUE>
-+<VALUE>68</VALUE>
-+<VALUE>69</VALUE>
-+<VALUE>70</VALUE>
-+<VALUE>71</VALUE>
-+<VALUE>72</VALUE>
-+<VALUE>73</VALUE>
-+<VALUE>74</VALUE>
-+<VALUE>75</VALUE>
-+<VALUE>76</VALUE>
-+<VALUE>77</VALUE>
-+<VALUE>78</VALUE>
-+<VALUE>79</VALUE>
-+<VALUE>80</VALUE>
-+<VALUE>81</VALUE>
-+<VALUE>82</VALUE>
-+<VALUE>83</VALUE>
-+<VALUE>84</VALUE>
-+<VALUE>85</VALUE>
-+<VALUE>86</VALUE>
-+<VALUE>87</VALUE>
-+<VALUE>88</VALUE>
-+<VALUE>89</VALUE>
-+<VALUE>90</VALUE>
-+<VALUE>91</VALUE>
-+<VALUE>92</VALUE>
-+<VALUE>93</VALUE>
-+<VALUE>94</VALUE>
-+<VALUE>95</VALUE>
-+<VALUE>96</VALUE>
-+<VALUE>97</VALUE>
-+<VALUE>98</VALUE>
-+<VALUE>99</VALUE>
-+<VALUE>100</VALUE>
-+<VALUE>101</VALUE>
-+<VALUE>102</VALUE>
-+<VALUE>103</VALUE>
-+<VALUE>104</VALUE>
-+<VALUE>105</VALUE>
-+<VALUE>106</VALUE>
-+<VALUE>107</VALUE>
-+<VALUE>108</VALUE>
-+<VALUE>109</VALUE>
-+<VALUE>110</VALUE>
-+<VALUE>111</VALUE>
-+<VALUE>112</VALUE>
-+<VALUE>113</VALUE>
-+<VALUE>114</VALUE>
-+<VALUE>115</VALUE>
-+<VALUE>116</VALUE>
-+<VALUE>117</VALUE>
-+<VALUE>118</VALUE>
-+<VALUE>119</VALUE>
-+<VALUE>120</VALUE>
-+<VALUE>121</VALUE>
-+<VALUE>122</VALUE>
-+<VALUE>123</VALUE>
-+<VALUE>124</VALUE>
-+<VALUE>125</VALUE>
-+<VALUE>126</VALUE>
-+<VALUE>127</VALUE>
-+<VALUE>128</VALUE>
-+<VALUE>129</VALUE>
-+<VALUE>130</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>Unknown</VALUE>
-+<VALUE>Other</VALUE>
-+<VALUE>Adapter/Card Error</VALUE>
-+<VALUE>Application Subsystem Failure</VALUE>
-+<VALUE>Bandwidth Reduced</VALUE>
-+<VALUE>Connection Establishment Error</VALUE>
-+<VALUE>Communications Protocol Error</VALUE>
-+<VALUE>Communications Subsystem Failure</VALUE>
-+<VALUE>Configuration/Customization Error</VALUE>
-+<VALUE>Congestion</VALUE>
-+<VALUE>Corrupt Data</VALUE>
-+<VALUE>CPU Cycles Limit Exceeded</VALUE>
-+<VALUE>Dataset/Modem Error</VALUE>
-+<VALUE>Degraded Signal</VALUE>
-+<VALUE>DTE-DCE Interface Error</VALUE>
-+<VALUE>Enclosure Door Open</VALUE>
-+<VALUE>Equipment Malfunction</VALUE>
-+<VALUE>Excessive Vibration</VALUE>
-+<VALUE>File Format Error</VALUE>
-+<VALUE>Fire Detected</VALUE>
-+<VALUE>Flood Detected</VALUE>
-+<VALUE>Framing Error</VALUE>
-+<VALUE>HVAC Problem</VALUE>
-+<VALUE>Humidity Unacceptable</VALUE>
-+<VALUE>I/O Device Error</VALUE>
-+<VALUE>Input Device Error</VALUE>
-+<VALUE>LAN Error</VALUE>
-+<VALUE>Non-Toxic Leak Detected</VALUE>
-+<VALUE>Local Node Transmission Error</VALUE>
-+<VALUE>Loss of Frame</VALUE>
-+<VALUE>Loss of Signal</VALUE>
-+<VALUE>Material Supply Exhausted</VALUE>
-+<VALUE>Multiplexer Problem</VALUE>
-+<VALUE>Out of Memory</VALUE>
-+<VALUE>Output Device Error</VALUE>
-+<VALUE>Performance Degraded</VALUE>
-+<VALUE>Power Problem</VALUE>
-+<VALUE>Pressure Unacceptable</VALUE>
-+<VALUE>Processor Problem (Internal Machine Error)</VALUE>
-+<VALUE>Pump Failure</VALUE>
-+<VALUE>Queue Size Exceeded</VALUE>
-+<VALUE>Receive Failure</VALUE>
-+<VALUE>Receiver Failure</VALUE>
-+<VALUE>Remote Node Transmission Error</VALUE>
-+<VALUE>Resource at or Nearing Capacity</VALUE>
-+<VALUE>Response Time Excessive</VALUE>
-+<VALUE>Retransmission Rate Excessive</VALUE>
-+<VALUE>Software Error</VALUE>
-+<VALUE>Software Program Abnormally Terminated</VALUE>
-+<VALUE>Software Program Error (Incorrect Results)</VALUE>
-+<VALUE>Storage Capacity Problem</VALUE>
-+<VALUE>Temperature Unacceptable</VALUE>
-+<VALUE>Threshold Crossed</VALUE>
-+<VALUE>Timing Problem</VALUE>
-+<VALUE>Toxic Leak Detected</VALUE>
-+<VALUE>Transmit Failure</VALUE>
-+<VALUE>Transmitter Failure</VALUE>
-+<VALUE>Underlying Resource Unavailable</VALUE>
-+<VALUE>Version Mismatch</VALUE>
-+<VALUE>Previous Alert Cleared</VALUE>
-+<VALUE>Login Attempts Failed</VALUE>
-+<VALUE>Software Virus Detected</VALUE>
-+<VALUE>Hardware Security Breached</VALUE>
-+<VALUE>Denial of Service Detected</VALUE>
-+<VALUE>Security Credential Mismatch</VALUE>
-+<VALUE>Unauthorized Access</VALUE>
-+<VALUE>Alarm Received</VALUE>
-+<VALUE>Loss of Pointer</VALUE>
-+<VALUE>Payload Mismatch</VALUE>
-+<VALUE>Transmission Error</VALUE>
-+<VALUE>Excessive Error Rate</VALUE>
-+<VALUE>Trace Problem</VALUE>
-+<VALUE>Element Unavailable</VALUE>
-+<VALUE>Element Missing</VALUE>
-+<VALUE>Loss of Multi Frame</VALUE>
-+<VALUE>Broadcast Channel Failure</VALUE>
-+<VALUE>Invalid Message Received</VALUE>
-+<VALUE>Routing Failure</VALUE>
-+<VALUE>Backplane Failure</VALUE>
-+<VALUE>Identifier Duplication</VALUE>
-+<VALUE>Protection Path Failure</VALUE>
-+<VALUE>Sync Loss or Mismatch</VALUE>
-+<VALUE>Terminal Problem</VALUE>
-+<VALUE>Real Time Clock Failure</VALUE>
-+<VALUE>Antenna Failure</VALUE>
-+<VALUE>Battery Charging Failure</VALUE>
-+<VALUE>Disk Failure</VALUE>
-+<VALUE>Frequency Hopping Failure</VALUE>
-+<VALUE>Loss of Redundancy</VALUE>
-+<VALUE>Power Supply Failure</VALUE>
-+<VALUE>Signal Quality Problem</VALUE>
-+<VALUE>Battery Discharging</VALUE>
-+<VALUE>Battery Failure</VALUE>
-+<VALUE>Commercial Power Problem</VALUE>
-+<VALUE>Fan Failure</VALUE>
-+<VALUE>Engine Failure</VALUE>
-+<VALUE>Sensor Failure</VALUE>
-+<VALUE>Fuse Failure</VALUE>
-+<VALUE>Generator Failure</VALUE>
-+<VALUE>Low Battery</VALUE>
-+<VALUE>Low Fuel</VALUE>
-+<VALUE>Low Water</VALUE>
-+<VALUE>Explosive Gas</VALUE>
-+<VALUE>High Winds</VALUE>
-+<VALUE>Ice Buildup</VALUE>
-+<VALUE>Smoke</VALUE>
-+<VALUE>Memory Mismatch</VALUE>
-+<VALUE>Out of CPU Cycles</VALUE>
-+<VALUE>Software Environment Problem</VALUE>
-+<VALUE>Software Download Failure</VALUE>
-+<VALUE>Element Reinitialized</VALUE>
-+<VALUE>Timeout</VALUE>
-+<VALUE>Logging Problems</VALUE>
-+<VALUE>Leak Detected</VALUE>
-+<VALUE>Protection Mechanism Failure</VALUE>
-+<VALUE>Protecting Resource Failure</VALUE>
-+<VALUE>Database Inconsistency</VALUE>
-+<VALUE>Authentication Failure</VALUE>
-+<VALUE>Breach of Confidentiality</VALUE>
-+<VALUE>Cable Tamper</VALUE>
-+<VALUE>Delayed Information</VALUE>
-+<VALUE>Duplicate Information</VALUE>
-+<VALUE>Information Missing</VALUE>
-+<VALUE>Information Modification</VALUE>
-+<VALUE>Information Out of Sequence</VALUE>
-+<VALUE>Key Expired</VALUE>
-+<VALUE>Non-Repudiation Failure</VALUE>
-+<VALUE>Out of Hours Activity</VALUE>
-+<VALUE>Out of Service</VALUE>
-+<VALUE>Procedural Error</VALUE>
-+<VALUE>Unexpected Information</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>Recommendation.ITU|X733.Probable cause</VALUE>
-+<VALUE>Recommendation.ITU|M3100.probableCause</VALUE>
-+<VALUE>ITU-IANA-ALARM-TC</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.ProbableCauseDescription</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="ProbableCauseDescription" CLASSORIGIN="CIM_Error" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A free-form string describing the probable cause of the error.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.ProbableCause</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY.ARRAY NAME="RecommendedActions" TYPE="string" CLASSORIGIN="CIM_Error">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A free-form string describing recommended actions to take to resolve the error.</VALUE>
-+</QUALIFIER>
-+</PROPERTY.ARRAY>
-+<PROPERTY NAME="ErrorSource" CLASSORIGIN="CIM_Error" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The identifying information of the entity (i.e., the instance) generating the error. If this entity is modeled in the CIM Schema, this property contains the path of the instance encoded as a string parameter. If not modeled, the property contains some identifying string that names the entity that generated the error. The path or identifying string is formatted per the ErrorSourceFormat property.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.ErrorSourceFormat</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="ErrorSourceFormat" CLASSORIGIN="CIM_Error" TYPE="uint16">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The format of the ErrorSource property is interpretable based on the value of this property. Values are defined as: 0 - Unknown. The format is unknown or not meaningfully interpretable by a CIM client application. 1 - Other. The format is defined by the value of the OtherErrorSourceFormat property.2 - CIMObjectPath. A CIM Object Path as defined in the CIM Infrastructure specification. Note: CIM 2.5 and earlier used the term object names.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>0</VALUE>
-+<VALUE>1</VALUE>
-+<VALUE>2</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>Unknown</VALUE>
-+<VALUE>Other</VALUE>
-+<VALUE>CIMObjectPath</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.ErrorSource</VALUE>
-+<VALUE>CIM_Error.OtherErrorSourceFormat</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<VALUE>0</VALUE>
-+</PROPERTY>
-+<PROPERTY NAME="OtherErrorSourceFormat" CLASSORIGIN="CIM_Error" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A string defining "Other" values for ErrorSourceFormat. This value MUST be set to a non NULL value when ErrorSourceFormat is set to a value of 1 ("Other"). For all other values of ErrorSourceFormat, the value of this string must be set to NULL.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.ErrorSourceFormat</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="CIMStatusCode" CLASSORIGIN="CIM_Error" TYPE="uint32">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The CIM status code that characterizes this instance. This property defines the status codes that MAY be return by a conforming CIM Server or Listener. Note that not all status codes are valid for each operation. The specification for each operation SHOULD define the status codes that may be returned by that operation. The following values for CIM status code are defined: 1 - CIM_ERR_FAILED. A general error occurred that is not covered by a more specific error code. 2 - CIM_ERR_ACCESS_DENIED. Access to a CIM resource was not available to the client. 3 - CIM_ERR_INVALID_NAMESPACE. The target namespace does not exist. 4 - CIM_ERR_INVALID_PARAMETER. One or more parameter values passed to the method were invalid. 5 - CIM_ERR_INVALID_CLASS. The specified Class does not exist. 6 - CIM_ERR_NOT_FOUND. The requested object could not be found. 7 - CIM_ERR_NOT_SUPPORTED. The requested operation is not supported. 8 - CIM_ERR_CLASS_HAS_CH
ILDREN. Operation cannot be carried out on this class since it has instances. 9 - CIM_ERR_CLASS_HAS_INSTANCES. Operation cannot be carried out on this class since it has instances. 10 - CIM_ERR_INVALID_SUPERCLASS. Operation cannot be carried out since the specified superclass does not exist. 11 - CIM_ERR_ALREADY_EXISTS. Operation cannot be carried out because an object already exists. 12 - CIM_ERR_NO_SUCH_PROPERTY. The specified Property does not exist. 13 - CIM_ERR_TYPE_MISMATCH. The value supplied is incompatible with the type. 14 - CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED. The query language is not recognized or supported. 15 - CIM_ERR_INVALID_QUERY. The query is not valid for the specified query language. 16 - CIM_ERR_METHOD_NOT_AVAILABLE. The extrinsic Method could not be executed. 17 - CIM_ERR_METHOD_NOT_FOUND. The specified extrinsic Method does not exist. 18 - CIM_ERR_UNEXPECTED_RESPONSE. The returned response to the asynchronous
operation was not expected. 19 - CIM_ERR_INVALID_RESPONSE_DESTINATION. The specified destination for the asynchronous response is not valid. 20 - CIM_ERR_NAMESPACE_NOT_EMPTY. The specified Namespace is not empty. 21 - CIM_ERR_INVALID_ENUMERATION_CONTEXT. The enumeration context supplied is not valid. 22 - CIM_ERR_INVALID_OPERATION_TIMEOUT. The specified Namespace is not empty. 23 - CIM_ERR_PULL_HAS_BEEN_ABANDONED. The specified Namespace is not empty. 24 - CIM_ERR_PULL_CANNOT_BE_ABANDONED. The attempt to abandon a pull operation has failed. 25 - CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED. Filtered Enumeratrions are not supported. 26 - CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED. Continue on error is not supported. 27 - CIM_ERR_SERVER_LIMITS_EXCEEDED. The WBEM Server limits have been exceeded (e.g. memory, connections, ...). 28 - CIM_ERR_SERVER_IS_SHUTTING_DOWN. The WBEM Server is shutting down. 29 - CIM_ERR_QUERY_FEATURE_NOT_SUPPORTED.
The specified Query Feature is not supported.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>1</VALUE>
-+<VALUE>2</VALUE>
-+<VALUE>3</VALUE>
-+<VALUE>4</VALUE>
-+<VALUE>5</VALUE>
-+<VALUE>6</VALUE>
-+<VALUE>7</VALUE>
-+<VALUE>8</VALUE>
-+<VALUE>9</VALUE>
-+<VALUE>10</VALUE>
-+<VALUE>11</VALUE>
-+<VALUE>12</VALUE>
-+<VALUE>13</VALUE>
-+<VALUE>14</VALUE>
-+<VALUE>15</VALUE>
-+<VALUE>16</VALUE>
-+<VALUE>17</VALUE>
-+<VALUE>18</VALUE>
-+<VALUE>19</VALUE>
-+<VALUE>20</VALUE>
-+<VALUE>21</VALUE>
-+<VALUE>22</VALUE>
-+<VALUE>23</VALUE>
-+<VALUE>24</VALUE>
-+<VALUE>25</VALUE>
-+<VALUE>26</VALUE>
-+<VALUE>27</VALUE>
-+<VALUE>28</VALUE>
-+<VALUE>29</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>CIM_ERR_FAILED</VALUE>
-+<VALUE>CIM_ERR_ACCESS_DENIED</VALUE>
-+<VALUE>CIM_ERR_INVALID_NAMESPACE</VALUE>
-+<VALUE>CIM_ERR_INVALID_PARAMETER</VALUE>
-+<VALUE>CIM_ERR_INVALID_CLASS</VALUE>
-+<VALUE>CIM_ERR_NOT_FOUND</VALUE>
-+<VALUE>CIM_ERR_NOT_SUPPORTED</VALUE>
-+<VALUE>CIM_ERR_CLASS_HAS_CHILDREN</VALUE>
-+<VALUE>CIM_ERR_CLASS_HAS_INSTANCES</VALUE>
-+<VALUE>CIM_ERR_INVALID_SUPERCLASS</VALUE>
-+<VALUE>CIM_ERR_ALREADY_EXISTS</VALUE>
-+<VALUE>CIM_ERR_NO_SUCH_PROPERTY</VALUE>
-+<VALUE>CIM_ERR_TYPE_MISMATCH</VALUE>
-+<VALUE>CIM_ERR_QUERY_LANGUAGE_NOT_SUPPORTED</VALUE>
-+<VALUE>CIM_ERR_INVALID_QUERY</VALUE>
-+<VALUE>CIM_ERR_METHOD_NOT_AVAILABLE</VALUE>
-+<VALUE>CIM_ERR_METHOD_NOT_FOUND</VALUE>
-+<VALUE>CIM_ERR_UNEXPECTED_RESPONSE</VALUE>
-+<VALUE>CIM_ERR_INVALID_RESPONSE_DESTINATION</VALUE>
-+<VALUE>CIM_ERR_NAMESPACE_NOT_EMPTY</VALUE>
-+<VALUE>CIM_ERR_INVALID_ENUMERATION_CONTEXT</VALUE>
-+<VALUE>CIM_ERR_INVALID_OPERATION_TIMEOUT</VALUE>
-+<VALUE>CIM_ERR_PULL_HAS_BEEN_ABANDONED</VALUE>
-+<VALUE>CIM_ERR_PULL_CANNOT_BE_ABANDONED</VALUE>
-+<VALUE>CIM_ERR_FILTERED_ENUMERATION_NOT_SUPPORTED</VALUE>
-+<VALUE>CIM_ERR_CONTINUATION_ON_ERROR_NOT_SUPPORTED</VALUE>
-+<VALUE>CIM_ERR_SERVER_LIMITS_EXCEEDED</VALUE>
-+<VALUE>CIM_ERR_SERVER_IS_SHUTTING_DOWN</VALUE>
-+<VALUE>CIM_ERR_QUERY_FEATURE_NOT_SUPPORTED</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>DSP0201.DMTF|ERROR.CODE|2.3</VALUE>
-+<VALUE>DSP0200.DMTF|CIMError|1.3</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.CIMStatusCodeDescription</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="CIMStatusCodeDescription" CLASSORIGIN="CIM_Error" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A free-form string containing a human-readable description of CIMStatusCode. This description MAY extend, but MUST be consistent with, the definition of CIMStatusCode.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>DSP0201.DMTF|ERROR.DESCRIPTION|2.3</VALUE>
-+<VALUE>DSP0200.DMTF|CIMError|1.3</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error.CIMStatusCode</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+</CLASS>
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/CIM_Indication.xml b/src/Pegasus/Common/tests/SCMOStreamer/CIM_Indication.xml
-new file mode 100644
-index 0000000..18d5777
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/CIM_Indication.xml
-@@ -0,0 +1,123 @@
-+<CLASS NAME="CIM_Indication" >
-+<QUALIFIER NAME="INDICATION" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Abstract" TYPE="boolean" TOSUBCLASS="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Version" TYPE="string" TOSUBCLASS="false" TRANSLATABLE="true">
-+<VALUE>2.24.0</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="UMLPackagePath" TYPE="string">
-+<VALUE>CIM::Event</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>CIM_Indication is the abstract root class for all notifications about changes in schema, objects and their data, and about events detected by providers and instrumentation. Subclasses represent specific types of notifications. To receive an Indication, a consumer (or subscriber) must create an instance of CIM_IndicationFilter describing the criteria of the notification, an instance of CIM_ListenerDestination describing the delivery of the notification, and an instance of CIM_IndicationSubscription associating the Filter and Handler.</VALUE>
-+</QUALIFIER>
-+<PROPERTY NAME="IndicationIdentifier" CLASSORIGIN="CIM_Indication" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An identifier for the Indication. This property is similar to a key value in that it can be used for identification, when correlating Indications (see the CorrelatedIndications array). Its value SHOULD be unique as long as correlations are reported, but MAY be reused or left NULL if no future Indications will reference it in their CorrelatedIndications array.To ensure uniqueness, the value of IndicationIdentifier should be constructed using the following "preferred" algorithm: <OrgID>:<LocalID> Where <OrgID> and <LocalID> are separated by a colon (:), and where <OrgID> must include a copyrighted, trademarked, or otherwise unique name that is owned by the business entity that is creating or defining the IndicationIdentifier or that is a recognized ID that is assigned to the business entity by a recognized global authority. (This requirement is similar to the <Schema Name>_<Class Name> structure of Schema class name
s.) In addition, to ensure uniqueness <OrgID> must not contain a colon (:). When using this algorithm, the first colon to appear in IndicationIdentifier must appear between <OrgID> and <LocalID>. <LocalID> is chosen by the business entity and should not be re-used to identify different underlying (real-world) elements. If the above "preferred" algorithm is not used, the defining entity should assure that the resulting IndicationIdentifier is not re-used across any IndicationIdentifiers that are produced by this or other providers for the NameSpace of this instance. For DMTF-defined instances, the "preferred" algorithm should be used with the <OrgID> set to CIM.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>Recommendation.ITU|X733.Notification identifier</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY.ARRAY NAME="CorrelatedIndications" TYPE="string" CLASSORIGIN="CIM_Indication">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A list of IndicationIdentifiers whose notifications are correlated with (related to) this one.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>Recommendation.ITU|X733.Correlated notifications</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Indication.IndicationIdentifier</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY.ARRAY>
-+<PROPERTY NAME="IndicationTime" CLASSORIGIN="CIM_Indication" TYPE="datetime">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The time and date of creation of the Indication. The property may be set to NULL if the entity creating the Indication is not capable of determining this information. Note that IndicationTime may be the same for two Indications that are generated in rapid succession.</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="PerceivedSeverity" CLASSORIGIN="CIM_Indication" TYPE="uint16">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An enumerated value that describes the severity of the Indication from the notifier's point of view: 1 - Other, by CIM convention, is used to indicate that the Severity's value can be found in the OtherSeverity property. 3 - Degraded/Warning should be used when its appropriate to let the user decide if action is needed. 4 - Minor should be used to indicate action is needed, but the situation is not serious at this time. 5 - Major should be used to indicate action is needed NOW. 6 - Critical should be used to indicate action is needed NOW and the scope is broad (perhaps an imminent outage to a critical resource will result). 7 - Fatal/NonRecoverable should be used to indicate an error occurred, but it's too late to take remedial action. 2 and 0 - Information and Unknown (respectively) follow common usage. Literally, the Indication is purely informational or its severity is simply unknown.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>0</VALUE>
-+<VALUE>1</VALUE>
-+<VALUE>2</VALUE>
-+<VALUE>3</VALUE>
-+<VALUE>4</VALUE>
-+<VALUE>5</VALUE>
-+<VALUE>6</VALUE>
-+<VALUE>7</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>Unknown</VALUE>
-+<VALUE>Other</VALUE>
-+<VALUE>Information</VALUE>
-+<VALUE>Degraded/Warning</VALUE>
-+<VALUE>Minor</VALUE>
-+<VALUE>Major</VALUE>
-+<VALUE>Critical</VALUE>
-+<VALUE>Fatal/NonRecoverable</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="MappingStrings" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>Recommendation.ITU|X733.Perceived severity</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="OtherSeverity" CLASSORIGIN="CIM_Indication" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>Holds the value of the user defined severity value when 'PerceivedSeverity' is 1 ("Other").</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_AlertIndication.PerceivedSeverity</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="IndicationFilterName" CLASSORIGIN="CIM_Indication" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An identifier for the indication filter that selects this indication and causes it to be sent. This property is to be filled out by the indication sending service. The value shall be correlatable with the Name property of the instance of CIM_IndicationFilter describing the criteria of the indication. The value of the IndicationFilterName should be formatted using the following algorithm: < OrgID > : < LocalID >, where < OrgID > and < LocalID > are separated by a colon (:) and < OrgID > shall include a copyrighted, trademarked, or otherwise unique name that is owned by the business entity that is creating or defining the value or that is a registered ID assigned to the business entity by a recognized global authority. In addition, to ensure uniqueness, < OrgID > shall not contain a colon (:).When using this algorithm, the first colon to appear in the value shall appear between < OrgID > and < LocalID >. < LocalID > is chos
en by the business entity and shall be used uniquely.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_IndicationFilter.Name</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="SequenceContext" CLASSORIGIN="CIM_Indication" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The sequence context portion of a sequence identifier for the indication. The sequence number portion of the sequence identifier is provided by the SequenceNumber property. The combination of both property values represents the sequence identifier for the indication. The sequence identifier for the indication enables a CIM listener to identify duplicate indications when the CIM service attempts the delivery retry of indications, to reorder indications that arrive out-of-order, and to detect lost indications. If a CIM service does not support sequence identifiers for indications, this property shall be NULL. If a CIM service supports sequence identifiers for indications, this property shall be maintained by the CIM service for each registered listener destination, and its value shall uniquely identify the CIM service and the indication service within the CIM service such that restarts of the CIM service and deregistration of listener destinations to the CIM servic
e cause the value to change, without reusing earlier values for a sufficiently long time. When retrying the delivery of an indication, this property shall have the same value as in the original delivery. To guarantee this uniqueness, the property value should be constructed using the following format (defined in ABNF): sequence-context = indication-service-name "#" cim-service-start-id "#" listener-destination-creation-time Where: indication-service-name is the value of the Name property of the CIM_IndicationService instance responsible for delivering the indication. cim-service-start-id is an identifier that uniquely identifies the CIM service start, for example via a timestamp of the start time, or via a counter that increases for each start or restart. listener-destination-creation-time is a timestamp of the creation time of the CIM_ListenerDestination instance representing the listener destination. Since this format is only a recommendation, C
IM clients shall treat the value as an opaque identifier for the sequence context and shall not rely on this format.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Indication.SequenceNumber</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="SequenceNumber" CLASSORIGIN="CIM_Indication" TYPE="sint64">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The sequence number portion of a sequence identifier for the indication. The sequence context portion of the sequence identifier is provided by the SequenceContext property. The combination of both property values represents the sequence identifier for the indication. The sequence identifier for the indication enables a CIM listener to identify duplicate indications when the CIM service attempts the delivery retry of indications, to reorder indications that arrive out-of-order, and to detect lost indications. If a CIM service does not support sequence identifiers for indications, this property shall be NULL. If a CIM service supports sequence identifiers for indications, this property shall be maintained by the CIM service for each registered listener destination, and its value shall uniquely identify the indication within the sequence context provided by SequenceContext. It shall start at 0 whenever the sequence context string changes. Otherwise, it shall be inc
reased by 1 for every new indication to that listener destination, and it shall wrap to 0 when the value range is exceeded. When retrying the delivery of an indication, this property shall have the same value as in the original delivery.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Indication.SequenceContext</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+</CLASS>
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/CIM_InstIndication.xml b/src/Pegasus/Common/tests/SCMOStreamer/CIM_InstIndication.xml
-new file mode 100644
-index 0000000..64efa96
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/CIM_InstIndication.xml
-@@ -0,0 +1,48 @@
-+<CLASS NAME="CIM_InstIndication" SUPERCLASS="CIM_Indication" >
-+<QUALIFIER NAME="INDICATION" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Abstract" TYPE="boolean" TOSUBCLASS="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Version" TYPE="string" TOSUBCLASS="false" TRANSLATABLE="true">
-+<VALUE>2.29.0</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="UMLPackagePath" TYPE="string">
-+<VALUE>CIM::Event</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>CIM_InstIndication is an abstract superclass describing changes to instances. Subclasses represent specific types of change notifications, such as instance creation, deletion and modification.</VALUE>
-+</QUALIFIER>
-+<PROPERTY NAME="SourceInstance" CLASSORIGIN="CIM_InstIndication" TYPE="string">
-+<QUALIFIER NAME="Required" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A copy of the instance that changed to generate the Indication. SourceInstance contains the current values of the properties selected by the Indication Filter's Query. In the case of CIM_InstDeletion, the property values are copied before the instance is deleted.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="EmbeddedObject" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="SourceInstanceModelPath" CLASSORIGIN="CIM_InstIndication" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The Model Path of the SourceInstance. The following format MUST be used to encode the Model Path: <NamespacePath>:<ClassName>.<Prop1>="<Value1>", <Prop2>="<Value2>", ...</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_InstIndication.SourceInstance</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="SourceInstanceHost" CLASSORIGIN="CIM_InstIndication" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The host name or IP address of the SourceInstance.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_InstIndication.SourceInstance</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+</CLASS>
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/CIM_InstMethodCall.xml b/src/Pegasus/Common/tests/SCMOStreamer/CIM_InstMethodCall.xml
-new file mode 100644
-index 0000000..f27d00a
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/CIM_InstMethodCall.xml
-@@ -0,0 +1,120 @@
-+<CLASS NAME="CIM_InstMethodCall" SUPERCLASS="CIM_InstIndication" >
-+<QUALIFIER NAME="INDICATION" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Version" TYPE="string" TOSUBCLASS="false" TRANSLATABLE="true">
-+<VALUE>2.8.1000</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="UMLPackagePath" TYPE="string">
-+<VALUE>CIM::Event</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>CIM_InstMethodCall notifies when an instance's method is invoked.</VALUE>
-+</QUALIFIER>
-+<PROPERTY NAME="MethodName" CLASSORIGIN="CIM_InstMethodCall" TYPE="string">
-+<QUALIFIER NAME="Required" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The name of the method invoked.</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="MethodParameters" CLASSORIGIN="CIM_InstMethodCall" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The parameters of the method, formatted as an EmbeddedObject (with a predefined class name of "__MethodParameters".</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="EmbeddedObject" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="ReturnValue" CLASSORIGIN="CIM_InstMethodCall" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>ReturnValue's data is dependent on the PreCall property. When PreCall is TRUE, this property is NULL describing that there is no method return value (since the method has not yet executed). When PreCall is FALSE, ReturnValue contains a string representation of the method's return value.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_InstMethodCall.PreCall</VALUE>
-+<VALUE>CIM_InstMethodCall.ReturnValueType</VALUE>
-+<VALUE>CIM_InstMethodCall.Error</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="ReturnValueType" CLASSORIGIN="CIM_InstMethodCall" TYPE="uint16">
-+<QUALIFIER NAME="Experimental" TYPE="boolean" TOSUBCLASS="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The type of the method return value.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ValueMap" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>2</VALUE>
-+<VALUE>3</VALUE>
-+<VALUE>4</VALUE>
-+<VALUE>5</VALUE>
-+<VALUE>6</VALUE>
-+<VALUE>7</VALUE>
-+<VALUE>8</VALUE>
-+<VALUE>9</VALUE>
-+<VALUE>10</VALUE>
-+<VALUE>11</VALUE>
-+<VALUE>12</VALUE>
-+<VALUE>13</VALUE>
-+<VALUE>14</VALUE>
-+<VALUE>15</VALUE>
-+<VALUE>16</VALUE>
-+<VALUE>..</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="Values" TYPE="string" TRANSLATABLE="true">
-+<VALUE.ARRAY>
-+<VALUE>boolean</VALUE>
-+<VALUE>string</VALUE>
-+<VALUE>char16</VALUE>
-+<VALUE>uint8</VALUE>
-+<VALUE>sint8</VALUE>
-+<VALUE>uint16</VALUE>
-+<VALUE>sint16</VALUE>
-+<VALUE>uint32</VALUE>
-+<VALUE>sint32</VALUE>
-+<VALUE>uint64</VALUE>
-+<VALUE>sint64</VALUE>
-+<VALUE>datetime</VALUE>
-+<VALUE>real32</VALUE>
-+<VALUE>real64</VALUE>
-+<VALUE>reference</VALUE>
-+<VALUE>DMTF Reserved</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_InstMethodCall.ReturnValue</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY.ARRAY NAME="Error" TYPE="string" CLASSORIGIN="CIM_InstMethodCall">
-+<QUALIFIER NAME="Experimental" TYPE="boolean" TOSUBCLASS="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>Error's data is dependent on the PreCall property. When PreCall is TRUE, this property is NULL describing that there is no method Error instances (since the method has not yet executed). When PreCall is FALSE, Error contains an array of zero or more entries containing CIM_ERROR instances represented as an array of Embedded Instances.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="EmbeddedInstance" TYPE="string">
-+<VALUE>CIM_Error</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_InstMethodCall.PreCall</VALUE>
-+<VALUE>CIM_InstMethodCall.ReturnValue</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY.ARRAY>
-+<PROPERTY NAME="PreCall" CLASSORIGIN="CIM_InstMethodCall" TYPE="boolean">
-+<QUALIFIER NAME="Required" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>Boolean indicating whether the Indication is sent before the method begins executing (TRUE) or when the method completes (FALSE). When TRUE, the inherited property SourceInstance contains the value of the instance (the properties defined by the Filter's Query clause), before execution of the method. When PreCall is FALSE, SourceInstance embeds the instance as it appears after the completion of the method.</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+</CLASS>
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/CIM_Message.xml b/src/Pegasus/Common/tests/SCMOStreamer/CIM_Message.xml
-new file mode 100644
-index 0000000..d966c53
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/CIM_Message.xml
-@@ -0,0 +1,82 @@
-+<CLASS NAME="CIM_Message" >
-+<QUALIFIER NAME="INDICATION" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Experimental" TYPE="boolean" TOSUBCLASS="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Version" TYPE="string" TOSUBCLASS="false" TRANSLATABLE="true">
-+<VALUE>2.30.0</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Exception" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="UMLPackagePath" TYPE="string">
-+<VALUE>CIM::Interop</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>CIM_Message instances represent DMTF standard messages that contain identification of the message, dynamic message arguments and the expanded message text. They can be used for returning detailed information from methods.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Error</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+<PROPERTY NAME="OwningEntity" CLASSORIGIN="CIM_Message" TYPE="string">
-+<QUALIFIER NAME="Required" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>A string that uniquely identifies the entity that owns the definition of the message. OwningEntity shall include a copyrighted, trademarked or otherwise unique name that is owned by the business entity or standards body defining the message.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Message.MessageID</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="MessageID" CLASSORIGIN="CIM_Message" TYPE="string">
-+<QUALIFIER NAME="Required" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An opaque string that uniquely identifies, within the scope of the OwningEntity, the format of the Message.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Message.OwningEntity</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="ContinuedInNextMessage" CLASSORIGIN="CIM_Message" TYPE="boolean">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An indicator that allows combining multiple messages into one logical message. The messages being combined need to be consecutive messages in an ordered sequence of messages (e.g. an indexed array of embedded instances of CIM_Message). A value of True indicates that the logical message continues with the next message after this message. A value of False or Null indicates that the logical message ends at this message. For instances of CIM_Message that are not part of an ordered sequence of messages, this property is meaningless and shall be Null.</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="Message" CLASSORIGIN="CIM_Message" TYPE="string">
-+<QUALIFIER NAME="Required" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>The message text, with all dynamic elements expanded. The property value shall constructed by combining all static and dynamic message elements defined in the message definition in the order defined, using the values specified in the MessageArguments array property for the dynamic elements, in the order of the array.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Message.MessageArguments</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY.ARRAY NAME="MessageArguments" TYPE="string" CLASSORIGIN="CIM_Message">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>An array containing the values of the dynamic elements of the message, in the order in which the dynamic elements are defined in the message definition.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ArrayType" TYPE="string" OVERRIDABLE="false">
-+<VALUE>Indexed</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="ModelCorrespondence" TYPE="string">
-+<VALUE.ARRAY>
-+<VALUE>CIM_Message.Message</VALUE>
-+</VALUE.ARRAY>
-+</QUALIFIER>
-+</PROPERTY.ARRAY>
-+</CLASS>
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/CIM_MethodResult.xml b/src/Pegasus/Common/tests/SCMOStreamer/CIM_MethodResult.xml
-new file mode 100644
-index 0000000..32aa910
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/CIM_MethodResult.xml
-@@ -0,0 +1,38 @@
-+<CLASS NAME="CIM_MethodResult" SUPERCLASS="CIM_ManagedElement" >
-+<QUALIFIER NAME="Version" TYPE="string" TOSUBCLASS="false" TRANSLATABLE="true">
-+<VALUE>2.31.0</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="UMLPackagePath" TYPE="string">
-+<VALUE>CIM::System::Processing</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>Jobs are sometimes used to represent extrinsic method invocations that execute for times longer than the length of time is reasonable to require a client to wait. The method executing continues beyond the method return to the client. The class provides the result of the execution of a Job that was itself started by the side-effect of this extrinsic method invocation. The indication instances embedded an instance of this class shall be the same indications delivered to listening clients or recorded, all or in part, to logs. Basically, this approach is a corollary to the functionality provided by an instance of ListenerDestinationLog (as defined in the Interop Model). The latter provides a comprehensive, persistent mechanism for recording Job results, but is also more resource-intensive and requires supporting logging functionality. Both the extra resources and logging may not be available in all environments (for example, embedded environments). Therefore, this instance-
based approach is also provided. The MethodResult instances shall not exist after the associated ConcreteJob is deleted.</VALUE>
-+</QUALIFIER>
-+<PROPERTY NAME="InstanceID" CLASSORIGIN="CIM_ManagedElement" TYPE="string">
-+<QUALIFIER NAME="Key" TYPE="boolean" OVERRIDABLE="false">
-+<VALUE>TRUE</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Override" TYPE="string" TOSUBCLASS="false">
-+<VALUE>InstanceID</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>Within the scope of the instantiating Namespace, InstanceID opaquely and uniquely identifies an instance of this class. In order to ensure uniqueness within the NameSpace, the value of InstanceID SHOULD be constructed using the following 'preferred' algorithm: <OrgID>:<LocalID> Where <OrgID> and <LocalID> are separated by a colon ':', and where <OrgID> MUST include a copyrighted, trademarked or otherwise unique name that is owned by the business entity creating/defining the InstanceID, or is a registered ID that is assigned to the business entity by a recognized global authority (This is similar to the <Schema Name>_<Class Name> structure of Schema class names.) In addition, to ensure uniqueness <OrgID> MUST NOT contain a colon (':'). When using this algorithm, the first colon to appear in InstanceID MUST appear between <OrgID> and <LocalID>. <LocalID> is chosen by
the business entity and SHOULD not be re-used to identify different underlying (real-world) elements. If the above 'preferred' algorithm is not used, the defining entity MUST assure that the resultant InstanceID is not re-used across any InstanceIDs produced by this or other providers for this instance's NameSpace. For DMTF defined instances, the 'preferred' algorithm MUST be used with the <OrgID> set to 'CIM'.</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="PreCallIndication" CLASSORIGIN="CIM_MethodResult" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>This property contains a CIM_InstMethodCall Indication that describes the pre-execution values of the extrinisic method invocation.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="EmbeddedInstance" TYPE="string">
-+<VALUE>CIM_InstMethodCall</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+<PROPERTY NAME="PostCallIndication" CLASSORIGIN="CIM_MethodResult" TYPE="string">
-+<QUALIFIER NAME="Description" TYPE="string" TRANSLATABLE="true">
-+<VALUE>This property contains a CIM_InstMethodCall Indication that describes the post-execution values of the extrinisic method invocation.</VALUE>
-+</QUALIFIER>
-+<QUALIFIER NAME="EmbeddedInstance" TYPE="string">
-+<VALUE>CIM_InstMethodCall</VALUE>
-+</QUALIFIER>
-+</PROPERTY>
-+</CLASS>
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/Makefile b/src/Pegasus/Common/tests/SCMOStreamer/Makefile
-new file mode 100644
-index 0000000..3b905c9
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/Makefile
-@@ -0,0 +1,45 @@
-+#//%LICENSE////////////////////////////////////////////////////////////////
-+#//
-+#// Licensed to The Open Group (TOG) under one or more contributor license
-+#// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
-+#// this work for additional information regarding copyright ownership.
-+#// Each contributor licenses this file to you under the OpenPegasus Open
-+#// Source License; you may not use this file except in compliance with the
-+#// License.
-+#//
-+#// Permission is hereby granted, free of charge, to any person obtaining a
-+#// copy of this software and associated documentation files (the "Software"),
-+#// to deal in the Software without restriction, including without limitation
-+#// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+#// and/or sell copies of the Software, and to permit persons to whom the
-+#// Software is furnished to do so, subject to the following conditions:
-+#//
-+#// The above copyright notice and this permission notice shall be included
-+#// in all copies or substantial portions of the Software.
-+#//
-+#// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+#// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+#// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+#// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+#// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+#// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+#// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#//
-+#//////////////////////////////////////////////////////////////////////////
-+ROOT = ../../../../..
-+DIR = Pegasus/Common/tests/SCMO
-+include $(ROOT)/mak/config.mak
-+include ../libraries.mak
-+
-+LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
-+
-+PROGRAM = TestSCMOStreamer
-+
-+SOURCES = TestSCMOStreamer.cpp
-+
-+include $(ROOT)/mak/program.mak
-+
-+tests:
-+ $(PROGRAM)
-+
-+poststarttests:
-diff --git a/src/Pegasus/Common/tests/SCMOStreamer/TestSCMOStreamer.cpp b/src/Pegasus/Common/tests/SCMOStreamer/TestSCMOStreamer.cpp
-new file mode 100644
-index 0000000..50da41e
---- /dev/null
-+++ b/src/Pegasus/Common/tests/SCMOStreamer/TestSCMOStreamer.cpp
-@@ -0,0 +1,239 @@
-+//%LICENSE////////////////////////////////////////////////////////////////
-+//
-+// Licensed to The Open Group (TOG) under one or more contributor license
-+// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
-+// this work for additional information regarding copyright ownership.
-+// Each contributor licenses this file to you under the OpenPegasus Open
-+// Source License; you may not use this file except in compliance with the
-+// License.
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a
-+// copy of this software and associated documentation files (the "Software"),
-+// to deal in the Software without restriction, including without limitation
-+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+// and/or sell copies of the Software, and to permit persons to whom the
-+// Software is furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included
-+// in all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+//
-+//////////////////////////////////////////////////////////////////////////
-+//
-+//%/////////////////////////////////////////////////////////////////////////////
-+
-+#include <Pegasus/Common/XmlReader.h>
-+#include <Pegasus/Common/XmlParser.h>
-+#include <Pegasus/Common/Config.h>
-+#include <Pegasus/Common/FileSystem.h>
-+#include <Pegasus/Common/SCMOClassCache.h>
-+#include <Pegasus/Common/CIMBuffer.h>
-+#include <Pegasus/Common/SCMOStreamer.h>
-+
-+
-+PEGASUS_USING_PEGASUS;
-+PEGASUS_USING_STD;
-+
-+#define VCOUT if (verbose) cout
-+
-+static Boolean verbose;
-+static Boolean loadClassOnce;
-+
-+const String TESTSCMO2XML("/src/Pegasus/Common/tests/SCMOStreamer/");
-+
-+#define TEST_INSTANCE_ID "my_instance_id"
-+#define TEST_ERROR_SOURCE "my_error_source"
-+#define TEST_PRE_METHOD_NAME "my_pre_method_name"
-+#define TEST_POST_METHOD_NAME "my_post_method_name"
-+
-+SCMOClass _scmoClassCache_GetClass(
-+ const CIMNamespaceName& nameSpace,
-+ const CIMName& className)
-+{
-+ CIMClass cl;
-+ Buffer text;
-+
-+ VCOUT << endl << "Loading class " << className.getString() << endl;
-+
-+ String filename (getenv("PEGASUS_ROOT"));
-+ filename.append(TESTSCMO2XML);
-+ filename.append(className.getString());
-+ filename.append(".xml");
-+
-+ FileSystem::loadFileToMemory(text,(const char*)filename.getCString());
-+
-+ XmlParser theParser((char*)text.getData());
-+ XmlReader::getObject(theParser,cl);
-+
-+ // The class was loaded.
-+ loadClassOnce = true;
-+
-+ VCOUT << endl << "Done." << endl;
-+
-+ return SCMOClass(
-+ cl, (const char*)nameSpace.getString().getCString());
-+}
-+
-+
-+void SCMOInstanceConverterTest()
-+{
-+
-+ CIMClass CIM_CSClass;
-+ CIMInstance CIM_CSInstance;
-+ Buffer text;
-+ CIMNamespaceName nm("root/cimv2");
-+
-+ VCOUT << endl << "SCMOStreamer Test.." << endl;
-+
-+ VCOUT << endl << "Loading classes" << endl;
-+ CIMName CIM_MethodResultName("CIM_MethodResult");
-+ SCMOClass CIM_MethodResult = _scmoClassCache_GetClass(nm, CIM_MethodResultName);
-+
-+ CIMName CIM_InstMethodCallName("CIM_InstMethodCall");
-+ SCMOClass CIM_InstMethodCall = _scmoClassCache_GetClass(nm, CIM_InstMethodCallName);
-+
-+ CIMName CIM_ErrorName("CIM_Error");
-+ SCMOClass CIM_Error = _scmoClassCache_GetClass(nm, CIM_ErrorName);
-+
-+ VCOUT << endl << "Creating CIM_Error instance" << endl;
-+ SCMOInstance error = SCMOInstance(CIM_Error);
-+ SCMBUnion val;
-+ val.extString.pchar = TEST_ERROR_SOURCE;
-+ val.extString.length = strlen(val.extString.pchar);
-+ error.setPropertyWithOrigin("ErrorSource", CIMTYPE_STRING, &val);
-+
-+ VCOUT << endl << "Creating PreCall instance" << endl;
-+ SCMOInstance preCall = SCMOInstance(CIM_InstMethodCall);
-+ val.extString.pchar = TEST_PRE_METHOD_NAME;
-+ val.extString.length = strlen(val.extString.pchar);
-+ preCall.setPropertyWithOrigin("MethodName", CIMTYPE_STRING, &val);
-+
-+ VCOUT << endl << "Creating PostCall instance" << endl;
-+ SCMOInstance postCall = SCMOInstance(CIM_InstMethodCall);
-+ val.extString.pchar = TEST_POST_METHOD_NAME;
-+ val.extString.length = strlen(val.extString.pchar);
-+ postCall.setPropertyWithOrigin("MethodName", CIMTYPE_STRING, &val);
-+ val.extRefPtr = &error;
-+ postCall.setPropertyWithOrigin("Error", CIMTYPE_INSTANCE, &val, true, 1);
-+
-+ VCOUT << endl << "Creating MethodResult instance" << endl;
-+ SCMOInstance methodResult = SCMOInstance(CIM_MethodResult);
-+ val.extString.pchar = TEST_INSTANCE_ID;
-+ val.extString.length = strlen(val.extString.pchar);
-+ methodResult.setPropertyWithOrigin("InstanceID", CIMTYPE_STRING, &val);
-+ val.extRefPtr = &preCall;
-+ methodResult.setPropertyWithOrigin("PreCallIndication", CIMTYPE_INSTANCE, &val);
-+ val.extRefPtr = &postCall;
-+ methodResult.setPropertyWithOrigin("PostCallIndication", CIMTYPE_INSTANCE, &val);
-+
-+ VCOUT << "serialize" << endl;
-+
-+ Array<SCMOInstance> in;
-+ in.append(methodResult);
-+
-+ CIMBuffer buf(4096);
-+ buf.putSCMOInstanceA(in);
-+ VCOUT << "serialize took " << buf.size() << endl;
-+
-+ VCOUT << "deserialize" << endl;
-+ Array<SCMOInstance> out;
-+ buf.rewind();
-+ bool ret = buf.getSCMOInstanceA(out);
-+ VCOUT << "deserialize returned " << ret << endl;
-+ VCOUT << "out size " << out.size() << endl;
-+
-+ SCMOInstance &methodResult2 = out[0];
-+
-+ CIMType type;
-+ const SCMBUnion *pval;
-+ Boolean isArray;
-+ Uint32 size;
-+
-+ //
-+ methodResult2.getProperty("InstanceID", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ VCOUT << "Got Instance ID: " << pval->extString.pchar << endl;
-+ PEGASUS_TEST_ASSERT(strcmp(pval->extString.pchar, TEST_INSTANCE_ID) == 0);
-+
-+ // check PreCallIndication
-+ methodResult2.getProperty("PreCallIndication", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ SCMOInstance *preCall2 = pval->extRefPtr;
-+
-+ preCall2->getProperty("MethodName", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ VCOUT << "Got PreCallIndication.MethodName: " << pval->extString.pchar << endl;
-+ PEGASUS_TEST_ASSERT(strcmp(pval->extString.pchar, TEST_PRE_METHOD_NAME) == 0);
-+
-+ // check PostCallIndication
-+ methodResult2.getProperty("PostCallIndication", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ SCMOInstance *postCall2 = pval->extRefPtr;
-+
-+ postCall2->getProperty("MethodName", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ VCOUT << "Got PostCallIndication.MethodName: " << pval->extString.pchar << endl;
-+ PEGASUS_TEST_ASSERT(strcmp(pval->extString.pchar, TEST_POST_METHOD_NAME) == 0);
-+
-+ // check error
-+ postCall2->getProperty("Error", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ SCMOInstance *error2 = pval->extRefPtr;
-+
-+ error2->getProperty("ErrorSource", type, &pval, isArray, size);
-+ PEGASUS_TEST_ASSERT(pval != NULL);
-+ VCOUT << "Got Error[0].ErrorSource: " << pval->extString.pchar << endl;
-+ PEGASUS_TEST_ASSERT(strcmp(pval->extString.pchar, TEST_ERROR_SOURCE) == 0);
-+
-+ VCOUT << endl << "Done." << endl << endl;
-+}
-+
-+
-+int main (int argc, char *argv[])
-+{
-+
-+ CIMClass CIM_TESTClass2;
-+
-+ verbose = getenv("PEGASUS_TEST_VERBOSE") ? true : false;
-+
-+ try
-+ {
-+ // init the cache.
-+ SCMOClassCache* _thecache = SCMOClassCache::getInstance();
-+ _thecache->setCallBack(_scmoClassCache_GetClass);
-+
-+ SCMOInstanceConverterTest();
-+
-+ //destroy the cache.
-+ _thecache->destroy();
-+ }
-+ catch (CIMException& e)
-+ {
-+ cout << endl << "CIMException: " ;
-+ cout << e.getMessage() << endl << endl ;
-+ exit(-1);
-+ }
-+
-+ catch (Exception& e)
-+ {
-+ cout << endl << "Exception: " ;
-+ cout << e.getMessage() << endl << endl ;
-+ exit(-1);
-+ }
-+ catch (...)
-+ {
-+ cout << endl << "Unkown exception!" << endl << endl;
-+ exit(-1);
-+ }
-+
-+ cout << argv[0] << " +++++ passed all tests" << endl;
-+ return 0;
-+
-+}
diff --git a/pegasus-2.14.1-build-fixes.patch b/pegasus-2.14.1-build-fixes.patch
new file mode 100644
index 0000000..ab170bb
--- /dev/null
+++ b/pegasus-2.14.1-build-fixes.patch
@@ -0,0 +1,28 @@
+diff -up pegasus/src/Pegasus/Common/Message.cpp.orig pegasus/src/Pegasus/Common/Message.cpp
+--- pegasus/src/Pegasus/Common/Message.cpp.orig 2015-03-14 14:56:48.000000000 +0100
++++ pegasus/src/Pegasus/Common/Message.cpp 2015-04-08 10:02:47.355935316 +0200
+@@ -430,7 +430,8 @@ CIMOperationType Message::convertMessage
+ */
+ Boolean Message::valid() const
+ {
+- return magic && (_type < NUMBER_OF_MESSAGES);
++ //return magic && (_type < NUMBER_OF_MESSAGES);
++ return true;
+ }
+
+
+diff -up pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.orig pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp
+--- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.orig 2015-03-14 14:56:48.000000000 +0100
++++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp 2015-04-08 10:02:47.357935317 +0200
+@@ -1008,9 +1008,11 @@ Boolean CIMOperationRequestDispatcher::_
+ }
+ else
+ {
++/*
+ EnumerationContext* ent = _enumerationContextTable->find(
+ poA->_contextId);
+ PEGASUS_DEBUG_ASSERT(ent == en);
++*/
+ }
+
+ PEGASUS_DEBUG_ASSERT(poA->_contextId == en->getContextId());
diff --git a/pegasus-2.6.0-cimuser.patch b/pegasus-2.6.0-cimuser.patch
index 601e9bd..0d97daa 100644
--- a/pegasus-2.6.0-cimuser.patch
+++ b/pegasus-2.6.0-cimuser.patch
@@ -1,6 +1,7 @@
---- pegasus.mark/Makefile.Release 2007-03-15 16:49:16.000000000 -0500
-+++ pegasus/Makefile.Release 2007-03-15 16:50:52.000000000 -0500
-@@ -156,6 +156,7 @@
+diff -up pegasus/Makefile.Release.orig pegasus/Makefile.Release
+--- pegasus/Makefile.Release.orig 2015-03-31 14:47:44.301518897 +0200
++++ pegasus/Makefile.Release 2015-03-31 14:48:04.060602183 +0200
+@@ -207,6 +207,7 @@ endif
PEGASUS_ADMIN_CMDS = \
cimauth \
diff --git a/pegasus-2.9.0-local-or-remote-auth.patch b/pegasus-2.9.0-local-or-remote-auth.patch
index 08b8857..67e0aa9 100644
--- a/pegasus-2.9.0-local-or-remote-auth.patch
+++ b/pegasus-2.9.0-local-or-remote-auth.patch
@@ -1,6 +1,6 @@
diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h
---- pegasus/src/Executor/Messages.h.orig 2013-08-27 13:31:54.792029310 +0200
-+++ pegasus/src/Executor/Messages.h 2013-08-27 13:32:20.294122741 +0200
+--- pegasus/src/Executor/Messages.h.orig 2015-03-31 14:49:58.125082973 +0200
++++ pegasus/src/Executor/Messages.h 2015-03-31 14:50:29.243214138 +0200
@@ -199,6 +199,7 @@ struct ExecutorAuthenticatePasswordReque
{
char username[EXECUTOR_BUFFER_SIZE];
@@ -10,8 +10,8 @@ diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h
struct ExecutorAuthenticatePasswordResponse
diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
---- pegasus/src/Executor/PAMAuth.h.orig 2013-08-27 13:32:39.064191519 +0200
-+++ pegasus/src/Executor/PAMAuth.h 2013-08-27 13:47:11.267390738 +0200
+--- pegasus/src/Executor/PAMAuth.h.orig 2015-03-31 14:50:48.589295683 +0200
++++ pegasus/src/Executor/PAMAuth.h 2015-03-31 14:57:25.561982718 +0200
@@ -49,6 +49,9 @@
#include <Executor/Defines.h>
#include <Executor/Socket.h>
@@ -38,25 +38,22 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
- pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle);
+ // NOTE: if any pam call should log anything, our syslog socket will be redirected
+ // to the AUTH facility, so we need to redirect it back after each pam call.
-
-- if (pam_rc != PAM_SUCCESS)
++
+ if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle)) != PAM_SUCCESS)
- {
-- return pam_rc;
++ {
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_start failed: %s", pam_strerror(handle, pam_rc));
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username);
+ return -1;
- }
++ }
-- pam_rc = pam_authenticate(handle, 0);
- if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS)
{
- pam_end(handle, 0);
- return pam_rc;
++ pam_end(handle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(handle, pam_rc));
@@ -65,18 +62,21 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
+ return -1;
}
-- pam_rc = pam_acct_mgmt(handle, 0);
+- pam_rc = pam_authenticate(handle, 0);
+- if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_authenticate(handle, 0)) != PAM_SUCCESS)
-+ {
-+ pam_end(handle, 0);
+ {
+ pam_end(handle, 0);
+- return pam_rc;
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(handle, pam_rc));
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username);
+ return -1;
-+ }
-+
+ }
+
+- pam_rc = pam_acct_mgmt(handle, 0);
+ if ((pam_rc = pam_acct_mgmt(handle, 0)) != PAM_SUCCESS)
+ {
+ pam_end(handle, 0);
@@ -86,7 +86,7 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username);
+ return -1;
-+ }
++ }
pam_end(handle, 0);
- return pam_rc;
@@ -101,24 +101,24 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
- pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle);
- if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle)) != PAM_SUCCESS)
- {
-- return pam_rc;
++ {
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, pam_rc));
+ return -1;
- }
-
-- pam_rc = pam_acct_mgmt(phandle, 0);
++ }
++
+ if ((pam_rc = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS)
-+ {
+ {
+- return pam_rc;
+ pam_end(phandle, 0);
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, pam_rc));
+ return -1;
-+ }
-+
+ }
+
+- pam_rc = pam_acct_mgmt(phandle, 0);
+ if ((pam_rc = pam_acct_mgmt(phandle, 0)) != PAM_SUCCESS)
+ {
+ pam_end(phandle, 0);
@@ -150,8 +150,8 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
}
diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c
---- pegasus/src/Executor/Parent.c.orig 2013-08-27 13:51:12.419277041 +0200
-+++ pegasus/src/Executor/Parent.c 2013-08-27 13:52:50.434650395 +0200
+--- pegasus/src/Executor/Parent.c.orig 2015-03-31 14:57:37.595034076 +0200
++++ pegasus/src/Executor/Parent.c 2015-03-31 14:58:11.034176796 +0200
@@ -634,7 +634,7 @@ static void HandleAuthenticatePasswordRe
#if defined(PEGASUS_PAM_AUTHENTICATION)
@@ -162,8 +162,8 @@ diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c
if (status == PAM_SUCCESS)
{
diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c
---- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2013-08-27 13:53:14.882743374 +0200
-+++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2013-08-27 13:53:39.089835311 +0200
+--- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2015-03-31 14:58:30.460259707 +0200
++++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2015-03-31 14:58:55.882368210 +0200
@@ -49,7 +49,7 @@ int main()
sprintf(prompt, "Enter password for %s: ", PEGASUS_CIMSERVERMAIN_USER);
pw = getpass(prompt);
@@ -174,10 +174,10 @@ diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig pegasus/s
else
printf("Wrong password\n");
diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasus/Common/AuthenticationInfo.h
---- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2013-08-27 13:54:15.842974734 +0200
-+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2013-08-27 13:55:32.977266918 +0200
-@@ -353,6 +353,22 @@ public:
- return _rep->getRemotePrivilegedUserAccessChecked();
+--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2015-03-31 14:59:10.875432201 +0200
++++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2015-03-31 15:00:03.130655230 +0200
+@@ -348,6 +348,22 @@ public:
+ _rep->setAuthHandle(authHandle);
}
+ /** Indicate whether the user is Remote
@@ -196,24 +196,25 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasu
+ _rep->setRemoteUser(isRemoteUser);
+ }
+
- void setAuthHandle(const AuthHandle & authHandle)
+ AuthHandle getAuthHandle()
{
CheckRep(_rep);
diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp
---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2013-08-27 13:56:01.394374402 +0200
-+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2013-08-27 13:59:22.129131385 +0200
-@@ -47,6 +47,7 @@ const String AuthenticationInfoRep::AUTH
+--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2015-03-31 15:00:26.267753980 +0200
++++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2015-03-31 15:01:53.018124238 +0200
+@@ -48,6 +48,7 @@ const String AuthenticationInfoRep::AUTH
AuthenticationInfoRep::AuthenticationInfoRep()
: _connectionAuthenticated(false),
_wasRemotePrivilegedUserAccessChecked(false),
+ _isRemoteUser(true),
_authHandle(),
_isExpiredPassword(false)
- {
-@@ -81,6 +82,16 @@ AuthenticationInfoRep::~AuthenticationIn
+ #ifdef PEGASUS_ENABLE_SESSION_COOKIES
+@@ -86,6 +87,16 @@ AuthenticationInfoRep::~AuthenticationIn
+
PEG_METHOD_EXIT();
}
-
++
+void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser)
+{
+ PEG_METHOD_ENTER(TRC_AUTHENTICATION,
@@ -223,16 +224,15 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/P
+
+ PEG_METHOD_EXIT();
+}
-+
+
void AuthenticationInfoRep::setConnectionAuthenticated(
Boolean connectionAuthenticated)
- {
diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.h
---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2013-08-27 13:59:47.458226631 +0200
-+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2013-08-27 14:01:27.744603255 +0200
-@@ -147,6 +147,13 @@ public:
- void setSecurityAssociation();
- #endif
+--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2015-03-31 15:02:17.868230300 +0200
++++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2015-03-31 15:03:53.065636608 +0200
+@@ -148,6 +148,13 @@ public:
+ }
+ #endif //PEGASUS_NEGOTIATE_AUTHENTICATION
+ Boolean isRemoteUser() const
+ {
@@ -244,7 +244,7 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Peg
Array<SSLCertificateInfo*> getClientCertificateChain()
{
return _clientCertificate;
-@@ -218,6 +225,8 @@ private:
+@@ -233,6 +240,8 @@ private:
Array<SSLCertificateInfo*> _clientCertificate;
@@ -254,8 +254,8 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Peg
String _userRole;
Boolean _isExpiredPassword;
diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common/Executor.cpp
---- pegasus/src/Pegasus/Common/Executor.cpp.orig 2013-08-27 14:01:50.929690223 +0200
-+++ pegasus/src/Pegasus/Common/Executor.cpp 2013-08-27 14:07:28.655952891 +0200
+--- pegasus/src/Pegasus/Common/Executor.cpp.orig 2015-03-31 15:04:10.843712487 +0200
++++ pegasus/src/Pegasus/Common/Executor.cpp 2015-03-31 15:08:16.953762900 +0200
@@ -126,7 +126,8 @@ public:
virtual int authenticatePassword(
@@ -312,8 +312,8 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
int Executor::validateUser(
diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/Executor.h
---- pegasus/src/Pegasus/Common/Executor.h.orig 2013-08-27 14:09:28.767397015 +0200
-+++ pegasus/src/Pegasus/Common/Executor.h 2013-08-27 14:10:55.934717862 +0200
+--- pegasus/src/Pegasus/Common/Executor.h.orig 2015-03-31 15:08:26.668804365 +0200
++++ pegasus/src/Pegasus/Common/Executor.h 2015-03-31 15:08:46.535889158 +0200
@@ -184,7 +184,8 @@ public:
*/
static int authenticatePassword(
@@ -325,9 +325,9 @@ diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/E
/** Check whether the given user is valid for the underlying authentcation
mechanism.
diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/Common/HTTPConnection.cpp
---- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2013-08-27 14:11:11.103773653 +0200
-+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2013-08-27 14:12:27.743055754 +0200
-@@ -2305,6 +2305,70 @@ void HTTPConnection::_handleReadEvent()
+--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2015-03-31 15:09:05.706970982 +0200
++++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2015-03-31 15:10:08.472238867 +0200
+@@ -2295,6 +2295,70 @@ void HTTPConnection::_handleReadEvent()
message->contentLanguages = contentLanguages;
message->dest = _outputMessageQueue->getQueueId();
@@ -399,8 +399,8 @@ diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/
// The _closeConnection method sets the _connectionClosePending flag.
// If we are executing on the client side and the
diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig pegasus/src/Pegasus/Common/HTTPMessage.cpp
---- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2013-08-27 14:12:39.200097953 +0200
-+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2013-08-27 14:13:05.903196184 +0200
+--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2015-03-31 15:10:32.186340162 +0200
++++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2015-03-31 15:11:00.008459185 +0200
@@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage(
authInfo(0),
acceptLanguagesDecoded(false),
@@ -412,8 +412,8 @@ diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig pegasus/src/Pegasus/Com
if (cimException_)
cimException = *cimException_;
diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Common/HTTPMessage.h
---- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2013-08-27 14:13:16.272234342 +0200
-+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2013-08-27 14:13:52.605368078 +0200
+--- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2015-03-31 15:11:13.706517786 +0200
++++ pegasus/src/Pegasus/Common/HTTPMessage.h 2015-03-31 15:11:33.528602586 +0200
@@ -73,6 +73,7 @@ public:
ContentLanguageList contentLanguages;
Boolean acceptLanguagesDecoded;
@@ -423,8 +423,8 @@ diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Commo
bool binaryResponse;
diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp
---- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig 2013-08-27 14:14:16.255455117 +0200
-+++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2013-08-27 14:15:54.285815870 +0200
+--- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig 2015-03-31 15:11:50.617675692 +0200
++++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2015-03-31 15:12:49.031925589 +0200
@@ -76,7 +76,7 @@ void testExecutorLoopbackImpl()
#endif
@@ -444,9 +444,9 @@ diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus
char challengeFilePath[EXECUTOR_BUFFER_SIZE];
diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp
---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2013-08-27 14:16:28.110940302 +0200
-+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2013-08-27 14:18:41.085429677 +0200
-@@ -157,6 +157,7 @@ AuthenticationStatus BasicAuthentication
+--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2015-03-31 15:12:58.057964203 +0200
++++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2015-03-31 15:13:19.591056322 +0200
+@@ -159,6 +159,7 @@ AuthenticationStatus BasicAuthentication
_basicAuthenticator->authenticate(
userName,
password,
@@ -455,8 +455,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.
// Log audit message.
diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h
---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2013-08-27 14:18:53.678475974 +0200
-+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2013-08-27 14:19:37.740638125 +0200
+--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2015-03-31 15:13:32.889113211 +0200
++++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2015-03-31 15:13:51.240191720 +0200
@@ -65,6 +65,7 @@ public:
virtual AuthenticationStatus authenticate(
const String& userName,
@@ -466,8 +466,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig p
/** Construct and return the HTTP Basic authentication challenge header
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h
---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2013-08-27 14:20:05.917741881 +0200
-+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2013-08-27 14:20:47.564895056 +0200
+--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2015-03-31 15:14:04.185247096 +0200
++++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2015-03-31 15:14:20.391316426 +0200
@@ -54,6 +54,7 @@ public:
AuthenticationStatus authenticate(
const String& userName,
@@ -477,8 +477,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.ori
AuthenticationStatus validateUser(
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp
---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2013-08-27 14:20:55.805925482 +0200
-+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2013-08-27 14:21:25.421034454 +0200
+--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2015-03-31 15:14:32.937370098 +0200
++++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2015-03-31 15:14:52.631454350 +0200
@@ -74,6 +74,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
AuthenticationStatus PAMBasicAuthenticator::authenticate(
const String& userName,
@@ -488,8 +488,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.c
{
PEG_METHOD_ENTER(TRC_AUTHENTICATION,
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp
---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2013-08-27 14:21:41.870094885 +0200
-+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2013-08-27 14:22:36.012294104 +0200
+--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2015-03-31 15:15:08.521522327 +0200
++++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2015-03-31 15:15:49.255696589 +0200
@@ -66,6 +66,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
AuthenticationStatus PAMBasicAuthenticator::authenticate(
const String& userName,
@@ -509,9 +509,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.c
// return code of -1 will be translated to AUTHSC_UNAUTHORIZED
AuthenticationStatus authStatus = _getAuthStatusFromPAM_RC(pam_rc);
diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp
---- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2013-08-27 14:22:56.429369205 +0200
-+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2013-08-27 14:23:20.267456931 +0200
-@@ -237,7 +237,7 @@ AuthenticationStatus SecureBasicAuthenti
+--- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2015-03-31 15:16:03.097755805 +0200
++++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2015-03-31 15:16:24.758848473 +0200
+@@ -239,7 +239,7 @@ AuthenticationStatus SecureBasicAuthenti
if (Executor::detectExecutor() == 0)
{
if (Executor::authenticatePassword(
@@ -521,9 +521,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cp
authenticated = true;
}
diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
---- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2013-08-27 14:23:47.293556300 +0200
-+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2013-08-27 14:24:18.748672110 +0200
-@@ -430,6 +430,9 @@ void HTTPAuthenticatorDelegator::handleH
+--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2015-03-31 15:16:39.848913028 +0200
++++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2015-03-31 15:17:21.079089410 +0200
+@@ -431,6 +431,9 @@ void HTTPAuthenticatorDelegator::handleH
Tracer::LEVEL3,
"HTTPAuthenticatorDelegator - Authentication processing start");
diff --git a/pegasus-2.9.0-redhat-config.patch b/pegasus-2.9.0-redhat-config.patch
index 94d5a2b..baf2c5b 100644
--- a/pegasus-2.9.0-redhat-config.patch
+++ b/pegasus-2.9.0-redhat-config.patch
@@ -1,6 +1,6 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
---- pegasus/env_var_Linux.status.orig 2013-07-18 15:45:12.000000000 +0200
-+++ pegasus/env_var_Linux.status 2013-08-27 15:35:09.838665443 +0200
+--- pegasus/env_var_Linux.status.orig 2015-03-31 14:43:37.774479768 +0200
++++ pegasus/env_var_Linux.status 2015-03-31 14:45:21.003914888 +0200
@@ -25,18 +25,21 @@ PEGASUS_HAS_SSL=yes
PEGASUS_USE_SSL_RANDOMFILE=false
PEGASUS_NOASSERTS=yes
@@ -9,7 +9,7 @@ diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
- PEGASUS_CIM_SCHEMA=CIM236
+ PEGASUS_CIM_SCHEMA=CIM241
PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
diff --git a/sources b/sources
index 13d82e8..3673bb9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b8ece4ab1e2d9223a6f96b6e03aef81b pegasus-2.13.0.tar.gz
+6e02fe14dd36b2b761d69e19a6fab219 pegasus-2.14.1.tar.gz
e5cad2e960f80dda4390bf422dd7f164 cim_schema_2.38.0Experimental-MOFs.zip
diff --git a/tog-pegasus.spec b/tog-pegasus.spec
index 0a95a9f..16a48d9 100644
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@ -2,12 +2,12 @@
# do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.
%global srcname pegasus
-%global major_ver 2.13
+%global major_ver 2.14
%global pegasus_gid 65
%global pegasus_uid 66
Name: tog-pegasus
-Version: %{major_ver}.0
+Version: %{major_ver}.1
Release: 23%{?dist}
Epoch: 2
Summary: OpenPegasus WBEM Services for Linux
@@ -74,22 +74,12 @@ Patch24: pegasus-2.12.0-empty_arrays.patch
Patch25: pegasus-2.12.0-cimmofl-allow-experimental.patch
# 26: use external schema and add missing includes there
Patch26: pegasus-2.12.0-schema-version-and-includes.patch
-# 27: fixes unused wariable warning which causes fail of the build
-Patch27: pegasus-2.13.0-build-fix.patch
-# 28: PG_ComputerSystem having CreationClassName="CIM_ComputerSystem"
-# http://bugzilla.openpegasus.org/show_bug.cgi?id=9795
-Patch28: pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch
# 29: bz#1049314, allow unprivileged users to subscribe to indications by default
Patch29: pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch
-# 30: Create x509v3 self-signed certificates with CA:FALSE
-Patch30: pegasus-2.13.0-SSLGeneration.patch
-# 31: bz#1111571, backported from upstream
-Patch31: pegasus-2.13.0-CMGetKey-data-type-fix.patch
-# 32: bz#1038013, fixes wrong EmbeddedInstances from CIMOM callback,
-# backported from upstream
-Patch32: pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch
# 33: fixes build with gcc5
Patch33: pegasus-2.13.0-gcc5-build.patch
+# 34: fixes various build problemss
+Patch34: pegasus-2.14.1-build-fixes.patch
BuildRequires: procps, libstdc++, pam-devel
BuildRequires: openssl, openssl-devel
@@ -231,13 +221,9 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
%patch24 -p1 -b .empty_arrays
%patch25 -p1 -b .cimmofl-allow-experimental
%patch26 -p1 -b .schema-version-and-includes
-%patch27 -p1 -b .build-fix
-%patch28 -p0 -b .PG_ComputerSystem.CreationClassName
%patch29 -p1 -b .enable-subscriptions-for-nonprivileged-users
-%patch30 -p1 -b .genssl
-%patch31 -p0 -b .CMGetKey-data-type-fix
-%patch32 -p1 -b .wrong-embedded-instances-from-cimom-callback
%patch33 -p1 -b .gcc5-build
+%patch34 -p1 -b .build-fixes
%build
@@ -511,6 +497,9 @@ fi
%changelog
+* Wed Apr 08 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.14.1-1
+- Update to upstream version 2.14.1
+
* Tue Feb 10 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 2:2.13.0-23
- Fix tog-pegasus.service is marked world-inaccessible
Resolves: #1191026
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/tog-pegasus.git/commit/?h=master&id=dfde10b829261ccd9189a35756e4592f09f0a3e4
More information about the scm-commits
mailing list