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

Update to upstream version 2.7.2, Enable out-of-process providers

Browse Source
This commit is contained in:
vcrhonek 2008-11-07 07:32:29 +00:00
parent 7e39a5a45e
commit 22e79ecce9
7 changed files with 17 additions and 1986 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -8,3 +8,4 @@ pegasus-2.6.0-local-or-remote-auth.patch
pegasus-2.6.0-no-rpath.patch
pegasus-2.7.0.tar.gz
pegasus-2.7.1.tar.gz
pegasus-2.7.2.tar.gz

49
pegasus-2.7.0-redhat-config.patch
View File

@ -1,53 +1,18 @@
--- pegasus/mak/config-linux.mak_old 2007-11-07 11:10:31.000000000 +0100
+++ pegasus/mak/config-linux.mak 2007-11-07 11:14:48.000000000 +0100
@@ -119,7 +119,8 @@
ifdef PEGASUS_USE_DEBUG_BUILD_OPTIONS
FLAGS += -g
else
- FLAGS += -s
+# FLAGS += -s
+# ^= let rpm handle stripping
#
# The -fno-enforce-eh-specs is not available in 2.9.5 and it probably
# appeared in the 3.0 series of compilers.
--- pegasus/Makefile.Release_old 2007-11-07 10:49:01.000000000 +0100
+++ pegasus/Makefile.Release 2007-11-07 11:08:05.000000000 +0100
@@ -366,10 +366,10 @@
$(foreach i, $(MANAGEDSYSTEM_MOF_FILES), $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr__r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_MOF_DIR)/Pegasus/$(i);)
stage_PegasusVarDataDirectoryFiles: FORCE
- $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(COPY) $(ROOT)/src/Server/cimserver_planned.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
setpermissions_PegasusVarDataDirectoryFiles: FORCE
- $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
+ $(MAKE) -f $(ROOT)/Makefile.Release setpermissions PERMISSIONS="$(Pr________)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)
stage_genOpenPegasusSSLCertsFile: FORCE
@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
@@ -1037,7 +1037,7 @@
"/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace) %attr($(Prw_r__r__), " \
"$(CIMSERVER_USR), $(CIMSERVER_GRP))" \
- "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
+ "$(PEGASUS_CONFIG_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
--- pegasus/env_var_Linux.status_old 2007-11-07 10:44:43.000000000 +0100
+++ pegasus/env_var_Linux.status 2007-11-07 10:48:47.000000000 +0100
@@ -19,7 +19,9 @@
diff -up pegasus/env_var_Linux.status.old pegasus/env_var_Linux.status
--- pegasus/env_var_Linux.status.old 2008-10-28 18:44:08.000000000 +0100
+++ pegasus/env_var_Linux.status 2008-11-06 15:09:20.000000000 +0100
@@ -19,7 +19,9 @@ ifndef PEGASUS_STAGING_DIR
PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
endif
-PEGASUS_DISABLE_CQL=true
+PEGASUS_ENABLE_CQL=true
+PEGASUS_DEFAULT_ENABLE_OOP = false
+PEGASUS_DEFAULT_ENABLE_OOP=true
+
PEGASUS_DISABLE_OBJECT_NORMALIZATION=true
PEGASUS_DISABLE_PERFINST=yes
PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER=true
@@ -28,7 +30,6 @@
@@ -28,7 +30,6 @@ PEGASUS_HAS_SSL=yes
PEGASUS_USE_SSL_RANDOMFILE=false
PEGASUS_NOASSERTS=yes
PEGASUS_PAM_AUTHENTICATION=true
@ -55,7 +20,7 @@
PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
PEGASUS_USE_RELEASE_DIRS=true
PEGASUS_USE_SYSLOGS=true
@@ -67,22 +68,21 @@
@@ -67,22 +68,21 @@ PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VA
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/trace
PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc

49
pegasus-2.7.1-bz454589.patch
View File

