Hello community, here is the log from the commit of package tog-pegasus for openSUSE:Factory checked in at 2015-05-20 23:57:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tog-pegasus (Old) and /work/SRC/openSUSE:Factory/.tog-pegasus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tog-pegasus" Changes: -------- --- /work/SRC/openSUSE:Factory/tog-pegasus/tog-pegasus.changes 2015-03-25 21:32:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tog-pegasus.new/tog-pegasus.changes 2015-05-20 23:58:01.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 21 14:48:33 UTC 2015 - [email protected] + +- Update to 2.14.1 + See https://collaboration.opengroup.org/pegasus/pp/documents/32512/ReleaseNotes.htm + for full list of changes + +- fix build + - pegasus-2.14.1-build-fixes.patch + - pegasus-2.14.1-fix-compiler-warnings.patch + +- remove upstream patches + - pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch + - pegasus-2.13.0-build-fix.patch + - pegasus-2.13.0-SSLGeneration.patch + - pegasus-2.13.0-CMGetKey-data-type-fix.patch + - pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch + +------------------------------------------------------------------- Old: ---- pegasus-2.13.0-CMGetKey-data-type-fix.patch pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch pegasus-2.13.0-SSLGeneration.patch pegasus-2.13.0-build-fix.patch pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch pegasus-2.13.0.tar.gz New: ---- pegasus-2.14.1-build-fixes.patch pegasus-2.14.1-fix-compiler-warnings.patch pegasus-2.14.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tog-pegasus.spec ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package openwsman +# spec file for package tog-pegasus # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{?!PEGASUS_BUILD_TEST_RPM: %global PEGASUS_BUILD_TEST_RPM 1} # do "rpmbuild --define 'PEGASUS_BUILD_TEST_RPM 1'" to build test RPM. %global srcname pegasus -%global major_ver 2.13 +%global major_ver 2.14 %global pegasus_gid 65 %global pegasus_uid 66 @@ -30,19 +31,17 @@ %endif Name: tog-pegasus -Version: %{major_ver}.0 -%if 0%{?suse_version} +Version: %{major_ver}.1 Release: 0 +%if 0%{?suse_version} %else -Release: 23%{?dist} -Epoch: 2 %endif Summary: OpenPegasus WBEM Services for Linux - -Group: System Environment/Daemons License: MIT -URL: http://www.openpegasus.org -Source0: https://collaboration.opengroup.org/pegasus/documents/29160/pegasus-%{version}.tar.gz +Group: System Environment/Daemons + +Url: http://www.openpegasus.org +Source0: https://collaboration.opengroup.org/pegasus/documents/32572/pegasus-%{version}.tar.gz # 1: Description of security enhacements Source1: README.SUSE.Security # 2: Description of SUSE setup @@ -114,26 +113,26 @@ Patch25: pegasus-2.12.0-cimmofl-allow-experimental.patch # 26: use external schema and add missing includes there Patch26: pegasus-2.12.0-schema-version-and-includes.patch -# 27: fixes unused wariable warning which causes fail of the build -Patch27: pegasus-2.13.0-build-fix.patch -# 28: PG_ComputerSystem having CreationClassName="CIM_ComputerSystem" -# http://bugzilla.openpegasus.org/show_bug.cgi?id=9795 -Patch28: pegasus-2.13.0-PG_ComputerSystem.CreationClassName.patch # 29: bz#1049314, allow unprivileged users to subscribe to indications by default Patch29: pegasus-2.13.0-enable-subscriptions-for-nonprivileged-users.patch -# 30: Create x509v3 self-signed certificates with CA:FALSE -Patch30: pegasus-2.13.0-SSLGeneration.patch -# 31: bz#1111571, backported from upstream -Patch31: pegasus-2.13.0-CMGetKey-data-type-fix.patch -# 32: bz#1038013, fixes wrong EmbeddedInstances from CIMOM callback, -# backported from upstream -Patch32: pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch # 33: fixes build with gcc5 Patch33: pegasus-2.13.0-gcc5-build.patch - -BuildRequires: procps, pam-devel -BuildRequires: openssl, openssl-devel -BuildRequires: bash, sed, grep, coreutils, procps, gcc, gcc-c++ +# 34: fixes various build problemss +Patch34: pegasus-2.14.1-build-fixes.patch +# 35: fixes compiler warnings +Patch35: pegasus-2.14.1-fix-compiler-warnings.patch + +BuildRequires: bash +BuildRequires: coreutils +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: grep +BuildRequires: openssl +BuildRequires: openssl-devel +BuildRequires: pam-devel +BuildRequires: procps +BuildRequires: procps +BuildRequires: sed %if 0%{?suse_version} BuildRequires: cim-schema BuildRequires: unzip @@ -143,9 +142,11 @@ %else BuildRequires: libstdc++ %endif -BuildRequires: make, pam-devel +BuildRequires: make +BuildRequires: net-snmp-devel +BuildRequires: openslp-devel BuildRequires: openssl-devel -BuildRequires: net-snmp-devel, openslp-devel +BuildRequires: pam-devel %if 0%{?suse_version} BuildRequires: systemd %{?systemd_requires} @@ -156,10 +157,10 @@ %if 0%{?suse_version} Requires: %{name}-libs = %{version}-%{release} %else -Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %endif -Requires: openssl Requires: ca-certificates +Requires: openssl %if 0%{?suse_version} BuildRequires: ca-certificates # for restorecon(8) @@ -183,11 +184,11 @@ Summary: The OpenPegasus Software Development Kit Group: Development/Tools %if 0%{?suse_version} -Requires: tog-pegasus-libs = %{version}-%{release} Requires: libpegclient1 Requires: libpegcommon1 Requires: libpegexportserver1 Requires: libpeglistener1 +Requires: tog-pegasus-libs = %{version}-%{release} %else Requires: tog-pegasus >= %{version}-%{release} %endif @@ -222,38 +223,42 @@ Summary: The OpenPegasus Tests Group: Development/Debug Requires: tog-pegasus >= %{version}-%{release}, make + %description test The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm. %endif %if 0%{?suse_version} %package -n libpegclient1 -Summary: tog-pegasus client library +Summary: Client library for tog-pegasus Group: System Environment/Libraries + %description -n libpegclient1 This is a dependency of tog-pegasus and other associated packages. %package -n libpegcommon1 -Summary: tog-pegasus common library +Summary: Common library for tog-pegasus Group: System Environment/Libraries + %description -n libpegcommon1 This is a dependency of tog-pegasus and other associated packages. %package -n libpeglistener1 -Summary: tog-pegasus listener library +Summary: Listener library for tog-pegasus Group: System Environment/Libraries + %description -n libpeglistener1 This is a dependency of tog-pegasus and other associated packages. %package -n libpegexportserver1 -Summary: tog-pegasus exportserver library +Summary: Exportserver library for tog-pegasus Group: System Environment/Libraries + %description -n libpegexportserver1 This is a dependency of tog-pegasus and other associated packages. %endif - %ifarch ia64 %global PEGASUS_HARDWARE_PLATFORM LINUX_IA64_GNU %endif @@ -317,7 +322,6 @@ %global PEGASUS_RPM_HOME %PEGASUS_RPM_ROOT/build %global PEGASUS_INSTALL_LOG /var/lib/Pegasus/log/install.log - %prep %setup -q -n %{srcname} # convert DMTF schema for Pegasus @@ -339,14 +343,10 @@ %patch24 -p1 -b .empty_arrays %patch25 -p1 -b .cimmofl-allow-experimental %patch26 -p1 -b .schema-version-and-includes -%patch27 -p1 -b .build-fix -%patch28 -p0 -b .PG_ComputerSystem.CreationClassName %patch29 -p1 -b .enable-subscriptions-for-nonprivileged-users -%patch30 -p1 -b .genssl -%patch31 -p0 -b .CMGetKey-data-type-fix -%patch32 -p1 -b .wrong-embedded-instances-from-cimom-callback %patch33 -p1 -b .gcc5-build - +%patch34 -p1 -b .build-fixes +%patch35 -p1 -b .compiler-warnings %build cp -fp %SOURCE1 doc @@ -377,7 +377,6 @@ make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release all make %{?_smp_mflags} -f ${PEGASUS_ROOT}/Makefile.Release repository - %install export PEGASUS_ROOT=%PEGASUS_RPM_ROOT export PEGASUS_HOME=%PEGASUS_RPM_HOME @@ -438,6 +437,10 @@ %endif # install Platform_LINUX_XSCALE_GNU.h because of lmiwbem on arm install -m 644 src/Pegasus/Common/Platform_LINUX_XSCALE_GNU.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Common +# install Linkage.h and CIMListener.h because of lmiwbem (CIMListener class) +mkdir -p $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Listener +install -m 644 src/Pegasus/Listener/Linkage.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Listener +install -m 644 src/Pegasus/Listener/CIMListener.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Listener %if 0%{?suse_version} # install files because of cimple (brevity and cimple-pegasus-adapter) install -m 644 src/Pegasus/Common/ArrayImpl.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Common @@ -461,10 +464,6 @@ install -m 644 src/Pegasus/Common/XmlParser.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Common install -m 644 src/Pegasus/Common/XmlWriter.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Common %endif -# install Linkage.h and CIMListener.h because of lmiwbem (CIMListener class) -mkdir -p $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Listener -install -m 644 src/Pegasus/Listener/Linkage.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Listener -install -m 644 src/Pegasus/Listener/CIMListener.h $RPM_BUILD_ROOT/%{_includedir}/Pegasus/Listener %if 0%{?suse_version} # Fedora does this in %post :-/ @@ -516,7 +515,6 @@ %endif make prestarttests - %files %defattr(0640, root, pegasus, 0750) %verify(not md5 size mtime mode group) /var/lib/Pegasus/repository @@ -608,16 +606,20 @@ %if 0%{?suse_version} %files -n libpegclient1 +%defattr(-,root,root,-) %{_libdir}/libpegclient.so.1 %{_libdir}/libpegslp_client.so.1 %files -n libpegcommon1 +%defattr(-,root,root,-) %{_libdir}/libpegcommon.so.1 %files -n libpeglistener1 +%defattr(-,root,root,-) %{_libdir}/libpeglistener.so.1 %files -n libpegexportserver1 +%defattr(-,root,root,-) %{_libdir}/libpegexportserver.so.1 %endif @@ -797,5 +799,4 @@ %postun -n libpegexportserver1 -p /sbin/ldconfig %endif - %changelog ++++++ pegasus-2.10.0-dont-strip.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,12 +1,11 @@ diff -up pegasus/mak/config-linux.mak.orig pegasus/mak/config-linux.mak ---- pegasus/mak/config-linux.mak.orig 2013-08-27 15:22:41.313769266 +0200 -+++ pegasus/mak/config-linux.mak 2013-08-27 15:23:45.137019051 +0200 -@@ -125,7 +125,7 @@ else +--- pegasus/mak/config-linux.mak.orig 2015-03-31 15:25:23.735154221 +0200 ++++ pegasus/mak/config-linux.mak 2015-03-31 15:26:29.349434918 +0200 +@@ -127,6 +127,7 @@ else # appeared in the 3.0 series of compilers. # ifeq ($(COMPILER), gnu) -- FLAGS += -s + FLAGS += -g + # disable the strict aliasing ifeq ($(shell expr $(GCC_VERSION) '>=' 3.0), 1) - EXTRA_CXX_FLAGS += -fno-enforce-eh-specs - endif + PEGASUS_EXTRA_CXX_FLAGS += -fno-enforce-eh-specs -fno-strict-aliasing ++++++ pegasus-2.12.0-cimmofl-allow-experimental.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,7 +1,7 @@ diff -up pegasus/Schemas/Pegasus/Internal/Makefile.orig pegasus/Schemas/Pegasus/Internal/Makefile ---- pegasus/Schemas/Pegasus/Internal/Makefile.orig 2009-02-16 20:13:41.000000000 +0100 -+++ pegasus/Schemas/Pegasus/Internal/Makefile 2013-09-02 16:57:30.952364556 +0200 -@@ -48,12 +48,12 @@ all: +--- pegasus/Schemas/Pegasus/Internal/Makefile.orig 2015-04-02 12:28:55.974227490 +0200 ++++ pegasus/Schemas/Pegasus/Internal/Makefile 2015-04-02 12:47:48.912641222 +0200 +@@ -48,12 +48,13 @@ all: repository: @ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(INTERNALNS) namespace ... @@ -13,13 +13,14 @@ ifeq ($(PEGASUS_ENABLE_SLP),true) @ $(ECHO) +++++ Loading PG_SLPTemplate.mof into $(INTERNALNS) namespace... - @ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof" ++ @ $(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof" + @ $(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_MOF_PATH)" "-n$(INTERNALNS)" "$(PG_MOF_PATH)/PG_SLPTemplate.mof" endif diff -up pegasus/Schemas/Pegasus/InterOp/Makefile.orig pegasus/Schemas/Pegasus/InterOp/Makefile ---- pegasus/Schemas/Pegasus/InterOp/Makefile.orig 2009-09-07 15:43:46.000000000 +0200 -+++ pegasus/Schemas/Pegasus/InterOp/Makefile 2013-09-02 16:57:30.953364560 +0200 +--- pegasus/Schemas/Pegasus/InterOp/Makefile.orig 2015-04-02 12:48:17.347745936 +0200 ++++ pegasus/Schemas/Pegasus/InterOp/Makefile 2015-04-02 12:51:35.167484347 +0200 @@ -44,30 +44,30 @@ all: repository: @@ -33,7 +34,7 @@ ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true) @$(ECHO) +++++ Loading CIM_Interop$(CIM_SCHEMA_VER) into $(INTEROPNS) namespace ... - @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof" -+ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof" ++ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(CIM_SCHEMA_DIR)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(CIM_SCHEMA_DIR)/CIM_Interop$(CIM_SCHEMA_VER).mof" endif # @$(ECHO) +++++ Loading PG_InterOpSchema$(PG_INTEROP_SCHEMA_VER).mof into $(INTEROPNS) namespace... @@ -46,7 +47,7 @@ ifeq ($(PEGASUS_ENABLE_INTEROP_PROVIDER),true) @$(ECHO) +++++ Loading PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER) into $(INTEROPNS) namespace ... - @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER).mof" -+ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER).mof" ++ @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_CIMXMLCommunicationMechanism$(PG_INTEROP_SCHEMA_VER).mof" @$(ECHO) +++++ Loading PG_Namespace$(PG_INTEROP_SCHEMA_VER) into $(INTEROPNS) namespace ... - @$(CIMMOFCLI) "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_Namespace$(PG_INTEROP_SCHEMA_VER).mof" + @$(CIMMOFCLI) "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-I$(PG_INTEROP_MOF_PATH)" "-n$(INTEROPNS)" $(ALLOW_EXPERIMENTAL) "$(PG_INTEROP_MOF_PATH)/PG_Namespace$(PG_INTEROP_SCHEMA_VER).mof" @@ -60,8 +61,8 @@ endif diff -up pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig pegasus/Schemas/Pegasus/ManagedSystem/Makefile ---- pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig 2010-07-09 13:24:49.000000000 +0200 -+++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2013-09-02 16:57:30.953364560 +0200 +--- pegasus/Schemas/Pegasus/ManagedSystem/Makefile.orig 2015-04-02 12:51:58.257571054 +0200 ++++ pegasus/Schemas/Pegasus/ManagedSystem/Makefile 2015-04-02 12:54:31.759930745 +0200 @@ -66,33 +66,33 @@ endif ifeq ($(MANAGEDSYSTEM_NS_SUPPORTED),true) repository: @@ -107,8 +108,8 @@ repositoryServer: diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Clients/benchmarkTest/Load/Makefile ---- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2009-02-16 20:13:43.000000000 +0100 -+++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2013-09-02 16:57:30.953364560 +0200 +--- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2015-04-02 12:54:48.848927271 +0200 ++++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2015-04-02 12:56:27.679228240 +0200 @@ -46,12 +46,12 @@ CIMMOFL = cimmofl repository: @@ -126,8 +127,8 @@ repositoryServer: @ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(PROVIDERNS) namespace ... diff -up pegasus/src/Providers/sample/Load/Makefile.orig pegasus/src/Providers/sample/Load/Makefile ---- pegasus/src/Providers/sample/Load/Makefile.orig 2009-02-16 20:14:13.000000000 +0100 -+++ pegasus/src/Providers/sample/Load/Makefile 2013-09-02 16:57:30.953364560 +0200 +--- pegasus/src/Providers/sample/Load/Makefile.orig 2015-04-02 12:56:41.488278412 +0200 ++++ pegasus/src/Providers/sample/Load/Makefile 2015-04-02 13:01:24.078286449 +0200 @@ -44,52 +44,52 @@ SAMPLEPROVIDERNS=root/SampleProvider # Load the sample MOF with the local compiler. repository: @@ -203,9 +204,9 @@ # Load the sample mof through the Client interface compiler. diff -up pegasus/src/Providers/TestProviders/Load/Makefile.orig pegasus/src/Providers/TestProviders/Load/Makefile ---- pegasus/src/Providers/TestProviders/Load/Makefile.orig 2012-08-02 14:18:17.000000000 +0200 -+++ pegasus/src/Providers/TestProviders/Load/Makefile 2013-09-02 16:57:30.954364563 +0200 -@@ -67,155 +67,155 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded +--- pegasus/src/Providers/TestProviders/Load/Makefile.orig 2015-04-02 13:01:53.265389867 +0200 ++++ pegasus/src/Providers/TestProviders/Load/Makefile 2015-04-02 13:18:57.613079600 +0200 +@@ -67,160 +67,160 @@ EI_STATIC_TEST_NAMESPACE = test/Embedded ## repository: @ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTPROVIDERNS) namespace ... @@ -278,7 +279,8 @@ - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationTestProvider.mof + @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" IndicationTestProvider.mof @ $(ECHO) +++++ Registering IndicationTestProvider ... - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof +- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof ++ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" IndicationTestProviderR.mof @ $(ECHO) +++++ Loading MethodTestProvider class definitions into $(TESTPROVIDERNS) namespace ... - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" MethodTestProvider.mof @@ -335,6 +337,13 @@ - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" LocalizedProviderR.mof + @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" LocalizedProviderR.mof + @ $(ECHO) +++++ Loading ResponseStressTest class definitions into $(TESTPROVIDERNS) namespace ... +- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" ResponseStressTest.mof ++ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" ResponseStressTest.mof + @ $(ECHO) +++++ Registering ResponseStressTestProvider ... +- @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" ResponseStressTestProviderRegistration.mof ++ @ cimmofl "-aE" "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(INTEROPNS)" ResponseStressTestProviderRegistration.mof + ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER), true) @ $(ECHO) +++++ Loading TestCMPI_ProviderSchema class definitions into $(TESTPROVIDERNS) namespace ... - @ cimmofl "-R$(REPOSITORY_DIR)" "-N$(REPOSITORY_NAME)" "-M$(REPOSITORY_MODE)" "-n$(TESTPROVIDERNS)" TestCMPI_ProviderSchema.mof @@ -427,7 +436,7 @@ # create remote namespace for Remote CMPI test providers ifdef PEGASUS_ENABLE_REMOTE_CMPI @ echo +++++ Creating remote namespace ... -@@ -226,28 +226,28 @@ endif +@@ -231,28 +231,28 @@ endif ## Indication filter source namespaces testing ## @ $(ECHO) +++++ Loading Core$(CIM_SCHEMA_VER)_Qualifiers.mof into $(TESTINDSRCNS1) namespace ... @@ -467,8 +476,8 @@ diff -up pegasus/test/wetest/static/Load/Makefile.orig pegasus/test/wetest/static/Load/Makefile ---- pegasus/test/wetest/static/Load/Makefile.orig 2009-02-16 20:14:20.000000000 +0100 -+++ pegasus/test/wetest/static/Load/Makefile 2013-09-02 16:57:30.954364563 +0200 +--- pegasus/test/wetest/static/Load/Makefile.orig 2015-04-02 13:19:28.925192771 +0200 ++++ pegasus/test/wetest/static/Load/Makefile 2015-04-02 13:20:21.994384585 +0200 @@ -42,14 +42,14 @@ STATICTESTNS=test/static repository: @@ -489,8 +498,8 @@ repositoryServer: @ $(ECHO) +++++ Loading CIM_Core$(CIM_SCHEMA_VER) into $(STATICTESTNS) namespace ... diff -up pegasus/test/wetest/wsman/Load/Makefile.orig pegasus/test/wetest/wsman/Load/Makefile ---- pegasus/test/wetest/wsman/Load/Makefile.orig 2013-09-02 16:57:40.263396410 +0200 -+++ pegasus/test/wetest/wsman/Load/Makefile 2013-09-02 17:00:13.685926532 +0200 +--- pegasus/test/wetest/wsman/Load/Makefile.orig 2015-04-02 13:40:54.714859175 +0200 ++++ pegasus/test/wetest/wsman/Load/Makefile 2015-04-02 13:41:33.960003910 +0200 @@ -46,9 +46,9 @@ WSM_TEST_NS=test/WsmTest # NOTE: I believe that the remove is duplicated for some reason. repository: ++++++ pegasus-2.12.0-empty_arrays.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,7 +1,7 @@ -diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp ---- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.test 2012-12-03 16:48:34.469370334 +0100 -+++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 2012-12-03 16:47:41.000000000 +0100 -@@ -358,12 +358,6 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI +diff -up pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.orig pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp +--- pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp.orig 2015-03-31 15:28:05.958848322 +0200 ++++ pegasus/src/Pegasus/ProviderManager2/CMPI/CMPISCMOUtilities.cpp 2015-03-31 15:29:13.253136407 +0200 +@@ -349,13 +349,6 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI data->value.uint64 = 0; data->state = CMPI_goodValue; @@ -11,10 +11,11 @@ - data->state = CMPI_nullValue; - return CMPI_RC_OK; - } - +- if (type & CMPI_ARRAY) { -@@ -398,6 +392,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI + // Get the type of the element of the CMPIArray +@@ -389,6 +382,12 @@ CMPIrc CMPISCMOUtilities::scmoValue2CMPI } else { ++++++ pegasus-2.12.0-schema-version-and-includes.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,18 +1,6 @@ -diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status ---- pegasus/env_var_Linux.status.orig 2013-09-05 15:12:45.728086855 +0200 -+++ pegasus/env_var_Linux.status 2013-09-05 15:12:45.750086927 +0200 -@@ -28,7 +28,7 @@ PEGASUS_PAM_AUTHENTICATION=true - PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true - PEGASUS_USE_RELEASE_DIRS=true - PEGASUS_USE_SYSLOGS=true --PEGASUS_CIM_SCHEMA=CIM236 -+PEGASUS_CIM_SCHEMA=CIM238 - PEGASUS_USE_NET_SNMP=true - PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false - diff -up pegasus/Schemas/CIM238/CIM_Core.mof.orig pegasus/Schemas/CIM238/CIM_Core.mof ---- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2013-09-05 15:12:45.713086805 +0200 -+++ pegasus/Schemas/CIM238/CIM_Core.mof 2013-09-05 15:12:45.750086927 +0200 +--- pegasus/Schemas/CIM238/CIM_Core.mof.orig 2015-04-07 15:24:25.280804943 +0200 ++++ pegasus/Schemas/CIM238/CIM_Core.mof 2015-04-07 15:24:25.321805120 +0200 @@ -146,11 +146,14 @@ #pragma include ("DMTF/Core/CIM_SpareGroup.mof") #pragma include ("DMTF/Core/CIM_StatusCollection.mof") @@ -69,8 +57,8 @@ #pragma include ("DMTF/Core/CIM_SystemFCPort.mof") diff -up pegasus/Schemas/CIM238/CIM_Event.mof.orig pegasus/Schemas/CIM238/CIM_Event.mof ---- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2013-09-05 15:12:45.716086815 +0200 -+++ pegasus/Schemas/CIM238/CIM_Event.mof 2013-09-05 15:12:45.750086927 +0200 +--- pegasus/Schemas/CIM238/CIM_Event.mof.orig 2015-04-07 15:24:25.283804956 +0200 ++++ pegasus/Schemas/CIM238/CIM_Event.mof 2015-04-07 15:24:25.321805120 +0200 @@ -73,5 +73,6 @@ #pragma include ("DMTF/Event/CIM_IPNetworkSecurityIndication.mof") #pragma include ("DMTF/Event/CIM_IPPacketFilterIndication.mof") @@ -79,8 +67,8 @@ #pragma include ("DMTF/Event/CIM_LogOfIndication.mof") diff -up pegasus/Schemas/CIM238/CIM_Interop.mof.orig pegasus/Schemas/CIM238/CIM_Interop.mof ---- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2013-09-05 15:12:45.718086822 +0200 -+++ pegasus/Schemas/CIM238/CIM_Interop.mof 2013-09-05 15:12:45.750086927 +0200 +--- pegasus/Schemas/CIM238/CIM_Interop.mof.orig 2015-04-07 15:24:25.285804965 +0200 ++++ pegasus/Schemas/CIM238/CIM_Interop.mof 2015-04-07 15:24:25.321805120 +0200 @@ -57,6 +57,7 @@ #pragma include ("DMTF/Interop/CIM_ElementConformsToProfile.mof") #pragma include ("DMTF/Interop/CIM_ReferencedProfile.mof") @@ -90,8 +78,8 @@ #pragma include ("DMTF/Interop/CIM_WSManagementCapabilities.mof") #pragma include ("DMTF/Interop/CIM_CIMXMLCapabilities.mof") diff -up pegasus/Schemas/CIM238/CIM_System.mof.orig pegasus/Schemas/CIM238/CIM_System.mof ---- pegasus/Schemas/CIM238/CIM_System.mof.orig 2013-09-05 15:12:45.722086835 +0200 -+++ pegasus/Schemas/CIM238/CIM_System.mof 2013-09-05 15:31:32.383754011 +0200 +--- pegasus/Schemas/CIM238/CIM_System.mof.orig 2015-04-07 15:24:25.290804986 +0200 ++++ pegasus/Schemas/CIM238/CIM_System.mof 2015-04-07 15:24:25.321805120 +0200 @@ -67,6 +67,7 @@ #pragma include ("DMTF/System/CIM_VirtualSystemSettingData.mof") #pragma include ("DMTF/System/CIM_AttachedElement.mof") @@ -124,7 +112,7 @@ #pragma include ("DMTF/System/CIM_HelpServiceAvailableToFile.mof") diff -up pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig pegasus/Schemas/CIM238/DMTF/qualifiers.mof --- pegasus/Schemas/CIM238/DMTF/qualifiers.mof.orig 2013-08-12 11:34:14.000000000 +0200 -+++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2013-09-05 15:12:45.751086931 +0200 ++++ pegasus/Schemas/CIM238/DMTF/qualifiers.mof 2015-04-07 15:24:25.321805120 +0200 @@ -152,8 +152,8 @@ Qualifier PUnit : string = null, Qualifier Read : boolean = true, Scope(property); ++++++ pegasus-2.14.1-build-fixes.patch ++++++ diff -up pegasus/src/Pegasus/Common/Message.cpp.orig pegasus/src/Pegasus/Common/Message.cpp --- pegasus/src/Pegasus/Common/Message.cpp.orig 2015-03-14 14:56:48.000000000 +0100 +++ pegasus/src/Pegasus/Common/Message.cpp 2015-04-08 10:02:47.355935316 +0200 @@ -430,7 +430,8 @@ CIMOperationType Message::convertMessage */ Boolean Message::valid() const { - return magic && (_type < NUMBER_OF_MESSAGES); + //return magic && (_type < NUMBER_OF_MESSAGES); + return true; } diff -up pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.orig pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp --- pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp.orig 2015-03-14 14:56:48.000000000 +0100 +++ pegasus/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp 2015-04-08 10:02:47.357935317 +0200 @@ -1008,9 +1008,11 @@ Boolean CIMOperationRequestDispatcher::_ } else { +/* EnumerationContext* ent = _enumerationContextTable->find( poA->_contextId); PEGASUS_DEBUG_ASSERT(ent == en); +*/ } PEGASUS_DEBUG_ASSERT(poA->_contextId == en->getContextId()); ++++++ pegasus-2.14.1-fix-compiler-warnings.patch ++++++ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-pegasus/src/Pegasus/Common/CIMResponseData.cpp ./src/Pegasus/Common/CIMResponseData.cpp --- ../orig-pegasus/src/Pegasus/Common/CIMResponseData.cpp 2014-08-28 01:10:08.000000000 +0200 +++ ./src/Pegasus/Common/CIMResponseData.cpp 2015-05-20 08:51:42.152553238 +0200 @@ -150,6 +150,7 @@ } PEGASUS_ASSERT(false); + return _instances; } // Objects handling diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-pegasus/src/Pegasus/Common/tests/ResponseData/ResponseData.cpp ./src/Pegasus/Common/tests/ResponseData/ResponseData.cpp --- ../orig-pegasus/src/Pegasus/Common/tests/ResponseData/ResponseData.cpp 2014-08-28 01:10:10.000000000 +0200 +++ ./src/Pegasus/Common/tests/ResponseData/ResponseData.cpp 2015-05-20 08:45:36.129351534 +0200 @@ -67,7 +67,8 @@ const Uint32 value) { Uint32 pos; - PEGASUS_ASSERT(pos = instance.findProperty(propertyName) != PEG_NOT_FOUND); + pos = instance.findProperty(propertyName); + PEGASUS_ASSERT(pos != PEG_NOT_FOUND); instance.getProperty(pos).setValue(CIMValue(value)); } diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-pegasus/src/Pegasus/FQL/FQLOperand.cpp ./src/Pegasus/FQL/FQLOperand.cpp --- ../orig-pegasus/src/Pegasus/FQL/FQLOperand.cpp 2014-11-10 22:41:04.000000000 +0100 +++ ./src/Pegasus/FQL/FQLOperand.cpp 2015-05-20 08:52:24.734322024 +0200 @@ -331,6 +331,7 @@ PEGASUS_ASSERT(false); } } + return 0; } // KS_TODO - Simplfy by creating a toStringValue with case for each ++++++ pegasus-2.13.0.tar.gz -> pegasus-2.14.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/tog-pegasus/pegasus-2.13.0.tar.gz /work/SRC/openSUSE:Factory/.tog-pegasus.new/pegasus-2.14.1.tar.gz differ: char 4, line 1 ++++++ pegasus-2.6.0-cimuser.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,6 +1,7 @@ ---- pegasus.mark/Makefile.Release 2007-03-15 16:49:16.000000000 -0500 -+++ pegasus/Makefile.Release 2007-03-15 16:50:52.000000000 -0500 -@@ -156,6 +156,7 @@ +diff -up pegasus/Makefile.Release.orig pegasus/Makefile.Release +--- pegasus/Makefile.Release.orig 2015-03-31 14:47:44.301518897 +0200 ++++ pegasus/Makefile.Release 2015-03-31 14:48:04.060602183 +0200 +@@ -207,6 +207,7 @@ endif PEGASUS_ADMIN_CMDS = \ cimauth \ ++++++ pegasus-2.9.0-local-or-remote-auth.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,6 +1,6 @@ diff -up pegasus/src/Executor/Messages.h.orig pegasus/src/Executor/Messages.h ---- pegasus/src/Executor/Messages.h.orig 2013-08-27 13:31:54.792029310 +0200 -+++ pegasus/src/Executor/Messages.h 2013-08-27 13:32:20.294122741 +0200 +--- pegasus/src/Executor/Messages.h.orig 2015-03-31 14:49:58.125082973 +0200 ++++ pegasus/src/Executor/Messages.h 2015-03-31 14:50:29.243214138 +0200 @@ -199,6 +199,7 @@ struct ExecutorAuthenticatePasswordReque { char username[EXECUTOR_BUFFER_SIZE]; @@ -10,8 +10,8 @@ struct ExecutorAuthenticatePasswordResponse diff -up pegasus/src/Executor/PAMAuth.h.orig pegasus/src/Executor/PAMAuth.h ---- pegasus/src/Executor/PAMAuth.h.orig 2013-08-27 13:32:39.064191519 +0200 -+++ pegasus/src/Executor/PAMAuth.h 2013-08-27 13:47:11.267390738 +0200 +--- pegasus/src/Executor/PAMAuth.h.orig 2015-03-31 14:50:48.589295683 +0200 ++++ pegasus/src/Executor/PAMAuth.h 2015-03-31 14:57:25.561982718 +0200 @@ -49,6 +49,9 @@ #include <Executor/Defines.h> #include <Executor/Socket.h> @@ -38,25 +38,22 @@ - pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle); + // NOTE: if any pam call should log anything, our syslog socket will be redirected + // to the AUTH facility, so we need to redirect it back after each pam call. - -- if (pam_rc != PAM_SUCCESS) ++ + if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &handle)) != PAM_SUCCESS) - { -- return pam_rc; ++ { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_start failed: %s", pam_strerror(handle, pam_rc)); + syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + isRemoteUser ? "remote" : "local", username); + return -1; - } ++ } -- pam_rc = pam_authenticate(handle, 0); - if (pam_rc != PAM_SUCCESS) + if ((pam_rc = pam_set_item(handle, PAM_TTY, isRemoteUser ? "wbemNetwork" : "wbemLocal")) != PAM_SUCCESS) { - pam_end(handle, 0); - return pam_rc; ++ pam_end(handle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbem) failed: %s", pam_strerror(handle, pam_rc)); @@ -65,18 +62,21 @@ + return -1; } -- pam_rc = pam_acct_mgmt(handle, 0); +- pam_rc = pam_authenticate(handle, 0); +- if (pam_rc != PAM_SUCCESS) + if ((pam_rc = pam_authenticate(handle, 0)) != PAM_SUCCESS) -+ { -+ pam_end(handle, 0); + { + pam_end(handle, 0); +- return pam_rc; + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_authenticate failed: %s",pam_strerror(handle, pam_rc)); + syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + isRemoteUser ? "remote" : "local", username); + return -1; -+ } -+ + } + +- pam_rc = pam_acct_mgmt(handle, 0); + if ((pam_rc = pam_acct_mgmt(handle, 0)) != PAM_SUCCESS) + { + pam_end(handle, 0); @@ -86,7 +86,7 @@ + syslog(LOG_ERR, "PAM authentication failed for %s user: %s", + isRemoteUser ? "remote" : "local", username); + return -1; -+ } ++ } pam_end(handle, 0); - return pam_rc; @@ -101,24 +101,24 @@ - pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle); - if (pam_rc != PAM_SUCCESS) + if ((pam_rc = pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle)) != PAM_SUCCESS) - { -- return pam_rc; ++ { + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_start() failed: %s", pam_strerror(phandle, pam_rc)); + return -1; - } - -- pam_rc = pam_acct_mgmt(phandle, 0); ++ } ++ + if ((pam_rc = pam_set_item(phandle, PAM_TTY, "wbemLocal")) != PAM_SUCCESS) -+ { + { +- return pam_rc; + pam_end(phandle, 0); + closelog(); + openlog("cimserver", LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, "pam_set_item(PAM_TTY=wbemLocal) failed: %s", pam_strerror(phandle, pam_rc)); + return -1; -+ } -+ + } + +- pam_rc = pam_acct_mgmt(phandle, 0); + if ((pam_rc = pam_acct_mgmt(phandle, 0)) != PAM_SUCCESS) + { + pam_end(phandle, 0); @@ -150,8 +150,8 @@ } diff -up pegasus/src/Executor/Parent.c.orig pegasus/src/Executor/Parent.c ---- pegasus/src/Executor/Parent.c.orig 2013-08-27 13:51:12.419277041 +0200 -+++ pegasus/src/Executor/Parent.c 2013-08-27 13:52:50.434650395 +0200 +--- pegasus/src/Executor/Parent.c.orig 2015-03-31 14:57:37.595034076 +0200 ++++ pegasus/src/Executor/Parent.c 2015-03-31 14:58:11.034176796 +0200 @@ -634,7 +634,7 @@ static void HandleAuthenticatePasswordRe #if defined(PEGASUS_PAM_AUTHENTICATION) @@ -162,8 +162,8 @@ if (status == PAM_SUCCESS) { diff -up pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c ---- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2013-08-27 13:53:14.882743374 +0200 -+++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2013-08-27 13:53:39.089835311 +0200 +--- pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c.orig 2015-03-31 14:58:30.460259707 +0200 ++++ pegasus/src/Executor/tests/PAMAuth/TestExecutorPAMAuth.c 2015-03-31 14:58:55.882368210 +0200 @@ -49,7 +49,7 @@ int main() sprintf(prompt, "Enter password for %s: ", PEGASUS_CIMSERVERMAIN_USER); pw = getpass(prompt); @@ -174,10 +174,10 @@ else printf("Wrong password\n"); diff -up pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig pegasus/src/Pegasus/Common/AuthenticationInfo.h ---- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2013-08-27 13:54:15.842974734 +0200 -+++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2013-08-27 13:55:32.977266918 +0200 -@@ -353,6 +353,22 @@ public: - return _rep->getRemotePrivilegedUserAccessChecked(); +--- pegasus/src/Pegasus/Common/AuthenticationInfo.h.orig 2015-03-31 14:59:10.875432201 +0200 ++++ pegasus/src/Pegasus/Common/AuthenticationInfo.h 2015-03-31 15:00:03.130655230 +0200 +@@ -348,6 +348,22 @@ public: + _rep->setAuthHandle(authHandle); } + /** Indicate whether the user is Remote @@ -196,24 +196,25 @@ + _rep->setRemoteUser(isRemoteUser); + } + - void setAuthHandle(const AuthHandle & authHandle) + AuthHandle getAuthHandle() { CheckRep(_rep); diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp ---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2013-08-27 13:56:01.394374402 +0200 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2013-08-27 13:59:22.129131385 +0200 -@@ -47,6 +47,7 @@ const String AuthenticationInfoRep::AUTH +--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp.orig 2015-03-31 15:00:26.267753980 +0200 ++++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.cpp 2015-03-31 15:01:53.018124238 +0200 +@@ -48,6 +48,7 @@ const String AuthenticationInfoRep::AUTH AuthenticationInfoRep::AuthenticationInfoRep() : _connectionAuthenticated(false), _wasRemotePrivilegedUserAccessChecked(false), + _isRemoteUser(true), _authHandle(), _isExpiredPassword(false) - { -@@ -81,6 +82,16 @@ AuthenticationInfoRep::~AuthenticationIn + #ifdef PEGASUS_ENABLE_SESSION_COOKIES +@@ -86,6 +87,16 @@ AuthenticationInfoRep::~AuthenticationIn + PEG_METHOD_EXIT(); } - ++ +void AuthenticationInfoRep::setRemoteUser(Boolean isRemoteUser) +{ + PEG_METHOD_ENTER(TRC_AUTHENTICATION, @@ -223,16 +224,15 @@ + + PEG_METHOD_EXIT(); +} -+ + void AuthenticationInfoRep::setConnectionAuthenticated( Boolean connectionAuthenticated) - { diff -up pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig pegasus/src/Pegasus/Common/AuthenticationInfoRep.h ---- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2013-08-27 13:59:47.458226631 +0200 -+++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2013-08-27 14:01:27.744603255 +0200 -@@ -147,6 +147,13 @@ public: - void setSecurityAssociation(); - #endif +--- pegasus/src/Pegasus/Common/AuthenticationInfoRep.h.orig 2015-03-31 15:02:17.868230300 +0200 ++++ pegasus/src/Pegasus/Common/AuthenticationInfoRep.h 2015-03-31 15:03:53.065636608 +0200 +@@ -148,6 +148,13 @@ public: + } + #endif //PEGASUS_NEGOTIATE_AUTHENTICATION + Boolean isRemoteUser() const + { @@ -244,7 +244,7 @@ Array<SSLCertificateInfo*> getClientCertificateChain() { return _clientCertificate; -@@ -218,6 +225,8 @@ private: +@@ -233,6 +240,8 @@ private: Array<SSLCertificateInfo*> _clientCertificate; @@ -254,8 +254,8 @@ String _userRole; Boolean _isExpiredPassword; diff -up pegasus/src/Pegasus/Common/Executor.cpp.orig pegasus/src/Pegasus/Common/Executor.cpp ---- pegasus/src/Pegasus/Common/Executor.cpp.orig 2013-08-27 14:01:50.929690223 +0200 -+++ pegasus/src/Pegasus/Common/Executor.cpp 2013-08-27 14:07:28.655952891 +0200 +--- pegasus/src/Pegasus/Common/Executor.cpp.orig 2015-03-31 15:04:10.843712487 +0200 ++++ pegasus/src/Pegasus/Common/Executor.cpp 2015-03-31 15:08:16.953762900 +0200 @@ -126,7 +126,8 @@ public: virtual int authenticatePassword( @@ -312,8 +312,8 @@ int Executor::validateUser( diff -up pegasus/src/Pegasus/Common/Executor.h.orig pegasus/src/Pegasus/Common/Executor.h ---- pegasus/src/Pegasus/Common/Executor.h.orig 2013-08-27 14:09:28.767397015 +0200 -+++ pegasus/src/Pegasus/Common/Executor.h 2013-08-27 14:10:55.934717862 +0200 +--- pegasus/src/Pegasus/Common/Executor.h.orig 2015-03-31 15:08:26.668804365 +0200 ++++ pegasus/src/Pegasus/Common/Executor.h 2015-03-31 15:08:46.535889158 +0200 @@ -184,7 +184,8 @@ public: */ static int authenticatePassword( @@ -325,9 +325,9 @@ /** Check whether the given user is valid for the underlying authentcation mechanism. diff -up pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig pegasus/src/Pegasus/Common/HTTPConnection.cpp ---- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2013-08-27 14:11:11.103773653 +0200 -+++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2013-08-27 14:12:27.743055754 +0200 -@@ -2305,6 +2305,70 @@ void HTTPConnection::_handleReadEvent() +--- pegasus/src/Pegasus/Common/HTTPConnection.cpp.orig 2015-03-31 15:09:05.706970982 +0200 ++++ pegasus/src/Pegasus/Common/HTTPConnection.cpp 2015-03-31 15:10:08.472238867 +0200 +@@ -2295,6 +2295,70 @@ void HTTPConnection::_handleReadEvent() message->contentLanguages = contentLanguages; message->dest = _outputMessageQueue->getQueueId(); @@ -399,8 +399,8 @@ // The _closeConnection method sets the _connectionClosePending flag. // If we are executing on the client side and the diff -up pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig pegasus/src/Pegasus/Common/HTTPMessage.cpp ---- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2013-08-27 14:12:39.200097953 +0200 -+++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2013-08-27 14:13:05.903196184 +0200 +--- pegasus/src/Pegasus/Common/HTTPMessage.cpp.orig 2015-03-31 15:10:32.186340162 +0200 ++++ pegasus/src/Pegasus/Common/HTTPMessage.cpp 2015-03-31 15:11:00.008459185 +0200 @@ -133,7 +133,8 @@ HTTPMessage::HTTPMessage( authInfo(0), acceptLanguagesDecoded(false), @@ -412,8 +412,8 @@ if (cimException_) cimException = *cimException_; diff -up pegasus/src/Pegasus/Common/HTTPMessage.h.orig pegasus/src/Pegasus/Common/HTTPMessage.h ---- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2013-08-27 14:13:16.272234342 +0200 -+++ pegasus/src/Pegasus/Common/HTTPMessage.h 2013-08-27 14:13:52.605368078 +0200 +--- pegasus/src/Pegasus/Common/HTTPMessage.h.orig 2015-03-31 15:11:13.706517786 +0200 ++++ pegasus/src/Pegasus/Common/HTTPMessage.h 2015-03-31 15:11:33.528602586 +0200 @@ -73,6 +73,7 @@ public: ContentLanguageList contentLanguages; Boolean acceptLanguagesDecoded; @@ -423,8 +423,8 @@ bool binaryResponse; diff -up pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp ---- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig 2013-08-27 14:14:16.255455117 +0200 -+++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2013-08-27 14:15:54.285815870 +0200 +--- pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp.orig 2015-03-31 15:11:50.617675692 +0200 ++++ pegasus/src/Pegasus/Common/tests/Executor/TestExecutor.cpp 2015-03-31 15:12:49.031925589 +0200 @@ -76,7 +76,7 @@ void testExecutorLoopbackImpl() #endif @@ -444,9 +444,9 @@ char challengeFilePath[EXECUTOR_BUFFER_SIZE]; diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp ---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2013-08-27 14:16:28.110940302 +0200 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2013-08-27 14:18:41.085429677 +0200 -@@ -157,6 +157,7 @@ AuthenticationStatus BasicAuthentication +--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp.orig 2015-03-31 15:12:58.057964203 +0200 ++++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticationHandler.cpp 2015-03-31 15:13:19.591056322 +0200 +@@ -159,6 +159,7 @@ AuthenticationStatus BasicAuthentication _basicAuthenticator->authenticate( userName, password, @@ -455,8 +455,8 @@ // Log audit message. diff -up pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h ---- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2013-08-27 14:18:53.678475974 +0200 -+++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2013-08-27 14:19:37.740638125 +0200 +--- pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h.orig 2015-03-31 15:13:32.889113211 +0200 ++++ pegasus/src/Pegasus/Security/Authentication/BasicAuthenticator.h 2015-03-31 15:13:51.240191720 +0200 @@ -65,6 +65,7 @@ public: virtual AuthenticationStatus authenticate( const String& userName, @@ -466,8 +466,8 @@ /** Construct and return the HTTP Basic authentication challenge header diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2013-08-27 14:20:05.917741881 +0200 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2013-08-27 14:20:47.564895056 +0200 +--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h.orig 2015-03-31 15:14:04.185247096 +0200 ++++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticator.h 2015-03-31 15:14:20.391316426 +0200 @@ -54,6 +54,7 @@ public: AuthenticationStatus authenticate( const String& userName, @@ -477,8 +477,8 @@ AuthenticationStatus validateUser( diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2013-08-27 14:20:55.805925482 +0200 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2013-08-27 14:21:25.421034454 +0200 +--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp.orig 2015-03-31 15:14:32.937370098 +0200 ++++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorStub.cpp 2015-03-31 15:14:52.631454350 +0200 @@ -74,6 +74,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti AuthenticationStatus PAMBasicAuthenticator::authenticate( const String& userName, @@ -488,8 +488,8 @@ { PEG_METHOD_ENTER(TRC_AUTHENTICATION, diff -up pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp ---- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2013-08-27 14:21:41.870094885 +0200 -+++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2013-08-27 14:22:36.012294104 +0200 +--- pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp.orig 2015-03-31 15:15:08.521522327 +0200 ++++ pegasus/src/Pegasus/Security/Authentication/PAMBasicAuthenticatorUnix.cpp 2015-03-31 15:15:49.255696589 +0200 @@ -66,6 +66,7 @@ PAMBasicAuthenticator::~PAMBasicAuthenti AuthenticationStatus PAMBasicAuthenticator::authenticate( const String& userName, @@ -509,9 +509,9 @@ // return code of -1 will be translated to AUTHSC_UNAUTHORIZED AuthenticationStatus authStatus = _getAuthStatusFromPAM_RC(pam_rc); diff -up pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp ---- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2013-08-27 14:22:56.429369205 +0200 -+++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2013-08-27 14:23:20.267456931 +0200 -@@ -237,7 +237,7 @@ AuthenticationStatus SecureBasicAuthenti +--- pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp.orig 2015-03-31 15:16:03.097755805 +0200 ++++ pegasus/src/Pegasus/Security/Authentication/SecureBasicAuthenticator.cpp 2015-03-31 15:16:24.758848473 +0200 +@@ -239,7 +239,7 @@ AuthenticationStatus SecureBasicAuthenti if (Executor::detectExecutor() == 0) { if (Executor::authenticatePassword( @@ -521,9 +521,9 @@ authenticated = true; } diff -up pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp ---- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2013-08-27 14:23:47.293556300 +0200 -+++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2013-08-27 14:24:18.748672110 +0200 -@@ -430,6 +430,9 @@ void HTTPAuthenticatorDelegator::handleH +--- pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp.orig 2015-03-31 15:16:39.848913028 +0200 ++++ pegasus/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp 2015-03-31 15:17:21.079089410 +0200 +@@ -431,6 +431,9 @@ void HTTPAuthenticatorDelegator::handleH Tracer::LEVEL3, "HTTPAuthenticatorDelegator - Authentication processing start"); ++++++ pegasus-2.9.0-redhat-config.patch ++++++ --- /var/tmp/diff_new_pack.L1MxFi/_old 2015-05-20 23:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.L1MxFi/_new 2015-05-20 23:58:03.000000000 +0200 @@ -1,6 +1,6 @@ diff -up pegasus/env_var_Linux.status.orig pegasus/env_var_Linux.status ---- pegasus/env_var_Linux.status.orig 2013-07-18 15:45:12.000000000 +0200 -+++ pegasus/env_var_Linux.status 2013-08-27 15:35:09.838665443 +0200 +--- pegasus/env_var_Linux.status.orig 2015-03-31 14:43:37.774479768 +0200 ++++ pegasus/env_var_Linux.status 2015-03-31 14:45:21.003914888 +0200 @@ -25,18 +25,21 @@ PEGASUS_HAS_SSL=yes PEGASUS_USE_SSL_RANDOMFILE=false PEGASUS_NOASSERTS=yes @@ -9,7 +9,7 @@ PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true PEGASUS_USE_RELEASE_DIRS=true PEGASUS_USE_SYSLOGS=true - PEGASUS_CIM_SCHEMA=CIM236 + PEGASUS_CIM_SCHEMA=CIM241 PEGASUS_USE_NET_SNMP=true -PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true +PEGASUS_ENABLE_PRIVILEGE_SEPARATION=false
