rpms/tog-pegasus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 2.14.1

Browse Source
This commit is contained in:
Vitezslav Crhonek 2015-04-08 13:11:12 +02:00
parent 95fe6ae19e
commit dfde10b829
15 changed files with 174 additions and 1982 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pegasus-2.10.0-dont-strip.patch
View File

@ -1,12 +1,11 @@
diff -up pegasus/mak/config-linux.mak.orig pegasus/mak/config-linux.mak diff -up pegasus/mak/config-linux.mak.orig pegasus/mak/config-linux.mak
--- pegasus/mak/config-linux.mak.orig 2013-08-27 15:22:41.313769266 +0200 --- pegasus/mak/config-linux.mak.orig 2015-03-31 15:25:23.735154221 +0200
+++ pegasus/mak/config-linux.mak 2013-08-27 15:23:45.137019051 +0200 +++ pegasus/mak/config-linux.mak 2015-03-31 15:26:29.349434918 +0200
@@ -125,7 +125,7 @@ else @@ -127,6 +127,7 @@ else
# appeared in the 3.0 series of compilers. # appeared in the 3.0 series of compilers.
# #
ifeq ($(COMPILER), gnu) ifeq ($(COMPILER), gnu)
- FLAGS += -s
+ FLAGS += -g + FLAGS += -g
# disable the strict aliasing
ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1) ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
EXTRA_CXX_FLAGS += -fno-enforce-eh-specs PEGASUS_EXTRA_CXX_FLAGS += -fno-enforce-eh-specs -fno-strict-aliasing
endif

49
pegasus-2.12.0-cimmofl-allow-experimental.patch
View File

