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

Update to upstream version 2.13.0

Browse Source
This commit is contained in:
Vitezslav Crhonek 2013-09-03 12:30:53 +02:00
parent 1d997923ea
commit 1bcc4182fc
17 changed files with 416 additions and 765 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,12 @@
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 2011-02-28 16:28:23.223507762 +0100 --- pegasus/mak/config-linux.mak.orig 2013-08-27 15:22:41.313769266 +0200
+++ pegasus/mak/config-linux.mak 2011-02-28 16:29:37.946019681 +0100 +++ pegasus/mak/config-linux.mak 2013-08-27 15:23:45.137019051 +0200
@@ -106,7 +106,7 @@ DYNAMIC_FLAGS += -fPIC @@ -125,7 +125,7 @@ else
ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
FLAGS += -g
else
- FLAGS += -s
+ FLAGS += -g
#
# The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
# appeared in the 3.0 series of compilers. # appeared in the 3.0 series of compilers.
#
ifeq ($(COMPILER), gnu)
- FLAGS += -s
+ FLAGS += -g
ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1)
EXTRA_CXX_FLAGS += -fno-enforce-eh-specs
endif

26
pegasus-2.10.0-sparc-posix-lock.patch
View File

@ -1,15 +1,6 @@
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.orig 2011-03-30 15:59:54.000000000 -0500 diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.orig pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2011-03-30 16:00:52.000000000 -0500 --- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.orig 2013-08-27 15:26:50.593740210 +0200
@@ -90,4 +90,7 @@ +++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2013-08-27 15:27:12.543825109 +0200
# define PEGASUS_HAS_GETIFADDRS
#endif
+/* use POSIX read-write locks on this platform */
+#define PEGASUS_USE_POSIX_RWLOCK
+
#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.orig 2011-03-30 15:59:30.000000000 -0500
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2011-03-30 16:01:05.000000000 -0500
@@ -90,4 +90,7 @@ @@ -90,4 +90,7 @@
# define PEGASUS_HAS_GETIFADDRS # define PEGASUS_HAS_GETIFADDRS
#endif #endif
@ -18,3 +9,14 @@
+#define PEGASUS_USE_POSIX_RWLOCK +#define PEGASUS_USE_POSIX_RWLOCK
+ +
#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */ #endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */
diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.orig pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.orig 2013-08-27 15:25:59.601542527 +0200
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2013-08-27 15:26:33.232672955 +0200
@@ -90,4 +90,7 @@
# define PEGASUS_HAS_GETIFADDRS
#endif
+/* use POSIX read-write locks on this platform */
+#define PEGASUS_USE_POSIX_RWLOCK
+
#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */

12
pegasus-2.11.1-disable-privilege-separation.patch
View File

@ -1,12 +0,0 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2012-10-08 12:45:34.246048518 +0200
+++ pegasus/env_var_Linux.status 2012-10-08 12:45:49.428129781 +0200
@@ -31,7 +31,7 @@ PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
PEGASUS_CIM_SCHEMA=CIM231
PEGASUS_USE_NET_SNMP=true
-PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
+PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
PEGASUS_ENABLE_INTEROP_PROVIDER=false
PEGASUS_ENABLE_PROTOCOL_WSMAN=false

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

