diff --git a/README.en.md b/README.en.md
deleted file mode 100644
index b63e851..0000000
--- a/README.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# tog-pegasus
-
-#### Description
-{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
-
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Contribution
-
-1.  Fork the repository
-2.  Create Feat_xxx branch
-3.  Commit your code
-4.  Create Pull Request
-
-
-#### Gitee Feature
-
-1.  You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
-2.  Gitee blog [blog.gitee.com](https://blog.gitee.com)
-3.  Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
-4.  The most valuable open source project [GVP](https://gitee.com/gvp)
-5.  The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
-6.  The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/README.md b/README.md
deleted file mode 100644
index 0c739cc..0000000
--- a/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# tog-pegasus
-
-#### 介绍
-{**以下是码云平台说明，您可以替换此简介**
-码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
-无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 码云特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
-5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/access.conf b/access.conf
new file mode 100644
index 0000000..aa93fd6
--- /dev/null
+++ b/access.conf
@@ -0,0 +1,43 @@
+##############################################################################
+# Pegasus WBEM HTTP/HTTPS Network Service User Access Control Table:
+# 
+# This file controls access to the Pegasus WBEM Network services by users
+# with the PAM pam_access module .
+#
+# The format of the access control table is three fields separated by a
+# ":" character:
+# 
+# 	permission : users : origins
+# 
+# The first field should be a "+" (access granted) or "-" (access denied)
+# character. 
+#
+# The second field should be a list of one or more login names, group
+# names, or ALL (always matches). A pattern of the form user@host is
+# matched when the login name matches the "user" part, and when the
+# "host" part matches the local machine name.
+#
+# If you run NIS you can use @netgroupname in host or user patterns; this
+# even works for @usergroup@@hostgroup patterns. Weird.
+#
+# The EXCEPT operator makes it possible to write very compact rules.
+#
+# The group file is searched only when a name does not match that of the
+# logged-in user. Both the user's primary group is matched, as well as
+# groups in which users are explicitly listed.
+#
+# The third field must be 'wbemNetwork', to control access by users from
+# remote hosts, or 'wbemLocal', to control access by users from the local host.
+##############################################################################
+# 
+# Pegasus PAM Access Rules:
+# 1. The Remote host user access rule:
+#    By default, ONLY the pegasus user can use remote network HTTP/S service:
+#
+-: ALL EXCEPT pegasus:wbemNetwork
+#
+#
+# 2. The Local host user access rule:
+#    By default, ONLY the pegasus and root users can use pegasus local HTTP/S service:
+#
+-: ALL EXCEPT pegasus root:wbemLocal
diff --git a/cim_schema_2.38.0Experimental-MOFs.zip b/cim_schema_2.38.0Experimental-MOFs.zip
new file mode 100644
index 0000000..a9ee2fa
Binary files /dev/null and b/cim_schema_2.38.0Experimental-MOFs.zip differ
diff --git a/generate-certs b/generate-certs
new file mode 100644
index 0000000..ca02982
--- /dev/null
+++ b/generate-certs
@@ -0,0 +1,14 @@
+#!/bin/bash
+cd /etc/Pegasus
+
+if [ ! -e /etc/Pegasus/ssl-ca.cnf ] || [ ! -e /etc/Pegasus/ssl-service.cnf ] || [ ! -e /etc/pki/Pegasus/server.pem ] ||
+     [ ! -e /etc/pki/Pegasus/file.pem ]  || [ ! -e /etc/pki/Pegasus/client.pem ]; then
+         if [ -x /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts ]; then
+            # Create self-signed certificates for initial usage
+            /usr/share/Pegasus/scripts/genOpenPegasusSSLCerts
+            # Add the self-signed certificate to the local trust store
+            cp /etc/pki/Pegasus/ca.crt \
+               /etc/pki/ca-trust/source/anchors/localhost-pegasus.pem
+            /usr/bin/update-ca-trust extract
+         fi;
+      fi;
diff --git a/pegasus-2.10.0-dont-strip.patch b/pegasus-2.10.0-dont-strip.patch
new file mode 100644
index 0000000..e485ade
--- /dev/null
+++ b/pegasus-2.10.0-dont-strip.patch
@@ -0,0 +1,11 @@
+diff -up pegasus/mak/config-linux.mak.orig pegasus/mak/config-linux.mak
+--- 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 += -g
+    # disable the strict aliasing
+    ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
+      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
new file mode 100644
index 0000000..2da15c2
--- /dev/null
+++ b/pegasus-2.12.0-cimmofl-allow-experimental.patch
@@ -0,0 +1,514 @@
+diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/Internal/Makefile
+--- 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 ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTERNALNS)" "$(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTERNALNS)" "$(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof"
+ 	@ $(ECHO) +++++ Loading PG_InternalSchema$(PG_SCHEMA_VER).mof into $(INTERNALNS) namespace...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_InternalSchema$(PG_SCHEMA_VER).mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_InternalSchema$(PG_SCHEMA_VER).mof"
+ 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	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:
+ 	@$(ECHO) +++++ Loading CIM_Core$(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_Core$(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_Core$(CIM_SCHEMA_VER).mof"
+ 	@$(ECHO) +++++ Loading CIM_Event$(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_Event$(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_Event$(CIM_SCHEMA_VER).mof"
+ #
+ 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"
+ endif
+ #
+ 	@$(ECHO) +++++ Loading PG_InterOpSchema$(PG_INTEROP_SCHEMA_VER).mof into $(INTEROPNS) namespace...
+-	@$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_INTEROP_MOF_PATH)/PG_InterOpSchema$(PG_INTEROP_SCHEMA_VER).mof"
++	@$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_INTEROP_MOF_PATH)/PG_InterOpSchema$(PG_INTEROP_SCHEMA_VER).mof"
+ #
+ # Bug 1222
+ # The following code is temporary.  These classes should be incorporated into PG_InteropSchema
+ # however, this cannot be done now because we cannot conditionally compile MOF.	
+ 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"
+ 	@$(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"
+ 	@$(ECHO) +++++ Loading Computer System schema into $(INTEROPNS) namespace ...
+-	@$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_COMPUTERSYSTEM_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_COMPUTERSYSTEM_MOF_PATH)/PG_ComputerSystem$(PG_SCHEMA_VER).mof"
++	@$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_COMPUTERSYSTEM_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_COMPUTERSYSTEM_MOF_PATH)/PG_ComputerSystem$(PG_SCHEMA_VER).mof"
+ 	@$(ECHO) +++++ Loading PG_ServerProfile schema 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_ServerProfile$(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_ServerProfile$(PG_INTEROP_SCHEMA_VER).mof"
+ 
+ endif
+ 
+diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Pegasus/ManagedSystem/Makefile
+--- 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:
+ 	@ $(ECHO) +++++ Loading CIM_Schema$(CIM_SCHEMA_VER) into $(MANAGEDSYSTEMNS) namespace ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(MANAGEDSYSTEMNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(MANAGEDSYSTEMNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof"
+ 	@ $(ECHO) +++++ Loading PG_Events$(PG_INTEROP_SCHEMA_VER) into $(MANAGEDSYSTEMNS) namespace ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_INTEROP_MOF_PATH)/PG_Events$(PG_INTEROP_SCHEMA_VER).mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_INTEROP_MOF_PATH)/PG_Events$(PG_INTEROP_SCHEMA_VER).mof"
+ 	@ $(ECHO) +++++ Loading PG_ManagedSystemSchema$(PG_SCHEMA_VER) into $(MANAGEDSYSTEMNS) namespace ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_MOF_PATH)/PG_ManagedSystemSchema$(PG_SCHEMA_VER).mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_MOF_PATH)/PG_ManagedSystemSchema$(PG_SCHEMA_VER).mof"
+ ifndef SET_USER_CONTEXT_TO_REQUESTOR 
+ 	@ $(ECHO) +++++ Registering Providers for PG_ManagedSystemSchema$(PG_SCHEMA_VER) ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_ManagedSystemSchema$(PG_SCHEMA_VER)R.mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_ManagedSystemSchema$(PG_SCHEMA_VER)R.mof"
+ else
+ 	@ $(ECHO) +++++ Registering Providers for PG_ManagedSystemSchema21R ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_ManagedSystemSchema21R.mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_ManagedSystemSchema21R.mof"
+ endif
+ ifeq ($(PEGASUS_USE_RELEASE_CONFIG_OPTIONS),false)
+ 	@ $(ECHO) +++++ Loading PG_ManagedSystemTestSchema$(PG_SCHEMA_VER) into $(MANAGEDSYSTEMNS) namespace ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_MOF_PATH)/PG_ManagedSystemTestSchema$(PG_SCHEMA_VER).mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_MOF_PATH)/PG_ManagedSystemTestSchema$(PG_SCHEMA_VER).mof"
+ 	@ $(ECHO) +++++ Registering Providers for PG_ManagedSystemTestSchema$(PG_SCHEMA_VER) ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_ManagedSystemTestSchema$(PG_SCHEMA_VER)R.mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_ManagedSystemTestSchema$(PG_SCHEMA_VER)R.mof"
+ endif
+ ifeq ($(EXTENDED_MANAGEDSYSTEM_NS_SUPPORTED),true)
+ 	@ $(ECHO) +++++ Loading platform specific class definitions in $(MANAGEDSYSTEMNS) namespace  ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_MOF_PATH)/$(FILE_PREFIX)_ManagedSystemSchema$(PG_SCHEMA_VER).mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(MANAGEDSYSTEMNS)" "$(PG_MOF_PATH)/$(FILE_PREFIX)_ManagedSystemSchema$(PG_SCHEMA_VER).mof"
+ 	@ $(ECHO) +++++ Registering Providers for platform specific classes in $(MANAGEDSYSTEMNS) namespace ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/$(FILE_PREFIX)_ManagedSystemSchema$(PG_SCHEMA_VER)R.mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/$(FILE_PREFIX)_ManagedSystemSchema$(PG_SCHEMA_VER)R.mof"
+ endif
+ ifeq ($(PEGASUS_ENABLE_SLP),true)	
+ 	@ $(ECHO) +++++ Registering the SLPProvider in $(MANAGEDSYSTEMNS) namespace ...
+-	@ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_SLPProvider$(PG_SCHEMA_VER)R.mof"
++	@ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTEROPNS)" "$(PG_MOF_PATH)/PG_SLPProvider$(PG_SCHEMA_VER)R.mof"
+ endif
+ 
+ repositoryServer:
+diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Clients/benchmarkTest/Load/Makefile
+--- 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:
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(PROVIDERNS) namespace ...
+-	@ $(CIMMOFL) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" \
++	@ $(CIMMOFL) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" \
+               "-n$(PROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading $(BenchmarkMOF_NAME) class definitions into $(PROVIDERNS) namespace ...
+-	@ $(CIMMOFL) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(PROVIDERNS)" $(BenchmarkMOF_NAME).mof
++	@ $(CIMMOFL) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(PROVIDERNS)" $(BenchmarkMOF_NAME).mof
+ 	@ $(ECHO) +++++ Registering benchmark Provider   ...
+-	@ $(CIMMOFL) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" $(BenchmarkMOF_NAME)R.mof
++	@ $(CIMMOFL) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" $(BenchmarkMOF_NAME)R.mof
+ 
+ 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	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:
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Physical$(CIM_SCHEMA_VER) into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Physical$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Physical$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_System$(CIM_SCHEMA_VER) into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_System$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_System$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading PG_Events$(PG_INTEROP_SCHEMA_VER) into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(PG_INTEROP_MOF_PATH)/PG_Events$(PG_INTEROP_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(SAMPLEPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(PG_INTEROP_MOF_PATH)/PG_Events$(PG_INTEROP_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading SampleProvider class definitions into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" SampleProviderSchema.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" AssociationProvider.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" ClientTest.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" SampleProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" AssociationProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" ClientTest.mof
+ 	@ $(ECHO) +++++ Registering Sample Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" SampleProviderSchemaR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" SampleProviderSchemaR.mof
+ ifdef PEGASUS_ENABLE_EXECQUERY
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" InstanceQueryProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" InstanceQueryProviderR.mof
+ endif
+ ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
+ 	@ $(ECHO) +++++ Installing the MOF file for CMPI Providers
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" CWS_FilesAndDir.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" CWS_FilesAndDir.mof
+ 	@ $(ECHO) +++++ Registering FilesAndDir schema Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CWS_FilesAndDirR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CWS_FilesAndDirR.mof
+ 
+ 	@ $(ECHO) +++++ Installing the MOF file for CMPI ProcessIndication Provider
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" RT_Sample.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" RT_Sample.mof
+ 	@ $(ECHO) +++++ Registering CMPI ProcessIndication Provider  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" RT_SampleR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" RT_SampleR.mof
+ 
+ 	@ $(ECHO) +++++ Registering FilesAndDir CXX schema Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CWS_FilesAndDir_CXX_R.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CWS_FilesAndDir_CXX_R.mof
+ 
+ 	@ $(ECHO) +++++ Registering TestCMPI_CXX schema Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" TestCMPI_CXX.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_CXX_R.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" TestCMPI_CXX.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_CXX_R.mof
+ 
+ 	@ $(ECHO) +++++ Installing the MOF file for SampleClass CMPI Provider
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" CMPISampleClass.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" CMPISampleClass.mof
+ 	@ $(ECHO) +++++ Registering CMPI SampleClass Provider  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CMPISampleClassR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CMPISampleClassR.mof
+ 
+ 	@ $(ECHO) +++++ Loading CMPI Sample Provider class definitions into $(SAMPLEPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" CMPISampleProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(SAMPLEPROVIDERNS)" CMPISampleProviderSchema.mof
+ 	
+ 	@ $(ECHO) +++++ Registering CMPI Sample Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CMPISampleProviderSchemaR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CMPISampleProviderSchemaR.mof
+ endif
+ 
+ # 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	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 ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(TESTPROVIDERNS) $(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(TESTPROVIDERNS) $(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Physical$(CIM_SCHEMA_VER) into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Physical$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Physical$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_System$(CIM_SCHEMA_VER) into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_System$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_System$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof
+ 
+ 	@ $(ECHO) +++++ Loading PG_Events$(PG_INTEROP_SCHEMA_VER) into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(PG_INTEROP_MOF_PATH)/PG_Events$(PG_INTEROP_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(TESTPROVIDERNS)" $(ALLOW_EXPERIMENTAL) $(PG_INTEROP_MOF_PATH)/PG_Events$(PG_INTEROP_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading TestInstanceProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestInstanceProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestInstanceProviderSchema.mof
+ 	@ $(ECHO) +++++ Loading TestChunkingStressProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestChunkingStressProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestChunkingStressProviderSchema.mof
+ 	@ $(ECHO) +++++ Loading IndicationStressTest class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationStressTestProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationStressTestProviderSchema.mof
+ 	@ $(ECHO) +++++ Loading TestFaultyProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestFaultyProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestFaultyProviderSchema.mof
+ 
+ 	@ $(ECHO) +++++ Registering TestInstanceProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestInstanceProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestInstanceProviderRegistration.mof
+ 	@ $(ECHO) +++++ Registering TestChunkingStressProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestChunkingStressProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestChunkingStressProviderRegistration.mof
+ 	@ $(ECHO) +++++ Registering IndicationStressTest Provider  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationStressTestProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationStressTestProviderR.mof
+ 	@ $(ECHO) +++++ Registering IndicationStressTestConsumer Provider  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationStressTestConsumerR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationStressTestConsumerR.mof
+ 	@ $(ECHO) +++++ Registering ProviderLifecycleIndicationConsumer Provider  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" ProviderLifecycleIndicationConsumerR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" ProviderLifecycleIndicationConsumerR.mof
+ 	@ $(ECHO) +++++ Registering TestFaultyProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestFaultyProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestFaultyProviderRegistration.mof
+ 	@ $(ECHO) +++++ Registering TestGoodInstanceProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestGoodInstanceProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestGoodInstanceProviderRegistration.mof
+ 
+ 	@ $(ECHO) +++++ Loading DeliveryRetryTest class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" DeliveryRetryTestProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" DeliveryRetryTestProviderSchema.mof
+ 
+ 	@ $(ECHO) +++++ Registering DeliveryRetryTest Provider  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" DeliveryRetryTestProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" DeliveryRetryTestProviderR.mof
+ 
+ 	@ $(ECHO) +++++ Registering IndicationStressTestConsumer Provider  ...
+ 	@ $(ECHO) +++++ Loading IndicationTestProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ 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 "-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
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" MethodTestProvider.mof
+ 	@ $(ECHO) +++++ Loading GroupMethodProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" GroupMethodProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" GroupMethodProvider.mof
+ 	@ $(ECHO) +++++ Loading ProviderLifecycleIndicationProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" ProviderLifecycleIndicationProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" ProviderLifecycleIndicationProvider.mof
+ 	@ $(ECHO) +++++ Registering MethodTestProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" MethodTestProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" MethodTestProviderR.mof
+ 
+ 	@ $(ECHO) +++++ Loading CLITestProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" CLITestProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" CLITestProvider.mof
+ 	@ $(ECHO) +++++ Registering CLITestProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CLITestProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CLITestProviderR.mof
+ 
+ 	@ $(ECHO) +++++ Loading TestCIM_ErrorProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCIM_ErrorProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCIM_ErrorProvider.mof
+ 	@ $(ECHO) +++++ Registering TestCIM_ErrorProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCIM_ErrorProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCIM_ErrorProviderR.mof
+ 
+ 	@ $(ECHO) +++++ Installing the Family MOF file for the association provider
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TST_Family.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TST_Family.mof
+ 	@ $(ECHO) +++++ Registering FamilyProvider schema Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" FamilyProviderSchemaR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" FamilyProviderSchemaR.mof
+ 
+ 	@ $(ECHO) +++++ Loading CIMOMHandleTestProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" CIMOMHandleTestProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" CIMOMHandleTestProviderSchema.mof
+ 	@ $(ECHO) +++++ Registering CIMOMHandleTestProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CIMOMHandleTestProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CIMOMHandleTestProviderRegistration.mof
+ 
+ 	@ $(ECHO) +++++ Loading TestAggregationOutputProvider.mof into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestAggregationOutputProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestAggregationOutputProvider.mof
+ 	@ $(ECHO) +++++ Registering TestAggregationOutputProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestAggregationOutputProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestAggregationOutputProviderR.mof
+ 
+ 	@ $(ECHO) +++++ Loading LocalizedProvider.mof into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" LocalizedProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" LocalizedProvider.mof
+ 	@ $(ECHO) +++++ Registering LocalizedProvider ...
+-	@ 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
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCMPI_ProviderSchema.mof
+ 
+ 	@ $(ECHO) +++++ Registering TestCMPI_ProviderRegistration ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_ProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_ProviderRegistration.mof
+ 
+ 	@ $(ECHO) +++++ Loading TestCMPI_Association class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCMPI_AssociationProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCMPI_AssociationProvider.mof
+ 	@ $(ECHO) +++++ Registering TestCMPI_AssociationProviderRegistration ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_AssociationProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_AssociationProviderR.mof
+ 
+ 	@ $(ECHO) +++++ Loading CMPIPerf_TestProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" CMPIPerf_TestProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" CMPIPerf_TestProviderSchema.mof
+ 	@ $(ECHO) +++++ Registering CMPIPerf_TestProviderRegistration ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CMPIPerf_TestProviderRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" CMPIPerf_TestProviderRegistration.mof
+ 	
+ ifdef PEGASUS_ENABLE_EXECQUERY
+ 	@ $(ECHO) +++++ Registering TestCMPI_ProviderExecQueryRegistration ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_ProviderExecQueryRegistration.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestCMPI_ProviderExecQueryRegistration.mof
+ endif
+ 
+ endif
+ 
+ ifndef PEGASUS_DISABLE_PROV_USERCTXT
+ 	@ $(ECHO) +++++ Loading UserContextTestProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" UserContextTestProvider.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" UserContextTestProvider.mof
+ 
+ 	@ $(ECHO) +++++ Registering UserContextTestProvider ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextRequestorR.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextPrivilegedR.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextDesignatedR.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextCIMServerR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextRequestorR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextPrivilegedR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextDesignatedR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" UserContextCIMServerR.mof
+ endif
+ 	@ $(ECHO) +++++ Loading OOPModuleFailureTestProvider class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" FailureTestIndication.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" FailureTestIndication.mof
+ 
+ ifdef PEGASUS_BUILD_INTEROP 
+ 	@ $(ECHO) +++++ Loading TestServerProfile class definitions into $(TESTPROVIDERNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestServerProfileSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestServerProfileSchema.mof
+ 	@ $(ECHO) +++++ Registering TestServerProfile Providers ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestServerProfileR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" TestServerProfileR.mof
+ endif
+ 
+ 	@ $(ECHO) +++++ EmbeddedInstanceTest provider class definitions into $(EI_DYNAMIC_TEST_NAMESPACE) and $(EI_STATIC_TEST_NAMESPACE) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(EI_DYNAMIC_TEST_NAMESPACE) $(EI_SCHEMA_DIR)/Core_Qualifiers.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" CIMError.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Core.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Event.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Interop.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" EmbeddedInstanceProviderSchema.mof
+-
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(EI_STATIC_TEST_NAMESPACE) $(EI_SCHEMA_DIR)/Core_Qualifiers.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" CIMError.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Core.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Event.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Interop.mof
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" EmbeddedInstanceProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(EI_DYNAMIC_TEST_NAMESPACE) $(EI_SCHEMA_DIR)/Core_Qualifiers.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" CIMError.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Core.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Event.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Interop.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_DYNAMIC_TEST_NAMESPACE)" "-aE" EmbeddedInstanceProviderSchema.mof
++
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(EI_STATIC_TEST_NAMESPACE) $(EI_SCHEMA_DIR)/Core_Qualifiers.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" CIMError.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Core.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Event.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" $(EI_SCHEMA_DIR)/CIM_Interop.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(EI_SCHEMA_DIR)" "-n$(EI_STATIC_TEST_NAMESPACE)" "-aE" EmbeddedInstanceProviderSchema.mof
+ 
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" EmbeddedInstanceProviderR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" EmbeddedInstanceProviderR.mof
+ # create remote namespace for Remote CMPI test providers
+ ifdef PEGASUS_ENABLE_REMOTE_CMPI
+ 	@ echo +++++ Creating remote namespace ...
+@@ -231,28 +231,28 @@ endif
+ ##  Indication filter source namespaces testing
+ ##
+ 	@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTINDSRCNS1) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(TESTINDSRCNS1) $(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(TESTINDSRCNS1) $(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(TESTINDSRCNS1) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS1)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS1)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(TESTINDSRCNS1) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS1)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS1)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading IndicationStressTest class definition into $(TESTINDSRCNS1) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS1)" IndicationStressTestProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS1)" IndicationStressTestProviderSchema.mof
+ ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
+ 	@ $(ECHO) +++++ Loading TestCMPI_ProviderSchema class definitions into $(TESTINDSRCNS1) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS1)" TestCMPI_ProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS1)" TestCMPI_ProviderSchema.mof
+ endif
+ 	@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTINDSRCNS2) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(TESTINDSRCNS2) $(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(TESTINDSRCNS2) $(CIM_SCHEMA_DIR)/Core$(CIM_SCHEMA_VER)_Qualifiers.mof
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(TESTINDSRCNS2) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS2)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS2)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading CIM_Event$(CIM_SCHEMA_VER) into $(TESTINDSRCNS2) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS2)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(TESTINDSRCNS2)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Event$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading IndicationStressTest class definition into $(TESTINDSRCNS2) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS2)" IndicationStressTestProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS2)" IndicationStressTestProviderSchema.mof
+ ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
+ 	@ $(ECHO) +++++ Loading TestCMPI_ProviderSchema class definitions into $(TESTINDSRCNS2) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS2)" TestCMPI_ProviderSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTINDSRCNS2)" TestCMPI_ProviderSchema.mof
+ endif
+ 
+ 
+diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/static/Load/Makefile
+--- 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:
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(STATICTESTNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" -n$(STATICTESTNS) \
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" -n$(STATICTESTNS) \
+                      $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading WET_Schema into $(STATICTESTNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(STATICTESTNS) WET_Schema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(STATICTESTNS) WET_Schema.mof
+ 	@ $(ECHO) +++++ Loading Static Test Schema into $(STATICTESTNS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(STATICTESTNS) StaticTestSchema.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(STATICTESTNS) StaticTestSchema.mof
+ 	@ $(ECHO) +++++ Registering Static Tests Schema Providers  ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(INTEROPNS) StaticTestSchemaR.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" -n$(INTEROPNS) StaticTestSchemaR.mof
+ 
+ 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	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:
+ 	@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(WSM_TEST_NS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(WSM_TEST_NS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(WSM_TEST_NS)" $(ALLOW_EXPERIMENTAL) $(CIM_SCHEMA_DIR)/CIM_Core$(CIM_SCHEMA_VER).mof
+ 	@ $(ECHO) +++++ Loading Wsm test class definitions into $(WSM_TEST_NS) namespace ...
+-	@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(WSM_TEST_NS)" WsmTest.mof
++	@ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(WSM_TEST_NS)" WsmTest.mof
+ 
+ # Load the sample mof through the Client interface compiler but do not
+ # clean out the existing version.
diff --git a/pegasus-2.12.0-empty_arrays.patch b/pegasus-2.12.0-empty_arrays.patch
new file mode 100644
index 0000000..19cc7c2
--- /dev/null
+++ b/pegasus-2.12.0-empty_arrays.patch
@@ -0,0 +1,30 @@
+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;
+ 
+-    //Check for NULL CIMValue
+-    if( scmoValue == 0 )
+-    {
+-        data->state = CMPI_nullValue;
+-        return CMPI_RC_OK;
+-    }
+-
+     if (type & CMPI_ARRAY)
+     {
+         // Get the type of the element of the CMPIArray
+@@ -389,6 +382,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
+     }
+     else
+     {
++        //Check for NULL CIMValue
++        if( scmoValue == 0 )
++        {
++            data->state = CMPI_nullValue;
++            return CMPI_RC_OK;
++        }
+         // Check for encpsulated type, which need special handling
+         if (type&CMPI_ENC)
+         {
diff --git a/pegasus-2.12.0-null_value.patch b/pegasus-2.12.0-null_value.patch
new file mode 100644
index 0000000..70eff76
--- /dev/null
+++ b/pegasus-2.12.0-null_value.patch
@@ -0,0 +1,27 @@
+diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Enumeration.cpp.null_value pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Enumeration.cpp
+--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Enumeration.cpp.null_value	2012-10-22 19:24:19.593698102 +0200
++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPI_Enumeration.cpp	2012-10-22 19:28:19.190897537 +0200
+@@ -167,6 +167,7 @@ extern "C"
+                     (new CMPI_Object(
+                         new SCMOInstance((*ia)[ie->cursor++]),
+                         CMPI_Object::ObjectTypeInstance));
++                data.state = CMPI_goodValue;
+                 CMSetStatus(rc, CMPI_RC_OK);
+             }
+             else
+@@ -185,6 +186,7 @@ extern "C"
+                     (new CMPI_Object(
+                         new SCMOInstance((*ia)[ie->cursor++]),
+                         CMPI_Object::ObjectTypeInstance));
++                data.state = CMPI_goodValue;
+                 CMSetStatus(rc, CMPI_RC_OK);
+             }
+             else
+@@ -203,6 +205,7 @@ extern "C"
+                     (new CMPI_Object(
+                         new SCMOInstance((*opa)[oe->cursor++]),
+                         CMPI_Object::ObjectTypeObjectPath));
++                data.state = CMPI_goodValue;
+                 CMSetStatus(rc, CMPI_RC_OK);
+             }
+             else
diff --git a/pegasus-2.12.0-schema-version-and-includes.patch b/pegasus-2.12.0-schema-version-and-includes.patch
new file mode 100644
index 0000000..95c064b
--- /dev/null
+++ b/pegasus-2.12.0-schema-version-and-includes.patch
@@ -0,0 +1,126 @@
+diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Core.mof
+--- 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")
+ #pragma include ("DMTF/Core/CIM_StorageAllocationSettingData.mof")
++#pragma include ("DMTF/User/CIM_Identity.mof")
++#pragma include ("DMTF/User/CIM_StorageHardwareID.mof") 
+ #pragma include ("DMTF/Core/CIM_StorageHardwareIDElementSettingData.mof")
+ #pragma include ("DMTF/Core/CIM_StorageRedundancyGroup.mof")
+ #pragma include ("DMTF/Core/CIM_SystemSetting.mof")
+ #pragma include ("DMTF/Core/CIM_SystemSettingContext.mof")
+ #pragma include ("DMTF/Core/CIM_SystemSpecificCollection.mof")
++#pragma include ("DMTF/System/CIM_VirtualSystemSettingData.mof")
+ #pragma include ("DMTF/Core/CIM_VirtualEthernetSwitchSettingData.mof")
+ #pragma include ("DMTF/Core/CIM_VirtualSystemManagementCapabilities.mof")
+ #pragma include ("DMTF/Core/CIM_VirtualSystemSnapshotCapabilities.mof")
+@@ -185,6 +188,8 @@
+ #pragma include ("DMTF/Core/CIM_ScopedSetting.mof")
+ #pragma include ("DMTF/Core/CIM_StatisticsCollection.mof")
+ #pragma include ("DMTF/Core/CIM_StorageRedundancySet.mof")
++#pragma include ("DMTF/Interop/CIM_Message.mof")
++#pragma include ("DMTF/Interop/CIM_Error.mof")
+ #pragma include ("DMTF/Core/CIM_ConcreteJob.mof")
+ #pragma include ("DMTF/Core/CIM_DefaultSetting.mof")
+ #pragma include ("DMTF/Core/CIM_EnabledLogicalElement.mof")
+@@ -214,6 +219,7 @@
+ #pragma include ("DMTF/Core/CIM_AdminDomain.mof")
+ #pragma include ("DMTF/Core/CIM_BasedOn.mof")
+ #pragma include ("DMTF/Core/CIM_BasicExecutionService.mof")
++#pragma include ("DMTF/System/CIM_ComputerSystem.mof")
+ #pragma include ("DMTF/Core/CIM_ComputerSystemElementSettingData.mof")
+ #pragma include ("DMTF/Core/CIM_ConfigurationForSystem.mof")
+ #pragma include ("DMTF/Core/CIM_ContainedDomain.mof")
+@@ -245,6 +251,8 @@
+ #pragma include ("DMTF/Core/CIM_SettingForSystem.mof")
+ #pragma include ("DMTF/Core/CIM_SoftwareIdentityResource.mof")
+ #pragma include ("DMTF/Core/CIM_SystemDeviceView.mof")
++#pragma include ("DMTF/Device/CIM_ProtocolController.mof")
++#pragma include ("DMTF/Device/CIM_SCSIProtocolController.mof")
+ #pragma include ("DMTF/Core/CIM_SystemSCSIProtocolController.mof")
+ #pragma include ("DMTF/Core/CIM_VirtualSystemManagementService.mof")
+ #pragma include ("DMTF/Core/CIM_VirtualSystemSnapshotService.mof")
+@@ -258,6 +266,13 @@
+ #pragma include ("DMTF/Core/CIM_ProtocolService.mof")
+ #pragma include ("DMTF/Core/CIM_ProvidesEndpoint.mof")
+ #pragma include ("DMTF/Core/CIM_RemotePort.mof")
++#pragma include ("DMTF/User/CIM_SecurityService.mof")
++#pragma include ("DMTF/User/CIM_AuthenticationService.mof")
++#pragma include ("DMTF/User/CIM_IdentityManagementService.mof")
++#pragma include ("DMTF/User/CIM_StorageHardwareIDManagementService.mof")
+ #pragma include ("DMTF/Core/CIM_StorageHardwareIDManagementServiceDependency.mof")
++#pragma include ("DMTF/Device/CIM_LogicalPort.mof")
++#pragma include ("DMTF/Device/CIM_NetworkPort.mof")
++#pragma include ("DMTF/Device/CIM_FCPort.mof")
+ #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	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")
+ #pragma include ("DMTF/Event/CIM_IndicationService.mof")
++#pragma include ("DMTF/System/CIM_Log.mof")
+ #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	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")
+ #pragma include ("DMTF/Interop/CIM_SubProfileRequiresProfile.mof")
++#pragma include ("DMTF/Network/CIM_ProtocolServiceCapabilities.mof")
+ #pragma include ("DMTF/Interop/CIM_WBEMProtocolServiceCapabilities.mof")
+ #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	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")
+ #pragma include ("DMTF/System/CIM_BatchJobGroup.mof")
++#pragma include ("DMTF/User/CIM_Credential.mof")
+ #pragma include ("DMTF/System/CIM_BIOSServiceCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_BootServiceCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_ComputerSystemNodeCapabilities.mof")
+@@ -86,8 +87,10 @@
+ #pragma include ("DMTF/System/CIM_FileImportCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemConfigurationCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemSettingData.mof")
++#pragma include ("DMTF/Device/CIM_StatisticsCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemStatisticsCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemStatisticsManifestCollection.mof")
++#pragma include ("DMTF/User/CIM_Privilege.mof")
+ #pragma include ("DMTF/System/CIM_ImportedFileShareSetting.mof")
+ #pragma include ("DMTF/System/CIM_ImportedShareRoot.mof")
+ #pragma include ("DMTF/System/CIM_LogEntry.mof")
+@@ -147,8 +150,10 @@
+ #pragma include ("DMTF/System/CIM_ExportedFileShareCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_FCHBADiagnosticTest.mof")
+ #pragma include ("DMTF/System/CIM_FileSystem.mof")
++#pragma include ("DMTF/Device/CIM_StorageSetting.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemCapabilities.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemConfigurationService.mof")
++#pragma include ("DMTF/Device/CIM_StatisticsService.mof")
+ #pragma include ("DMTF/System/CIM_FileSystemStatisticsService.mof")
+ #pragma include ("DMTF/System/CIM_HelpService.mof")
+ #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	2015-04-07 15:24:25.321805120 +0200
+@@ -152,8 +152,8 @@ Qualifier PUnit : string = null,
+ Qualifier Read : boolean = true, 
+     Scope(property);
+ 
+-Qualifier Reference : string = null, 
+-    Scope(property);
++//Qualifier Reference : string = null, 
++//    Scope(property);
+ 
+ Qualifier Required : boolean = false, 
+     Scope(property, reference, method, parameter), 
diff --git a/pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch b/pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch
new file mode 100644
index 0000000..7312327
--- /dev/null
+++ b/pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch
@@ -0,0 +1,24 @@
+diff -up pegasus/rpm/manLinux/man8.Z/cimconfig.8.orig pegasus/rpm/manLinux/man8.Z/cimconfig.8
+--- pegasus/rpm/manLinux/man8.Z/cimconfig.8.orig	2014-01-07 14:51:40.841757649 +0100
++++ pegasus/rpm/manLinux/man8.Z/cimconfig.8	2014-01-07 14:52:03.415820767 +0100
+@@ -161,7 +161,7 @@ and listener destination instances other
+ is required.
+ .PD 0
+ .IP 
+-.BR "Default Value: " False
++.BR "Default Value: " True
+ .IP 
+ .BR Dynamic: \0No
+ .PD
+diff -up pegasus/src/Pegasus/Config/SecurityPropertyOwner.cpp.orig pegasus/src/Pegasus/Config/SecurityPropertyOwner.cpp
+--- pegasus/src/Pegasus/Config/SecurityPropertyOwner.cpp.orig	2014-01-07 14:48:14.377180640 +0100
++++ pegasus/src/Pegasus/Config/SecurityPropertyOwner.cpp	2014-01-07 14:51:30.760729464 +0100
+@@ -121,7 +121,7 @@ static struct ConfigPropertyRow properti
+ #if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_OS_LINUX)
+ # ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
+     {"enableSubscriptionsForNonprivilegedUsers",
+-         "false", IS_STATIC, IS_VISIBLE},
++         "true", IS_STATIC, IS_VISIBLE},
+ # else
+     {"enableSubscriptionsForNonprivilegedUsers", "true", IS_STATIC, IS_VISIBLE},
+ # endif
diff --git a/pegasus-2.13.0-gcc5-build.patch b/pegasus-2.13.0-gcc5-build.patch
new file mode 100644
index 0000000..35fae89
--- /dev/null
+++ b/pegasus-2.13.0-gcc5-build.patch
@@ -0,0 +1,23 @@
+diff -up pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp.orig pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp
+--- pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp.orig	2015-02-10 15:00:48.660891308 +0100
++++ pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp	2015-02-10 15:02:01.811194154 +0100
+@@ -129,6 +129,7 @@ Array<CIMInstance> InteropProvider::enum
+ Array<CIMInstance> InteropProvider::enumElementConformsToProfileInstances(
+     const OperationContext & opContext, const CIMNamespaceName & opNamespace)
+ {
++    const Uint32 PEGASUS_DYNAMIC_LEN(PEGASUS_DYNAMIC.size());
+     CIMClass elementConformsClass = repository->getClass(
+         PEGASUS_NAMESPACENAME_INTEROP,
+         PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE,
+diff -up pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h.orig pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h
+--- pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h.orig	2015-02-10 14:43:34.168607514 +0100
++++ pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h	2015-02-10 14:43:44.165648967 +0100
+@@ -150,7 +150,7 @@ const String PEGASUS_INTERNAL_PROVIDER_T
+ const String PEGASUS_INTERNAL_SERVICE_TYPE(
+     "Internal Service");
+ const String PEGASUS_DYNAMIC("__DYNAMIC_");
+-const Uint32 PEGASUS_DYNAMIC_LEN(PEGASUS_DYNAMIC.size());
++// const Uint32 PEGASUS_DYNAMIC_LEN(PEGASUS_DYNAMIC.size());
+ const CIMNamespaceName PEGASUS_NAMESPACENAME_ROOT("root");
+ 
+ #define thisProvider "InteropProvider"
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.14.1-openssl-1.1-fix.patch b/pegasus-2.14.1-openssl-1.1-fix.patch
new file mode 100644
index 0000000..c96934f
--- /dev/null
+++ b/pegasus-2.14.1-openssl-1.1-fix.patch
@@ -0,0 +1,96 @@
+diff -up pegasus/src/Pegasus/Common/SSLContext.cpp.orig pegasus/src/Pegasus/Common/SSLContext.cpp
+--- pegasus/src/Pegasus/Common/SSLContext.cpp.orig	2017-02-28 14:39:49.497066327 +0100
++++ pegasus/src/Pegasus/Common/SSLContext.cpp	2017-03-01 10:56:06.726453475 +0100
+@@ -225,27 +225,31 @@ int SSLCallback::verificationCRLCallback
+     PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4, buf);
+ 
+     //initialize the CRL store
+-    X509_STORE_CTX crlStoreCtx;
+-    X509_STORE_CTX_init(&crlStoreCtx, sslCRLStore, NULL, NULL);
++    X509_STORE_CTX* crlStoreCtx;
++    crlStoreCtx = X509_STORE_CTX_new();
++    X509_STORE_CTX_init(crlStoreCtx, sslCRLStore, NULL, NULL);
+ 
+     PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
+         "---> SSL: Initialized CRL store");
+ 
+     //attempt to get a CRL issued by the certificate's issuer
+-    X509_OBJECT obj;
++    X509_OBJECT* obj;
++    obj = X509_OBJECT_new();
+     if (X509_STORE_get_by_subject(
+-            &crlStoreCtx, X509_LU_CRL, issuerName, &obj) <= 0)
++            crlStoreCtx, X509_LU_CRL, issuerName, obj) <= 0)
+     {
+-        X509_STORE_CTX_cleanup(&crlStoreCtx);
++        X509_OBJECT_free(obj);
++        X509_STORE_CTX_cleanup(crlStoreCtx);
+         PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL3,
+             "---> SSL: No CRL by that issuer");
+         PEG_METHOD_EXIT();
+         return 0;
+     }
+-    X509_STORE_CTX_cleanup(&crlStoreCtx);
++    X509_STORE_CTX_cleanup(crlStoreCtx);
+ 
+     //get CRL
+-    X509_CRL* crl = obj.data.crl;
++    X509_CRL* crl;
++    crl = X509_OBJECT_get0_X509_CRL(obj);
+     if (crl == NULL)
+     {
+         PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4, "---> SSL: CRL is null");
+@@ -272,18 +276,18 @@ int SSLCallback::verificationCRLCallback
+     {
+         revokedCert = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
+         //a matching serial number indicates revocation
+-        if (ASN1_INTEGER_cmp(revokedCert->serialNumber, serialNumber) == 0)
++        if (ASN1_INTEGER_cmp(X509_REVOKED_get0_serialNumber(revokedCert), serialNumber) == 0)
+         {
+             PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL2,
+                 "---> SSL: Certificate is revoked");
+             X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REVOKED);
+-            X509_CRL_free(crl);
++            X509_OBJECT_free(obj);
+             PEG_METHOD_EXIT();
+             return 1;
+         }
+     }
+ 
+-    X509_CRL_free(crl);
++    X509_OBJECT_free(obj);
+ 
+     PEG_TRACE_CSTRING(TRC_SSL, Tracer::LEVEL4,
+         "---> SSL: Certificate is not revoked at this level");
+diff -up pegasus/src/Pegasus/Common/SSLContextRep.h.orig pegasus/src/Pegasus/Common/SSLContextRep.h
+--- pegasus/src/Pegasus/Common/SSLContextRep.h.orig	2017-02-28 14:32:44.379013979 +0100
++++ pegasus/src/Pegasus/Common/SSLContextRep.h	2017-02-28 14:36:38.088039077 +0100
+@@ -104,7 +104,11 @@ public:
+ 
+             //important as per following site for 
+             //http://www.openssl.org/support/faq.html#PROG
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+             CRYPTO_malloc_init();
++#else
++            OPENSSL_malloc_init();
++#endif
+             SSL_library_init();
+             SSL_load_error_strings();
+         }
+diff -up pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp.orig pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp
+--- pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp.orig	2017-03-01 10:34:19.367952613 +0100
++++ pegasus/src/Pegasus/ControlProviders/CertificateProvider/CertificateProvider.cpp	2017-03-01 10:36:18.003931270 +0100
+@@ -531,11 +531,11 @@ inline CIMInstance _getCRLInstance(X509_
+     for (int i = 0; i < numRevoked; i++)
+     {
+         r = sk_X509_REVOKED_value(revoked, i);
+-        rawSerialNumber = ASN1_INTEGER_get(r->serialNumber);
++        rawSerialNumber = ASN1_INTEGER_get(X509_REVOKED_get0_serialNumber(r));
+         sprintf(serial, "%lu", (unsigned long)rawSerialNumber);
+         revokedSerialNumbers.append(String(serial));
+ 
+-        revocationDate = getDateTime(r->revocationDate);
++        revocationDate = getDateTime(X509_REVOKED_get0_revocationDate(r));
+         revocationDates.append(revocationDate);
+     }
+ 
diff --git a/pegasus-2.14.1-ssl-include.patch b/pegasus-2.14.1-ssl-include.patch
new file mode 100644
index 0000000..b229d75
--- /dev/null
+++ b/pegasus-2.14.1-ssl-include.patch
@@ -0,0 +1,11 @@
+diff -up pegasus/src/Pegasus/Server/tests/TLSv_1_2_Support/TestTLSv1_2_Support.cpp.orig pegasus/src/Pegasus/Server/tests/TLSv_1_2_Support/TestTLSv1_2_Support.cpp
+--- pegasus/src/Pegasus/Server/tests/TLSv_1_2_Support/TestTLSv1_2_Support.cpp.orig	2015-05-19 13:49:59.100133630 +0200
++++ pegasus/src/Pegasus/Server/tests/TLSv_1_2_Support/TestTLSv1_2_Support.cpp	2015-05-19 13:50:40.665309444 +0200
+@@ -37,6 +37,7 @@
+ 
+ 
+ #ifdef PEGASUS_HAS_SSL
++#  include <openssl/ssl.h>
+ #  include <openssl/tls1.h>
+ #endif
+ 
diff --git a/pegasus-2.14.1.tar.gz b/pegasus-2.14.1.tar.gz
new file mode 100644
index 0000000..fc9b896
Binary files /dev/null and b/pegasus-2.14.1.tar.gz differ
diff --git a/pegasus-2.14.1.tar.gz.1 b/pegasus-2.14.1.tar.gz.1
new file mode 100644
index 0000000..604ca35
Binary files /dev/null and b/pegasus-2.14.1.tar.gz.1 differ
diff --git a/pegasus-2.5.1-pam-wbem.patch b/pegasus-2.5.1-pam-wbem.patch
new file mode 100644
index 0000000..932bfe1
--- /dev/null
+++ b/pegasus-2.5.1-pam-wbem.patch
@@ -0,0 +1,22 @@
+--- pegasus/rpm/wbem.pam-wbem	2006-01-17 14:17:43.000000000 -0500
++++ pegasus/rpm/wbem	2006-04-05 19:26:46.000000000 -0400
+@@ -1,13 +1,7 @@
+ #%PAM-1.0
+-auth        required      $ISA/pam_env.so
+-auth        sufficient    $ISA/pam_unix.so nullok
+-auth        required      $ISA/pam_deny.so
+-
+-account     required      $ISA/pam_unix.so
+-
+-password    required      $ISA/pam_cracklib.so retry=3 type=
+-password    sufficient    $ISA/pam_unix.so nullok use_authtok md5 shadow
+-password    required      $ISA/pam_deny.so
+-
+-session     required      $ISA/pam_limits.so
+-session     required      $ISA/pam_unix.so
++auth       include      password-auth
++account    required     pam_access.so accessfile=/etc/Pegasus/access.conf
++account    include      password-auth
++password   include      password-auth
++session    required     pam_loginuid.so 
++session    include      password-auth
diff --git a/pegasus-2.7.0-PIE.patch b/pegasus-2.7.0-PIE.patch
new file mode 100644
index 0000000..6eabde6
--- /dev/null
+++ b/pegasus-2.7.0-PIE.patch
@@ -0,0 +1,132 @@
+diff -up pegasus/src/Clients/cimauth/Makefile_orig pegasus/src/Clients/cimauth/Makefile
+--- pegasus/src/Clients/cimauth/Makefile_orig	2011-05-17 15:03:15.822670486 +0200
++++ pegasus/src/Clients/cimauth/Makefile	2011-05-17 15:03:26.893426279 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimauth
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegcliutils \
+     pegclient \
+diff -up pegasus/src/Clients/cimconfig/Makefile_orig pegasus/src/Clients/cimconfig/Makefile
+--- pegasus/src/Clients/cimconfig/Makefile_orig	2011-05-17 15:01:19.759266385 +0200
++++ pegasus/src/Clients/cimconfig/Makefile	2011-05-17 15:01:37.629099999 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimconfig
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegcliutils \
+     pegclient \
+diff -up pegasus/src/Clients/cimprovider/Makefile_orig pegasus/src/Clients/cimprovider/Makefile
+--- pegasus/src/Clients/cimprovider/Makefile_orig	2011-05-17 15:01:55.278898872 +0200
++++ pegasus/src/Clients/cimprovider/Makefile	2011-05-17 15:02:09.021077534 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimprovider
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegcliutils \
+     pegclient \
+diff -up pegasus/src/Clients/cimuser/Makefile_orig pegasus/src/Clients/cimuser/Makefile
+--- pegasus/src/Clients/cimuser/Makefile_orig	2011-05-17 15:02:18.991658613 +0200
++++ pegasus/src/Clients/cimuser/Makefile	2011-05-17 15:02:38.476748769 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/cimuser
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegcliutils \
+     pegclient \
+diff -up pegasus/src/Clients/osinfo/Makefile_orig pegasus/src/Clients/osinfo/Makefile
+--- pegasus/src/Clients/osinfo/Makefile_orig	2011-05-17 15:03:57.952350916 +0200
++++ pegasus/src/Clients/osinfo/Makefile	2011-05-17 15:04:08.622043080 +0200
+@@ -33,6 +33,8 @@ PEGASUS_ZOS_PROGRAM_OBJECT = yes
+ DIR = Clients/osinfo
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegcliutils \
+     peggetoopt \
+diff -up pegasus/src/Clients/repupgrade/Makefile_orig pegasus/src/Clients/repupgrade/Makefile
+--- pegasus/src/Clients/repupgrade/Makefile_orig	2011-05-17 15:03:36.222905432 +0200
++++ pegasus/src/Clients/repupgrade/Makefile	2011-05-17 15:03:48.013774882 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/repupgrade
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
+ 
+ LIBRARIES = \
+diff -up pegasus/src/Clients/wbemexec/Makefile_orig pegasus/src/Clients/wbemexec/Makefile
+--- pegasus/src/Clients/wbemexec/Makefile_orig	2011-05-17 15:02:46.254981788 +0200
++++ pegasus/src/Clients/wbemexec/Makefile	2011-05-17 15:02:59.917148729 +0200
+@@ -34,6 +34,8 @@ DIR = Clients/wbemexec
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
+ 
+ LIBRARIES = \
+diff -up pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_orig pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile
+--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_orig	2011-05-17 14:59:20.270319135 +0200
++++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2011-05-17 14:59:55.019829684 +0200
+@@ -30,6 +30,8 @@ ROOT = ../../../../..
+ DIR = Pegasus/Compiler/cmdline/cimmofl
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
+ 
+ PROGRAM = cimmofl
+diff -up pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_orig pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile
+--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_orig	2011-05-17 14:58:44.334620532 +0200
++++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile	2011-05-17 14:59:10.555778484 +0200
+@@ -32,6 +32,8 @@ include $(ROOT)/mak/config.mak
+ 
+ LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegcompiler \
+     pegclient \
+diff -up pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_orig pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile
+--- pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_orig	2011-05-17 14:58:03.166092772 +0200
++++ pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile	2011-05-17 14:58:22.652182571 +0200
+@@ -32,6 +32,8 @@ DIR = Pegasus/ProviderManagerService/Pro
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ LIBRARIES = \
+     pegpmrouter \
+     pegprovidermanager \
+diff -up pegasus/src/Pegasus/Server/Makefile_orig pegasus/src/Pegasus/Server/Makefile
+--- pegasus/src/Pegasus/Server/Makefile_orig	2011-05-17 14:57:08.349400296 +0200
++++ pegasus/src/Pegasus/Server/Makefile	2011-05-17 14:57:33.724424287 +0200
+@@ -32,6 +32,8 @@ DIR = Pegasus/Server
+ 
+ include $(ROOT)/mak/config.mak
+ 
++FLAGS := $(FLAGS:-fPIC=-fPIE)
++
+ EXTRA_INCLUDES = $(SYS_INCLUDES)
+ 
+ LOCAL_DEFINES = -DPEGASUS_SERVER_INTERNAL -DPEGASUS_INTERNALONLY
diff --git a/pegasus-2.7.0-no-snmp-tests.patch b/pegasus-2.7.0-no-snmp-tests.patch
new file mode 100644
index 0000000..46629c2
--- /dev/null
+++ b/pegasus-2.7.0-no-snmp-tests.patch
@@ -0,0 +1,33 @@
+diff -up pegasus/Makefile.ReleaseTest.orig pegasus/Makefile.ReleaseTest
+--- pegasus/Makefile.ReleaseTest.orig	2013-07-01 12:55:50.000000000 +0200
++++ pegasus/Makefile.ReleaseTest	2015-05-18 14:28:22.642686363 +0200
+@@ -128,6 +128,7 @@ POSTSTARTTEST_CMDS = \
+    $(PEGASUS_TEST_DIR)/bin/TestIndicationStressTest@@IndicationStressTestClass@@test/TestProvider@@cleanup
+ 
+ ifeq ($(PEGASUS_USE_NET_SNMP),true)
++   POSTSTARTTEST_CMDS_NO_SNMP := $(POSTSTARTTEST_CMDS)
+    POSTSTARTTEST_CMDS += \
+    $(PEGASUS_TEST_DIR)/bin/TestSnmpHandler@@setup@@WQL \
+    $(PEGASUS_TEST_DIR)/bin/TestSnmpHandler@@run@@4@@2 \
+@@ -212,10 +213,21 @@ createMakefile_poststarttests:
+ 	@$(ECHO-E) "poststarttests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ 	@$(ECHO-E) "\t@$(MAKE) -s poststarttests_internal\n" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ 	@$(ECHO-E) "poststarttests_internal:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++ifeq ($(PEGASUS_USE_NET_SNMP),true)
++	@$(foreach i, $(POSTSTARTTEST_CMDS_NO_SNMP), $(ECHO-E) "\t$(subst @@, ,$(i))" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile;)
++else
+ 	@$(foreach i, $(POSTSTARTTEST_CMDS), $(ECHO-E) "\t$(subst @@, ,$(i))" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile;)
+ 	@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++endif
+ 
+ createMakefile_tests:
++ifeq ($(PEGASUS_USE_NET_SNMP),true)
++	@$(ECHO-E) "\t/usr/share/Pegasus/test/bin/TestSnmpHandler setup WQL" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++	@$(ECHO-E) "\t/usr/share/Pegasus/test/bin/TestSnmpHandler run 4 2" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++	@$(ECHO-E) "\t/usr/share/Pegasus/test/bin/TestSnmpHandler cleanup" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++	@$(ECHO-E) "\t/usr/share/Pegasus/test/bin/TestSnmpHandler removelog" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++	@$(ECHO-E) "" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
++endif
+ 	@$(ECHO-E) "###############################################################################" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ 	@$(ECHO-E) "# The tests target stops the cimserver, runs the unit tests, starts the" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ 	@$(ECHO-E) "# cimserver, and runs the poststarttests and local TestClient." >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
diff --git a/pegasus-2.9.0-cmpi-provider-lib.patch b/pegasus-2.9.0-cmpi-provider-lib.patch
new file mode 100644
index 0000000..7e479cf
--- /dev/null
+++ b/pegasus-2.9.0-cmpi-provider-lib.patch
@@ -0,0 +1,13 @@
+diff -up pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h_orig pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h
+--- pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h_orig	2011-05-17 15:13:43.331172383 +0200
++++ pegasus/src/Pegasus/Config/FixedPropertyTableLinux.h	2011-05-17 15:15:34.672827232 +0200
+@@ -60,8 +60,7 @@
+     {"crlStore",             PEGASUS_SSL_SERVER_CRL},
+ #  endif
+     {"repositoryDir",        PEGASUS_REPOSITORY_DIR},
+-    {"providerDir", PEGASUS_EXTRA_PROVIDER_LIB_DIR PEGASUS_PROVIDER_LIB_DIR
+-                    ":/usr/" PEGASUS_ARCH_LIB "/cmpi"},
++    {"providerDir", PEGASUS_PROVIDER_LIB_DIR ":" PEGASUS_DEST_LIB_DIR "/cmpi"},
+     {"providerManagerDir",   PEGASUS_PROVIDER_MANAGER_LIB_DIR},
+ # else /* PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS */
+     {"traceFilePath",       "/var/opt/tog-pegasus/cache/trace/cimserver.trc"},
diff --git a/pegasus-2.9.0-local-or-remote-auth.patch b/pegasus-2.9.0-local-or-remote-auth.patch
new file mode 100644
index 0000000..67e0aa9
--- /dev/null
+++ b/pegasus-2.9.0-local-or-remote-auth.patch
@@ -0,0 +1,535 @@
+diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h
+--- 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];
+     char password[EXECUTOR_BUFFER_SIZE];
++    Boolean isRemoteUser;
+ };
+ 
+ struct ExecutorAuthenticatePasswordResponse
+diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
+--- 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>
+ 
++#include <syslog.h>
++typedef bool Boolean;
++
+ #ifdef PEGASUS_FLAVOR
+ # define PAM_CONFIG_FILE "wbem" PEGASUS_FLAVOR
+ #else
+@@ -397,7 +400,7 @@ static int PAMValidateUserCallback(
+ */
+ 
+ static int PAMAuthenticateInProcess(
+-    const char* username, const char* password)
++    const char* username, const char* password, const Boolean isRemoteUser)
+ {
+     PAMData data;
+     struct pam_conv pconv;
+@@ -412,24 +415,54 @@ static int PAMAuthenticateInProcess(
+     /* intentionally for testing purposes */
+     /* return PAM_SERVICE_ERR; */
+ 
+-    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_start(PAM_CONFIG_FILE, username, &pconv, &handle)) != PAM_SUCCESS)
++    {
++        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;
++    }
+ 
+-    if (pam_rc != PAM_SUCCESS)
++    if ((pam_rc = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS)
+     {
+-        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));
++        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_authenticate(handle, 0)) != PAM_SUCCESS)
+     {
+         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);
++        closelog();
++        openlog("cimserver", LOG_PID, LOG_DAEMON);
++        syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(handle, pam_rc));
++        syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
++            isRemoteUser ? "remote" : "local", username);
++        return -1;
++    }
+ 
+     pam_end(handle, 0);
+-    return pam_rc;
++    return 0;
+ }
+ 
+ /*
+@@ -452,16 +485,34 @@ static int PAMValidateUserInProcess(cons
+     pconv.conv = PAMValidateUserCallback;
+     pconv.appdata_ptr = &data;
+ 
+-    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)
++    {
++        closelog();
++        openlog("cimserver", LOG_PID, LOG_DAEMON);
++        syslog(LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, pam_rc));
++        return -1;
++    }
++
++    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);
++        closelog();
++        openlog("cimserver", LOG_PID, LOG_DAEMON);
++        syslog(LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, pam_rc));
++        return -1;
++    }
+ 
+     pam_end(phandle, 0);
+-    return pam_rc;
++    return 0;
+ }
+ 
+ /*
+@@ -474,12 +525,12 @@ static int PAMValidateUserInProcess(cons
+ **==============================================================================
+ */
+ 
+-static int PAMAuthenticate(const char* username, const char* password)
++static int PAMAuthenticate(const char* username, const char* password, const Boolean isRemoteUser)
+ {
+ #ifdef PEGASUS_USE_PAM_STANDALONE_PROC
+     return CimserveraProcessOperation("authenticate", username, password);
+ #else
+-    return PAMAuthenticateInProcess(username, password);
++    return PAMAuthenticateInProcess(username, password, isRemoteUser);
+ #endif
+ }
+ 
+diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c
+--- 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)
+ 
+-        status = PAMAuthenticate(request.username, request.password);
++        status = PAMAuthenticate(request.username, request.password, request.isRemoteUser);
+ 
+         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	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);
+ 
+-        if (PAMAuthenticate(PEGASUS_CIMSERVERMAIN_USER, pw) == 0)
++        if (PAMAuthenticate(PEGASUS_CIMSERVERMAIN_USER, pw, 0) == 0)
+             printf("Correct password\n");
+         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	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 
++    */
++    Boolean isRemoteUser() const
++    {
++        CheckRep(_rep);
++        return _rep->isRemoteUser();
++    }
++
++    /** Set the Remote User flag
++    */
++    void setRemoteUser(Boolean isRemoteUser)
++    {
++        CheckRep(_rep);
++        _rep->setRemoteUser(isRemoteUser);
++    }
++
+     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	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)
+ #ifdef PEGASUS_ENABLE_SESSION_COOKIES
+@@ -86,6 +87,16 @@ AuthenticationInfoRep::~AuthenticationIn
+ 
+     PEG_METHOD_EXIT();
+ }
++
++void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser)
++{
++    PEG_METHOD_ENTER(TRC_AUTHENTICATION,
++        "AuthenticationInfoRep::setRemoteUser");
++
++    _isRemoteUser = isRemoteUser;
++
++    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	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
++    {
++        return _isRemoteUser;
++    }
++
++    void setRemoteUser(Boolean isRemoteUser);
++
+     Array<SSLCertificateInfo*> getClientCertificateChain()
+     {
+         return _clientCertificate;
+@@ -233,6 +240,8 @@ private:
+ 
+     Array<SSLCertificateInfo*> _clientCertificate;
+ 
++    Boolean _isRemoteUser;
++
+     AuthHandle _authHandle;
+     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	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(
+         const char* username,
+-        const char* password) = 0;
++        const char* password,
++        Boolean isRemoteUser) = 0;
+ 
+     virtual int validateUser(
+         const char* username) = 0;
+@@ -562,9 +563,10 @@ public:
+ #if defined(PEGASUS_PAM_AUTHENTICATION)
+     virtual int authenticatePassword(
+         const char* username,
+-        const char* password)
++        const char* password,
++        Boolean isRemoteUser)
+     {
+-        return PAMAuthenticate(username, password);
++        return PAMAuthenticate(username, password, isRemoteUser);
+     }
+     
+     virtual int validateUser(
+@@ -912,7 +914,8 @@ public:
+ 
+     virtual int authenticatePassword(
+         const char* username,
+-        const char* password)
++        const char* password,
++        Boolean isRemoteUser)
+     {
+         AutoMutex autoMutex(_mutex);
+ 
+@@ -930,6 +933,7 @@ public:
+         memset(&request, 0, sizeof(request));
+         Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);
+         Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);
++        request.isRemoteUser = isRemoteUser;
+ 
+         if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
+             return -1;
+@@ -1181,10 +1185,11 @@ int Executor::reapProviderAgent(
+ 
+ int Executor::authenticatePassword(
+     const char* username,
+-    const char* password)
++    const char* password,
++    Boolean isRemoteUser)
+ {
+     once(&_executorImplOnce, _initExecutorImpl);
+-    return _executorImpl->authenticatePassword(username, password);
++    return _executorImpl->authenticatePassword(username, password, isRemoteUser);
+ }
+ 
+ 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	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(
+         const char* username,
+-        const char* password);
++        const char* password,
++        Boolean isRemoteUser);
+ 
+     /** 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	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();
+ 
++        // Allow authenticators to differentiate Remote and Local users:
++        struct sockaddr_storage sin_peer, sin_svr;
++        socklen_t slen1 = sizeof (struct sockaddr_storage), slen2 = sizeof (struct sockaddr_storage);
++        uint32_t  sock = _socket.get()->getSocket() ;
++        memset(&sin_peer,'\0',slen1);
++        memset(&sin_svr, '\0',slen2);
++        if ( ( ::getpeername( sock, (struct sockaddr*)&sin_peer, &slen1) == 0 )
++           ||( ::getsockname( sock, (struct sockaddr*)&sin_svr,  &slen2) == 0 )
++           )
++        {
++            PEG_TRACE((TRC_HTTP, Tracer::LEVEL4,
++              "sin_peer.ss_family: %d",
++              sin_peer.ss_family));
++            if( sin_peer.ss_family == AF_INET )
++            {
++                struct sockaddr_in *s = (struct sockaddr_in *)&sin_peer;
++                if( ((ntohl( s->sin_addr.s_addr ) >> 24) & 0xff) == 127 )
++                    // message was sent FROM localhost interface
++                    message->isFromRemoteHost = false;
++            }
++            if( sin_peer.ss_family == AF_INET6 )
++            {
++                char straddr[INET6_ADDRSTRLEN];
++                struct sockaddr_in6 *s = (struct sockaddr_in6 *)&sin_peer;
++                static const unsigned char localhost_bytes[] =
++                  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
++                inet_ntop(AF_INET6, &s->sin6_addr, straddr, sizeof(straddr));
++                PEG_TRACE((TRC_HTTP, Tracer::LEVEL4,
++                  "Peer IP address: %s",
++                  straddr));
++                if(memcmp(s->sin6_addr.s6_addr, localhost_bytes, 16) == 0)
++                    // message was sent FROM localhost interface
++                    message->isFromRemoteHost = false;
++            }
++            PEG_TRACE((TRC_HTTP, Tracer::LEVEL4,
++              "sin_svr.ss_family: %d",
++              sin_svr.ss_family));
++            if( sin_svr.ss_family == AF_INET )
++            {
++                struct sockaddr_in *s = (struct sockaddr_in *)&sin_svr;
++                if( ((ntohl( s->sin_addr.s_addr ) >> 24) & 0xff) == 127 )
++                    // message was sent TO localhost interface
++                    message->isFromRemoteHost = false;
++            }
++            if( sin_svr.ss_family == AF_INET6 )
++            {
++                char straddr[INET6_ADDRSTRLEN];
++                struct sockaddr_in6 *s = (struct sockaddr_in6 *)&sin_svr;
++                static const unsigned char localhost_bytes[] =
++                  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
++                inet_ntop(AF_INET6, &s->sin6_addr, straddr, sizeof(straddr));
++                PEG_TRACE((TRC_HTTP, Tracer::LEVEL4,
++                  "svr IP address: %s",
++                  straddr));
++                if(memcmp(s->sin6_addr.s6_addr, localhost_bytes, 16) == 0)
++                    // message was sent TO localhost interface
++                    message->isFromRemoteHost = false;
++            }
++        }
++
++        PEG_TRACE((TRC_HTTP, Tracer::LEVEL4,
++          "isFromRemoteHost: %d",
++          message->isFromRemoteHost));
++
+         //
+         // 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	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),
+     contentLanguagesDecoded(false),
+-    binaryResponse(false)
++    binaryResponse(false),
++    isFromRemoteHost(true)
+ {
+     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	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;
+     Boolean contentLanguagesDecoded;
++    Boolean isFromRemoteHost;
+     CIMException cimException;
+     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	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
+ 
+     PEGASUS_TEST_ASSERT(Executor::authenticatePassword(
+-        "xnonexistentuserx", "wrongpassword") != 0);
++        "xnonexistentuserx", "wrongpassword", true) != 0);
+     PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") != 0);
+ 
+     char challengeFilePath[EXECUTOR_BUFFER_SIZE];
+@@ -115,7 +115,7 @@ void testExecutorSocketImpl()
+     PEGASUS_TEST_ASSERT(Executor::reapProviderAgent(123) == 0);
+ 
+     PEGASUS_TEST_ASSERT(Executor::authenticatePassword(
+-        "xnonexistentuserx", "wrongpassword") == -1);
++        "xnonexistentuserx", "wrongpassword", true) == -1);
+     PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1);
+ 
+     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	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,
++            authInfo->isRemoteUser(),
+             authInfo);
+ 
+     // 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	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,
+         const String& password,
++        Boolean isRemoteUser,
+         AuthenticationInfo* authInfo) = 0;
+ 
+     /** 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	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,
+         const String& password,
++        Boolean isRemoteUser,
+         AuthenticationInfo* authInfo);
+ 
+     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	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,
+     const String& password,
++    Boolean isRemoteUser,
+     AuthenticationInfo* authInfo)
+ {
+     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	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,
+     const String& password,
++    Boolean isRemoteUser,
+     AuthenticationInfo* authInfo)
+ {
+     PEG_METHOD_ENTER(TRC_AUTHENTICATION,
+@@ -74,7 +75,8 @@ AuthenticationStatus PAMBasicAuthenticat
+     int pam_rc =
+         Executor::authenticatePassword(
+             userName.getCString(),
+-            password.getCString());
++            password.getCString(),
++            isRemoteUser);
+ 
+     // 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	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(
+-                userName.getCString(), password.getCString()) == 0)
++                userName.getCString(), password.getCString(), true) == 0)
+             {
+                 authenticated = true;
+             }
+diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
+--- 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");
+ 
++    // Let Authenticators know whether this user is Local or Remote:
++    httpMessage->authInfo->setRemoteUser( httpMessage->isFromRemoteHost );
++
+     //
+     // Handle authentication:
+     //
diff --git a/pegasus-2.9.0-no-rpath.patch b/pegasus-2.9.0-no-rpath.patch
new file mode 100644
index 0000000..6a98f30
--- /dev/null
+++ b/pegasus-2.9.0-no-rpath.patch
@@ -0,0 +1,62 @@
+diff -up pegasus/mak/program-unix.mak.orig pegasus/mak/program-unix.mak
+--- pegasus/mak/program-unix.mak.orig	2012-10-08 12:19:55.965024675 +0200
++++ pegasus/mak/program-unix.mak	2012-10-08 12:21:02.378355115 +0200
+@@ -28,19 +28,10 @@
+ #//////////////////////////////////////////////////////////////////////////
+ INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
+ 
+-ifndef LINK_RPATH
+-    LINK_RPATH = -Xlinker -rpath
+-endif
+-
+ LINK_DEST_LIB = -Xlinker $(PEGASUS_DEST_LIB_DIR)
+ 
+ LINK_LIB_DIR = -Xlinker $(LIB_DIR)
+ 
+-ifndef LINK_RPATH_LINK
+-    LINK_RPATH_LINK = -Xlinker -rpath-link
+-endif
+-
+-
+ TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
+ 
+ S_OBJECTS = $(TMP_OBJECTS:.s=.o)
+@@ -52,15 +43,9 @@ FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
+ EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM)
+ 
+ ifdef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
+-    ifdef PEGASUS_USE_RELEASE_DIRS
+-        EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_DEST_LIB) $(LINK_RPATH_LINK) $(LINK_LIB_DIR)
+-    else
+-        EXTRA_LINK_FLAGS += $(LINK_RPATH) $(LINK_LIB_DIR)
+-    endif
+-
+     ifeq ($(HAS_ICU_DEPENDENCY),true)
+         ifdef ICU_INSTALL
+-            EXTRA_LINK_FLAGS += $(LINK_RPATH) -Xlinker ${ICU_INSTALL}/lib
++            EXTRA_LINK_FLAGS += -Xlinker ${ICU_INSTALL}/lib
+         endif
+     endif
+ endif
+diff -up pegasus/mak/shared-library-unix.mak.orig pegasus/mak/shared-library-unix.mak
+--- pegasus/mak/shared-library-unix.mak.orig	2012-10-08 12:21:15.279419276 +0200
++++ pegasus/mak/shared-library-unix.mak	2012-10-08 12:22:32.715804612 +0200
+@@ -98,15 +98,14 @@ ifeq ($(COMPILER),gnu)
+   ifneq ($(OS),darwin)
+    ifdef PEGASUS_USE_RELEASE_DIRS
+       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
+-      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath \
+-          -Xlinker $(PEGASUS_DEST_LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
++      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  $(EXTRA_LINK_ARGUMENTS)
+    else
+       LINK_COMMAND = $(CXX) -shared $(LINK_MACHINE_OPTIONS)
+-      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  -Xlinker -rpath -Xlinker $(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
++      LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX)  $(EXTRA_LINK_ARGUMENTS)
+    endif
+   else
+     LINK_COMMAND = $(CXX) -dynamiclib
+-    LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl
++    LINK_ARGUMENTS = --helplib$(LIBRARY)$(LIB_SUFFIX) -ldl $(EXTRA_LINK_ARGUMENTS)
+   endif
+   ifeq ($(PEGASUS_PLATFORM), SOLARIS_SPARC_GNU)
+     LINK_ARGUMENTS = -Wl,-hlib$(LIBRARY)$(LIB_SUFFIX) -Xlinker -L$(LIB_DIR) $(EXTRA_LINK_ARGUMENTS)
diff --git a/pegasus-2.9.0-redhat-config.patch b/pegasus-2.9.0-redhat-config.patch
new file mode 100644
index 0000000..2829a32
--- /dev/null
+++ b/pegasus-2.9.0-redhat-config.patch
@@ -0,0 +1,38 @@
+diff -up pegasus/env_var_Linux.status.redhat-config pegasus/env_var_Linux.status
+--- pegasus/env_var_Linux.status.redhat-config	2015-04-01 00:41:07.000000000 +0200
++++ pegasus/env_var_Linux.status	2015-05-26 13:05:21.021110656 +0200
+@@ -25,18 +25,21 @@ PEGASUS_HAS_SSL=yes
+ PEGASUS_USE_SSL_RANDOMFILE=false
+ PEGASUS_NOASSERTS=yes
+ PEGASUS_PAM_AUTHENTICATION=true
+-PEGASUS_USE_PAM_STANDALONE_PROC=true
+ PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
+ PEGASUS_USE_RELEASE_DIRS=true
+ PEGASUS_USE_SYSLOGS=true
+-PEGASUS_CIM_SCHEMA=CIM241
++PEGASUS_CIM_SCHEMA=CIM238
+ PEGASUS_USE_NET_SNMP=true
+-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
++PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
++
++PEGASUS_ENABLE_EXECQUERY=true
++PEGASUS_DEFAULT_ENABLE_OOP=true
++PEGASUS_INTEROP_NAMESPACE=root/interop
+ 
+ PEGASUS_ENABLE_INTEROP_PROVIDER=true
+ PEGASUS_ENABLE_PROTOCOL_WSMAN=true
+ 
+-PEGASUS_ENABLE_SLP=false
++PEGASUS_ENABLE_SLP=true
+ ifeq ($(PEGASUS_ENABLE_SLP), true)
+ PEGASUS_SLP_REG_TIMEOUT=1090
+ PEGASUS_USE_EXTERNAL_SLP=openslp
+@@ -126,7 +129,7 @@ PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)
+ 
+ PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
+ PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
+-PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
++PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)
+ PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = \
+      $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
+ 
diff --git a/pegasus-2.9.1-getpagesize.patch b/pegasus-2.9.1-getpagesize.patch
new file mode 100644
index 0000000..00c8279
--- /dev/null
+++ b/pegasus-2.9.1-getpagesize.patch
@@ -0,0 +1,66 @@
+diff -up pegasus/src/Providers/ManagedSystem/Process/Process_Linux.cpp_old pegasus/src/Providers/ManagedSystem/Process/Process_Linux.cpp
+--- pegasus/src/Providers/ManagedSystem/Process/Process_Linux.cpp_old	2010-01-14 15:06:36.757941652 +0100
++++ pegasus/src/Providers/ManagedSystem/Process/Process_Linux.cpp	2010-01-14 15:08:12.113962655 +0100
+@@ -539,7 +539,7 @@ NOTES             :
+ */
+ Boolean Process::getRealText(Uint64& i64) const
+ {
+-  i64 = pInfo.pst_tsize * getpagesize() / 1024;
++  i64 = pInfo.pst_tsize * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
+@@ -555,7 +555,7 @@ NOTES             :
+ */
+ Boolean Process::getRealData(Uint64& i64) const
+ {
+-  i64 = pInfo.pst_dsize * getpagesize() / 1024;
++  i64 = pInfo.pst_dsize * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
+@@ -603,7 +603,7 @@ NOTES             :
+ */
+ Boolean Process::getVirtualData(Uint64& i64) const
+ {
+-  i64 = pInfo.pst_vdsize * getpagesize() / 1024;
++  i64 = pInfo.pst_vdsize * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
+@@ -619,7 +619,7 @@ NOTES             :
+ */
+ Boolean Process::getVirtualStack(Uint64& i64) const
+ {
+-  i64 = pInfo.pst_vssize * getpagesize() / 1024;
++  i64 = pInfo.pst_vssize * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
+@@ -635,7 +635,7 @@ NOTES             :
+ */
+ Boolean Process::getVirtualMemoryMappedFileSize(Uint64& i64) const
+ {
+-  i64 = pInfo.pst_vmmsize * getpagesize() / 1024;
++  i64 = pInfo.pst_vmmsize * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
+@@ -651,7 +651,7 @@ NOTES             :
+ */
+ Boolean Process::getVirtualSharedMemory(Uint64& i64) const
+ {
+-  i64 = pInfo.pst_vshmsize * getpagesize() / 1024;
++  i64 = pInfo.pst_vshmsize * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
+@@ -721,7 +721,7 @@ Boolean Process::getRealSpace(Uint64& i6
+   i64 = (pInfo.pst_dsize +  // real data
+          pInfo.pst_tsize)   // real text  may need to figure out how to get
+                             // realStackSize
+-        * getpagesize() / 1024;
++        * sysconf(_SC_PAGESIZE) / 1024;
+   return true;
+ }
+ 
diff --git a/tog-pegasus.service b/tog-pegasus.service
new file mode 100644
index 0000000..50df564
--- /dev/null
+++ b/tog-pegasus.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OpenPegasus CIM Server
+After=syslog.target slpd.service
+
+[Service]
+Type=forking
+ExecStartPre=/usr/share/Pegasus/scripts/generate-certs
+ExecStart=/usr/sbin/cimserver
+PIDFile=/var/run/tog-pegasus/cimserver.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/tog-pegasus.spec b/tog-pegasus.spec
new file mode 100644
index 0000000..1840b4a
--- /dev/null
+++ b/tog-pegasus.spec
@@ -0,0 +1,369 @@
+%global PEGASUS_BUILD_TEST_RPM 1
+%global srcname pegasus
+%global major_ver 2.14
+%global pegasus_gid 65
+%global pegasus_uid 66
+
+Name:           tog-pegasus
+Version:        %{major_ver}.1
+Release:        48
+Epoch:          2
+Summary:        OpenPegasus WBEM Services for Linux
+License:        MIT
+URL:            http://www.openpegasus.org
+Source0:        https://collaboration.opengroup.org/pegasus/documents/27211/pegasus-%{version}.tar.gz
+Source1:        tog-pegasus.tmpfiles
+Source2:        tog-pegasus.service
+Source3:        access.conf
+Source4:        cim_schema_2.38.0Experimental-MOFs.zip
+Source5:       generate-certs
+
+Patch1:         pegasus-2.9.0-no-rpath.patch
+Patch2:         pegasus-2.7.0-PIE.patch
+Patch3:         pegasus-2.9.0-redhat-config.patch
+Patch4:         pegasus-2.9.0-cmpi-provider-lib.patch
+Patch5:         pegasus-2.5.1-pam-wbem.patch
+Patch6:         pegasus-2.7.0-no-snmp-tests.patch 
+Patch7:         pegasus-2.9.0-local-or-remote-auth.patch
+Patch8:         pegasus-2.9.1-getpagesize.patch
+Patch9:        pegasus-2.10.0-dont-strip.patch
+Patch10:        pegasus-2.12.0-null_value.patch
+Patch11:        pegasus-2.12.0-empty_arrays.patch
+Patch12:        pegasus-2.12.0-cimmofl-allow-experimental.patch
+Patch13:        pegasus-2.12.0-schema-version-and-includes.patch
+Patch14:        pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch
+Patch15:        pegasus-2.13.0-gcc5-build.patch
+Patch16:        pegasus-2.14.1-build-fixes.patch
+Patch17:        pegasus-2.14.1-ssl-include.patch
+Patch18:        pegasus-2.14.1-openssl-1.1-fix.patch
+
+BuildRequires:  procps libstdc++ pam-devel openssl openssl-devel
+BuildRequires:  bash sed grep coreutils procps gcc gcc-c++ libstdc++
+BuildRequires:  make pam-devel net-snmp-devel openslp-devel systemd-units
+Requires:       net-snmp-libs openssl ca-certificates
+Requires(pre):  %{_sbindir}/useradd %{_sbindir}/groupadd
+Requires(post): /sbin/ldconfig /sbin/restorecon
+Conflicts:      libcmpiCppImpl0
+
+Provides:       cim-server = 1
+Provides:       %{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-libs < %{epoch}:%{version}-%{release}
+
+%description
+OpenPegasus WBEM Services for Linux enables management solutions that deliver
+increased control of enterprise resources. WBEM is a platform and resource
+independent DMTF standard that defines a common information model and
+communication protocol for monitoring and controlling resources from diverse
+sources.
+
+%package        devel
+Summary:        Header files for tog-pegasus
+Requires:       %{name} >= %{version}-%{release} make
+
+Provides:       %{name}-test = %{epoch}:%{version}-%{release}
+Obsoletes:      %{name}-test < %{epoch}:%{version}-%{release}
+
+%description devel
+Header files for tog-pegasus
+
+%package_help
+
+%ifarch x86_64
+%global PEGASUS_HARDWARE_PLATFORM LINUX_X86_64_GNU
+%endif
+%ifarch %{arm}
+%global PEGASUS_HARDWARE_PLATFORM LINUX_XSCALE_GNU
+%endif
+%ifarch aarch64
+%global PEGASUS_HARDWARE_PLATFORM LINUX_AARCH64_GNU
+%endif
+
+%global PEGASUS_ARCH_LIB %{_lib}
+%global OPENSSL_HOME %{_prefix}
+%global OPENSSL_BIN %{_bindir}
+%global PEGASUS_PEM_DIR %{_sysconfdir}/Pegasus
+%global PEGASUS_SSL_CERT_FILE server.pem
+%global PEGASUS_SSL_KEY_FILE file.pem
+%global PEGASUS_SSL_TRUSTSTORE client.pem
+%global PAM_CONFIG_DIR %{_sysconfdir}/pam.d
+%global PEGASUS_CONFIG_DIR %{_sysconfdir}/Pegasus
+%global PEGASUS_VARDATA_DIR /var/lib/Pegasus
+%global PEGASUS_VARDATA_CACHE_DIR /var/lib/Pegasus/cache
+%global PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  /var/run/tog-pegasus/socket/cimxml.socket
+%global PEGASUS_CIMSERVER_START_FILE /var/run/tog-pegasus/cimserver.pid
+%global PEGASUS_TRACE_FILE_PATH /var/lib/Pegasus/cache/trace/cimserver.trc
+%global PEGASUS_CIMSERVER_START_LOCK_FILE /var/run/tog-pegasus/cimserver_start.lock
+%global PEGASUS_REPOSITORY_DIR /var/lib/Pegasus/repository
+%global PEGASUS_PREV_REPOSITORY_DIR_NAME prev_repository
+%global PEGASUS_REPOSITORY_PARENT_DIR /var/lib/Pegasus
+%global PEGASUS_PREV_REPOSITORY_DIR /var/lib/PegasusXXX/prev_repository
+%global PEGASUS_SBIN_DIR %{_sbindir}
+%global PEGASUS_DOC_DIR %{_datadir}/doc/%{name}-%{version}
+%global PEGASUS_RPM_ROOT $RPM_BUILD_DIR/%{srcname}
+%global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build
+%global PEGASUS_INSTALL_LOG /var/lib/Pegasus/log/install.log
+
+%prep
+%setup -q -n %{srcname}
+export PEGASUS_ROOT=%PEGASUS_RPM_ROOT
+yes | mak/CreateDmtfSchema 238 %{SOURCE4} cim_schema_2.38.0
+%patch1 -p1 -b .no-rpath
+%patch2 -p1 -b .PIE
+%patch3 -p1 -b .redhat-config
+%patch4 -p1 -b .cmpi-provider-lib
+%patch5 -p1 -b .pam-wbem
+%patch6 -p1 -b .snmp-tests
+%patch7 -p1 -b .local-or-remote-auth
+%patch8 -p1 -b .getpagesize
+%patch9 -p1 -b .dont-strip
+%patch10 -p1 -b .null_value
+%patch11 -p1 -b .empty_arrays
+%patch12 -p1 -b .cimmofl-allow-experimental
+%patch13 -p1 -b .schema-version-and-includes
+%patch14 -p1 -b .enable-subscriptions-for-nonprivileged-users
+%patch15 -p1 -b .gcc5-build
+%patch16 -p1 -b .build-fixes
+%patch17 -p1 -b .ssl-include
+%patch18 -p1 -b .openssl-1.1-fix
+
+%build
+cp -fp %SOURCE3 rpm
+
+export PEGASUS_ROOT=%PEGASUS_RPM_ROOT
+export PEGASUS_HOME=%PEGASUS_RPM_HOME
+export PEGASUS_PLATFORM=%PEGASUS_HARDWARE_PLATFORM
+export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB
+export PEGASUS_ENVVAR_FILE=$PEGASUS_ROOT/env_var_Linux.status
+
+export OPENSSL_HOME=%OPENSSL_HOME
+export OPENSSL_BIN=%OPENSSL_BIN
+export LD_LIBRARY_PATH=$PEGASUS_HOME/lib
+export PATH=$PEGASUS_HOME/bin:$PATH
+
+export PEGASUS_EXTRA_C_FLAGS="$RPM_OPT_FLAGS -fPIC -g -Wall -Wno-unused -fno-strict-aliasing"
+export PEGASUS_EXTRA_CXX_FLAGS="$PEGASUS_EXTRA_C_FLAGS"
+export PEGASUS_EXTRA_LINK_FLAGS="$RPM_OPT_FLAGS"
+export PEGASUS_EXTRA_PROGRAM_LINK_FLAGS="-g -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack"
+export SYS_INCLUDES=-I/usr/kerberos/include
+
+%make_build -f ${PEGASUS_ROOT}/Makefile.Release create_ProductVersionFile
+%make_build -f ${PEGASUS_ROOT}/Makefile.Release create_CommonProductDirectoriesInclude
+%make_build -f ${PEGASUS_ROOT}/Makefile.Release create_ConfigProductDirectoriesInclude
+%make_build -f ${PEGASUS_ROOT}/Makefile.Release all
+%make_build -f ${PEGASUS_ROOT}/Makefile.Release repository
+
+
+%install
+
+export PEGASUS_ROOT=%PEGASUS_RPM_ROOT
+export PEGASUS_HOME=%PEGASUS_RPM_HOME
+export PEGASUS_PLATFORM=%PEGASUS_HARDWARE_PLATFORM
+export PEGASUS_ARCH_LIB=%PEGASUS_ARCH_LIB
+export PEGASUS_ENVVAR_FILE=$PEGASUS_ROOT/env_var_Linux.status
+export OPENSSL_BIN=%OPENSSL_BIN
+export LD_LIBRARY_PATH=$PEGASUS_HOME/lib
+export PATH=$PEGASUS_HOME/bin:$PATH
+export PEGASUS_STAGING_DIR=%{buildroot}
+
+make -f $PEGASUS_ROOT/Makefile.Release stage \
+    PEGASUS_STAGING_DIR=$PEGASUS_STAGING_DIR \
+    PEGASUS_BUILD_TEST_RPM=%{PEGASUS_BUILD_TEST_RPM}
+
+mkdir -p %{buildroot}/%{_tmpfilesdir}
+install -p -D -m 644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/tog-pegasus.conf
+mkdir -p %{buildroot}%{_datadir}/Pegasus/scripts
+install -p -m 755 %{SOURCE5} %{buildroot}%{_datadir}/Pegasus/scripts/generate-certs
+rm -f %{buildroot}%{_sysconfdir}/Pegasus/ssl.cnf
+mkdir -p %{buildroot}%{_sysconfdir}/Pegasus/crl
+
+rm -f %{buildroot}%{_sysconfdir}/init.d/tog-pegasus
+mkdir -p %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/tog-pegasus.service
+mkdir -p %{buildroot}/%{_docdir}/%{name}
+mv %{buildroot}%{_datadir}/doc/%{name}-%{major_ver}/* %{buildroot}/%{_docdir}/%{name}
+rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{major_ver}
+pushd %{buildroot}%{_libdir}
+ln -s libcmpiCppImpl.so.1 libcmpiCppImpl.so
+ln -s libpeglistener.so.1 libpeglistener.so
+popd
+mkdir -p %{buildroot}/%{_libexecdir}/pegasus
+mv %{buildroot}/%{_sbindir}/cimprovagt %{buildroot}/%{_libexecdir}/pegasus
+install -m 644 src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h %{buildroot}/%{_includedir}/Pegasus/Common
+mkdir -p %{buildroot}/%{_includedir}/Pegasus/Listener
+install -m 644 src/Pegasus/Listener/Linkage.h %{buildroot}/%{_includedir}/Pegasus/Listener
+install -m 644 src/Pegasus/Listener/CIMListener.h %{buildroot}/%{_includedir}/Pegasus/Listener
+install -m 644 src/Pegasus/Client/CIMEnumerationContext.h %{buildroot}/%{_includedir}/Pegasus/Client
+install -m 644 src/Pegasus/Common/UintArgs.h %{buildroot}/%{_includedir}/Pegasus/Common
+
+install -p Schemas/CIM238/DMTF/Core/CIM_AbstractComponent.mof %{buildroot}%{_datadir}/Pegasus/samples/Providers/Load/CIM238/DMTF/Core/
+mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1/
+
+%check
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+cd %{buildroot}%{_datadir}/Pegasus/test
+make prestarttests
+rm %{buildroot}%{_datadir}/Pegasus/test/log.trace.0
+rm %{buildroot}%{_datadir}/Pegasus/test/testtracer4.trace.0
+
+%pre
+if [ $1 -gt 1 ]; then
+   if [ -d /var/lib/Pegasus/repository ]; then
+        if [ -d /var/lib/Pegasus/prev_repository ]; then
+           rm -rf /var/lib/Pegasus/prev_repository
+        fi
+        cp -r /var/lib/Pegasus/repository /var/lib/Pegasus/prev_repository
+   fi
+fi
+:;
+
+if [ $1 -eq 1 ]; then
+    %{_sbindir}/groupadd -g %{pegasus_gid} -f -r pegasus >/dev/null 2>&1 || :;
+    %{_sbindir}/useradd -u %{pegasus_uid} -r -N -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \
+    -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :;
+fi
+:;
+
+%post
+install -d -m 1750 -o root -g pegasus /var/run/tog-pegasus
+restorecon /var/run/tog-pegasus
+/sbin/ldconfig;
+%systemd_post tog-pegasus.service
+if [ $1 -ge 1 ]; then
+   echo `date` >>  /var/lib/Pegasus/log/install.log 2>&1 || :;
+   if [ $1 -gt 1 ]; then
+      if [ -d /var/lib/Pegasus/prev_repository ]; then
+         %{_sbindir}/repupgrade 2>> /var/lib/Pegasus/log/install.log || :;
+      fi
+      /bin/systemctl try-restart tog-pegasus.service >/dev/null 2>&1 || :;
+   fi
+fi
+:;
+
+if [ $1 -eq 1 ]; then
+   ln -sf libpegclient.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/libpegclient.so
+   ln -sf libpegcommon.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/libpegcommon.so
+   ln -sf libpegprovider.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/libpegprovider.so
+   ln -sf libDefaultProviderManager.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/libDefaultProviderManager.so
+   ln -sf libCIMxmlIndicationHandler.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/libCIMxmlIndicationHandler.so
+   ln -sf libsnmpIndicationHandler.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/libsnmpIndicationHandler.so
+
+   ln -sf libComputerSystemProvider.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/Pegasus/providers/libComputerSystemProvider.so
+   ln -sf libOSProvider.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/Pegasus/providers/libOSProvider.so
+   ln -sf libProcessProvider.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/Pegasus/providers/libProcessProvider.so
+   ln -sf libCMPIProviderManager.so.1 %{_prefix}/%PEGASUS_ARCH_LIB/Pegasus/providerManagers/libCMPIProviderManager.so
+
+   /bin/chgrp -h pegasus %{_libdir}/libpegclient.so
+   /bin/chgrp -h pegasus %{_libdir}/libpegcommon.so
+   /bin/chgrp -h pegasus %{_libdir}/libpegprovider.so
+   /bin/chgrp -h pegasus %{_libdir}/libDefaultProviderManager.so
+   /bin/chgrp -h pegasus %{_libdir}/libCIMxmlIndicationHandler.so
+   /bin/chgrp -h pegasus %{_libdir}/libsnmpIndicationHandler.so
+   /bin/chgrp -h pegasus %{_libdir}/Pegasus/providers/libComputerSystemProvider.so
+   /bin/chgrp -h pegasus %{_libdir}/Pegasus/providers/libOSProvider.so
+   /bin/chgrp -h pegasus %{_libdir}/Pegasus/providers/libProcessProvider.so
+   /bin/chgrp -h pegasus %{_libdir}/Pegasus/providerManagers/libCMPIProviderManager.so
+fi
+:;
+/sbin/ldconfig
+
+%preun
+%systemd_preun stop tog-pegasus.service
+if [ $1 -eq 0 ]; then
+   rm -rf /var/run/tog-pegasus
+fi
+:;
+
+%postun
+/sbin/ldconfig
+%systemd_postun_with_restart tog-pegasus.service
+
+%preun devel
+if [ $1 -eq 0 ] ; then
+   make --directory %{_datadir}/Pegasus/samples -s clean >/dev/null 2>&1 || :;
+fi
+:;
+
+%files
+%defattr(0644, root, pegasus, 0755)
+%doc doc/Admin_Guide_Release.pdf doc/PegasusSSLGuidelines.htm doc/SecurityGuidelinesForDevelopers.html
+%license doc/license.txt OpenPegasusNOTICE.txt
+%defattr(0755, root, pegasus, 0755)
+%{_bindir}/*
+%{_sbindir}/*
+%{_libdir}/*
+%{_libexecdir}/pegasus/
+%defattr(0640, root, pegasus, 0750)
+%verify(not md5 size mtime mode group) /var/lib/Pegasus/repository
+%defattr(0644, root, pegasus, 0755)
+%dir %{_datadir}/Pegasus
+%{_datadir}/Pegasus/mof
+%defattr(0755, root, pegasus, 0750)
+%{_datadir}/Pegasus/scripts
+%defattr(0640, root, pegasus, 0750)
+%dir /var/lib/Pegasus
+/var/lib/Pegasus/cache
+%dir /var/lib/Pegasus/log
+%dir %{_sysconfdir}/Pegasus
+%{_tmpfilesdir}/tog-pegasus.conf
+%defattr(0640, root, pegasus, 1750)
+%ghost /var/run/tog-pegasus
+%ghost %attr(0600, root, root) /var/run/tog-pegasus/cimserver.pid
+%ghost %attr(0600, root, root) /var/run/tog-pegasus/cimserver_start.lock
+%ghost %attr(0777 ,root, root) /var/run/tog-pegasus/cimxml.socket
+%attr(0644, root, pegasus) %{_unitdir}/tog-pegasus.service
+%defattr(0640, root, pegasus, 0750)
+%ghost %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/Pegasus/cimserver_current.conf
+%ghost %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/Pegasus/cimserver_planned.conf
+%config(noreplace) %{_sysconfdir}/Pegasus/access.conf
+%config(noreplace) %{_sysconfdir}/pam.d/wbem
+%defattr(0444, root, root)
+%ghost %{_sysconfdir}/Pegasus/client.pem
+%ghost %{_sysconfdir}/Pegasus/server.pem
+%defattr(0400, root, root)
+%ghost %{_sysconfdir}/Pegasus/file.pem
+%defattr(0644, root, root)
+%ghost %{_sysconfdir}/Pegasus/ca.crt
+%ghost %{_sysconfdir}/Pegasus/ca.srl
+%ghost %{_sysconfdir}/Pegasus/client.srl
+%defattr(0400, root, root)
+%ghost %{_sysconfdir}/Pegasus/ssl-ca.cnf
+%ghost %{_sysconfdir}/Pegasus/ssl-service.cnf
+%defattr(0644, root, root)
+%ghost %{_sysconfdir}/ca-trust/source/anchors/localhost-pegasus.pem
+%ghost %attr(0640, root, pegasus) %{_sysconfdir}/Pegasus/cimserver_trust
+%ghost %attr(0640, root, pegasus) %{_sysconfdir}/Pegasus/indication_trust
+%dir %attr(0640, root, pegasus) %{_sysconfdir}/Pegasus/crl
+%ghost %attr(0644, root, root) %verify(not md5 size mtime) /var/lib/Pegasus/log/install.log
+%ghost %attr(0640, root, pegasus) %verify(not md5 size mtime) /var/lib/Pegasus/cache/trace/cimserver.trc
+%exclude %{_prefix}/lib/debug
+%exclude %{_pkgdocdir}/OpenPegasusNOTICE.txt
+%exclude %{_pkgdocdir}/license.txt
+
+%files devel
+%defattr(0644,root,pegasus,0755)
+%{_includedir}/Pegasus
+%{_datadir}/Pegasus/html
+%{_datadir}/Pegasus/samples
+%defattr(0750,root,pegasus,0755)
+%{_datadir}/Pegasus/test/bin
+%{_datadir}/Pegasus/test/%PEGASUS_ARCH_LIB
+%defattr(0644,root,pegasus,0755)
+%dir %{_datadir}/Pegasus/test
+%{_datadir}/Pegasus/test/mak
+%{_datadir}/Pegasus/test/Makefile
+%dir %{_datadir}/Pegasus/test/tmp
+%ghost %{_datadir}/Pegasus/test/tmp/procIdFile
+%ghost %{_datadir}/Pegasus/test/tmp/trapLogFile
+%ghost %{_datadir}/Pegasus/test/tmp/IndicationStressTestLog
+%ghost %{_datadir}/Pegasus/test/tmp/oldIndicationStressTestLog
+%verify(not md5 size mtime) /var/lib/Pegasus/testrepository
+
+%files help
+%defattr(0644, root, pegasus, 0755)
+%doc src/Clients/repupgrade/doc/repupgrade.html
+%{_mandir}/man8/*
+%{_mandir}/man1/*
+
+%changelog
+* Sat Feb 29 2020 Senlin Xia <xiasenlin1@huawei.com> - 2:2.14.1-48
+- Package init
diff --git a/tog-pegasus.tmpfiles b/tog-pegasus.tmpfiles
new file mode 100644
index 0000000..2fd3b8e
--- /dev/null
+++ b/tog-pegasus.tmpfiles
@@ -0,0 +1 @@
+d /var/run/tog-pegasus 1750 root pegasus -