update to latest upstream, three additional bugfixes

This commit is contained in:
vcrhonek 2008-07-15 12:37:43 +00:00
parent 3f367f4f03
commit 2ebb6e5215
6 changed files with 1956 additions and 5 deletions

View File

@ -7,3 +7,4 @@ pegasus-2.6.0-cmpi-provider-lib.patch
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

View File

@ -0,0 +1,49 @@
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 Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,12 @@
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");

View File

@ -1 +1 @@
f52417ddf39f1b3f75f8e0b172bebecb pegasus-2.7.0.tar.gz
2b7090821ffd68da1471f8bfac288ae2 pegasus-2.7.1.tar.gz

View File

@ -40,8 +40,10 @@
%endif
%endif
Version: 2.7.0
Release: 9%{?dist}
%define _default_patch_fuzz 2
Version: 2.7.1
Release: 1%{?dist}
Epoch: 2
#
Summary: OpenPegasus WBEM Services for Linux
@ -76,9 +78,11 @@ Patch6: pegasus-2.5.1-pam-wbem.patch
Patch7: pegasus-2.5.1-fix_tests.patch
Patch8: pegasus-2.6.0-multilib.patch
Patch9: pegasus-2.6.0-cimuser.patch
Patch10: pegasus-2.7.0-cmpiheaders.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
@ -144,9 +148,11 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
%patch7 -p1 -b .fix-tests
%patch8 -p1 -b .multilib
%patch9 -p1 -b .cimuser
%patch10 -p1 -b .cmpiheaders
%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
@ -442,6 +448,15 @@ fi
%changelog
* Tue Jul 15 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.7.1-1
- Update to upstream version 2.7.1
- Fix setElementAt() doesn't copy value of CMPI_char parameter
Resolves: #454589
- Fix CMPI MI factories that return errors are unsupported
Resolves: #454590
- Fix HTTP 401 responses lack Content-Length headers
Resolves: #454591
* Tue Jul 1 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.7.0-9
- Add SNMP indication handler to package
Resolves: #452930