@ -1,7 +1,7 @@
diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/Internal/Makefile diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/Internal/Makefile
--- pegasus/Schemas/Pegasus/Internal/Makefile.orig 2009-02-16 20:13:41.000000000 +0100 --- pegasus/Schemas/Pegasus/Internal/Makefile.orig 2015-04-02 12:28:55.974227490 +0200
+++ pegasus/Schemas/Pegasus/Internal/Makefile 2013-09-02 16:57:30.952364556 +0200 +++ pegasus/Schemas/Pegasus/Internal/Makefile 2015-04-02 12:47:48.912641222 +0200
@@ -48,12 +48,12 @@ all: @@ -48,12 +48,13 @@ all:
repository: repository:
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(INTERNALNS) namespace ... @ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(INTERNALNS) namespace ...
@ -13,13 +13,14 @@ diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/
ifeq ($(PEGASUS_ENABLE_SLP),true) ifeq ($(PEGASUS_ENABLE_SLP),true)
@ $(ECHO) +++++ Loading PG_SLPTemplate.mof into $(INTERNALNS) namespace... @ $(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) "-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" + @ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof"
endif endif
diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/InterOp/Makefile diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/InterOp/Makefile
--- pegasus/Schemas/Pegasus/InterOp/Makefile.orig 2009-09-07 15:43:46.000000000 +0200 --- pegasus/Schemas/Pegasus/InterOp/Makefile.orig 2015-04-02 12:48:17.347745936 +0200
+++ pegasus/Schemas/Pegasus/InterOp/Makefile 2013-09-02 16:57:30.953364560 +0200 +++ pegasus/Schemas/Pegasus/InterOp/Makefile 2015-04-02 12:51:35.167484347 +0200
@@ -44,30 +44,30 @@ all: @@ -44,30 +44,30 @@ all:
repository: repository:
@ -60,8 +61,8 @@ diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/I
endif endif
diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Pegasus/ManagedSystem/Makefile diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Pegasus/ManagedSystem/Makefile
--- pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig 2010-07-09 13:24:49.000000000 +0200 --- pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig 2015-04-02 12:51:58.257571054 +0200
+++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2013-09-02 16:57:30.953364560 +0200 +++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2015-04-02 12:54:31.759930745 +0200
@@ -66,33 +66,33 @@ endif @@ -66,33 +66,33 @@ endif
ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true) ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true)
repository: repository:
@ -107,8 +108,8 @@ diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Peg
repositoryServer: repositoryServer:
diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Clients/benchmarkTest/Load/Makefile diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Clients/benchmarkTest/Load/Makefile
--- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2009-02-16 20:13:43.000000000 +0100 --- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2015-04-02 12:54:48.848927271 +0200
+++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2013-09-02 16:57:30.953364560 +0200 +++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2015-04-02 12:56:27.679228240 +0200
@@ -46,12 +46,12 @@ CIMMOFL = cimmofl @@ -46,12 +46,12 @@ CIMMOFL = cimmofl
repository: repository:
@ -126,8 +127,8 @@ diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Client
repositoryServer: repositoryServer:
@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(PROVIDERNS) namespace ... @ $(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 diff -up pegasus/src/Providers/sample/Load/Makefile.orig pegasus/src/Providers/sample/Load/Makefile
--- pegasus/src/Providers/sample/Load/Makefile.orig 2009-02-16 20:14:13.000000000 +0100 --- pegasus/src/Providers/sample/Load/Makefile.orig 2015-04-02 12:56:41.488278412 +0200
+++ pegasus/src/Providers/sample/Load/Makefile 2013-09-02 16:57:30.953364560 +0200 +++ pegasus/src/Providers/sample/Load/Makefile 2015-04-02 13:01:24.078286449 +0200
@@ -44,52 +44,52 @@ SAMPLEPROVIDERNS=root/SampleProvider @@ -44,52 +44,52 @@ SAMPLEPROVIDERNS=root/SampleProvider
# Load the sample MOF with the local compiler. # Load the sample MOF with the local compiler.
repository: repository:
@ -203,9 +204,9 @@ diff -up pegasus/src/Providers/sample/Load/Makefile.orig pegasus/src/Providers/s
# Load the sample mof through the Client interface compiler. # Load the sample mof through the Client interface compiler.
diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Providers/TestProviders/Load/Makefile diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Providers/TestProviders/Load/Makefile
--- pegasus/src/Providers/TestProviders/Load/Makefile.orig 2012-08-02 14:18:17.000000000 +0200 --- pegasus/src/Providers/TestProviders/Load/Makefile.orig 2015-04-02 13:01:53.265389867 +0200
+++ pegasus/src/Providers/TestProviders/Load/Makefile 2013-09-02 16:57:30.954364563 +0200 +++ pegasus/src/Providers/TestProviders/Load/Makefile 2015-04-02 13:18:57.613079600 +0200
@@ -67,155 +67,155 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded @@ -67,160 +67,160 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded
## ##
repository: repository:
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTPROVIDERNS) namespace ... @ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTPROVIDERNS) namespace ...
@ -278,7 +279,8 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationTestProvider.mof - @ cimmofl "-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 + @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationTestProvider.mof
@ $(ECHO) +++++ Registering IndicationTestProvider ... @ $(ECHO) +++++ Registering IndicationTestProvider ...
@ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof
+ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof
@ $(ECHO) +++++ Loading MethodTestProvider class definitions into $(TESTPROVIDERNS) namespace ... @ $(ECHO) +++++ Loading MethodTestProvider class definitions into $(TESTPROVIDERNS) namespace ...
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" MethodTestProvider.mof - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" MethodTestProvider.mof
@ -335,6 +337,13 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" LocalizedProviderR.mof - @ cimmofl "-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 + @ 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) ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true)
@ $(ECHO) +++++ Loading TestCMPI_ProviderSchema class definitions into $(TESTPROVIDERNS) namespace ... @ $(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 "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCMPI_ProviderSchema.mof
@ -427,7 +436,7 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
# create remote namespace for Remote CMPI test providers # create remote namespace for Remote CMPI test providers
ifdef PEGASUS_ENABLE_REMOTE_CMPI ifdef PEGASUS_ENABLE_REMOTE_CMPI
@ echo +++++ Creating remote namespace ... @ echo +++++ Creating remote namespace ...
@@ -226,28 +226,28 @@ endif @@ -231,28 +231,28 @@ endif
## Indication filter source namespaces testing ## Indication filter source namespaces testing
## ##
@ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTINDSRCNS1) namespace ... @ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTINDSRCNS1) namespace ...
@ -467,8 +476,8 @@ diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Prov
diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/static/Load/Makefile diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/static/Load/Makefile
--- pegasus/test/wetest/static/Load/Makefile.orig 2009-02-16 20:14:20.000000000 +0100 --- pegasus/test/wetest/static/Load/Makefile.orig 2015-04-02 13:19:28.925192771 +0200
+++ pegasus/test/wetest/static/Load/Makefile 2013-09-02 16:57:30.954364563 +0200 +++ pegasus/test/wetest/static/Load/Makefile 2015-04-02 13:20:21.994384585 +0200
@@ -42,14 +42,14 @@ STATICTESTNS=test/static @@ -42,14 +42,14 @@ STATICTESTNS=test/static
repository: repository:
@ -489,8 +498,8 @@ diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/stati
repositoryServer: repositoryServer:
@ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(STATICTESTNS) namespace ... @ $(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 diff -up pegasus/test/wetest/wsman/Load/Makefile.orig pegasus/test/wetest/wsman/Load/Makefile
--- pegasus/test/wetest/wsman/Load/Makefile.orig 2013-09-02 16:57:40.263396410 +0200 --- pegasus/test/wetest/wsman/Load/Makefile.orig 2015-04-02 13:40:54.714859175 +0200
+++ pegasus/test/wetest/wsman/Load/Makefile 2013-09-02 17:00:13.685926532 +0200 +++ pegasus/test/wetest/wsman/Load/Makefile 2015-04-02 13:41:33.960003910 +0200
@@ -46,9 +46,9 @@ WSM_TEST_NS=test/WsmTest @@ -46,9 +46,9 @@ WSM_TEST_NS=test/WsmTest
# NOTE: I believe that the remove is duplicated for some reason. # NOTE: I believe that the remove is duplicated for some reason.
repository: repository:

13
pegasus-2.12.0-empty_arrays.patch
View File

@ -1,7 +1,7 @@
diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.orig pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp
--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test 2012-12-03 16:48:34.469370334 +0100 --- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.orig 2015-03-31 15:28:05.958848322 +0200
+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 2012-12-03 16:47:41.000000000 +0100 +++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 2015-03-31 15:29:13.253136407 +0200
@@ -358,12 +358,6 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI @@ -349,13 +349,6 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
data->value.uint64 = 0; data->value.uint64 = 0;
data->state = CMPI_goodValue; data->state = CMPI_goodValue;
@ -11,10 +11,11 @@ diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test pe
- data->state = CMPI_nullValue; - data->state = CMPI_nullValue;
- return CMPI_RC_OK; - return CMPI_RC_OK;
- } - }
-
if (type & CMPI_ARRAY) if (type & CMPI_ARRAY)
{ {
@@ -398,6 +392,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI // Get the type of the element of the CMPIArray
@@ -389,6 +382,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI
} }
else else
{ {

30
pegasus-2.12.0-schema-version-and-includes.patch
View File

@ -1,18 +1,6 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2013-09-05 15:12:45.728086855 +0200
+++ pegasus/env_var_Linux.status 2013-09-05 15:12:45.750086927 +0200
@@ -28,7 +28,7 @@ PEGASUS_PAM_AUTHENTICATION=true
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
-PEGASUS_CIM_SCHEMA=CIM236
+PEGASUS_CIM_SCHEMA=CIM238
PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Core.mof diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Core.mof
--- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2013-09-05 15:12:45.713086805 +0200 --- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2015-04-07 15:24:25.280804943 +0200
+++ pegasus/Schemas/CIM238/CIM_Core.mof 2013-09-05 15:12:45.750086927 +0200 +++ pegasus/Schemas/CIM238/CIM_Core.mof 2015-04-07 15:24:25.321805120 +0200
@@ -146,11 +146,14 @@ @@ -146,11 +146,14 @@
#pragma include ("DMTF/Core/CIM_SpareGroup.mof") #pragma include ("DMTF/Core/CIM_SpareGroup.mof")
#pragma include ("DMTF/Core/CIM_StatusCollection.mof") #pragma include ("DMTF/Core/CIM_StatusCollection.mof")
@ -69,8 +57,8 @@ diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Cor
#pragma include ("DMTF/Core/CIM_SystemFCPort.mof") #pragma include ("DMTF/Core/CIM_SystemFCPort.mof")
diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Event.mof diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Event.mof
--- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2013-09-05 15:12:45.716086815 +0200 --- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2015-04-07 15:24:25.283804956 +0200
+++ pegasus/Schemas/CIM238/CIM_Event.mof 2013-09-05 15:12:45.750086927 +0200 +++ pegasus/Schemas/CIM238/CIM_Event.mof 2015-04-07 15:24:25.321805120 +0200
@@ -73,5 +73,6 @@ @@ -73,5 +73,6 @@
#pragma include ("DMTF/Event/CIM_IPNetworkSecurityIndication.mof") #pragma include ("DMTF/Event/CIM_IPNetworkSecurityIndication.mof")
#pragma include ("DMTF/Event/CIM_IPPacketFilterIndication.mof") #pragma include ("DMTF/Event/CIM_IPPacketFilterIndication.mof")
@ -79,8 +67,8 @@ diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Ev
#pragma include ("DMTF/Event/CIM_LogOfIndication.mof") #pragma include ("DMTF/Event/CIM_LogOfIndication.mof")
diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_Interop.mof diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_Interop.mof
--- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2013-09-05 15:12:45.718086822 +0200 --- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2015-04-07 15:24:25.285804965 +0200
+++ pegasus/Schemas/CIM238/CIM_Interop.mof 2013-09-05 15:12:45.750086927 +0200 +++ pegasus/Schemas/CIM238/CIM_Interop.mof 2015-04-07 15:24:25.321805120 +0200
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
#pragma include ("DMTF/Interop/CIM_ElementConformsToProfile.mof") #pragma include ("DMTF/Interop/CIM_ElementConformsToProfile.mof")
#pragma include ("DMTF/Interop/CIM_ReferencedProfile.mof") #pragma include ("DMTF/Interop/CIM_ReferencedProfile.mof")
@ -90,8 +78,8 @@ diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_
#pragma include ("DMTF/Interop/CIM_WSManagementCapabilities.mof") #pragma include ("DMTF/Interop/CIM_WSManagementCapabilities.mof")
#pragma include ("DMTF/Interop/CIM_CIMXMLCapabilities.mof") #pragma include ("DMTF/Interop/CIM_CIMXMLCapabilities.mof")
diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_System.mof diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_System.mof
--- pegasus/Schemas/CIM238/CIM_System.mof.orig 2013-09-05 15:12:45.722086835 +0200 --- pegasus/Schemas/CIM238/CIM_System.mof.orig 2015-04-07 15:24:25.290804986 +0200
+++ pegasus/Schemas/CIM238/CIM_System.mof 2013-09-05 15:31:32.383754011 +0200 +++ pegasus/Schemas/CIM238/CIM_System.mof 2015-04-07 15:24:25.321805120 +0200
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@
#pragma include ("DMTF/System/CIM_VirtualSystemSettingData.mof") #pragma include ("DMTF/System/CIM_VirtualSystemSettingData.mof")
#pragma include ("DMTF/System/CIM_AttachedElement.mof") #pragma include ("DMTF/System/CIM_AttachedElement.mof")
@ -124,7 +112,7 @@ diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_S
#pragma include ("DMTF/System/CIM_HelpServiceAvailableToFile.mof") #pragma include ("DMTF/System/CIM_HelpServiceAvailableToFile.mof")
diff -up pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig pegasus/Schemas/CIM238/DMTF/qualifiers.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.orig 2013-08-12 11:34:14.000000000 +0200
+++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2013-09-05 15:12:45.751086931 +0200 +++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2015-04-07 15:24:25.321805120 +0200
@@ -152,8 +152,8 @@ Qualifier PUnit : string = null, @@ -152,8 +152,8 @@ Qualifier PUnit : string = null,
Qualifier Read : boolean = true, Qualifier Read : boolean = true,
Scope(property); Scope(property);

60
pegasus-2.13.0-CMGetKey-data-type-fix.patch
View File

@ -1,60 +0,0 @@
Index: src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp
===================================================================
RCS file: /cvs/MSB/pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 13 Feb 2013 11:40:04 -0000 1.4
+++ src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 7 Apr 2014 09:52:59 -0000 1.5
@@ -266,28 +266,14 @@
data->value.boolean=scmoValue->simple.val.bin;
data->type=CMPI_keyBoolean;
break;
-
case CMPI_real32:
- {
- char buffer[128];
- Uint32 size=0;
- Real32ToString(buffer, scmoValue->simple.val.r32, size);
- data->value.string = reinterpret_cast<CMPIString*>(
- new CMPI_Object(buffer));
- data->type=CIMKeyBinding::STRING;
- break;
- }
-
+ data->value.real32=(CMPIReal32)scmoValue->simple.val.r32;
+ data->type=CMPI_real32;
+ break;
case CMPI_real64:
- {
- char buffer[128];
- Uint32 size=0;
- Real64ToString(buffer, scmoValue->simple.val.r64, size);
- data->value.string = reinterpret_cast<CMPIString*>(
- new CMPI_Object(buffer));
- data->type=CIMKeyBinding::STRING;
- break;
- }
+ data->value.real64=(CMPIReal64)scmoValue->simple.val.r64;
+ data->type=CMPI_real64;
+ break;
case CMPI_charsptr:
case CMPI_chars:
@@ -309,11 +295,11 @@
case CMPI_dateTime:
{
- char buffer[26];
- _DateTimetoCStr(scmoValue->dateTimeValue, buffer);
- data->value.string = reinterpret_cast<CMPIString*>(
- new CMPI_Object(buffer));
- data->type=CIMKeyBinding::STRING;
+ CIMDateTime* cimdt =
+ new CIMDateTime(&scmoValue->dateTimeValue);
+ data->value.dateTime = reinterpret_cast<CMPIDateTime*>
+ (new CMPI_Object(cimdt));
+ data->type=CMPI_dateTime;
break;
}

175
pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch
View File

@ -1,175 +0,0 @@
Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp
===================================================================
RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp,v
retrieving revision 1.16
diff -u -b -w -r1.16 ComputerSystem.cpp
--- src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp 16 Dec 2008 18:57:17 -0000 1.16
+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystem.cpp 16 Oct 2013 13:13:10 -0000
@@ -27,12 +27,6 @@
//
//////////////////////////////////////////////////////////////////////////
//
-// Author: Mike Brasher (mbrasher@bmc.com)
-//
-// Modified By: Rudy Schuet (rudy.schuet@compaq.com) 11/12/01
-// added nsk platform support
-// Sean Keenan Hewlett-Packard Company (sean.keenan@hp.com)
-//
//%/////////////////////////////////////////////////////////////////////////////
#include "ComputerSystem.h"
Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp
===================================================================
RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp,v
retrieving revision 1.24
diff -u -b -w -r1.24 ComputerSystemProvider.cpp
--- src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp 2 Dec 2008 09:02:26 -0000 1.24
+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProvider.cpp 16 Oct 2013 13:13:10 -0000
@@ -37,9 +37,9 @@
// This provider is registered to support operations at
// several class levels:
//
-// CIM_ComputerSystem
-// CIM_UnitaryComputerSystem
// <platform>_ComputerSustem
+// CIM_UnitaryComputerSystem
+// CIM_ComputerSystem
//
// Enumeration operations always return instances from the
// deepest class available. All other
@@ -95,17 +95,22 @@
String keyValue;
if (keys.size() != keyCount)
+ {
throw CIMInvalidParameterException("Wrong number of keys");
+ }
for (unsigned int ii = 0; ii < keys.size(); ii++)
{
keyName = keys[ii].getName();
keyValue = keys[ii].getValue();
+ //Put CLASS_EXTENDED_COMPUTER_SYSTEM in front CLASS_CIM_COMPUTER_SYSTEM
+ //to prefer CLASS_EXTENDED_COMPUTER_SYSTEM as class being served first
+ //followed by CLASS_CIM_UNITARY_COMPUTER_SYSTEM
if (keyName.equal(PROPERTY_CREATION_CLASS_NAME) &&
- (String::equalNoCase(keyValue,CLASS_CIM_COMPUTER_SYSTEM) ||
+ (String::equalNoCase(keyValue,CLASS_EXTENDED_COMPUTER_SYSTEM) ||
String::equalNoCase(keyValue,CLASS_CIM_UNITARY_COMPUTER_SYSTEM) ||
- String::equalNoCase(keyValue,CLASS_EXTENDED_COMPUTER_SYSTEM) ||
+ String::equalNoCase(keyValue,CLASS_CIM_COMPUTER_SYSTEM) ||
String::equalNoCase(keyValue,String::EMPTY)))
{
keyCount--;
@@ -189,7 +194,7 @@
keys.append(CIMKeyBinding(
PROPERTY_CREATION_CLASS_NAME,
- CLASS_CIM_COMPUTER_SYSTEM,
+ CLASS_EXTENDED_COMPUTER_SYSTEM,
CIMKeyBinding::STRING));
keys.append(CIMKeyBinding(
PROPERTY_NAME,
@@ -250,9 +255,9 @@
void ComputerSystemProvider::_checkClass(CIMName& className)
{
- if (!className.equal(CLASS_CIM_COMPUTER_SYSTEM) &&
+ if (!className.equal(CLASS_EXTENDED_COMPUTER_SYSTEM) &&
!className.equal(CLASS_CIM_UNITARY_COMPUTER_SYSTEM) &&
- !className.equal(CLASS_EXTENDED_COMPUTER_SYSTEM))
+ !className.equal(CLASS_CIM_COMPUTER_SYSTEM))
{
throw CIMNotSupportedException(String::EMPTY);
}
Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp
===================================================================
RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp,v
retrieving revision 1.14
diff -u -b -w -r1.14 ComputerSystemProviderMain.cpp
--- src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp 16 Dec 2008 18:57:17 -0000 1.14
+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystemProviderMain.cpp 16 Oct 2013 13:13:10 -0000
@@ -27,14 +27,6 @@
//
//////////////////////////////////////////////////////////////////////////
//
-// Author: Christopher Neufeld <neufeld@linuxcare.com>
-// David Kennedy <dkennedy@linuxcare.com>
-//
-// Modified By: David Kennedy <dkennedy@linuxcare.com>
-// Christopher Neufeld <neufeld@linuxcare.com>
-// Al Stone <ahs3@fc.hp.com>
-// Mike Glantz <michael_glantz@hp.com>
-//
//%////////////////////////////////////////////////////////////////////////////
//
Index: src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp
===================================================================
RCS file: /cvs/MSB/pegasus/src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp,v
retrieving revision 1.24
diff -u -b -w -r1.24 ComputerSystem_Linux.cpp
--- src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 16 Dec 2008 18:57:17 -0000 1.24
+++ src/Providers/ManagedSystem/ComputerSystem/ComputerSystem_Linux.cpp 16 Oct 2013 13:13:10 -0000
@@ -43,8 +43,6 @@
PEGASUS_USING_STD;
PEGASUS_USING_PEGASUS;
-static String _hostName;
-
ComputerSystem::ComputerSystem()
{
}
@@ -304,48 +302,14 @@
}
/**
- * initialize primarily functions to initialize static global variables
- * that will not be changed frequently. These variables are currently
- * _hostName.
- *
+ * This is empty as we get the hostname through
+ * System class
*/
void ComputerSystem::initialize()
{
- char hostName[PEGASUS_MAXHOSTNAMELEN + 1];
- struct hostent *hostEntry;
-
- if (gethostname(hostName, sizeof(hostName)) != 0)
- {
- _hostName.assign("Not initialized");
- }
- hostName[sizeof(hostName)-1] = 0;
-
- // Now get the official hostname. If this call fails then return
- // the value from gethostname().
-
- char hostEntryBuffer[8192];
- struct hostent hostEntryStruct;
- int hostEntryErrno;
-
- gethostbyname_r(
- hostName,
- &hostEntryStruct,
- hostEntryBuffer,
- sizeof(hostEntryBuffer),
- &hostEntry,
- &hostEntryErrno);
-
- if (hostEntry)
- {
- _hostName.assign(hostEntry->h_name);
- }
- else
- {
- _hostName.assign(hostName);
- }
}
String ComputerSystem::getHostName()
{
- return _hostName;
+ return System::getFullyQualifiedHostName();
}

182
pegasus-2.13.0-SSLGeneration.patch
View File

@ -1,182 +0,0 @@
From 75b27360143b05626e3962a74b17ddba919c080b Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Mon, 18 Aug 2014 16:40:46 -0400
Subject: [PATCH] Update SSL certificate generation
We will now generate x509v3 certificates with the CA:FALSE
constraint. This will allow us to automatically load it into a
local trust store safely. In order to do this, instead of creating
a true self-signed certificate, we will generate a private CA
certificate and sign the service with that.
---
rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec | 136 +++++++++++++++++++------
1 file changed, 107 insertions(+), 29 deletions(-)
diff --git a/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec b/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec
index 81e6635936b77ddc486b217260fba59b23cf2a20..377b82d7a0bd3f42b1e58b0a795b2e628365dd36 100644
--- a/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec
+++ b/rpm/tog-specfiles/tog-pegasus-genSSLCerts.spec
@@ -4,22 +4,31 @@
# Creates a default ssl.cnf file.
# Generates a self-signed certificate for use by the cimserver.
#
-cnfChanged=0;
-if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
- mkdir -p ${PEGASUS_INSTALL_LOG%/*}
- mkdir -p $PEGASUS_CONFIG_DIR
- echo "[ req ]" > $PEGASUS_CONFIG_DIR/ssl.cnf
+
+function create_ssl_cnf #(config_file, CN)
+{
+ SSL_CFG=$1
+ CA=$2 # Add a second argument to differentiate issuer from subject
+
+ # Create OpenSSL configuration files for generating certificates
+ echo "[ req ]" > $PEGASUS_CONFIG_DIR/$SSL_CFG
echo "distinguished_name = req_distinguished_name" >> \
- $PEGASUS_CONFIG_DIR/ssl.cnf
- echo "prompt = no" >> $PEGASUS_CONFIG_DIR/ssl.cnf
- echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/ssl.cnf
- echo "C = UK" >> $PEGASUS_CONFIG_DIR/ssl.cnf
- echo "ST = Berkshire" >> $PEGASUS_CONFIG_DIR/ssl.cnf
- echo "L = Reading" >> $PEGASUS_CONFIG_DIR/ssl.cnf
+ $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "prompt = no" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+
+ # Include support for x509v3 so we can differentiate CA certificates
+ # from service certificates
+ echo "req_extensions = v3_req" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "x509_extensions = v3_ca" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+
+ echo "[ req_distinguished_name ]" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "C = UK" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "ST = Berkshire" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "L = Reading" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
echo "O = The Open Group" >> \
- $PEGASUS_CONFIG_DIR/ssl.cnf
+ $PEGASUS_CONFIG_DIR/$SSL_CFG
echo "OU = The OpenPegasus Project" >> \
- $PEGASUS_CONFIG_DIR/ssl.cnf
+ $PEGASUS_CONFIG_DIR/$SSL_CFG
DN=`hostname`;
if [ -z "$DN" ] || [ "$DN" = "(none)" ]; then
DN='localhost.localdomain';
@@ -30,30 +39,99 @@ if [ ! -e $PEGASUS_CONFIG_DIR/ssl.cnf ]; then
FQDN="$DN";
fi;
# cannot use 'hostname --fqdn' because this can hang indefinitely
- echo "CN = $FQDN" >> $PEGASUS_CONFIG_DIR/ssl.cnf
- chmod 400 $PEGASUS_CONFIG_DIR/ssl.cnf
- chown root $PEGASUS_CONFIG_DIR/ssl.cnf
- chgrp root $PEGASUS_CONFIG_DIR/ssl.cnf
+ # Hack the $CA onto the end of the CN so we differentiate the issuer
+ # of the signature from the subject
+ echo "CN = $FQDN$CA" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+
+ # Add x509v3 extensions
+ echo "[ v3_req ]" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "basicConstraints = CA:FALSE" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "[ v3_ca ]" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "subjectKeyIdentifier=hash" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "authorityKeyIdentifier=keyid:always,issuer" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+ echo "basicConstraints = CA:TRUE" >> $PEGASUS_CONFIG_DIR/$SSL_CFG
+}
+
+cnfChanged=0;
+if [ ! -e $PEGASUS_CONFIG_DIR/ssl-ca.cnf ] ||
+ [ ! -e $PEGASUS_CONFIG_DIR/ssl-service.cnf ] ||
+ [ ! -e $PEGASUS_CONFIG_DIR/server.pem ] ||
+ [ ! -e $PEGASUS_CONFIG_DIR/file.pem ] ||
+ [ ! -e $PEGASUS_CONFIG_DIR/client.pem ]; then
+
+ mkdir -p ${PEGASUS_INSTALL_LOG%/*}
+ mkdir -p $PEGASUS_CONFIG_DIR
+
+ create_ssl_cnf ssl-ca.cnf CA
+ create_ssl_cnf ssl-service.cnf
+
+ chmod 400 $PEGASUS_CONFIG_DIR/ssl-*.cnf
+ chown root $PEGASUS_CONFIG_DIR/ssl-*.cnf
+ chgrp root $PEGASUS_CONFIG_DIR/ssl-*.cnf
cnfChanged=1;
fi
if [ $cnfChanged -eq 1 ] || \
[ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE ] || \
[ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE ]; then
- /usr/bin/openssl req -x509 -days 3650 -newkey rsa:2048 \
- -nodes -config $PEGASUS_CONFIG_DIR/ssl.cnf \
- -keyout $PEGASUS_PEM_DIR/key.pem \
- -out $PEGASUS_PEM_DIR/cert.pem 2>>$PEGASUS_INSTALL_LOG
- chmod 700 $PEGASUS_PEM_DIR/*.pem
- cp -fp $PEGASUS_PEM_DIR/cert.pem \
- $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
- cp -fp $PEGASUS_PEM_DIR/key.pem \
- $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
+
+ # Restrict access of the key to root
+ OLDUMASK=`umask`
+ umask 0077
+
+ # Create private key for the CA certificate
+ TMPKEY=`mktemp --tmpdir=$PEGASUS_PEM_DIR XXXXXXXXXXXX`
+
+ /usr/bin/openssl genrsa -out $TMPKEY 2048
+
+ # Restore the umask for the other files
+ umask $OLDUMASK
+
+ # Create CA certificate:
+ /usr/bin/openssl req -new -x509 -days 3650 \
+ -config $PEGASUS_CONFIG_DIR/ssl-ca.cnf \
+ -key $TMPKEY \
+ -out $PEGASUS_PEM_DIR/ca.crt \
+
+ # Create private key for the service certificate
+ /usr/bin/openssl genrsa -out $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE 2048
+
+ # Create a signing request for the service certificate
+ /usr/bin/openssl req -new \
+ -config $PEGASUS_CONFIG_DIR/ssl-service.cnf \
+ -key $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE \
+ -out $PEGASUS_PEM_DIR/server.csr
+
+ # Sign the request with the CA certificate
+ /usr/bin/openssl x509 -req -days 3650 \
+ -in $PEGASUS_PEM_DIR/server.csr \
+ -CA $PEGASUS_PEM_DIR/ca.crt \
+ -CAkey $TMPKEY \
+ -CAcreateserial \
+ -out $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
+ -extfile $PEGASUS_CONFIG_DIR/ssl-ca.cnf
+
+ # Set file permissions appropriately
chmod 400 $PEGASUS_PEM_DIR/$PEGASUS_SSL_KEY_FILE
- chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
- rm -f $PEGASUS_PEM_DIR/key.pem $PEGASUS_PEM_DIR/cert.pem
+ chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE
+
+ # Remove the certificate signing request
+ # It is not needed after the signature is complete
+ rm -f $PEGASUS_PEM_DIR/server.csr
+
+ # Remove the private key for the CA certificate
+ # This will ensure that it cannot be used to sign any other
+ # (possibly suspicious) certificates
+ # This does mean that generating a new certificate for this
+ # service will need a new CA cert, but most real deployments
+ # will use real infrastructure.
+ # This does not impart perfect security; there is a fairly
+ # long race here between the key generation and its deletion.
+ # The random filename should significantly mitigate this.
+ rm -f $TMPKEY
+
fi;
if [ ! -e $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE ]; then
- cp -fp $PEGASUS_PEM_DIR/$PEGASUS_SSL_CERT_FILE \
+ cp -fp $PEGASUS_PEM_DIR/ca.crt \
$PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE
chmod 444 $PEGASUS_PEM_DIR/$PEGASUS_SSL_TRUSTSTORE;
fi;
--
2.1.0

19
pegasus-2.13.0-build-fix.patch
View File

@ -1,19 +0,0 @@
diff -up pegasus/src/slp/slp_agent/peg_slp_agent.cpp.orig pegasus/src/slp/slp_agent/peg_slp_agent.cpp
--- pegasus/src/slp/slp_agent/peg_slp_agent.cpp.orig 2013-08-27 16:04:10.154370312 +0200
+++ pegasus/src/slp/slp_agent/peg_slp_agent.cpp 2013-08-27 16:06:20.281855366 +0200
@@ -584,7 +584,6 @@ PEGASUS_THREAD_CDECL slp_service_agent::
agent->_should_listen = 1;
- lslpMsg msg_list;
while (agent->_should_listen.get())
{
Uint32 now, msec;
@@ -675,6 +674,7 @@ PEGASUS_THREAD_CDECL slp_service_agent::
{
}
#else
+ lslpMsg msg_list;
agent->_rep->service_listener(agent->_rep, 0, &msg_list);
_LSLP_SLEEP(1);
if (agent->_update_reg_count.get() && agent->_should_listen.get())

1387
pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch
View File

File diff suppressed because it is too large Load Diff

28
pegasus-2.14.1-build-fixes.patch Normal file
View File

@ -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());

7
pegasus-2.6.0-cimuser.patch
View File

@ -1,6 +1,7 @@
--- pegasus.mark/Makefile.Release 2007-03-15 16:49:16.000000000 -0500 diff -up pegasus/Makefile.Release.orig pegasus/Makefile.Release
+++ pegasus/Makefile.Release 2007-03-15 16:50:52.000000000 -0500 --- pegasus/Makefile.Release.orig 2015-03-31 14:47:44.301518897 +0200
@@ -156,6 +156,7 @@ +++ pegasus/Makefile.Release 2015-03-31 14:48:04.060602183 +0200
@@ -207,6 +207,7 @@ endif
PEGASUS_ADMIN_CMDS = \ PEGASUS_ADMIN_CMDS = \
cimauth \ cimauth \

156
pegasus-2.9.0-local-or-remote-auth.patch
View File

@ -1,6 +1,6 @@
diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h
--- pegasus/src/Executor/Messages.h.orig 2013-08-27 13:31:54.792029310 +0200 --- pegasus/src/Executor/Messages.h.orig 2015-03-31 14:49:58.125082973 +0200
+++ pegasus/src/Executor/Messages.h 2013-08-27 13:32:20.294122741 +0200 +++ pegasus/src/Executor/Messages.h 2015-03-31 14:50:29.243214138 +0200
@@ -199,6 +199,7 @@ struct ExecutorAuthenticatePasswordReque @@ -199,6 +199,7 @@ struct ExecutorAuthenticatePasswordReque
{ {
char username[EXECUTOR_BUFFER_SIZE]; char username[EXECUTOR_BUFFER_SIZE];
@ -10,8 +10,8 @@ diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h
struct ExecutorAuthenticatePasswordResponse struct ExecutorAuthenticatePasswordResponse
diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
--- pegasus/src/Executor/PAMAuth.h.orig 2013-08-27 13:32:39.064191519 +0200 --- pegasus/src/Executor/PAMAuth.h.orig 2015-03-31 14:50:48.589295683 +0200
+++ pegasus/src/Executor/PAMAuth.h 2013-08-27 13:47:11.267390738 +0200 +++ pegasus/src/Executor/PAMAuth.h 2015-03-31 14:57:25.561982718 +0200
@@ -49,6 +49,9 @@ @@ -49,6 +49,9 @@
#include <Executor/Defines.h> #include <Executor/Defines.h>
#include <Executor/Socket.h> #include <Executor/Socket.h>
@ -38,25 +38,22 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
- pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle); - pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle);
+ // NOTE: if any pam call should log anything, our syslog socket will be redirected + // 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. + // to the AUTH facility, so we need to redirect it back after each pam call.
+
- if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle)) != PAM_SUCCESS) + if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle)) != PAM_SUCCESS)
{ + {
- return pam_rc;
+ closelog(); + closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON); + openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_start failed: %s", pam_strerror(handle, pam_rc)); + syslog(LOG_ERR, "pam_start failed: %s", pam_strerror(handle, pam_rc));
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username); + isRemoteUser ? "remote" : "local", username);
+ return -1; + return -1;
} + }
- pam_rc = pam_authenticate(handle, 0);
- if (pam_rc != PAM_SUCCESS) - if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS) + if ((pam_rc = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS)
{ {
pam_end(handle, 0);
- return pam_rc; - return pam_rc;
+ pam_end(handle, 0);
+ closelog(); + closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON); + 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_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(handle, pam_rc));
@ -65,18 +62,21 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
+ return -1; + return -1;
} }
- pam_rc = pam_acct_mgmt(handle, 0); - pam_rc = pam_authenticate(handle, 0);
- if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_authenticate(handle, 0)) != PAM_SUCCESS) + if ((pam_rc = pam_authenticate(handle, 0)) != PAM_SUCCESS)
+ { {
+ pam_end(handle, 0); pam_end(handle, 0);
- return pam_rc;
+ closelog(); + closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON); + openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(handle, pam_rc)); + syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(handle, pam_rc));
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username); + isRemoteUser ? "remote" : "local", username);
+ return -1; + return -1;
+ } }
+
- pam_rc = pam_acct_mgmt(handle, 0);
+ if ((pam_rc = pam_acct_mgmt(handle, 0)) != PAM_SUCCESS) + if ((pam_rc = pam_acct_mgmt(handle, 0)) != PAM_SUCCESS)
+ { + {
+ pam_end(handle, 0); + pam_end(handle, 0);
@ -86,7 +86,7 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username); + isRemoteUser ? "remote" : "local", username);
+ return -1; + return -1;
+ } + }
pam_end(handle, 0); pam_end(handle, 0);
- return pam_rc; - return pam_rc;
@ -101,24 +101,24 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
- pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle); - pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle);
- if (pam_rc != PAM_SUCCESS) - if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle)) != PAM_SUCCESS) + if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle)) != PAM_SUCCESS)
{ + {
- return pam_rc;
+ closelog(); + closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON); + openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, pam_rc)); + syslog(LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, pam_rc));
+ return -1; + return -1;
} + }
+
- pam_rc = pam_acct_mgmt(phandle, 0);
+ if ((pam_rc = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS) + if ((pam_rc = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS)
+ { {
- return pam_rc;
+ pam_end(phandle, 0); + pam_end(phandle, 0);
+ closelog(); + closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON); + openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, pam_rc)); + syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, pam_rc));
+ return -1; + return -1;
+ } }
+
- pam_rc = pam_acct_mgmt(phandle, 0);
+ if ((pam_rc = pam_acct_mgmt(phandle, 0)) != PAM_SUCCESS) + if ((pam_rc = pam_acct_mgmt(phandle, 0)) != PAM_SUCCESS)
+ { + {
+ pam_end(phandle, 0); + pam_end(phandle, 0);
@ -150,8 +150,8 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
} }
diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c
--- pegasus/src/Executor/Parent.c.orig 2013-08-27 13:51:12.419277041 +0200 --- pegasus/src/Executor/Parent.c.orig 2015-03-31 14:57:37.595034076 +0200
+++ pegasus/src/Executor/Parent.c 2013-08-27 13:52:50.434650395 +0200 +++ pegasus/src/Executor/Parent.c 2015-03-31 14:58:11.034176796 +0200
@@ -634,7 +634,7 @@ static void HandleAuthenticatePasswordRe @@ -634,7 +634,7 @@ static void HandleAuthenticatePasswordRe
#if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
@ -162,8 +162,8 @@ diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c
if (status == PAM_SUCCESS) if (status == PAM_SUCCESS)
{ {
diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c
--- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2013-08-27 13:53:14.882743374 +0200 --- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2015-03-31 14:58:30.460259707 +0200
+++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2013-08-27 13:53:39.089835311 +0200 +++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2015-03-31 14:58:55.882368210 +0200
@@ -49,7 +49,7 @@ int main() @@ -49,7 +49,7 @@ int main()
sprintf(prompt, "Enter password for %s: ", PEGASUS_CIMSERVERMAIN_USER); sprintf(prompt, "Enter password for %s: ", PEGASUS_CIMSERVERMAIN_USER);
pw = getpass(prompt); pw = getpass(prompt);
@ -174,10 +174,10 @@ diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig pegasus/s
else else
printf("Wrong password\n"); printf("Wrong password\n");
diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasus/Common/AuthenticationInfo.h diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasus/Common/AuthenticationInfo.h
--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2013-08-27 13:54:15.842974734 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2015-03-31 14:59:10.875432201 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2013-08-27 13:55:32.977266918 +0200 +++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2015-03-31 15:00:03.130655230 +0200
@@ -353,6 +353,22 @@ public: @@ -348,6 +348,22 @@ public:
return _rep->getRemotePrivilegedUserAccessChecked(); _rep->setAuthHandle(authHandle);
} }
+ /** Indicate whether the user is Remote + /** Indicate whether the user is Remote
@ -196,24 +196,25 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasu
+ _rep->setRemoteUser(isRemoteUser); + _rep->setRemoteUser(isRemoteUser);
+ } + }
+ +
void setAuthHandle(const AuthHandle & authHandle) AuthHandle getAuthHandle()
{ {
CheckRep(_rep); CheckRep(_rep);
diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2013-08-27 13:56:01.394374402 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2015-03-31 15:00:26.267753980 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2013-08-27 13:59:22.129131385 +0200 +++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2015-03-31 15:01:53.018124238 +0200
@@ -47,6 +47,7 @@ const String AuthenticationInfoRep::AUTH @@ -48,6 +48,7 @@ const String AuthenticationInfoRep::AUTH
AuthenticationInfoRep::AuthenticationInfoRep() AuthenticationInfoRep::AuthenticationInfoRep()
: _connectionAuthenticated(false), : _connectionAuthenticated(false),
_wasRemotePrivilegedUserAccessChecked(false), _wasRemotePrivilegedUserAccessChecked(false),
+ _isRemoteUser(true), + _isRemoteUser(true),
_authHandle(), _authHandle(),
_isExpiredPassword(false) _isExpiredPassword(false)
{ #ifdef PEGASUS_ENABLE_SESSION_COOKIES
@@ -81,6 +82,16 @@ AuthenticationInfoRep::~AuthenticationIn @@ -86,6 +87,16 @@ AuthenticationInfoRep::~AuthenticationIn
PEG_METHOD_EXIT(); PEG_METHOD_EXIT();
} }
+
+void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser) +void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser)
+{ +{
+ PEG_METHOD_ENTER(TRC_AUTHENTICATION, + PEG_METHOD_ENTER(TRC_AUTHENTICATION,
@ -223,16 +224,15 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/P
+ +
+ PEG_METHOD_EXIT(); + PEG_METHOD_EXIT();
+} +}
+
void AuthenticationInfoRep::setConnectionAuthenticated( void AuthenticationInfoRep::setConnectionAuthenticated(
Boolean connectionAuthenticated) Boolean connectionAuthenticated)
{
diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.h diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.h
--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2013-08-27 13:59:47.458226631 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2015-03-31 15:02:17.868230300 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2013-08-27 14:01:27.744603255 +0200 +++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2015-03-31 15:03:53.065636608 +0200
@@ -147,6 +147,13 @@ public: @@ -148,6 +148,13 @@ public:
void setSecurityAssociation(); }
#endif #endif //PEGASUS_NEGOTIATE_AUTHENTICATION
+ Boolean isRemoteUser() const + Boolean isRemoteUser() const
+ { + {
@ -244,7 +244,7 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Peg
Array<SSLCertificateInfo*> getClientCertificateChain() Array<SSLCertificateInfo*> getClientCertificateChain()
{ {
return _clientCertificate; return _clientCertificate;
@@ -218,6 +225,8 @@ private: @@ -233,6 +240,8 @@ private:
Array<SSLCertificateInfo*> _clientCertificate; Array<SSLCertificateInfo*> _clientCertificate;
@ -254,8 +254,8 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Peg
String _userRole; String _userRole;
Boolean _isExpiredPassword; Boolean _isExpiredPassword;
diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common/Executor.cpp diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common/Executor.cpp
--- pegasus/src/Pegasus/Common/Executor.cpp.orig 2013-08-27 14:01:50.929690223 +0200 --- pegasus/src/Pegasus/Common/Executor.cpp.orig 2015-03-31 15:04:10.843712487 +0200
+++ pegasus/src/Pegasus/Common/Executor.cpp 2013-08-27 14:07:28.655952891 +0200 +++ pegasus/src/Pegasus/Common/Executor.cpp 2015-03-31 15:08:16.953762900 +0200
@@ -126,7 +126,8 @@ public: @@ -126,7 +126,8 @@ public:
virtual int authenticatePassword( virtual int authenticatePassword(
@ -312,8 +312,8 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
int Executor::validateUser( int Executor::validateUser(
diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/Executor.h diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/Executor.h
--- pegasus/src/Pegasus/Common/Executor.h.orig 2013-08-27 14:09:28.767397015 +0200 --- pegasus/src/Pegasus/Common/Executor.h.orig 2015-03-31 15:08:26.668804365 +0200
+++ pegasus/src/Pegasus/Common/Executor.h 2013-08-27 14:10:55.934717862 +0200 +++ pegasus/src/Pegasus/Common/Executor.h 2015-03-31 15:08:46.535889158 +0200
@@ -184,7 +184,8 @@ public: @@ -184,7 +184,8 @@ public:
*/ */
static int authenticatePassword( static int authenticatePassword(
@ -325,9 +325,9 @@ diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/E
/** Check whether the given user is valid for the underlying authentcation /** Check whether the given user is valid for the underlying authentcation
mechanism. mechanism.
diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/Common/HTTPConnection.cpp diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/Common/HTTPConnection.cpp
--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2013-08-27 14:11:11.103773653 +0200 --- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2015-03-31 15:09:05.706970982 +0200
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2013-08-27 14:12:27.743055754 +0200 +++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2015-03-31 15:10:08.472238867 +0200
@@ -2305,6 +2305,70 @@ void HTTPConnection::_handleReadEvent() @@ -2295,6 +2295,70 @@ void HTTPConnection::_handleReadEvent()
message->contentLanguages = contentLanguages; message->contentLanguages = contentLanguages;
message->dest = _outputMessageQueue->getQueueId(); message->dest = _outputMessageQueue->getQueueId();
@ -399,8 +399,8 @@ diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/
// The _closeConnection method sets the _connectionClosePending flag. // The _closeConnection method sets the _connectionClosePending flag.
// If we are executing on the client side and the // 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 diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig pegasus/src/Pegasus/Common/HTTPMessage.cpp
--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2013-08-27 14:12:39.200097953 +0200 --- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2015-03-31 15:10:32.186340162 +0200
+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2013-08-27 14:13:05.903196184 +0200 +++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2015-03-31 15:11:00.008459185 +0200
@@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage( @@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage(
authInfo(0), authInfo(0),
acceptLanguagesDecoded(false), acceptLanguagesDecoded(false),
@ -412,8 +412,8 @@ diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig pegasus/src/Pegasus/Com
if (cimException_) if (cimException_)
cimException = *cimException_; cimException = *cimException_;
diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Common/HTTPMessage.h diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Common/HTTPMessage.h
--- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2013-08-27 14:13:16.272234342 +0200 --- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2015-03-31 15:11:13.706517786 +0200
+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2013-08-27 14:13:52.605368078 +0200 +++ pegasus/src/Pegasus/Common/HTTPMessage.h 2015-03-31 15:11:33.528602586 +0200
@@ -73,6 +73,7 @@ public: @@ -73,6 +73,7 @@ public:
ContentLanguageList contentLanguages; ContentLanguageList contentLanguages;
Boolean acceptLanguagesDecoded; Boolean acceptLanguagesDecoded;
@ -423,8 +423,8 @@ diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Commo
bool binaryResponse; bool binaryResponse;
diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp
--- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig 2013-08-27 14:14:16.255455117 +0200 --- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig 2015-03-31 15:11:50.617675692 +0200
+++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2013-08-27 14:15:54.285815870 +0200 +++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2015-03-31 15:12:49.031925589 +0200
@@ -76,7 +76,7 @@ void testExecutorLoopbackImpl() @@ -76,7 +76,7 @@ void testExecutorLoopbackImpl()
#endif #endif
@ -444,9 +444,9 @@ diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus
char challengeFilePath[EXECUTOR_BUFFER_SIZE]; char challengeFilePath[EXECUTOR_BUFFER_SIZE];
diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2013-08-27 14:16:28.110940302 +0200 --- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2015-03-31 15:12:58.057964203 +0200
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2013-08-27 14:18:41.085429677 +0200 +++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2015-03-31 15:13:19.591056322 +0200
@@ -157,6 +157,7 @@ AuthenticationStatus BasicAuthentication @@ -159,6 +159,7 @@ AuthenticationStatus BasicAuthentication
_basicAuthenticator->authenticate( _basicAuthenticator->authenticate(
userName, userName,
password, password,
@ -455,8 +455,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.
// Log audit message. // Log audit message.
diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h
--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2013-08-27 14:18:53.678475974 +0200 --- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2015-03-31 15:13:32.889113211 +0200
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2013-08-27 14:19:37.740638125 +0200 +++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2015-03-31 15:13:51.240191720 +0200
@@ -65,6 +65,7 @@ public: @@ -65,6 +65,7 @@ public:
virtual AuthenticationStatus authenticate( virtual AuthenticationStatus authenticate(
const String& userName, const String& userName,
@ -466,8 +466,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig p
/** Construct and return the HTTP Basic authentication challenge header /** 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 diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2013-08-27 14:20:05.917741881 +0200 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2015-03-31 15:14:04.185247096 +0200
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2013-08-27 14:20:47.564895056 +0200 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2015-03-31 15:14:20.391316426 +0200
@@ -54,6 +54,7 @@ public: @@ -54,6 +54,7 @@ public:
AuthenticationStatus authenticate( AuthenticationStatus authenticate(
const String& userName, const String& userName,
@ -477,8 +477,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.ori
AuthenticationStatus validateUser( AuthenticationStatus validateUser(
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2013-08-27 14:20:55.805925482 +0200 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2015-03-31 15:14:32.937370098 +0200
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2013-08-27 14:21:25.421034454 +0200 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2015-03-31 15:14:52.631454350 +0200
@@ -74,6 +74,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti @@ -74,6 +74,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
AuthenticationStatus PAMBasicAuthenticator::authenticate( AuthenticationStatus PAMBasicAuthenticator::authenticate(
const String& userName, const String& userName,
@ -488,8 +488,8 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.c
{ {
PEG_METHOD_ENTER(TRC_AUTHENTICATION, PEG_METHOD_ENTER(TRC_AUTHENTICATION,
diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp
--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2013-08-27 14:21:41.870094885 +0200 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2015-03-31 15:15:08.521522327 +0200
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2013-08-27 14:22:36.012294104 +0200 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2015-03-31 15:15:49.255696589 +0200
@@ -66,6 +66,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti @@ -66,6 +66,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
AuthenticationStatus PAMBasicAuthenticator::authenticate( AuthenticationStatus PAMBasicAuthenticator::authenticate(
const String& userName, const String& userName,
@ -509,9 +509,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.c
// return code of -1 will be translated to AUTHSC_UNAUTHORIZED // return code of -1 will be translated to AUTHSC_UNAUTHORIZED
AuthenticationStatus authStatus = _getAuthStatusFromPAM_RC(pam_rc); AuthenticationStatus authStatus = _getAuthStatusFromPAM_RC(pam_rc);
diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp
--- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2013-08-27 14:22:56.429369205 +0200 --- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2015-03-31 15:16:03.097755805 +0200
+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2013-08-27 14:23:20.267456931 +0200 +++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2015-03-31 15:16:24.758848473 +0200
@@ -237,7 +237,7 @@ AuthenticationStatus SecureBasicAuthenti @@ -239,7 +239,7 @@ AuthenticationStatus SecureBasicAuthenti
if (Executor::detectExecutor() == 0) if (Executor::detectExecutor() == 0)
{ {
if (Executor::authenticatePassword( if (Executor::authenticatePassword(
@ -521,9 +521,9 @@ diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cp
authenticated = true; authenticated = true;
} }
diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2013-08-27 14:23:47.293556300 +0200 --- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2015-03-31 15:16:39.848913028 +0200
+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2013-08-27 14:24:18.748672110 +0200 +++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2015-03-31 15:17:21.079089410 +0200
@@ -430,6 +430,9 @@ void HTTPAuthenticatorDelegator::handleH @@ -431,6 +431,9 @@ void HTTPAuthenticatorDelegator::handleH
Tracer::LEVEL3, Tracer::LEVEL3,
"HTTPAuthenticatorDelegator - Authentication processing start"); "HTTPAuthenticatorDelegator - Authentication processing start");

6
pegasus-2.9.0-redhat-config.patch
View File

@ -1,6 +1,6 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2013-07-18 15:45:12.000000000 +0200 --- pegasus/env_var_Linux.status.orig 2015-03-31 14:43:37.774479768 +0200
+++ pegasus/env_var_Linux.status 2013-08-27 15:35:09.838665443 +0200 +++ pegasus/env_var_Linux.status 2015-03-31 14:45:21.003914888 +0200
@@ -25,18 +25,21 @@ PEGASUS_HAS_SSL=yes @@ -25,18 +25,21 @@ PEGASUS_HAS_SSL=yes
PEGASUS_USE_SSL_RANDOMFILE=false PEGASUS_USE_SSL_RANDOMFILE=false
PEGASUS_NOASSERTS=yes PEGASUS_NOASSERTS=yes
@ -9,7 +9,7 @@ diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true PEGASUS_USE_SYSLOGS=true
PEGASUS_CIM_SCHEMA=CIM236 PEGASUS_CIM_SCHEMA=CIM241
PEGASUS_USE_NET_SNMP=true PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true -PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false +PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false

2
sources
View File

@ -1,2 +1,2 @@
b8ece4ab1e2d9223a6f96b6e03aef81b pegasus-2.13.0.tar.gz 6e02fe14dd36b2b761d69e19a6fab219 pegasus-2.14.1.tar.gz
e5cad2e960f80dda4390bf422dd7f164 cim_schema_2.38.0Experimental-MOFs.zip e5cad2e960f80dda4390bf422dd7f164 cim_schema_2.38.0Experimental-MOFs.zip

27
tog-pegasus.spec
View File

@ -2,12 +2,12 @@
# do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM. # do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM.
%global srcname pegasus %global srcname pegasus
%global major_ver 2.13 %global major_ver 2.14
%global pegasus_gid 65 %global pegasus_gid 65
%global pegasus_uid 66 %global pegasus_uid 66
Name: tog-pegasus Name: tog-pegasus
Version: %{major_ver}.0 Version: %{major_ver}.1
Release: 23%{?dist} Release: 23%{?dist}
Epoch: 2 Epoch: 2
Summary: OpenPegasus WBEM Services for Linux Summary: OpenPegasus WBEM Services for Linux
@ -74,22 +74,12 @@ Patch24: pegasus-2.12.0-empty_arrays.patch
Patch25: pegasus-2.12.0-cimmofl-allow-experimental.patch Patch25: pegasus-2.12.0-cimmofl-allow-experimental.patch
# 26: use external schema and add missing includes there # 26: use external schema and add missing includes there
Patch26: pegasus-2.12.0-schema-version-and-includes.patch Patch26: pegasus-2.12.0-schema-version-and-includes.patch
# 27: fixes unused wariable warning which causes fail of the build
Patch27: pegasus-2.13.0-build-fix.patch
# 28: PG_ComputerSystem having CreationClassName="CIM_ComputerSystem"
# http://bugzilla.openpegasus.org/show_bug.cgi?id=9795
Patch28: pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch
# 29: bz#1049314, allow unprivileged users to subscribe to indications by default # 29: bz#1049314, allow unprivileged users to subscribe to indications by default
Patch29: pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch Patch29: pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch
# 30: Create x509v3 self-signed certificates with CA:FALSE
Patch30: pegasus-2.13.0-SSLGeneration.patch
# 31: bz#1111571, backported from upstream
Patch31: pegasus-2.13.0-CMGetKey-data-type-fix.patch
# 32: bz#1038013, fixes wrong EmbeddedInstances from CIMOM callback,
# backported from upstream
Patch32: pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch
# 33: fixes build with gcc5 # 33: fixes build with gcc5
Patch33: pegasus-2.13.0-gcc5-build.patch Patch33: pegasus-2.13.0-gcc5-build.patch
# 34: fixes various build problemss
Patch34: pegasus-2.14.1-build-fixes.patch
BuildRequires: procps, libstdc++, pam-devel BuildRequires: procps, libstdc++, pam-devel
BuildRequires: openssl, openssl-devel BuildRequires: openssl, openssl-devel
@ -231,13 +221,9 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
%patch24 -p1 -b .empty_arrays %patch24 -p1 -b .empty_arrays
%patch25 -p1 -b .cimmofl-allow-experimental %patch25 -p1 -b .cimmofl-allow-experimental
%patch26 -p1 -b .schema-version-and-includes %patch26 -p1 -b .schema-version-and-includes
%patch27 -p1 -b .build-fix
%patch28 -p0 -b .PG_ComputerSystem.CreationClassName
%patch29 -p1 -b .enable-subscriptions-for-nonprivileged-users %patch29 -p1 -b .enable-subscriptions-for-nonprivileged-users
%patch30 -p1 -b .genssl
%patch31 -p0 -b .CMGetKey-data-type-fix
%patch32 -p1 -b .wrong-embedded-instances-from-cimom-callback
%patch33 -p1 -b .gcc5-build %patch33 -p1 -b .gcc5-build
%patch34 -p1 -b .build-fixes
%build %build
@ -511,6 +497,9 @@ fi
%changelog %changelog
* Wed Apr 08 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-1
- Update to upstream version 2.14.1
* Tue Feb 10 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-23 * Tue Feb 10 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-23
- Fix tog-pegasus.service is marked world-inaccessible - Fix tog-pegasus.service is marked world-inaccessible
Resolves: #1191026 Resolves: #1191026