@ -1,6 +1,6 @@
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 2009-02-16 20:13:41.000000000 +0100
+++ pegasus/Schemas/Pegasus/Internal/Makefile 2013-01-16 12:35:53.807287853 +0100 +++ pegasus/Schemas/Pegasus/Internal/Makefile 2013-09-02 16:57:30.952364556 +0200
@@ -48,12 +48,12 @@ all: @@ -48,12 +48,12 @@ all:
repository: repository:
@ -19,7 +19,7 @@ diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/
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 2009-09-07 15:43:46.000000000 +0200
+++ pegasus/Schemas/Pegasus/InterOp/Makefile 2013-01-16 12:35:53.808287858 +0100 +++ pegasus/Schemas/Pegasus/InterOp/Makefile 2013-09-02 16:57:30.953364560 +0200
@@ -44,30 +44,30 @@ all: @@ -44,30 +44,30 @@ all:
repository: repository:
@ -61,7 +61,7 @@ diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/I
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 2010-07-09 13:24:49.000000000 +0200
+++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2013-01-16 12:35:53.808287858 +0100 +++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2013-09-02 16:57:30.953364560 +0200
@@ -66,33 +66,33 @@ endif @@ -66,33 +66,33 @@ endif
ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true) ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true)
repository: repository:
@ -108,7 +108,7 @@ 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 2009-02-16 20:13:43.000000000 +0100
+++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2013-01-16 12:35:53.809287864 +0100 +++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2013-09-02 16:57:30.953364560 +0200
@@ -46,12 +46,12 @@ CIMMOFL = cimmofl @@ -46,12 +46,12 @@ CIMMOFL = cimmofl
repository: repository:
@ -127,7 +127,7 @@ diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Client
@ $(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 2009-02-16 20:14:13.000000000 +0100
+++ pegasus/src/Providers/sample/Load/Makefile 2013-01-16 12:35:53.809287864 +0100 +++ pegasus/src/Providers/sample/Load/Makefile 2013-09-02 16:57:30.953364560 +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:
@ -204,7 +204,7 @@ 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 2012-08-02 14:18:17.000000000 +0200
+++ pegasus/src/Providers/TestProviders/Load/Makefile 2013-01-16 12:35:53.810287870 +0100 +++ pegasus/src/Providers/TestProviders/Load/Makefile 2013-09-02 16:57:30.954364563 +0200
@@ -67,155 +67,155 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded @@ -67,155 +67,155 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded
## ##
repository: repository:
@ -468,7 +468,7 @@ 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 2009-02-16 20:14:20.000000000 +0100
+++ pegasus/test/wetest/static/Load/Makefile 2013-01-16 12:35:53.811287876 +0100 +++ pegasus/test/wetest/static/Load/Makefile 2013-09-02 16:57:30.954364563 +0200
@@ -42,14 +42,14 @@ STATICTESTNS=test/static @@ -42,14 +42,14 @@ STATICTESTNS=test/static
repository: repository:
@ -488,3 +488,18 @@ 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
--- pegasus/test/wetest/wsman/Load/Makefile.orig 2013-09-02 16:57:40.263396410 +0200
+++ pegasus/test/wetest/wsman/Load/Makefile 2013-09-02 17:00:13.685926532 +0200
@@ -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.

12
pegasus-2.12.0-enable_interop_provider.patch
View File

@ -1,12 +0,0 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2012-11-20 11:11:58.000000000 +0100
+++ pegasus/env_var_Linux.status 2012-11-20 11:12:16.650291672 +0100
@@ -34,7 +34,7 @@ PEGASUS_CIM_SCHEMA=CIM231
PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
-PEGASUS_ENABLE_INTEROP_PROVIDER=false
+PEGASUS_ENABLE_INTEROP_PROVIDER=true
PEGASUS_ENABLE_PROTOCOL_WSMAN=false
PEGASUS_ENABLE_SLP=true

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

@ -1,30 +1,26 @@
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-01-16 13:03:12.592203615 +0100 --- pegasus/env_var_Linux.status.orig 2013-09-02 16:41:54.550820261 +0200
+++ pegasus/env_var_Linux.status 2013-01-16 13:03:12.614203736 +0100 +++ pegasus/env_var_Linux.status 2013-09-02 16:41:54.579820363 +0200
@@ -30,7 +30,7 @@ PEGASUS_PAM_AUTHENTICATION=true @@ -28,7 +28,7 @@ PEGASUS_PAM_AUTHENTICATION=true
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=CIM231 -PEGASUS_CIM_SCHEMA=CIM236
+PEGASUS_CIM_SCHEMA=CIM233 +PEGASUS_CIM_SCHEMA=CIM237
PEGASUS_USE_NET_SNMP=true PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
diff -up pegasus/Schemas/CIM233/CIM_Core.mof.orig pegasus/Schemas/CIM233/CIM_Core.mof diff -up pegasus/Schemas/CIM237/CIM_Core.mof.orig pegasus/Schemas/CIM237/CIM_Core.mof
--- pegasus/Schemas/CIM233/CIM_Core.mof.orig 2013-01-16 13:03:12.000000000 +0100 --- pegasus/Schemas/CIM237/CIM_Core.mof.orig 2013-09-02 16:41:54.533820202 +0200
+++ pegasus/Schemas/CIM233/CIM_Core.mof 2013-01-15 09:44:51.000000000 +0100 +++ pegasus/Schemas/CIM237/CIM_Core.mof 2013-09-02 16:41:54.579820363 +0200
@@ -40,7 +40,9 @@ @@ -144,11 +144,14 @@
#pragma include ("DMTF/Core/CIM_SpareGroup.mof")
#pragma include ("DMTF/qualifiers.mof") #pragma include ("DMTF/Core/CIM_StatusCollection.mof")
#pragma include ("DMTF/qualifiers_optional.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/Interop/CIM_Message.mof") #pragma include ("DMTF/Core/CIM_StorageHardwareIDElementSettingData.mof")
+#pragma include ("DMTF/Interop/CIM_Error.mof") #pragma include ("DMTF/Core/CIM_StorageRedundancyGroup.mof")
#pragma include ("DMTF/Core/CIM_ManagedElement.mof")
#pragma include ("DMTF/Core/CIM_ManagedSystemElement.mof")
#pragma include ("DMTF/Core/CIM_MethodParameters.mof")
@@ -146,6 +148,7 @@
#pragma include ("DMTF/Core/CIM_SystemSetting.mof") #pragma include ("DMTF/Core/CIM_SystemSetting.mof")
#pragma include ("DMTF/Core/CIM_SystemSettingContext.mof") #pragma include ("DMTF/Core/CIM_SystemSettingContext.mof")
#pragma include ("DMTF/Core/CIM_SystemSpecificCollection.mof") #pragma include ("DMTF/Core/CIM_SystemSpecificCollection.mof")
@ -32,26 +28,49 @@ diff -up pegasus/Schemas/CIM233/CIM_Core.mof.orig pegasus/Schemas/CIM233/CIM_Cor
#pragma include ("DMTF/Core/CIM_VirtualEthernetSwitchSettingData.mof") #pragma include ("DMTF/Core/CIM_VirtualEthernetSwitchSettingData.mof")
#pragma include ("DMTF/Core/CIM_VirtualSystemManagementCapabilities.mof") #pragma include ("DMTF/Core/CIM_VirtualSystemManagementCapabilities.mof")
#pragma include ("DMTF/Core/CIM_VirtualSystemSnapshotCapabilities.mof") #pragma include ("DMTF/Core/CIM_VirtualSystemSnapshotCapabilities.mof")
@@ -205,6 +208,8 @@ @@ -183,6 +186,8 @@
#pragma include ("DMTF/Core/CIM_TimeService.mof") #pragma include ("DMTF/Core/CIM_ScopedSetting.mof")
#pragma include ("DMTF/Core/CIM_ViewOnSystem.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")
@@ -211,6 +216,7 @@
#pragma include ("DMTF/Core/CIM_AdminDomain.mof") #pragma include ("DMTF/Core/CIM_AdminDomain.mof")
+#pragma include ("DMTF/Device/CIM_PowerAllocationSettingData.mof")
+#pragma include ("DMTF/Device/CIM_PowerManagementService.mof")
#pragma include ("DMTF/Core/CIM_AssociatedPowerManagementService.mof")
#pragma include ("DMTF/Core/CIM_BasedOn.mof") #pragma include ("DMTF/Core/CIM_BasedOn.mof")
#pragma include ("DMTF/Core/CIM_BasicExecutionService.mof") #pragma include ("DMTF/Core/CIM_BasicExecutionService.mof")
@@ -213,6 +218,7 @@
#pragma include ("DMTF/Core/CIM_DeviceSAPImplementation.mof")
#pragma include ("DMTF/Core/CIM_DeviceServiceImplementation.mof")
#pragma include ("DMTF/Core/CIM_DeviceStatistics.mof")
+#pragma include ("DMTF/System/CIM_ComputerSystem.mof") +#pragma include ("DMTF/System/CIM_ComputerSystem.mof")
#pragma include ("DMTF/Core/CIM_DomainMemberCS.mof") #pragma include ("DMTF/Core/CIM_ComputerSystemElementSettingData.mof")
#pragma include ("DMTF/Core/CIM_ExtentRedundancyComponent.mof") #pragma include ("DMTF/Core/CIM_ConfigurationForSystem.mof")
#pragma include ("DMTF/Core/CIM_HostedAccessPoint.mof") #pragma include ("DMTF/Core/CIM_ContainedDomain.mof")
diff -up pegasus/Schemas/CIM233/CIM_Event.mof.orig pegasus/Schemas/CIM233/CIM_Event.mof @@ -242,6 +248,8 @@
--- pegasus/Schemas/CIM233/CIM_Event.mof.orig 2013-01-16 13:03:12.000000000 +0100 #pragma include ("DMTF/Core/CIM_SettingForSystem.mof")
+++ pegasus/Schemas/CIM233/CIM_Event.mof 2013-01-15 10:29:26.000000000 +0100 #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")
@@ -255,6 +263,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/CIM237/CIM_Event.mof.orig pegasus/Schemas/CIM237/CIM_Event.mof
--- pegasus/Schemas/CIM237/CIM_Event.mof.orig 2013-09-02 16:41:54.535820209 +0200
+++ pegasus/Schemas/CIM237/CIM_Event.mof 2013-09-02 16:41:54.579820363 +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")
@ -59,10 +78,29 @@ diff -up pegasus/Schemas/CIM233/CIM_Event.mof.orig pegasus/Schemas/CIM233/CIM_Ev
+#pragma include ("DMTF/System/CIM_Log.mof") +#pragma include ("DMTF/System/CIM_Log.mof")
#pragma include ("DMTF/Event/CIM_LogOfIndication.mof") #pragma include ("DMTF/Event/CIM_LogOfIndication.mof")
diff -up pegasus/Schemas/CIM233/CIM_System.mof.orig pegasus/Schemas/CIM233/CIM_System.mof diff -up pegasus/Schemas/CIM237/CIM_Interop.mof.orig pegasus/Schemas/CIM237/CIM_Interop.mof
--- pegasus/Schemas/CIM233/CIM_System.mof.orig 2013-01-16 13:03:12.000000000 +0100 --- pegasus/Schemas/CIM237/CIM_Interop.mof.orig 2013-09-02 16:41:54.537820216 +0200
+++ pegasus/Schemas/CIM233/CIM_System.mof 2013-01-15 13:42:11.000000000 +0100 +++ pegasus/Schemas/CIM237/CIM_Interop.mof 2013-09-02 16:41:54.579820363 +0200
@@ -79,6 +79,7 @@ @@ -56,6 +56,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/CIM237/CIM_System.mof.orig pegasus/Schemas/CIM237/CIM_System.mof
--- pegasus/Schemas/CIM237/CIM_System.mof.orig 2013-09-02 16:41:54.542820234 +0200
+++ pegasus/Schemas/CIM237/CIM_System.mof 2013-09-02 16:48:02.744613226 +0200
@@ -65,6 +65,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")
@@ -84,6 +85,7 @@
#pragma include ("DMTF/System/CIM_FileImportCapabilities.mof") #pragma include ("DMTF/System/CIM_FileImportCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemConfigurationCapabilities.mof") #pragma include ("DMTF/System/CIM_FileSystemConfigurationCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemSettingData.mof") #pragma include ("DMTF/System/CIM_FileSystemSettingData.mof")
@ -70,15 +108,7 @@ diff -up pegasus/Schemas/CIM233/CIM_System.mof.orig pegasus/Schemas/CIM233/CIM_S
#pragma include ("DMTF/System/CIM_ImportedFileShareSetting.mof") #pragma include ("DMTF/System/CIM_ImportedFileShareSetting.mof")
#pragma include ("DMTF/System/CIM_ImportedShareRoot.mof") #pragma include ("DMTF/System/CIM_ImportedShareRoot.mof")
#pragma include ("DMTF/System/CIM_LogEntry.mof") #pragma include ("DMTF/System/CIM_LogEntry.mof")
@@ -121,6 +122,7 @@ @@ -142,6 +144,7 @@
#pragma include ("DMTF/System/CIM_BatchJob.mof")
#pragma include ("DMTF/System/CIM_BatchSAP.mof")
#pragma include ("DMTF/System/CIM_BatchService.mof")
+#pragma include ("DMTF/User/CIM_Credential.mof")
#pragma include ("DMTF/System/CIM_BIOSService.mof")
#pragma include ("DMTF/System/CIM_BootConfigSetting.mof")
#pragma include ("DMTF/System/CIM_BootSAP.mof")
@@ -141,6 +143,7 @@
#pragma include ("DMTF/System/CIM_ExportedFileShareCapabilities.mof") #pragma include ("DMTF/System/CIM_ExportedFileShareCapabilities.mof")
#pragma include ("DMTF/System/CIM_FCHBADiagnosticTest.mof") #pragma include ("DMTF/System/CIM_FCHBADiagnosticTest.mof")
#pragma include ("DMTF/System/CIM_FileSystem.mof") #pragma include ("DMTF/System/CIM_FileSystem.mof")
@ -86,3 +116,17 @@ diff -up pegasus/Schemas/CIM233/CIM_System.mof.orig pegasus/Schemas/CIM233/CIM_S
#pragma include ("DMTF/System/CIM_FileSystemCapabilities.mof") #pragma include ("DMTF/System/CIM_FileSystemCapabilities.mof")
#pragma include ("DMTF/System/CIM_FileSystemConfigurationService.mof") #pragma include ("DMTF/System/CIM_FileSystemConfigurationService.mof")
#pragma include ("DMTF/System/CIM_HelpService.mof") #pragma include ("DMTF/System/CIM_HelpService.mof")
diff -up pegasus/Schemas/CIM237/DMTF/qualifiers.mof.orig pegasus/Schemas/CIM237/DMTF/qualifiers.mof
--- pegasus/Schemas/CIM237/DMTF/qualifiers.mof.orig 2013-05-09 16:56:30.000000000 +0200
+++ pegasus/Schemas/CIM237/DMTF/qualifiers.mof 2013-09-02 16:41:54.580820366 +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),

276
pegasus-2.12.1-aarch64.patch
View File

