Hello community, here is the log from the commit of package sblim-sfcc for openSUSE:Factory checked in at 2012-11-21 17:22:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-sfcc (Old) and /work/SRC/openSUSE:Factory/.sblim-sfcc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-sfcc", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-sfcc/sblim-sfcc.changes 2012-06-15 16:31:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-sfcc.new/sblim-sfcc.changes 2012-11-21 17:22:36.000000000 +0100 @@ -1,0 +2,23 @@ +Tue Nov 13 11:04:15 UTC 2012 - [email protected] + +- remove test debug patch + (0006-Show-class-and-property-qualifiers.patch) + +- add upstream patches + 0001-3547832-memory-leak-in-backend-cimxml-grammer.c.patch + 0002-3555103-wrong-declaration-of-release-attribute-in-_C.patch + 0003-3566968-sfcc-enumInstances-fails-to-parse-the-xml.patch + +------------------------------------------------------------------- +Tue Nov 13 10:52:00 UTC 2012 - [email protected] + +- report failure to load libcimcClientXML.so properly + (0001-Improve-error-reporting-within-cmciConnect2.patch) + +------------------------------------------------------------------- +Tue Nov 13 10:50:51 UTC 2012 - [email protected] + +- fix packaging: move libcimcClientXML.so from -devel to main + package, it's dlopen'ed at runtime ! + +------------------------------------------------------------------- Old: ---- 0006-Show-class-and-property-qualifiers.patch New: ---- 0001-3547832-memory-leak-in-backend-cimxml-grammer.c.patch 0001-Improve-error-reporting-within-cmciConnect2.patch 0002-3555103-wrong-declaration-of-release-attribute-in-_C.patch 0003-3566968-sfcc-enumInstances-fails-to-parse-the-xml.patch sblim-sfcc.rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-sfcc.spec ++++++ --- /var/tmp/diff_new_pack.B1yCjm/_old 2012-11-21 17:22:37.000000000 +0100 +++ /var/tmp/diff_new_pack.B1yCjm/_new 2012-11-21 17:22:37.000000000 +0100 @@ -26,7 +26,13 @@ Source: %{name}-%{version}.tar.bz2 Source1: autoconfiscate.sh -Patch15: 0006-Show-class-and-property-qualifiers.patch +# patches from upstream past 2.2.4 +Patch1: 0001-3547832-memory-leak-in-backend-cimxml-grammer.c.patch +Patch2: 0002-3555103-wrong-declaration-of-release-attribute-in-_C.patch +Patch3: 0003-3566968-sfcc-enumInstances-fails-to-parse-the-xml.patch + +# upstream ID 3586680 ([email protected]) +Patch10: 0001-Improve-error-reporting-within-cmciConnect2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -58,7 +64,10 @@ %prep %setup -q -%patch15 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch10 -p1 %build # autoconfiscate @@ -94,10 +103,13 @@ %{_docdir}/%{name}/* %doc %{_mandir}/man3/* %{_libdir}/*.so.* +# dlopen'ed lib +%{_libdir}/libcimcClientXML.so %files devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/*.so +%{_libdir}/libcimcclient.so +%{_libdir}/libcmpisfcc.so %changelog ++++++ 0001-3547832-memory-leak-in-backend-cimxml-grammer.c.patch ++++++ >From d4e5c1630998c0819f99051319843acd8ceb51cd Mon Sep 17 00:00:00 2001 From: buccella <[email protected]> Date: Tue, 31 Jul 2012 15:14:18 -0400 Subject: [PATCH 01/14] [ 3547832 ] memory leak in backend/cimxml/grammer.c --- ChangeLog | 6 ++++++ NEWS | 1 + backend/cimxml/grammar.c | 3 ++- contributions.txt | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c index 8fb5f91..d109421 100644 --- a/backend/cimxml/grammar.c +++ b/backend/cimxml/grammar.c @@ -571,7 +571,7 @@ static void valueObjectWithPath(ParserControl *parm, parseUnion *stateUnion) static void valueObjectWithPathData(ParserControl *parm, parseUnion *stateUnion) { parseUnion lvalp={0}; - CMPIObjectPath *op; + CMPIObjectPath *op = NULL; CMPIInstance *inst; ct = localLex((parseUnion*)&stateUnion->xtokObjectWithPathData, parm); if(ct == XTOK_CLASSPATH) { @@ -590,6 +590,7 @@ static void valueObjectWithPathData(ParserControl *parm, parseUnion *stateUnion) setInstQualifiers(inst, &stateUnion->xtokObjectWithPathData.inst.inst.qualifiers); setInstProperties(inst, &stateUnion->xtokObjectWithPathData.inst.inst.properties); simpleArrayAdd(parm->respHdr.rvArray,(CMPIValue*)&inst,CMPI_instance); + if (op) op->ft->release(op); } else { parseError("XTOK_CLASSPATH or XTOK_INSTANCEPATH", ct, parm); -- 1.7.10.4 ++++++ 0001-Improve-error-reporting-within-cmciConnect2.patch ++++++ >From a02fa1d342b3c18e770e44a1ccfa0dbab52753e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 13 Nov 2012 11:39:27 +0100 Subject: [PATCH] Improve error reporting within cmciConnect2() --- frontend/sfcc/sfcclient.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/sfcc/sfcclient.c b/frontend/sfcc/sfcclient.c index 0b32d98..0073bbc 100644 --- a/frontend/sfcc/sfcclient.c +++ b/frontend/sfcc/sfcclient.c @@ -76,10 +76,11 @@ CMCIClient *cmciConnect2(const char *hn, const char *scheme, const char *port, CMPIStatus *rc) { CMCIClient *cc = NULL; - char *msg; + char *msg = NULL; int retc = 0; char *client; + if (rc) rc->rc = CMPI_RC_OK; pthread_mutex_lock(&ConnectionControl.ccMux); if (ConnectionControl.ccCount == 0) { client = getenv("SFCC_CLIENT"); @@ -94,8 +95,15 @@ CMCIClient *cmciConnect2(const char *hn, const char *scheme, const char *port, } if (retc || ConnectionControl.ccEnv == NULL) { if(rc) { - rc->rc=CMPI_RC_ERR_FAILED; - rc->msg=NULL; + rc->rc = CMPI_RC_ERR_FAILED; + if (msg) { + fprintf(stderr, "sfcc: NewCIMCEnv failed: %s\n", msg); + free(msg); + } + else { + fprintf(stderr, "sfcc: NewCIMCEnv failed without message\n"); + } + rc->msg = NULL; /* Can't create CMPIString without ConnectionControl.ccEnv ! */ } cc=NULL; } else { @@ -113,8 +121,10 @@ CMCIClient *cmciConnect2(const char *hn, const char *scheme, const char *port, /* cleanup ccEnv after pthread_mutex_unlock */ cmciRelease(NULL); if (rc) { - rc->rc = CMPI_RC_ERR_FAILED; - rc->msg = NULL; + if (rc->rc == CMPI_RC_OK) + rc->rc = CMPI_RC_ERR_FAILED; + if (rc->msg == NULL && ConnectionControl.ccEnv != NULL) + rc->msg = native_new_CMPIString("Connection failed", NULL); } } -- 1.7.10.4 ++++++ 0002-3555103-wrong-declaration-of-release-attribute-in-_C.patch ++++++ >From 417ba82cfdbd2d75edc0625a15c64fc78fcb6988 Mon Sep 17 00:00:00 2001 From: Dave Heller <[email protected]> Date: Mon, 10 Sep 2012 17:38:20 -0400 Subject: [PATCH 02/14] [ 3555103 ] wrong declaration of release attribute in _CIMCArgsFT --- NEWS | 1 + cimc/cimcft.h | 2 +- contributions.txt | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cimc/cimcft.h b/cimc/cimcft.h index 773ee3b..80613d5 100644 --- a/cimc/cimcft.h +++ b/cimc/cimcft.h @@ -434,7 +434,7 @@ extern "C" { struct _CIMCArgsFT { int ftVersion; - CIMCStatus (*release) (CIMCArgs args); + CIMCStatus (*release) (CIMCArgs* args); CIMCArgs* (*clone) (CIMCArgs* args, CIMCStatus* rc); CIMCStatus (*addArg) (CIMCArgs* args, const char* name, CIMCValue* value, CIMCType type); CIMCData (*getArg) (CIMCArgs * args, const char * name, CIMCStatus * rc); -- 1.7.10.4 ++++++ 0003-3566968-sfcc-enumInstances-fails-to-parse-the-xml.patch ++++++ >From 3a92ae92be9d8911f84bca787b92734c9f48d605 Mon Sep 17 00:00:00 2001 From: Dave Heller <[email protected]> Date: Thu, 13 Sep 2012 21:18:49 -0400 Subject: [PATCH 03/14] [ 3566968 ] sfcc enumInstances fails to parse the xml --- NEWS | 1 + backend/cimxml/cimXmlParser.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c index b7b590e..128d92f 100644 --- a/backend/cimxml/cimXmlParser.c +++ b/backend/cimxml/cimXmlParser.c @@ -757,9 +757,10 @@ static int procKeyValue(parseUnion * lvalp, ParserControl * parm) { static XmlElement elm[] = { {"VALUETYPE"}, + {"TYPE"}, {NULL} }; - XmlAttr attr[1] = { + XmlAttr attr[2] = { {NULL} }; char *val; -- 1.7.10.4 ++++++ sblim-sfcc.rpmlintrc ++++++ addFilter("shlib-policy-name-error") addFilter("shlib-policy-missing-suffix") addFilter("shared-lib-calls-exit .*\.so") addFilter("devel-file-in-non-devel-package.*libcimcClientXML.so") -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