@ -1,49 +0,0 @@
diff --git a/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp b/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp
index a152be5..4612912 100644
--- a/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp
+++ b/src/Pegasus/ProviderManager2/CMPI/CMPI_Array.cpp
@@ -194,7 +194,17 @@ extern "C"
CMSetStatus(rc,CMPI_RC_OK);
if (pos < dta->value.uint32)
{
- return dta[pos+1];
+ if (dta->type == CMPI_chars)
+ {
+ data.type = CMPI_chars;
+ data.state = CMPI_goodValue;
+ data.value.chars = (char*)CMGetCharPtr(dta[pos+1].value.string);
+ return data;
+ }
+ else
+ {
+ return dta[pos+1];
+ }
}
CMSetStatus(rc,CMPI_RC_ERR_NO_SUCH_PROPERTY);
return data;
@@ -227,7 +237,11 @@ extern "C"
dta[pos+1].state=CMPI_goodValue;
if (type == CMPI_chars)
{
- dta[pos+1].value.chars = (char*) val;
+ // Store char* as CMPIString internally, this frees us from
+ // doing explicit memory management for char*.
+ dta[pos+1].value.string = reinterpret_cast<CMPIString*>(
+ new CMPI_Object((const char*) val));
+ dta[pos+1].type = CMPI_string;
}
else
{
diff --git a/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp b/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp
index 48dd518..d293e40 100644
--- a/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp
+++ b/src/Pegasus/ProviderManager2/CMPI/CMPI_Value.cpp
@@ -177,7 +177,7 @@ CIMValue value2CIMValue(const CMPIValue* data, const CMPIType type, CMPIrc *rc)
else
if( aType == CMPI_chars )
{
- CopyToStringArray(String,chars)
+ CopyToStringArray(String,string->hdl)
}
else
if( aType == CMPI_charsptr )

1874
pegasus-2.7.1-bz454590.patch
View File

File diff suppressed because it is too large Load Diff

12
pegasus-2.7.1-bz454591.patch
View File

@ -1,12 +0,0 @@
diff -up pegasus/src/Pegasus/Common/XmlWriter.cpp_old pegasus/src/Pegasus/Common/XmlWriter.cpp
--- pegasus/src/Pegasus/Common/XmlWriter.cpp_old 2008-07-15 14:24:21.000000000 +0200
+++ pegasus/src/Pegasus/Common/XmlWriter.cpp 2008-07-15 14:25:38.000000000 +0200
@@ -2094,6 +2094,8 @@ void XmlWriter::appendUnauthorizedRespon
const String& content)
{
out << STRLIT("HTTP/1.1 " HTTP_STATUS_UNAUTHORIZED "\r\n");
+ Uint32 contentLength = 0;
+ OUTPUT_CONTENTLENGTH;
out << content << STRLIT("\r\n");
out << STRLIT("\r\n");

2
sources
View File

@ -1 +1 @@
2b7090821ffd68da1471f8bfac288ae2 pegasus-2.7.1.tar.gz
f5026a5ba7bcde7b04f882b0b2d205ed pegasus-2.7.2.tar.gz

16
tog-pegasus.spec
View File

@ -42,8 +42,8 @@
%define _default_patch_fuzz 2
Version: 2.7.1
Release: 2%{?dist}
Version: 2.7.2
Release: 1%{?dist}
Epoch: 2
#
Summary: OpenPegasus WBEM Services for Linux
@ -80,9 +80,6 @@ Patch8: pegasus-2.6.0-multilib.patch
Patch9: pegasus-2.6.0-cimuser.patch
Patch11: pegasus-2.7.0-no_privilege_separation.patch
Patch12: pegasus-2.7.0-no_snmp_tests.patch
Patch13: pegasus-2.7.1-bz454589.patch
Patch14: pegasus-2.7.1-bz454590.patch
Patch15: pegasus-2.7.1-bz454591.patch
#
Conflicts: openwbem
Provides: tog-pegasus-cimserver
@ -150,9 +147,6 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%patch9 -p1 -b .cimuser
%patch11 -p1 -b .no_privilege_separation
%patch12 -p1 -b .no_snmp_tests
%patch13 -p1 -b .bz454589
%patch14 -p1 -b .bz454590
%patch15 -p1 -b .bz454591
find . -name 'CVS' -exec /bin/rm -rf '{}' ';' >/dev/null 2>&1 ||:;
%build
@ -448,6 +442,12 @@ fi
%changelog
* Thu Nov 6 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.7.2-1
- Update to upstream version 2.7.2
(remove patches added in 2.7.1-1 - they're upstream now)
- Enable out-of-process providers
Resolves: #455109
* Mon Sep 8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2:2.7.1-2
- fix license tag