@ -1,276 +0,0 @@
diff -up pegasus/mak/platform_LINUX_AARCH64_GNU.mak.aarch64 pegasus/mak/platform_LINUX_AARCH64_GNU.mak
--- pegasus/mak/platform_LINUX_AARCH64_GNU.mak.aarch64 2013-06-26 18:25:52.000000000 -0400
+++ pegasus/mak/platform_LINUX_AARCH64_GNU.mak 2013-06-26 18:25:52.000000000 -0400
@@ -0,0 +1,72 @@
+#//%LICENSE////////////////////////////////////////////////////////////////
+#//
+#// Licensed to The Open Group (TOG) under one or more contributor license
+#// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
+#// this work for additional information regarding copyright ownership.
+#// Each contributor licenses this file to you under the OpenPegasus Open
+#// Source License; you may not use this file except in compliance with the
+#// License.
+#//
+#// Permission is hereby granted, free of charge, to any person obtaining a
+#// copy of this software and associated documentation files (the "Software"),
+#// to deal in the Software without restriction, including without limitation
+#// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#// and/or sell copies of the Software, and to permit persons to whom the
+#// Software is furnished to do so, subject to the following conditions:
+#//
+#// The above copyright notice and this permission notice shall be included
+#// in all copies or substantial portions of the Software.
+#//
+#// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+#// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+#// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+#// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+#// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#//
+#//////////////////////////////////////////////////////////////////////////
+# Platform Configuration for Linux on AARCH64
+# If you have generic Linux config options, please place them in config-linux.mak
+
+include $(ROOT)/mak/config-linux.mak
+
+ARCHITECTURE = AARCH64
+CXX_MACHINE_OPTIONS =
+LINK_MACHINE_OPTIONS =
+#//%LICENSE////////////////////////////////////////////////////////////////
+#//
+#// Licensed to The Open Group (TOG) under one or more contributor license
+#// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
+#// this work for additional information regarding copyright ownership.
+#// Each contributor licenses this file to you under the OpenPegasus Open
+#// Source License; you may not use this file except in compliance with the
+#// License.
+#//
+#// Permission is hereby granted, free of charge, to any person obtaining a
+#// copy of this software and associated documentation files (the "Software"),
+#// to deal in the Software without restriction, including without limitation
+#// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#// and/or sell copies of the Software, and to permit persons to whom the
+#// Software is furnished to do so, subject to the following conditions:
+#//
+#// The above copyright notice and this permission notice shall be included
+#// in all copies or substantial portions of the Software.
+#//
+#// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+#// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+#// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+#// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+#// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#//
+#//////////////////////////////////////////////////////////////////////////
+# Platform Configuration for Linux on AARCH64
+# If you have generic Linux config options, please place them in config-linux.mak
+
+include $(ROOT)/mak/config-linux.mak
+
+ARCHITECTURE = AARCH64
+CXX_MACHINE_OPTIONS =
+LINK_MACHINE_OPTIONS =
diff -up pegasus/mak/SDKMakefile.aarch64 pegasus/mak/SDKMakefile
--- pegasus/mak/SDKMakefile.aarch64 2013-06-26 18:25:51.000000000 -0400
+++ pegasus/mak/SDKMakefile 2013-06-26 18:25:52.000000000 -0400
@@ -67,6 +67,7 @@ endif
ifeq ($(OS),linux)
PACKAGED_PLATFORM_FILES = \
+ LINUX_AARCH64_GNU \
LINUX_IA64_GNU \
LINUX_IX86_GNU \
LINUX_IX86_CLANG \
@@ -436,6 +437,13 @@ createSDKEnvVarFile:
createConfigFile_setPegasusPlatform:
ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), true)
ifeq ($(OS),linux)
+ @$(ECHO-E) " ifeq (\044(shell uname -i),aarch64)" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_PLATFORM = LINUX_AARCH64_GNU" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " endif" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+
@$(ECHO-E) " ifeq (\044(shell uname -i),ia64)" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO-E) " PEGASUS_PLATFORM = LINUX_IA64_GNU" \
@@ -527,6 +535,13 @@ endif
createConfigFile_setPlatformArchitecture:
ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), true)
ifeq ($(OS),linux)
+ @$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_AARCH64_GNU)" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_ARCH_LIB = lib64" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) "endif" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+
@$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_IA64_GNU)" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO-E) " PEGASUS_ARCH_LIB = lib" \
diff -up pegasus/src/Pegasus/Common/Config.h.aarch64 pegasus/src/Pegasus/Common/Config.h
--- pegasus/src/Pegasus/Common/Config.h.aarch64 2013-06-26 18:25:51.000000000 -0400
+++ pegasus/src/Pegasus/Common/Config.h 2013-06-26 18:25:52.000000000 -0400
@@ -100,6 +100,8 @@
# include <Pegasus/Common/Platform_VMS_IA64_DECCXX.h>
#elif defined (PEGASUS_PLATFORM_LINUX_XSCALE_GNU)
# include <Pegasus/Common/Platform_LINUX_XSCALE_GNU.h>
+#elif defined (PEGASUS_PLATFORM_LINUX_AARCH64_GNU)
+# include <Pegasus/Common/Platform_LINUX_AARCH64_GNU.h>
#elif defined (PEGASUS_PLATFORM_LINUX_X86_64_CLANG)
# include <Pegasus/Common/Platform_LINUX_X86_64_CLANG.h>
#elif defined (PEGASUS_PLATFORM_LINUX_IX86_CLANG)
diff -up pegasus/src/Pegasus/Common/Platform_LINUX_AARCH64_GNU.h.aarch64 pegasus/src/Pegasus/Common/Platform_LINUX_AARCH64_GNU.h
--- pegasus/src/Pegasus/Common/Platform_LINUX_AARCH64_GNU.h.aarch64 2013-06-26 18:25:52.000000000 -0400
+++ pegasus/src/Pegasus/Common/Platform_LINUX_AARCH64_GNU.h 2013-06-26 18:25:52.000000000 -0400
@@ -0,0 +1,108 @@
+//%LICENSE////////////////////////////////////////////////////////////////
+//
+// Licensed to The Open Group (TOG) under one or more contributor license
+// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
+// this work for additional information regarding copyright ownership.
+// Each contributor licenses this file to you under the OpenPegasus Open
+// Source License; you may not use this file except in compliance with the
+// License.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+//////////////////////////////////////////////////////////////////////////
+//
+//%/////////////////////////////////////////////////////////////////////////////
+
+/*****************************************************************************
+ The platform configuration files in pegasus/src/Pegasus/Common/Platform_*.h
+ are intended to normalize platform/compiler differences so that Pegasus code
+ can be written to work on all platforms without requiring platform ifdefs.
+ Since these files are part of the Pegasus SDK, their contents should be
+ the minimum that achieves the stated purpose.
+
+ Examples of differences that are normalized here are support for C++
+ namespaces, 64-bit integer type, support for C++ template specialization.
+
+ Examples of things that are not appropriate in these files are the enablement
+ of Pegasus features for a specific platform and other build configuration.
+******************************************************************************/
+
+#ifndef Pegasus_Platform_LINUX_AARCH64_GNU_h
+#define Pegasus_Platform_LINUX_AARCH64_GNU_h
+
+#include <stddef.h>
+
+#define PEGASUS_OS_TYPE_UNIX
+
+#ifndef PEGASUS_PLATFORM_LINUX_GENERIC_GNU
+#define PEGASUS_PLATFORM_LINUX_GENERIC_GNU
+#endif
+
+#define PEGASUS_OS_LINUX
+
+#define PEGASUS_POINTER_64BIT
+
+#define PEGASUS_COMPILER_GNU
+
+#define PEGASUS_UINT64 unsigned long long
+
+#define PEGASUS_SINT64 long long
+
+#define PEGASUS_HAVE_NAMESPACES
+
+#define PEGASUS_HAVE_FOR_SCOPE
+
+#define PEGASUS_HAVE_TEMPLATE_SPECIALIZATION
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#ifndef _REENTRANT
+#define _REENTRANT
+#endif
+#define _THREAD_SAFE
+#include <features.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/param.h> /* For MAXHOSTNAMELEN */
+#include <limits.h> /* _POSIX_HOST_NAME_MAX */
+
+#if (__GNUC__ >= 4)
+# define PEGASUS_EXPORT __attribute__ ((visibility("default")))
+# define PEGASUS_IMPORT __attribute__ ((visibility("default")))
+# define PEGASUS_HIDDEN_LINKAGE __attribute__((visibility("hidden")))
+#endif
+
+#define PEGASUS_HAVE_PTHREADS
+
+#define PEGASUS_HAVE_NANOSLEEP
+
+#define PEGASUS_HAS_SIGNALS
+
+#define PEGASUS_INTEGERS_BOUNDARY_ALIGNED
+
+/* getifaddrs() avilable in gcc version >= 3.4 */
+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+# define PEGASUS_HAS_GETIFADDRS
+#endif
+
+/* use POSIX read-write locks on this platform */
+#define PEGASUS_USE_POSIX_RWLOCK
+
+#endif /* Pegasus_Platform_LINUX_AARCH64_GNU_h */
diff -up pegasus/src/SDK/samples/mak/platform_LINUX_AARCH64_GNU.mak.aarch64 pegasus/src/SDK/samples/mak/platform_LINUX_AARCH64_GNU.mak
--- pegasus/src/SDK/samples/mak/platform_LINUX_AARCH64_GNU.mak.aarch64 2013-06-26 18:25:52.000000000 -0400
+++ pegasus/src/SDK/samples/mak/platform_LINUX_AARCH64_GNU.mak 2013-06-26 18:25:52.000000000 -0400
@@ -0,0 +1,33 @@
+#//%LICENSE////////////////////////////////////////////////////////////////
+#//
+#// Licensed to The Open Group (TOG) under one or more contributor license
+#// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with
+#// this work for additional information regarding copyright ownership.
+#// Each contributor licenses this file to you under the OpenPegasus Open
+#// Source License; you may not use this file except in compliance with the
+#// License.
+#//
+#// Permission is hereby granted, free of charge, to any person obtaining a
+#// copy of this software and associated documentation files (the "Software"),
+#// to deal in the Software without restriction, including without limitation
+#// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#// and/or sell copies of the Software, and to permit persons to whom the
+#// Software is furnished to do so, subject to the following conditions:
+#//
+#// The above copyright notice and this permission notice shall be included
+#// in all copies or substantial portions of the Software.
+#//
+#// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+#// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+#// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+#// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+#// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#//
+#//////////////////////////////////////////////////////////////////////////
+
+CXX_MACHINE_OPTIONS =
+LINK_MACHINE_OPTIONS =
+
+include $(ROOT)/mak/platform_LINUX_GNU.mak

81
pegasus-2.12.1-atomic-operations-on-arm.patch
View File

@ -1,81 +0,0 @@
Index: src/Pegasus/Common/AtomicInt.h
===================================================================
RCS file: /cvs/MSB/pegasus/src/Pegasus/Common/AtomicInt.h,v
retrieving revision 1.23
diff -u -r1.23 AtomicInt.h
--- src/Pegasus/Common/AtomicInt.h 30 Jul 2012 09:23:47 -0000 1.23
+++ src/Pegasus/Common/AtomicInt.h 30 Apr 2013 14:04:53 -0000
@@ -95,6 +95,64 @@
PEGASUS_NAMESPACE_END
+// if GNU GCC version >= 4.7.0, use the built-in atomic operations
+#if defined(GCC_VERSION) && GCC_VERSION >= 40700
+# define PEGASUS_ATOMIC_INT_DEFINED
+
+PEGASUS_NAMESPACE_BEGIN
+
+struct AtomicType
+{
+ volatile int n;
+};
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline AtomicIntTemplate<AtomicType>::AtomicIntTemplate(Uint32 n)
+{
+ __atomic_store_n (&_rep.n, n, __ATOMIC_SEQ_CST);
+}
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline AtomicIntTemplate<AtomicType>::~AtomicIntTemplate()
+{
+}
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline Uint32 AtomicIntTemplate<AtomicType>::get() const
+{
+ return __atomic_load_n (&_rep.n, __ATOMIC_SEQ_CST);
+}
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline void AtomicIntTemplate<AtomicType>::set(Uint32 n)
+{
+ __atomic_store_n (&_rep.n, n, __ATOMIC_SEQ_CST);
+}
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline void AtomicIntTemplate<AtomicType>::inc()
+{
+ __atomic_fetch_add (&_rep.n, 1, __ATOMIC_SEQ_CST);
+}
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline void AtomicIntTemplate<AtomicType>::dec()
+{
+ __atomic_fetch_sub (&_rep.n, 1, __ATOMIC_SEQ_CST);
+}
+
+PEGASUS_TEMPLATE_SPECIALIZATION
+inline bool AtomicIntTemplate<AtomicType>::decAndTestIfZero()
+{
+ return (__atomic_fetch_sub (&_rep.n, 1, __ATOMIC_SEQ_CST) == 1);
+}
+
+typedef AtomicIntTemplate<AtomicType> AtomicInt;
+
+PEGASUS_NAMESPACE_END
+
+#else //!(GCC_VERSION && GCC_VERSION >= 40700), use platform specific atomics
+
//==============================================================================
//
// PEGASUS_PLATFORM_LINUX_IX86_GNU
@@ -1056,6 +1114,8 @@
#endif /* PEGASUS_PLATFORM_AIX_RS_IBMCXX, \
PEGASUS_PLATFORM_PASE_ISERIES_IBMCXX */
+#endif /* GCC_VERSION && GCC_VERSION >= 40700 */
+
//==============================================================================
//
// Generic Implementation

11
pegasus-2.12.1-interop.patch
View File

@ -1,11 +0,0 @@
diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.orig 2013-07-18 13:24:46.839705853 +0200
+++ pegasus/env_var_Linux.status 2013-07-18 13:25:18.638865967 +0200
@@ -33,6 +33,7 @@ PEGASUS_USE_SYSLOGS=true
PEGASUS_CIM_SCHEMA=CIM233
PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
+PEGASUS_INTEROP_NAMESPACE=root/interop
PEGASUS_ENABLE_INTEROP_PROVIDER=true
PEGASUS_ENABLE_PROTOCOL_WSMAN=false

23
pegasus-2.12.1-python-reinit-workaround.patch
View File

@ -1,23 +0,0 @@
diff -up pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/ProviderAgent.cpp.test pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/ProviderAgent.cpp
--- pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/ProviderAgent.cpp.test 2011-08-11 14:12:36.000000000 +0200
+++ pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/ProviderAgent.cpp 2013-05-28 09:50:56.639410167 +0200
@@ -923,6 +928,19 @@ void ProviderAgent::_unloadIdleProviders
PEG_TRACE_CSTRING(TRC_PROVIDERAGENT, Tracer::LEVEL1,
"Could not allocate thread to unload idle providers.");
}
+
+ // Wait for the cleanup thread to finish
+ Uint64 shutdownTimeout = 0;
+ StringConversion::stringToUnsignedInteger(
+ PEGASUS_DEFAULT_SHUTDOWN_TIMEOUT_SECONDS_STRING,
+ shutdownTimeout);
+
+ while ((_unloadIdleProvidersBusy.get() > 0) && (shutdownTimeout > 0)) {
+ Threads::yield();
+ Threads::sleep(1000);
+ shutdownTimeout--;
+ }
+
PEG_METHOD_EXIT();
}

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

@ -0,0 +1,19 @@
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())

16
pegasus-2.7.0-no_snmp_tests.patch
View File

@ -1,19 +1,19 @@
diff -up pegasus/Makefile.ReleaseTest_old pegasus/Makefile.ReleaseTest diff -up pegasus/Makefile.ReleaseTest.orig pegasus/Makefile.ReleaseTest
--- pegasus/Makefile.ReleaseTest_old 2008-01-15 14:18:29.000000000 +0100 --- pegasus/Makefile.ReleaseTest.orig 2013-08-27 13:21:13.433679327 +0200
+++ pegasus/Makefile.ReleaseTest 2008-01-15 14:23:30.000000000 +0100 +++ pegasus/Makefile.ReleaseTest 2013-08-27 13:27:20.055022758 +0200
@@ -130,6 +130,7 @@ POSTSTARTTEST_CMDS = \ @@ -128,6 +128,7 @@ POSTSTARTTEST_CMDS = \
$(PEGASUS_TEST_DIR)/bin/TestIndicationStressTest@@IndicationStressTestClass@@test/TestProvider@@cleanup $(PEGASUS_TEST_DIR)/bin/TestIndicationStressTest@@IndicationStressTestClass@@test/TestProvider@@cleanup
ifdef PEGASUS_USE_NET_SNMP ifeq ($(PEGASUS_USE_NET_SNMP),true)
+ POSTSTARTTEST_CMDS_NO_SNMP := $(POSTSTARTTEST_CMDS) + POSTSTARTTEST_CMDS_NO_SNMP := $(POSTSTARTTEST_CMDS)
POSTSTARTTEST_CMDS += \ POSTSTARTTEST_CMDS += \
$(PEGASUS_TEST_DIR)/bin/TestSnmpHandler@@setup@@WQL \ $(PEGASUS_TEST_DIR)/bin/TestSnmpHandler@@setup@@WQL \
$(PEGASUS_TEST_DIR)/bin/TestSnmpHandler@@run@@4@@2 \ $(PEGASUS_TEST_DIR)/bin/TestSnmpHandler@@run@@4@@2 \
@@ -206,10 +207,23 @@ createMakefile_poststarttests: @@ -212,10 +213,23 @@ createMakefile_poststarttests:
@$(ECHO-E) "poststarttests:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(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) "\t@$(MAKE) -s poststarttests_internal\n" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
@$(ECHO-E) "poststarttests_internal:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile @$(ECHO-E) "poststarttests_internal:" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ifdef PEGASUS_USE_NET_SNMP +ifeq ($(PEGASUS_USE_NET_SNMP),true)
+ @$(foreach i, $(POSTSTARTTEST_CMDS_NO_SNMP), $(ECHO-E) "\t$(subst @@, ,$(i))" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile;) + @$(foreach i, $(POSTSTARTTEST_CMDS_NO_SNMP), $(ECHO-E) "\t$(subst @@, ,$(i))" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile;)
+else +else
@$(foreach i, $(POSTSTARTTEST_CMDS), $(ECHO-E) "\t$(subst @@, ,$(i))" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile;) @$(foreach i, $(POSTSTARTTEST_CMDS), $(ECHO-E) "\t$(subst @@, ,$(i))" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile;)
@ -21,7 +21,7 @@ diff -up pegasus/Makefile.ReleaseTest_old pegasus/Makefile.ReleaseTest
+endif +endif
createMakefile_tests: createMakefile_tests:
+ifdef PEGASUS_USE_NET_SNMP +ifeq ($(PEGASUS_USE_NET_SNMP),true)
+ @$(ECHO-E) "# To test OpenPegasus with net-snmp support, please setup net-snmp" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile + @$(ECHO-E) "# To test OpenPegasus with net-snmp support, please setup net-snmp" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ @$(ECHO-E) "# and uncomment following four lines." >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile + @$(ECHO-E) "# and uncomment following four lines." >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile
+ @$(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 setup WQL" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_TEST_DIR)/Makefile

362
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 2012-10-16 14:53:31.124376018 +0200 --- pegasus/src/Executor/Messages.h.orig 2013-08-27 13:31:54.792029310 +0200
+++ pegasus/src/Executor/Messages.h 2012-10-16 14:53:50.642434211 +0200 +++ pegasus/src/Executor/Messages.h 2013-08-27 13:32:20.294122741 +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 2009-12-15 11:52:33.000000000 +0100 --- pegasus/src/Executor/PAMAuth.h.orig 2013-08-27 13:32:39.064191519 +0200
+++ pegasus/src/Executor/PAMAuth.h 2012-10-16 14:54:10.162493458 +0200 +++ pegasus/src/Executor/PAMAuth.h 2013-08-27 13:47:11.267390738 +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>
@ -22,7 +22,7 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
#ifdef PEGASUS_FLAVOR #ifdef PEGASUS_FLAVOR
# define PAM_CONFIG_FILE "wbem" PEGASUS_FLAVOR # define PAM_CONFIG_FILE "wbem" PEGASUS_FLAVOR
#else #else
@@ -398,29 +401,60 @@ static int PAMValidateUserCallback( @@ -397,7 +400,7 @@ static int PAMValidateUserCallback(
*/ */
static int PAMAuthenticateInProcess( static int PAMAuthenticateInProcess(
@ -31,100 +31,110 @@ diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h
{ {
PAMData data; PAMData data;
struct pam_conv pconv; struct pam_conv pconv;
pam_handle_t* handle; @@ -412,24 +415,54 @@ static int PAMAuthenticateInProcess(
+ int retcode; /* intentionally for testing purposes */
/* return PAM_SERVICE_ERR; */
data.password = password;
pconv.conv = PAMAuthenticateCallback;
pconv.appdata_ptr = &data;
- 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 ((retcode = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle)) != PAM_SUCCESS) - if (pam_rc != 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, retcode)); + 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;
+ } }
- if (pam_start(PAM_CONFIG_FILE, username, &pconv, &handle) != PAM_SUCCESS) - pam_rc = pam_authenticate(handle, 0);
+ if ((retcode = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS) - if (pam_rc != PAM_SUCCESS)
+ if ((pam_rc = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS)
{
pam_end(handle, 0);
- return pam_rc;
+ 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_acct_mgmt(handle, 0);
+ if ((pam_rc = pam_authenticate(handle, 0)) != PAM_SUCCESS)
+ { + {
+ pam_end(handle, 0); + 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, retcode)); + 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;
+ } + }
+
- if (pam_authenticate(handle, 0) != PAM_SUCCESS) + if ((pam_rc = pam_acct_mgmt(handle, 0)) != PAM_SUCCESS)
+ if ((retcode = pam_authenticate(handle, 0)) != PAM_SUCCESS) + {
{ + pam_end(handle, 0);
pam_end(handle, 0);
+ closelog(); + closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON); + openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(handle, retcode)); + syslog(LOG_ERR, "pam_acct_mgmt 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;
} + }
- if (pam_acct_mgmt(handle, 0) != PAM_SUCCESS) pam_end(handle, 0);
+ if ((retcode = pam_acct_mgmt(handle, 0)) != PAM_SUCCESS) - return pam_rc;
{ + return 0;
pam_end(handle, 0); }
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_acct_mgmt failed: %s",pam_strerror(handle, retcode));
+ syslog(LOG_ERR, "PAM authentication failed for %s user: %s",
+ isRemoteUser ? "remote" : "local", username);
return -1;
}
@@ -444,16 +478,34 @@ static int PAMValidateUserInProcess(cons
PAMData data;
struct pam_conv pconv;
pam_handle_t* phandle;
+ int retcode;
/*
@@ -452,16 +485,34 @@ static int PAMValidateUserInProcess(cons
pconv.conv = PAMValidateUserCallback; pconv.conv = PAMValidateUserCallback;
pconv.appdata_ptr = &data; pconv.appdata_ptr = &data;
- if (pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle) != PAM_SUCCESS) - pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle);
+ if ((retcode = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle)) != PAM_SUCCESS) - if (pam_rc != 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, retcode)); + syslog(LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, pam_rc));
return -1; + return -1;
+ } }
+
+ if ((retcode = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS) - pam_rc = pam_acct_mgmt(phandle, 0);
+ if ((pam_rc = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS)
+ { + {
+ 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, retcode)); + syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, pam_rc));
+ return -1;
+ }
+
+ 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; + return -1;
+ } + }
- if (pam_acct_mgmt(phandle, 0) != PAM_SUCCESS) pam_end(phandle, 0);
+ if ((retcode = pam_acct_mgmt(phandle, 0)) != PAM_SUCCESS) - return pam_rc;
{ + return 0;
pam_end(phandle, 0); }
+ closelog();
+ openlog("cimserver", LOG_PID, LOG_DAEMON);
+ syslog(LOG_ERR, "pam_acct_mgmt() failed: %s", pam_strerror(phandle, retcode));
return -1;
}
@@ -472,12 +524,12 @@ static int PAMValidateUserInProcess(cons /*
@@ -474,12 +525,12 @@ static int PAMValidateUserInProcess(cons
**============================================================================== **==============================================================================
*/ */
@ -140,20 +150,20 @@ 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 2011-05-19 08:50:25.000000000 +0200 --- pegasus/src/Executor/Parent.c.orig 2013-08-27 13:51:12.419277041 +0200
+++ pegasus/src/Executor/Parent.c 2012-10-16 14:55:47.731794152 +0200 +++ pegasus/src/Executor/Parent.c 2013-08-27 13:52:50.434650395 +0200
@@ -633,7 +633,7 @@ static void HandleAuthenticatePasswordRe @@ -634,7 +634,7 @@ static void HandleAuthenticatePasswordRe
#if defined(PEGASUS_PAM_AUTHENTICATION) #if defined(PEGASUS_PAM_AUTHENTICATION)
- if (PAMAuthenticate(request.username, request.password) != 0) - status = PAMAuthenticate(request.username, request.password);
+ if (PAMAuthenticate(request.username, request.password, request.isRemoteUser) != 0) + status = PAMAuthenticate(request.username, request.password, request.isRemoteUser);
if (status == PAM_SUCCESS)
{ {
status = -1;
break;
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 2008-12-02 10:00:15.000000000 +0100 --- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2013-08-27 13:53:14.882743374 +0200
+++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2012-10-16 14:33:21.159612909 +0200 +++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2013-08-27 13:53:39.089835311 +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);
@ -164,9 +174,9 @@ 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 2008-12-16 19:55:59.000000000 +0100 --- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2013-08-27 13:54:15.842974734 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2012-10-16 14:33:21.160612914 +0200 +++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2013-08-27 13:55:32.977266918 +0200
@@ -354,6 +354,22 @@ public: @@ -353,6 +353,22 @@ public:
return _rep->getRemotePrivilegedUserAccessChecked(); return _rep->getRemotePrivilegedUserAccessChecked();
} }
@ -186,23 +196,21 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasu
+ _rep->setRemoteUser(isRemoteUser); + _rep->setRemoteUser(isRemoteUser);
+ } + }
+ +
private: void setAuthHandle(const AuthHandle & authHandle)
{
AuthenticationInfo(AuthenticationInfoRep* rep) : _rep(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 2010-07-28 16:37:52.000000000 +0200 --- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2013-08-27 13:56:01.394374402 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2012-10-16 14:33:21.160612914 +0200 +++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2013-08-27 13:59:22.129131385 +0200
@@ -46,7 +46,8 @@ const String AuthenticationInfoRep::AUTH @@ -47,6 +47,7 @@ const String AuthenticationInfoRep::AUTH
AuthenticationInfoRep::AuthenticationInfoRep()
AuthenticationInfoRep::AuthenticationInfoRep(Boolean flag)
: _connectionAuthenticated(false), : _connectionAuthenticated(false),
- _wasRemotePrivilegedUserAccessChecked(false) _wasRemotePrivilegedUserAccessChecked(false),
+ _wasRemotePrivilegedUserAccessChecked(false), + _isRemoteUser(true),
+ _isRemoteUser(true) _authHandle(),
_isExpiredPassword(false)
{ {
PEG_METHOD_ENTER( @@ -81,6 +82,16 @@ AuthenticationInfoRep::~AuthenticationIn
TRC_AUTHENTICATION, "AuthenticationInfoRep::AuthenticationInfoRep");
@@ -79,6 +80,16 @@ AuthenticationInfoRep::~AuthenticationIn
PEG_METHOD_EXIT(); PEG_METHOD_EXIT();
} }
@ -220,8 +228,8 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/P
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 2008-12-16 19:55:59.000000000 +0100 --- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2013-08-27 13:59:47.458226631 +0200
+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2012-10-16 14:33:21.160612914 +0200 +++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2013-08-27 14:01:27.744603255 +0200
@@ -147,6 +147,13 @@ public: @@ -147,6 +147,13 @@ public:
void setSecurityAssociation(); void setSecurityAssociation();
#endif #endif
@ -236,17 +244,18 @@ diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Peg
Array<SSLCertificateInfo*> getClientCertificateChain() Array<SSLCertificateInfo*> getClientCertificateChain()
{ {
return _clientCertificate; return _clientCertificate;
@@ -190,6 +197,7 @@ private: @@ -218,6 +225,8 @@ private:
Boolean _wasRemotePrivilegedUserAccessChecked;
Array<SSLCertificateInfo*> _clientCertificate; Array<SSLCertificateInfo*> _clientCertificate;
+ Boolean _isRemoteUser;
};
PEGASUS_NAMESPACE_END + Boolean _isRemoteUser;
+
AuthHandle _authHandle;
String _userRole;
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 2010-10-29 07:29:50.000000000 +0200 --- pegasus/src/Pegasus/Common/Executor.cpp.orig 2013-08-27 14:01:50.929690223 +0200
+++ pegasus/src/Pegasus/Common/Executor.cpp 2012-10-16 14:57:10.260055467 +0200 +++ pegasus/src/Pegasus/Common/Executor.cpp 2013-08-27 14:07:28.655952891 +0200
@@ -126,7 +126,8 @@ public: @@ -126,7 +126,8 @@ public:
virtual int authenticatePassword( virtual int authenticatePassword(
@ -257,21 +266,20 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
virtual int validateUser( virtual int validateUser(
const char* username) = 0; const char* username) = 0;
@@ -560,10 +561,11 @@ public: @@ -562,9 +563,10 @@ public:
#if defined(PEGASUS_PAM_AUTHENTICATION)
virtual int authenticatePassword( virtual int authenticatePassword(
const char* username, const char* username,
- const char* password) - const char* password)
+ const char* password, + const char* password,
+ Boolean isRemoteUser) + Boolean isRemoteUser)
{ {
#if defined(PEGASUS_PAM_AUTHENTICATION)
- return PAMAuthenticate(username, password); - return PAMAuthenticate(username, password);
+ return PAMAuthenticate(username, password, isRemoteUser); + return PAMAuthenticate(username, password, isRemoteUser);
#else }
// ATTN: not handled so don't call in this case.
return -1; virtual int validateUser(
@@ -904,7 +906,8 @@ public: @@ -912,7 +914,8 @@ public:
virtual int authenticatePassword( virtual int authenticatePassword(
const char* username, const char* username,
@ -281,7 +289,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
{ {
AutoMutex autoMutex(_mutex); AutoMutex autoMutex(_mutex);
@@ -922,6 +925,7 @@ public: @@ -930,6 +933,7 @@ public:
memset(&request, 0, sizeof(request)); memset(&request, 0, sizeof(request));
Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE); Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);
Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE); Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);
@ -289,7 +297,7 @@ diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common
if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request)) if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
return -1; return -1;
@@ -1173,10 +1177,11 @@ int Executor::reapProviderAgent( @@ -1181,10 +1185,11 @@ int Executor::reapProviderAgent(
int Executor::authenticatePassword( int Executor::authenticatePassword(
const char* username, const char* username,
@ -304,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 2010-10-29 07:29:50.000000000 +0200 --- pegasus/src/Pegasus/Common/Executor.h.orig 2013-08-27 14:09:28.767397015 +0200
+++ pegasus/src/Pegasus/Common/Executor.h 2012-10-16 14:33:21.162612924 +0200 +++ pegasus/src/Pegasus/Common/Executor.h 2013-08-27 14:10:55.934717862 +0200
@@ -184,7 +184,8 @@ public: @@ -184,7 +184,8 @@ public:
*/ */
static int authenticatePassword( static int authenticatePassword(
@ -317,8 +325,8 @@ 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 2012-08-30 16:49:10.000000000 +0200 --- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2013-08-27 14:11:11.103773653 +0200
+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2012-10-16 14:59:06.452439014 +0200 +++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2013-08-27 14:12:27.743055754 +0200
@@ -2305,6 +2305,70 @@ void HTTPConnection::_handleReadEvent() @@ -2305,6 +2305,70 @@ void HTTPConnection::_handleReadEvent()
message->contentLanguages = contentLanguages; message->contentLanguages = contentLanguages;
message->dest = _outputMessageQueue->getQueueId(); message->dest = _outputMessageQueue->getQueueId();
@ -391,9 +399,9 @@ 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 2012-08-30 16:49:11.000000000 +0200 --- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2013-08-27 14:12:39.200097953 +0200
+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2012-10-16 14:33:21.164612934 +0200 +++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2013-08-27 14:13:05.903196184 +0200
@@ -135,7 +135,8 @@ HTTPMessage::HTTPMessage( @@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage(
authInfo(0), authInfo(0),
acceptLanguagesDecoded(false), acceptLanguagesDecoded(false),
contentLanguagesDecoded(false), contentLanguagesDecoded(false),
@ -404,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 2012-08-30 16:49:11.000000000 +0200 --- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2013-08-27 14:13:16.272234342 +0200
+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2012-10-16 14:33:21.164612934 +0200 +++ pegasus/src/Pegasus/Common/HTTPMessage.h 2013-08-27 14:13:52.605368078 +0200
@@ -73,6 +73,7 @@ public: @@ -73,6 +73,7 @@ public:
ContentLanguageList contentLanguages; ContentLanguageList contentLanguages;
Boolean acceptLanguagesDecoded; Boolean acceptLanguagesDecoded;
@ -415,15 +423,15 @@ 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 2010-10-29 07:29:50.000000000 +0200 --- 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 2012-10-16 14:33:21.165612939 +0200 +++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2013-08-27 14:15:54.285815870 +0200
@@ -76,7 +76,7 @@ void testExecutorLoopbackImpl() @@ -76,7 +76,7 @@ void testExecutorLoopbackImpl()
#endif #endif
PEGASUS_TEST_ASSERT(Executor::authenticatePassword( PEGASUS_TEST_ASSERT(Executor::authenticatePassword(
- "xnonexistentuserx", "wrongpassword") == -1); - "xnonexistentuserx", "wrongpassword") != 0);
+ "xnonexistentuserx", "wrongpassword", true) == -1); + "xnonexistentuserx", "wrongpassword", true) != 0);
PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") == -1); PEGASUS_TEST_ASSERT(Executor::validateUser("xnonexistentuserx") != 0);
char challengeFilePath[EXECUTOR_BUFFER_SIZE]; char challengeFilePath[EXECUTOR_BUFFER_SIZE];
@@ -115,7 +115,7 @@ void testExecutorSocketImpl() @@ -115,7 +115,7 @@ void testExecutorSocketImpl()
@ -436,80 +444,74 @@ 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 2009-08-07 07:43:31.000000000 +0200 --- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2013-08-27 14:16:28.110940302 +0200
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2012-10-16 14:33:21.165612939 +0200 +++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2013-08-27 14:18:41.085429677 +0200
@@ -153,7 +153,7 @@ Boolean BasicAuthenticationHandler::auth @@ -157,6 +157,7 @@ AuthenticationStatus BasicAuthentication
} _basicAuthenticator->authenticate(
authInfo->setRemotePrivilegedUserAccessChecked(); userName,
password,
- authenticated = _basicAuthenticator->authenticate(userName, password); + authInfo->isRemoteUser(),
+ authenticated = _basicAuthenticator->authenticate(userName, password, authInfo->isRemoteUser()); authInfo);
// Log audit message. // Log audit message.
PEG_AUDIT_LOG(logBasicAuthentication(
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 2008-12-16 19:57:08.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2013-08-27 14:18:53.678475974 +0200
+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2012-10-16 14:33:21.165612939 +0200 +++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2013-08-27 14:19:37.740638125 +0200
@@ -65,7 +65,8 @@ public: @@ -65,6 +65,7 @@ public:
*/ virtual AuthenticationStatus authenticate(
virtual Boolean authenticate(
const String& userName, const String& userName,
- const String& password) = 0; const String& password,
+ const String& password, + Boolean isRemoteUser,
+ Boolean isRemoteUser) = 0; AuthenticationInfo* authInfo) = 0;
/** Construct and return the HTTP Basic authentication challenge header /** Construct and return the HTTP Basic authentication challenge header
@return A string containing the 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 2008-12-16 19:57:08.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2013-08-27 14:20:05.917741881 +0200
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2012-10-16 14:33:21.166612944 +0200 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2013-08-27 14:20:47.564895056 +0200
@@ -53,7 +53,8 @@ public: @@ -54,6 +54,7 @@ public:
AuthenticationStatus authenticate(
Boolean authenticate(
const String& userName, const String& userName,
- const String& password); const String& password,
+ const String& password, + Boolean isRemoteUser,
+ Boolean isRemoteUser); AuthenticationInfo* authInfo);
Boolean validateUser(const String& userName);
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 2008-12-16 19:57:08.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2013-08-27 14:20:55.805925482 +0200
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2012-10-16 14:33:21.166612944 +0200 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2013-08-27 14:21:25.421034454 +0200
@@ -73,7 +73,8 @@ PAMBasicAuthenticator::~PAMBasicAuthenti @@ -74,6 +74,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
AuthenticationStatus PAMBasicAuthenticator::authenticate(
Boolean PAMBasicAuthenticator::authenticate(
const String& userName, const String& userName,
- const String& password) const String& password,
+ const String& password, + Boolean isRemoteUser,
+ Boolean isRemoteUser) AuthenticationInfo* authInfo)
{ {
PEG_METHOD_ENTER(TRC_AUTHENTICATION, PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()");
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 2008-12-16 19:57:08.000000000 +0100 --- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2013-08-27 14:21:41.870094885 +0200
+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2012-10-16 14:33:21.166612944 +0200 +++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2013-08-27 14:22:36.012294104 +0200
@@ -64,13 +64,14 @@ PAMBasicAuthenticator::~PAMBasicAuthenti @@ -66,6 +66,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti
AuthenticationStatus PAMBasicAuthenticator::authenticate(
Boolean PAMBasicAuthenticator::authenticate(
const String& userName, const String& userName,
- const String& password) const String& password,
+ const String& password, + Boolean isRemoteUser,
+ Boolean isRemoteUser) AuthenticationInfo* authInfo)
{ {
PEG_METHOD_ENTER(TRC_AUTHENTICATION, PEG_METHOD_ENTER(TRC_AUTHENTICATION,
"PAMBasicAuthenticator::authenticate()"); @@ -74,7 +75,8 @@ AuthenticationStatus PAMBasicAuthenticat
int pam_rc =
Executor::authenticatePassword(
userName.getCString(),
- password.getCString());
+ password.getCString(),
+ isRemoteUser);
if (Executor::authenticatePassword( // return code of -1 will be translated to AUTHSC_UNAUTHORIZED
- userName.getCString(), password.getCString()) != 0) AuthenticationStatus authStatus = _getAuthStatusFromPAM_RC(pam_rc);
+ userName.getCString(), password.getCString(), isRemoteUser) != 0)
{
return false;
}
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 2009-04-17 16:39:31.000000000 +0200 --- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2013-08-27 14:22:56.429369205 +0200
+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2012-10-16 14:33:21.167612949 +0200 +++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2013-08-27 14:23:20.267456931 +0200
@@ -236,7 +236,7 @@ Boolean SecureBasicAuthenticator::authen @@ -237,7 +237,7 @@ AuthenticationStatus SecureBasicAuthenti
if (Executor::detectExecutor() == 0) if (Executor::detectExecutor() == 0)
{ {
if (Executor::authenticatePassword( if (Executor::authenticatePassword(
@ -519,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 2012-08-30 16:49:12.000000000 +0200 --- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2013-08-27 14:23:47.293556300 +0200
+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2012-10-16 14:33:21.168612954 +0200 +++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2013-08-27 14:24:18.748672110 +0200
@@ -426,6 +426,9 @@ void HTTPAuthenticatorDelegator::handleH @@ -430,6 +430,9 @@ void HTTPAuthenticatorDelegator::handleH
Tracer::LEVEL3, Tracer::LEVEL3,
"HTTPAuthenticatorDelegator - Authentication processing start"); "HTTPAuthenticatorDelegator - Authentication processing start");

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

@ -1,18 +1,7 @@
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 2011-05-17 15:05:31.568195433 +0200 --- pegasus/env_var_Linux.status.orig 2013-07-18 15:45:12.000000000 +0200
+++ pegasus/env_var_Linux.status 2011-05-17 15:12:09.216249476 +0200 +++ pegasus/env_var_Linux.status 2013-08-27 15:35:09.838665443 +0200
@@ -17,7 +17,9 @@ ifndef PEGASUS_STAGING_DIR @@ -25,18 +25,21 @@ PEGASUS_HAS_SSL=yes
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif
-PEGASUS_ENABLE_CQL=false
+PEGASUS_ENABLE_EXECQUERY=true
+PEGASUS_ENABLE_CQL=true
+PEGASUS_DEFAULT_ENABLE_OOP=true
PEGASUS_DISABLE_PERFINST=yes
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
PEGASUS_ENABLE_USERGROUP_AUTHORIZATION=true
@@ -25,7 +27,6 @@ PEGASUS_HAS_SSL=yes
PEGASUS_USE_SSL_RANDOMFILE=false PEGASUS_USE_SSL_RANDOMFILE=false
PEGASUS_NOASSERTS=yes PEGASUS_NOASSERTS=yes
PEGASUS_PAM_AUTHENTICATION=true PEGASUS_PAM_AUTHENTICATION=true
@ -20,16 +9,24 @@ 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
@@ -36,7 +37,7 @@ PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true PEGASUS_CIM_SCHEMA=CIM236
PEGASUS_ENABLE_INTEROP_PROVIDER=false PEGASUS_USE_NET_SNMP=true
PEGASUS_ENABLE_PROTOCOL_WSMAN=false -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=false
+PEGASUS_ENABLE_SLP=true +PEGASUS_ENABLE_SLP=true
ifeq ($(PEGASUS_ENABLE_SLP), true) ifeq ($(PEGASUS_ENABLE_SLP), true)
PEGASUS_ENABLE_INTEROP_PROVIDER=true
PEGASUS_SLP_REG_TIMEOUT=1090 PEGASUS_SLP_REG_TIMEOUT=1090
@@ -127,7 +128,7 @@ PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR) 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_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock

73
pegasus-2.9.0-sparc.patch
View File

@ -1,19 +1,19 @@
diff -up pegasus/mak/config-linux.mak.sparc pegasus/mak/config-linux.mak diff -up pegasus/mak/config-linux.mak.orig pegasus/mak/config-linux.mak
--- pegasus/mak/config-linux.mak.sparc 2012-10-08 12:25:24.910661094 +0200 --- pegasus/mak/config-linux.mak.orig 2013-08-27 14:26:51.229234756 +0200
+++ pegasus/mak/config-linux.mak 2012-10-08 12:28:07.613507858 +0200 +++ pegasus/mak/config-linux.mak 2013-08-27 14:27:23.467354043 +0200
@@ -166,6 +166,9 @@ ifndef PEGASUS_ARCH_LIB @@ -176,6 +176,9 @@ ifndef PEGASUS_ARCH_LIB
ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_CLANG) ifeq ($(PEGASUS_PLATFORM),LINUX_X86_64_CLANG)
PEGASUS_ARCH_LIB = lib64 PEGASUS_ARCH_LIB = lib64
endif endif
+ ifeq ($(PEGASUS_PLATFORM),LINUX_SPARC64_GNU) + ifeq ($(PEGASUS_PLATFORM),LINUX_SPARC64_GNU)
+ PEGASUS_ARCH_LIB = lib64 + PEGASUS_ARCH_LIB = lib64
+ endif + endif
PEGASUS_ARCH_LIB = lib PEGASUS_ARCH_LIB = lib
endif endif
DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\" DEFINES += -DPEGASUS_ARCH_LIB=\"$(PEGASUS_ARCH_LIB)\"
diff -up pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc pegasus/mak/platform_LINUX_SPARC64_GNU.mak diff -up pegasus/mak/platform_LINUX_SPARC64_GNU.mak.orig pegasus/mak/platform_LINUX_SPARC64_GNU.mak
--- pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc 2012-10-08 12:29:27.198953706 +0200 --- pegasus/mak/platform_LINUX_SPARC64_GNU.mak.orig 2013-08-27 14:27:56.748477172 +0200
+++ pegasus/mak/platform_LINUX_SPARC64_GNU.mak 2012-10-08 12:33:08.735161475 +0200 +++ pegasus/mak/platform_LINUX_SPARC64_GNU.mak 2013-08-27 14:28:42.522646515 +0200
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//
@ -51,9 +51,9 @@ diff -up pegasus/mak/platform_LINUX_SPARC64_GNU.mak.sparc pegasus/mak/platform_L
+include $(ROOT)/mak/config-linux.mak +include $(ROOT)/mak/config-linux.mak
+ +
+ARCHITECTURE = sparc +ARCHITECTURE = sparc
diff -up pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc pegasus/mak/platform_LINUX_SPARCV9_GNU.mak diff -up pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.orig pegasus/mak/platform_LINUX_SPARCV9_GNU.mak
--- pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc 2012-10-08 12:33:49.424379019 +0200 --- pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.orig 2013-08-27 14:29:02.011718625 +0200
+++ pegasus/mak/platform_LINUX_SPARCV9_GNU.mak 2012-10-08 12:30:54.670435787 +0200 +++ pegasus/mak/platform_LINUX_SPARCV9_GNU.mak 2013-08-27 14:29:28.282815781 +0200
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//
@ -91,10 +91,10 @@ diff -up pegasus/mak/platform_LINUX_SPARCV9_GNU.mak.sparc pegasus/mak/platform_L
+include $(ROOT)/mak/config-linux.mak +include $(ROOT)/mak/config-linux.mak
+ +
+ARCHITECTURE = sparc +ARCHITECTURE = sparc
diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile diff -up pegasus/mak/SDKMakefile.orig pegasus/mak/SDKMakefile
--- pegasus/mak/SDKMakefile.sparc 2012-10-08 12:31:17.904562644 +0200 --- pegasus/mak/SDKMakefile.orig 2013-08-27 14:29:46.108881720 +0200
+++ pegasus/mak/SDKMakefile 2012-10-08 12:37:29.392538539 +0200 +++ pegasus/mak/SDKMakefile 2013-08-27 14:32:18.170444052 +0200
@@ -501,6 +501,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t @@ -510,6 +510,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO-E) " endif" \ @$(ECHO-E) " endif" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@ -113,11 +113,10 @@ diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile
else else
$(error This SDK has been defined to include the following \ $(error This SDK has been defined to include the following \
platforms: $(PACKAGED_PLATFORM_FILES). \ platforms: $(PACKAGED_PLATFORM_FILES). \
@@ -577,7 +589,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t @@ -594,6 +606,18 @@ ifeq ($(RUNTIME_PLATFORM_TEST_NEEDED), t
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
@$(ECHO-E) "endif" \ @$(ECHO-E) "endif" \
>> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
-
+ @$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_SPARCV9_GNU)" \ + @$(ECHO-E) "ifeq (\044(PEGASUS_PLATFORM),LINUX_SPARCV9_GNU)" \
+ >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak + >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)/mak/config.mak
+ @$(ECHO-E) " PEGASUS_ARCH_LIB = lib" \ + @$(ECHO-E) " PEGASUS_ARCH_LIB = lib" \
@ -133,9 +132,9 @@ diff -up pegasus/mak/SDKMakefile.sparc pegasus/mak/SDKMakefile
else else
$(error This SDK has been defined to include the following \ $(error This SDK has been defined to include the following \
platforms: $(PACKAGED_PLATFORM_FILES). \ platforms: $(PACKAGED_PLATFORM_FILES). \
diff -up pegasus/src/Pegasus/Common/Config.h.sparc pegasus/src/Pegasus/Common/Config.h diff -up pegasus/src/Pegasus/Common/Config.h.orig pegasus/src/Pegasus/Common/Config.h
--- pegasus/src/Pegasus/Common/Config.h.sparc 2012-10-08 12:38:08.351741449 +0200 --- pegasus/src/Pegasus/Common/Config.h.orig 2013-08-27 14:32:34.763505395 +0200
+++ pegasus/src/Pegasus/Common/Config.h 2012-10-08 12:38:53.697976948 +0200 +++ pegasus/src/Pegasus/Common/Config.h 2013-08-27 14:33:05.402618625 +0200
@@ -82,6 +82,10 @@ @@ -82,6 +82,10 @@
# include <Pegasus/Common/Platform_LINUX_PPC64_GNU.h> # include <Pegasus/Common/Platform_LINUX_PPC64_GNU.h>
#elif defined (PEGASUS_PLATFORM_LINUX_PPC_E500_GNU) #elif defined (PEGASUS_PLATFORM_LINUX_PPC_E500_GNU)
@ -147,9 +146,9 @@ diff -up pegasus/src/Pegasus/Common/Config.h.sparc pegasus/src/Pegasus/Common/Co
#elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES_GNU) #elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES_GNU)
# include <Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h> # include <Pegasus/Common/Platform_LINUX_ZSERIES_GNU.h>
#elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES64_GNU) #elif defined (PEGASUS_PLATFORM_LINUX_ZSERIES64_GNU)
diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.orig pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc 2012-10-08 12:39:25.331140743 +0200 --- pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.orig 2013-08-27 14:33:28.186702833 +0200
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2012-10-08 12:40:32.353486723 +0200 +++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h 2013-08-27 14:34:45.833989895 +0200
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
+//%2006//////////////////////////////////////////////////////////////////////// +//%2006////////////////////////////////////////////////////////////////////////
@ -244,9 +243,9 @@ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARC64_GNU.h.sparc pegasus/s
+#endif +#endif
+ +
+#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */ +#endif /* Pegasus_Platform_LINUX_SPARC64_GNU_h */
diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.orig pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h
--- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc 2012-10-08 12:40:43.042541758 +0200 --- pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.orig 2013-08-27 14:35:15.787100560 +0200
+++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2012-10-08 12:41:51.297892618 +0200 +++ pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h 2013-08-27 14:36:22.937348657 +0200
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
+//%2006//////////////////////////////////////////////////////////////////////// +//%2006////////////////////////////////////////////////////////////////////////
@ -341,9 +340,9 @@ diff -up pegasus/src/Pegasus/Common/Platform_LINUX_SPARCV9_GNU.h.sparc pegasus/s
+#endif +#endif
+ +
+#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */ +#endif /* Pegasus_Platform_LINUX_SPARCV9_GNU_h */
diff -up pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak diff -up pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.orig pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak
--- pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc 2012-10-08 12:42:23.140055774 +0200 --- pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.orig 2013-08-27 14:37:02.458494760 +0200
+++ pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak 2012-10-08 12:42:54.003213719 +0200 +++ pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak 2013-08-27 14:37:36.121619044 +0200
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//
@ -400,9 +399,9 @@ diff -up pegasus/src/SDK/samples/mak/LINUX_SPARC64_GNU.mak.sparc pegasus/src/SDK
+LINK_OUT = -o +LINK_OUT = -o
+SYM_LINK_LIB = $(PEGASUS_PROVIDER_LIB_DIR)/lib$(LIBRARY) +SYM_LINK_LIB = $(PEGASUS_PROVIDER_LIB_DIR)/lib$(LIBRARY)
+PLATFORM_LIB_SUFFIX = so +PLATFORM_LIB_SUFFIX = so
diff -up pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak diff -up pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.orig pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak
--- pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.sparc 2012-10-08 12:43:12.451308189 +0200 --- pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak.orig 2013-08-27 14:38:00.233708183 +0200
+++ pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak 2012-10-08 12:43:44.962474061 +0200 +++ pegasus/src/SDK/samples/mak/LINUX_SPARCV9_GNU.mak 2013-08-27 14:38:37.113844321 +0200
@@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
+#//%2006//////////////////////////////////////////////////////////////////////// +#//%2006////////////////////////////////////////////////////////////////////////
+#// +#//

4
sources
View File

@ -1,2 +1,2 @@
a02d07fadc899cacafaf25b9de5cca31 pegasus-2.12.1.tar.gz b8ece4ab1e2d9223a6f96b6e03aef81b pegasus-2.13.0.tar.gz
854bc4694349b3eadeda040985880640 cim_schema_2.33.0Experimental-MOFs.zip e1b630e43d09360064f73c2fc8d4a6eb cim_schema_2.37.0Experimental-MOFs.zip

38
tog-pegasus.spec
View File

@ -2,13 +2,13 @@
# 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.12 %global major_ver 2.13
%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}.1 Version: %{major_ver}.0
Release: 9%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
Summary: OpenPegasus WBEM Services for Linux Summary: OpenPegasus WBEM Services for Linux
@ -33,7 +33,7 @@ Source7: cimprovagt-wrapper.sh
# 8: Example wrapper confining Operating System Provider from sblim-cmpi-base package # 8: Example wrapper confining Operating System Provider from sblim-cmpi-base package
Source8: cmpiOSBase_OperatingSystemProvider-cimprovagt.example Source8: cmpiOSBase_OperatingSystemProvider-cimprovagt.example
# 9: DMTF CIM schema # 9: DMTF CIM schema
Source9: cim_schema_2.33.0Experimental-MOFs.zip Source9: cim_schema_2.37.0Experimental-MOFs.zip
# 1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011 # 1: http://cvs.rdg.opengroup.org/bugzilla/show_bug.cgi?id=5011
# Removing insecure -rpath # Removing insecure -rpath
@ -64,29 +64,17 @@ Patch16: pegasus-2.9.1-getpagesize.patch
Patch19: pegasus-2.10.0-dont-strip.patch Patch19: pegasus-2.10.0-dont-strip.patch
# 20: use posix locks on sparc arches # 20: use posix locks on sparc arches
Patch20: pegasus-2.10.0-sparc-posix-lock.patch Patch20: pegasus-2.10.0-sparc-posix-lock.patch
# 21: temporarily disable privilege separation, the package doesn't work with it, it's
# necessary to prepare it first
Patch21: pegasus-2.11.1-disable-privilege-separation.patch
# 22: Fix CMPI enumGetNext function to change CMPI Data state from default CMPI_nullValue # 22: Fix CMPI enumGetNext function to change CMPI Data state from default CMPI_nullValue
# to CMPI_goodValue when it finds and returns next instance correctly # to CMPI_goodValue when it finds and returns next instance correctly
Patch22: pegasus-2.12.0-null_value.patch Patch22: pegasus-2.12.0-null_value.patch
# 23: Enables Interop Provider - necessary to e. g. register CMPI providers
Patch23: pegasus-2.12.0-enable_interop_provider.patch
# 24: bz#883030, getPropertyAt() returns Null instead of empty array # 24: bz#883030, getPropertyAt() returns Null instead of empty array
Patch24: pegasus-2.12.0-empty_arrays.patch Patch24: pegasus-2.12.0-empty_arrays.patch
# 25: allow experimental schema registration with cimmofl during build # 25: allow experimental schema registration with cimmofl during build
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: patch by D. Marlin, already upstream # 27: fixes unused wariable warning which causes fail of the build
Patch27: pegasus-2.12.1-atomic-operations-on-arm.patch Patch27: pegasus-2.13.0-build-fix.patch
# 28: patch by J. Safranek, bz#958273, upstream bug:
# http://bugzilla.openpegasus.org/show_bug.cgi?id=9669
Patch28: pegasus-2.12.1-python-reinit-workaround.patch
# 29: change root/PG_InterOp to root/interop
Patch29: pegasus-2.12.1-interop.patch
# 30: Add Aarch64 support
Patch30: pegasus-2.12.1-aarch64.patch
BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++ BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++
BuildRequires: libstdc++, make, pam-devel BuildRequires: libstdc++, make, pam-devel
@ -202,7 +190,7 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%setup -q -n %{srcname} %setup -q -n %{srcname}
# convert DMTF schema for Pegasus # convert DMTF schema for Pegasus
export PEGASUS_ROOT=%PEGASUS_RPM_ROOT export PEGASUS_ROOT=%PEGASUS_RPM_ROOT
yes | mak/CreateDmtfSchema 233 %{SOURCE9} cim_schema_2.33.0 yes | mak/CreateDmtfSchema 237 %{SOURCE9} cim_schema_2.37.0
%patch1 -p1 -b .no-rpath %patch1 -p1 -b .no-rpath
%patch2 -p1 -b .PIE %patch2 -p1 -b .PIE
%patch3 -p1 -b .redhat-config %patch3 -p1 -b .redhat-config
@ -215,16 +203,11 @@ yes | mak/CreateDmtfSchema 233 %{SOURCE9} cim_schema_2.33.0
%patch16 -p1 -b .getpagesize %patch16 -p1 -b .getpagesize
%patch19 -p1 -b .dont-strip %patch19 -p1 -b .dont-strip
%patch20 -p1 -b .sparc-locks %patch20 -p1 -b .sparc-locks
%patch21 -p1 -b .disable-privilege-separation
%patch22 -p1 -b .null_value %patch22 -p1 -b .null_value
%patch23 -p1 -b .enable_interop_provider
%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 -p0 -b .atomic-operations-on-arm %patch27 -p1 -b .build-fix
%patch28 -p1 -b .python-reinit
%patch29 -p1 -b .interop
%patch30 -p1 -b .aarch64
%build %build
@ -369,6 +352,8 @@ make prestarttests
%files test %files test
%defattr(0644,root,pegasus,0755) %defattr(0644,root,pegasus,0755)
%dir /usr/share/Pegasus/test %dir /usr/share/Pegasus/test
/usr/share/Pegasus/test/log.trace.0
/usr/share/Pegasus/test/testtracer4.trace.0
/usr/share/Pegasus/test/Makefile /usr/share/Pegasus/test/Makefile
/usr/share/Pegasus/test/mak /usr/share/Pegasus/test/mak
%dir /usr/share/Pegasus/test/tmp %dir /usr/share/Pegasus/test/tmp
@ -491,6 +476,9 @@ fi
%changelog %changelog
* Tue Sep 03 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-1
- Update to upstream version 2.13.0
* Tue Aug 27 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.12.1-9 * Tue Aug 27 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.12.1-9
- Fix package FTBFS, unversioned docdir change - Fix package FTBFS, unversioned docdir change
Resolves: #992795 Resolves: #992795