Hello community, here is the log from the commit of package sblim-wbemcli for openSUSE:Factory checked in at Thu Sep 15 14:14:16 CEST 2011.
-------- --- sblim-wbemcli/sblim-wbemcli.changes 2009-08-05 15:05:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-wbemcli/sblim-wbemcli.changes 2011-07-14 08:50:12.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jul 14 06:46:07 UTC 2011 - [email protected] + +- update to 1.6.2 + Bugfix release: + * 3324380 support optional CIMType in KEYVALUE element + * 3216622 wbemcli throws parser error on CDATA string value + * 2991546 Core dumps when property contains value within "[]" + +------------------------------------------------------------------- +Tue Sep 14 19:51:37 UTC 2010 - [email protected] + +- Fix SLE 10 build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sblim-wbemcli-1.6.1.tar.bz2 New: ---- sblim-wbemcli-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-wbemcli.spec ++++++ --- /var/tmp/diff_new_pack.LDMcc4/_old 2011-09-15 14:14:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LDMcc4/_new 2011-09-15 14:14:11.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sblim-wbemcli (Version 1.6.1) +# spec file for package sblim-wbemcli # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,14 @@ Name: sblim-wbemcli -BuildRequires: binutils-devel curl-devel gcc-c++ -Version: 1.6.1 +%if 0%{?suse_version} > 1010 +BuildRequires: binutils-devel +%else +# SLE_10 +BuildRequires: binutils +%endif +BuildRequires: curl-devel gcc-c++ +Version: 1.6.2 Release: 1 Group: System/Management License: Eclipse Public License ++++++ sblim-wbemcli-1.6.1.tar.bz2 -> sblim-wbemcli-1.6.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/ChangeLog new/sblim-wbemcli-1.6.2/ChangeLog --- old/sblim-wbemcli-1.6.1/ChangeLog 2009-06-30 04:49:49.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/ChangeLog 2011-07-13 23:21:36.000000000 +0200 @@ -1,3 +1,35 @@ +2011-06-21 Tyrel Datwyler <[email protected]> + + * CimXml.cpp, NEWS, contributions.txt: + + Fixed 2991546: Core dumps when property contains value within "[]" + (Patch by Aruna Venkataraman) + +2011-06-21 Tyrel Datwyler <[email protected]> + + * CimXml.cpp, NEWS, contributions.txt: + + Fixed 3216622: wbemcli throws parser error on CDATA string value + (Patch by Chris Poblete) + +2011-06-21 Tyrel Datwyler <[email protected]> + + * .cvsignore: + + updated list of autogenerated files to ignore + +2011-06-21 Tyrel Datwyler <[email protected]> + + * CimXml.cpp, CimXml.h, NEWS: + + Fixed 3324380: support optional CIMType in KEYVALUE element + +2009-06-29 Tyrel Datwyler <[email protected]> + + * ChangeLog, NEWS, configure.ac: + + Updated to release version 1.6.1 + 2009-06-24 Tyrel Datwyler <[email protected]> * NEWS: @@ -26,8 +58,8 @@ * CimXml.cpp: - Fixed 2805214: should escape backslash character in CimXml::unescapeXml() - (revised patch) + Fixed 2805214: should escape backslash character in + CimXml::unescapeXml() (revised patch) 2009-06-19 Tyrel Datwyler <[email protected]> @@ -45,8 +77,8 @@ * CimXml.cpp: - Fixed 2805214: should escape backslash character in CimXml::unescapeXml() - (patch by Anon Sricharoenchai) + Fixed 2805214: should escape backslash character in + CimXml::unescapeXml() (patch by Anon Sricharoenchai) 2009-03-25 Tyrel Datwyler <[email protected]> @@ -70,13 +102,15 @@ * CimXml.cpp, ChangeLog: - [ 2108395 ] wbemcli segfaults on cm when objectpath is just classname + [ 2108395 ] wbemcli segfaults on cm when objectpath is just + classname 2009-02-05 Tyrel Datwyler <[email protected]> * ChangeLog, CimXml.cpp, NEWS, configure.ac: - [ 2108395 ] wbemcli segfaults on cm when objectpath is just classname + [ 2108395 ] wbemcli segfaults on cm when objectpath is just + classname 2008-12-11 Tyrel Datwyler <[email protected]> @@ -88,15 +122,16 @@ * ChangeLog, NEWS: - [ 2418867 ] wbemcli: remove deprecated const string to char conversion + [ 2418867 ] wbemcli: remove deprecated const string to char + conversion 2008-12-11 Tyrel Datwyler <[email protected]> * CimCurl.cpp, CimCurl.h, CimWinHttp.cpp, CimWinHttp.h, CimXml.cpp, - CimXml.h, Cimghttp.cpp, Cimghttp.h, Cimwww.cpp, Cimwww.h, - main.cpp: + CimXml.h, Cimghttp.cpp, Cimghttp.h, Cimwww.cpp, Cimwww.h, main.cpp: - [ 2418867 ] wbemcli: remove deprecated const string to char conversion + [ 2418867 ] wbemcli: remove deprecated const string to char + conversion 2008-10-15 Tyrel Datwyler <[email protected]> @@ -119,10 +154,10 @@ 2008-08-07 Tyrel Datwyler <[email protected]> * ChangeLog, CimCurl.cpp, CimCurl.h, CimWinHttp.cpp, CimWinHttp.h, - CimXml.cpp, CimXml.h, CimXml.i, Cimghttp.cpp, Cimghttp.h, - Cimwww.cpp, Cimwww.h, NEWS, README.pycli, SunSMC.cpp, cimcli.py, - configure.ac, license.html, main.cpp, sblim-wbemcli.rh.spec, - sblim-wbemcli.spec.in, stdhdr.i: + CimXml.cpp, CimXml.h, CimXml.i, Cimghttp.cpp, Cimghttp.h, + Cimwww.cpp, Cimwww.h, NEWS, README.pycli, SunSMC.cpp, cimcli.py, + configure.ac, license.html, main.cpp, sblim-wbemcli.rh.spec, + sblim-wbemcli.spec.in, stdhdr.i: [ 2041983 ] wbemcli: Change license from CPL to EPL @@ -130,8 +165,8 @@ * contributions.txt: - The format for the contributions.txt file was taken from sfcb. Fixed header of - the file to refer to wbemcli and sfcb. + The format for the contributions.txt file was taken from sfcb. + Fixed header of the file to refer to wbemcli and sfcb. 2008-08-05 Tyrel Datwyler <[email protected]> @@ -161,7 +196,8 @@ * contributions.txt: - Need a place to document contributions from the open source community. + Need a place to document contributions from the open source + community. 2008-07-28 Tyrel Datwyler <[email protected]> @@ -179,7 +215,8 @@ * ChangeLog, NEWS, main.cpp: - [ 1756553 ] wbemcli: doesn't accept classes for ain,ai,rin,ri operations + [ 1756553 ] wbemcli: doesn't accept classes for ain,ai,rin,ri + operations 2008-07-09 Tyrel Datwyler <[email protected]> @@ -199,8 +236,10 @@ [ 1719163 ] wbemcli: is guessing wrong on key value type - Updated README and manpage to reflect that single quotes need to be used - to prevent the shell from striping double quotes off quoted string + Updated README and manpage to reflect that single quotes need + to be used + to prevent the shell from striping double quotes off quoted + string properties. 2007-06-04 Tyrel Datwyler <[email protected]> @@ -219,7 +258,8 @@ * ChangeLog, CimXml.cpp, NEWS: - [ 1698325 ] wbemcli: enumeration of association instances does not work + [ 1698325 ] wbemcli: enumeration of association instances does not + work 2007-04-02 Heidi Eckhart <[email protected]> @@ -273,27 +313,28 @@ * CimXml.cpp, CimXml.h: - [1611024]: enabled support for create/modifyInstance for associations + [1611024]: enabled support for create/modifyInstance for + associations 2006-10-24 Heidi Eckhart <[email protected]> * CimXml.cpp, CimXml.h: - #1560865 fixed: createInstance and modifyInstance does not correctly deal - with arrays + #1560865 fixed: createInstance and modifyInstance does not + correctly deal with arrays 2006-03-24 Viktor Mihajlovski <[email protected]> * ChangeLog, CimCurl.cpp, NEWS, configure.ac: - [ 1457924 ] Various Compile Warnings. - Fix by [email protected]: added parenthesis in if statement. + [ 1457924 ] Various Compile Warnings. Fix by [email protected]: + added parenthesis in if statement. 2005-11-21 Viktor Mihajlovski <[email protected]> * ChangeLog, CimCurl.cpp, Makefile.am, NEWS, configure.ac, - main.cpp, sblim-wbemcli.rh.spec, sblim-wbemcli.spec.in, - man/wbemcli.1.pre.in: + main.cpp, sblim-wbemcli.rh.spec, sblim-wbemcli.spec.in, + man/wbemcli.1.pre.in: Bugs fixed: 1362712, 1362716. Force SSL V3 usage and use a default certificate bundle. @@ -307,11 +348,11 @@ 2005-09-29 Viktor Mihajlovski <[email protected]> * CimCurl.cpp, CimCurl.h, CimWinHttp.cpp, CimWinHttp.h, CimXml.h, - Cimghttp.cpp, Cimghttp.h, Cimwww.cpp, Cimwww.h, README, - configure.ac, main.cpp, man/wbemcli.1.pre.in: + Cimghttp.cpp, Cimghttp.h, Cimwww.cpp, Cimwww.h, README, + configure.ac, main.cpp, man/wbemcli.1.pre.in: - Bugs: 1308031. Added support for server certificate verification and - client side certificates. + Bugs: 1308031. Added support for server certificate verification + and client side certificates. 2005-09-29 Viktor Mihajlovski <[email protected]> @@ -323,9 +364,9 @@ * ChangeLog, Makefile.am, NEWS, configure.ac, man/wbemcli.1.pre.in: - Bug 1221942: Fixed typo in man page. Updated the way man pages are handled so - that version and install path information can be injected into the - man page at build time. + Bug 1221942: Fixed typo in man page. Updated the way man pages are + handled so that version and install path information can be + injected into the man page at build time. 2005-09-28 Tyrel Datwyler <[email protected]> @@ -333,7 +374,7 @@ Bug 1221942: Moving man pages to a dedicated man directory. -2005-09-27 Adrian Schuur +2005-09-27 Adrian Schuur <[email protected]> * CimXml.cpp: @@ -382,24 +423,26 @@ Bugs fixed: 1236584. Added tarball name to configure.ac. Changed copyright to License. -2005-07-12 Adrian Schuur +2005-07-12 Adrian Schuur <[email protected]> * CimCurl.cpp, CimCurl.h, CimXml.cpp, CimXml.h, main.cpp: - Added chunking support - must use -cte switch at wbemcli invocation time to activate + Added chunking support - must use -cte switch at wbemcli invocation + time to activate 2005-06-02 Gareth Bestor <[email protected]> * Makefile.am: - fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1200308&group_id=128809&atid=712784 + fix for + http://sourceforge.net/tracker/index.php?func=detail&aid=1200308&group_id=128809&atid=712784 2005-06-02 Gareth Bestor <[email protected]> * Makefile.am: - added NOP makefile entries for postinstall and runtest, so conform a bit - cleaner to typical SBLIM autoconf package install procedure. + added NOP makefile entries for postinstall and runtest, so conform + a bit cleaner to typical SBLIM autoconf package install procedure. 2005-06-01 Viktor Mihajlovski <[email protected]> @@ -411,7 +454,8 @@ * ChangeLog, CimCurl.cpp, NEWS, configure.ac: - Bug 1200421: suppress Accept header to allow interoperation with OW 3.1.0. + Bug 1200421: suppress Accept header to allow interoperation with OW + 3.1.0. 2005-05-02 Viktor Mihajlovski <[email protected]> @@ -424,7 +468,7 @@ 2005-04-05 Viktor Mihajlovski <[email protected]> * Makefile.am, configure.ac, sblim-wbemcli.spec.in, - contrib/sblim-wbemcli.spec.in: + contrib/sblim-wbemcli.spec.in: Modified spec file location for RPM build facilitation. @@ -467,7 +511,7 @@ 2004-12-06 Viktor Mihajlovski <[email protected]> * AUTHORS, CimWinHttp.cpp, CimXml.cpp, CimXml.h, Cimghttp.cpp, - Cimwww.cpp, configure.ac, main.cpp: + Cimwww.cpp, configure.ac, main.cpp: Kudos go to Philip K. Warren for contributing libcurl support. @@ -486,9 +530,9 @@ 2004-10-14 Viktor Mihajlovski <[email protected]> * AUTHORS, COPYING, ChangeLog, CimXml_wrap.cpp, CimXml_wrap.cxx, - INSTALL, Makefile.am, NEWS, README, autoconfiscate.sh, - configure.ac, main.cpp, makefile, contrib/sblim-wbemcli.spec, - contrib/sblim-wbemcli.spec.in: + INSTALL, Makefile.am, NEWS, README, autoconfiscate.sh, + configure.ac, main.cpp, makefile, contrib/sblim-wbemcli.spec, + contrib/sblim-wbemcli.spec.in: Autoconfiscated. @@ -508,22 +552,22 @@ * CimXml.cpp: - Insert CIM symbolic error names to the description, if the CIMOM isn't - returning them by itself. This happens with OpenWBEM. + Insert CIM symbolic error names to the description, if the CIMOM + isn't returning them by itself. This happens with OpenWBEM. 2004-06-14 Heidi Eckhart <[email protected]> * CimXml.cpp: - returning empty exception in case of empty result set on ei / ein against - OpenWBEM fixed + returning empty exception in case of empty result set on ei / ein + against OpenWBEM fixed 2004-06-09 Heidi Eckhart <[email protected]> * Cimghttp.cpp: - fixed seg fault when running in unauthorized mode against authorization - required CIMOM + fixed seg fault when running in unauthorized mode against + authorization required CIMOM 2004-05-28 Viktor Mihajlovski <[email protected]> @@ -553,20 +597,19 @@ * CimXml.h, main.cpp: - Added conditional compile sections to support backlevel (<3.x) versions of - GCC. + Added conditional compile sections to support backlevel (<3.x) + versions of GCC. 2004-02-02 Viktor Mihajlovski <[email protected]> * CimWinHttp.cpp, CimWinHttp.h, CimXml.cpp, CimXml.h, Cimghttp.cpp, - Cimghttp.h, Cimwww.cpp, Cimwww.h, README, SunSMC.cpp, main.cpp, - makefile, wbemcli.1: + Cimghttp.h, Cimwww.cpp, Cimwww.h, README, SunSMC.cpp, main.cpp, + makefile, wbemcli.1: - Incorporated Steve Shepherd's new code: method invocation and get class - definition. - Some formatting and bug fixing changes. + Incorporated Steve Shepherd's new code: method invocation and get + class definition. Some formatting and bug fixing changes. -2003-11-03 Adrian Schuur +2003-11-03 Adrian Schuur <[email protected]> * CimXml.cpp: @@ -576,96 +619,97 @@ * main.cpp, makefile: - fixed return behaviour if no instances were found; test suite relies on - the fact, that nothing is returned (former empty line) + fixed return behaviour if no instances were found; test suite + relies on the fact, that nothing is returned (former empty line) 2003-09-15 Heidi Eckhart <[email protected]> * CimXml.cpp, CimXml.h, CimXml_wrap.cxx, Cimghttp.cpp, Cimghttp.h, - Cimwww.cpp, Cimwww.h, README, README.pycli, main.cpp, makefile, - stdhdr.i: + Cimwww.cpp, Cimwww.h, README, README.pycli, main.cpp, makefile, + stdhdr.i: updated Copyright statement -2003-08-27 Adrian Schuur +2003-08-27 Adrian Schuur <[email protected]> * CimXml.h: changed includeQualifiers to false for most operations -2003-08-12 Adrian Schuur +2003-08-12 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp: Fixed missing IRETURNVALUE situation for enumerations -2003-08-04 Adrian Schuur +2003-08-04 Adrian Schuur <[email protected]> * CimXml.i, CimXml.py, CimXml_wrap.cxx, README.pycli, cimcli.py: - Python support for wbemcli is now complete - Many thanks to David T Eger. - This extension enables you to write management applications using the Python language. - See README.pycli for details and examples + Python support for wbemcli is now complete - Many thanks to David T + Eger. This extension enables you to write management applications + using the Python language. See README.pycli for details and + examples -2003-07-31 Adrian Schuur +2003-07-31 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, Cimwww.cpp, main.cpp: - Fixed create instance problems - Fixed PropertyXml problems - Added EmptyValue excpetion - Fixed exception reporting problems + Fixed create instance problems Fixed PropertyXml problems Added + EmptyValue excpetion Fixed exception reporting problems -2003-07-30 Adrian Schuur +2003-07-30 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp, makefile: Added additional dteger fixes -2003-07-29 Adrian Schuur +2003-07-29 Adrian Schuur <[email protected]> * CimXml.h, CimXml.i, CimXml.py, CimXml_wrap.cxx, makefile: - Added Python wrapper support - Use "make clipy" to compile the wrapper + Added Python wrapper support Use "make clipy" to compile the + wrapper -2003-07-29 Adrian Schuur +2003-07-29 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, Cimghttp.cpp, Cimghttp.h, Cimwww.cpp, - Cimwww.h, main.cpp, makefile: + Cimwww.h, main.cpp, makefile: - Major version update - David Eger reworked wbemcli inprepartion for Python support - Many memory leaks removed - vielen Dank David ! - Better error diagnostics for libwww - Thanks to Viktor ! - Libghttp causes hangups in certain error situations - Therefire it is recomended to use libwww instead. + Major version update David Eger reworked wbemcli inprepartion for + Python support Many memory leaks removed - vielen Dank David ! + Better error diagnostics for libwww - Thanks to Viktor ! Libghttp + causes hangups in certain error situations Therefire it is + recomended to use libwww instead. 2003-07-28 Viktor Mihajlovski <[email protected]> * Cimwww.cpp, Cimwww.h, makefile: - Updated libwww code to convey error information from the protocol modules. + Updated libwww code to convey error information from the protocol + modules. -2003-07-25 Adrian Schuur +2003-07-25 Adrian Schuur <[email protected]> * makefile: fixed INSTALLROOT error -2003-07-25 Adrian Schuur +2003-07-25 Adrian Schuur <[email protected]> * CimXml.cpp: - Fixed gi for assoctiations - <HOST></HOST> and <LOCALINTANCEPATH/> incorrectly + Fixed gi for assoctiations - <HOST></HOST> and <LOCALINTANCEPATH/> + incorrectly -2003-07-09 Adrian Schuur +2003-07-09 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h: - Fixed SNIA/Pegasus toleration for asscoiatiors output (localinstancepath vs instancepath) + Fixed SNIA/Pegasus toleration for asscoiatiors output + (localinstancepath vs instancepath) -2003-07-07 Adrian Schuur +2003-07-07 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp: @@ -677,32 +721,30 @@ Support for RPM build enhanced. -2003-06-12 Adrian Schuur +2003-06-12 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp, makefile, wbemcli.1: - New version 1.2 - Added setProperty and getProperty operations - Added propertyList support for most operations - Extended -t option flag key properties - Reworked man page + New version 1.2 Added setProperty and getProperty operations Added + propertyList support for most operations Extended -t option flag + key properties Reworked man page 2003-05-16 Viktor Mihajlovski <[email protected]> * samples/: list_instrumented_classes, - list_instrumented_classes.output, show_network_info, - show_network_info.output, show_processor_info, - show_processor_info.output: + list_instrumented_classes.output, show_network_info, + show_network_info.output, show_processor_info, + show_processor_info.output: Added usage samples. -2003-05-08 Adrian Schuur +2003-05-08 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp, makefile, wbemcli.1: Corrected association instance objectpath parsing -2003-05-07 Adrian Schuur +2003-05-07 Adrian Schuur <[email protected]> * CimXml.cpp, makefile: @@ -720,19 +762,19 @@ Added support for W3C libwww HTTP library. -2003-04-11 Adrian Schuur +2003-04-11 Adrian Schuur <[email protected]> * CimXml.cpp: Removed debuging messages -2003-04-11 Adrian Schuur +2003-04-11 Adrian Schuur <[email protected]> * CimXml.cpp: Stripping trailing blanks from wbemcli.ind records -2003-04-11 Adrian Schuur +2003-04-11 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp, wbemcli.1: @@ -747,10 +789,11 @@ 2003-04-03 Viktor Mihajlovski <[email protected]> * CimXml.cpp, CimXml.h, Cimghttp.cpp, Cimghttp.h, main.cpp, - makefile: + makefile: - Restructured code in preparation of support for alternative HTTP protocol - libraries. Libghttp stuff is now encapsulated in the Cimghttp.* files. + Restructured code in preparation of support for alternative HTTP + protocol libraries. Libghttp stuff is now encapsulated in the + Cimghttp.* files. 2003-04-01 Heidi Eckhart <[email protected]> @@ -758,7 +801,7 @@ added support for role and resultRole parameter to associatorNames -2003-03-26 Adrian Schuur +2003-03-26 Adrian Schuur <[email protected]> * CimXml.cpp, CimXml.h, main.cpp: @@ -768,8 +811,8 @@ * CimXml.cpp, CimXml.h, main.cpp: - support for Associator Interface and parameter assocClass,resultClass, - resultRole and Role implemented by Adrian + support for Associator Interface and parameter + assocClass,resultClass, resultRole and Role implemented by Adrian 2003-02-21 Heidi Eckhart <[email protected]> @@ -777,7 +820,7 @@ added support for Associator Provider Interface; associatorNames(), referenceNames() ... run stable; associators() and references() ... - still buggy + still buggy 2003-02-19 Heidi Eckhart <[email protected]> @@ -788,7 +831,7 @@ 2002-08-13 Viktor Mihajlovski <[email protected]> * CimXml.cpp, CimXml.h, README, main.cpp, makefile, stdhdr.i, - wbemcli.1: + wbemcli.1: Reorganized code, Support for Caldera. @@ -837,14 +880,14 @@ 2002-04-04 Viktor Mihajlovski <[email protected]> * CimXml.cpp, CimXml.h, license.html, makefile, stdhdr.i, - wbemcli.1: + wbemcli.1: Initial revision 2002-04-04 Viktor Mihajlovski <[email protected]> * CimXml.cpp, CimXml.h, license.html, makefile, stdhdr.i, - wbemcli.1: + wbemcli.1: WBEM Command Line Interface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/CimXml.cpp new/sblim-wbemcli-1.6.2/CimXml.cpp --- old/sblim-wbemcli-1.6.1/CimXml.cpp 2009-06-24 19:55:53.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/CimXml.cpp 2011-06-22 07:58:39.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: CimXml.cpp,v 1.68 2009/06/24 17:55:53 tyreld Exp $ + * $Id: CimXml.cpp,v 1.71 2011/06/22 05:58:39 tyreld Exp $ * * CimXml.cpp * @@ -2343,7 +2343,8 @@ /* KeyValueXml support */ /*-------------------------------------------------------*/ -XmlElement KeyValueXml::elm(1,string("VALUETYPE")); +XmlElement KeyValueXml::elm(2); +bool KeyValueXml::initialized(false); KeyValueXml::KeyValueXml(XmlBuffer &xb) { @@ -2351,6 +2352,12 @@ if (DBGX) cerr<<"--- KeyValueXml::KeyValueXml("<<xb.cur<<")"<<endl; #endif + if (!initialized) { + elm.attr[0] = string("VALUETYPE"); + elm.attr[1] = string("TYPE"); + initialized = true; + } + XmlAttr attr; attr.eTagFound = 0; attr.attr=StringArray(2); @@ -2740,7 +2747,25 @@ } } - else val=string(xb.getContent(&attr)); + else { + if (!strncmp(xb.cur, "<![CDATA[", 8)) { + char *start = xb.cur; + char *end = strstr(start, "]]>"); + char *cdataval; + + if (end == NULL) + throw ParseException("Failed to get CDATA end tag."); + + start += 9; // skip CDATA begin tag + end--; // skip CDATA end tag + cdataval = strndup(start, ((end - start) + 1)); + val=string(cdataval); + free(cdataval); + xb.cur = (end + 4); // move current pointer past CDATA section + } else { + val=string(xb.getContent(&attr)); + } + } tag=xb.nextTag(); if (xb.nextEquals(tag,"/VALUE")) { @@ -2993,7 +3018,13 @@ } else { p=strchr(u,']'); // make sure we don't grab inside the [] - p=strchr(p,':'); + + if(NULL != p){ + p=strchr(p,':'); + } + else{ //Clearly a case where the b('[') was found beyond addrress part + p=strchr(u,':'); + } } if (!p) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/CimXml.h new/sblim-wbemcli-1.6.2/CimXml.h --- old/sblim-wbemcli-1.6.1/CimXml.h 2009-06-24 19:44:48.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/CimXml.h 2011-06-22 07:33:02.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: CimXml.h,v 1.37 2009/06/24 17:44:48 tyreld Exp $ + * $Id: CimXml.h,v 1.38 2011/06/22 05:33:02 tyreld Exp $ * * CimXml.h * @@ -296,6 +296,7 @@ class KeyValueXml { static XmlElement elm; + static bool initialized; public: string valType, val; KeyValueXml(XmlBuffer&); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/NEWS new/sblim-wbemcli-1.6.2/NEWS --- old/sblim-wbemcli-1.6.1/NEWS 2009-06-30 04:49:49.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/NEWS 2011-06-22 07:57:57.000000000 +0200 @@ -1,3 +1,11 @@ +Changes in Version 1.6.2 +======================== + +Bugs: +- 3324380 support optional CIMType in KEYVALUE element +- 3216622 wbemcli throws parser error on CDATA string value +- 2991546 Core dumps when property contains value within "[]" + Changes in Version 1.6.1 ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/configure new/sblim-wbemcli-1.6.2/configure --- old/sblim-wbemcli-1.6.1/configure 2009-06-30 04:50:27.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/configure 2011-07-13 23:23:22.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for SBLIM WBEMCLI 1.6.1. +# Generated by GNU Autoconf 2.61 for SBLIM WBEMCLI 1.6.2. # # Report bugs to <[email protected]>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='SBLIM WBEMCLI' PACKAGE_TARNAME='sblim-wbemcli' -PACKAGE_VERSION='1.6.1' -PACKAGE_STRING='SBLIM WBEMCLI 1.6.1' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='SBLIM WBEMCLI 1.6.2' PACKAGE_BUGREPORT='[email protected]' ac_unique_file="CimXml.cpp" @@ -1235,7 +1235,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures SBLIM WBEMCLI 1.6.1 to adapt to many kinds of systems. +\`configure' configures SBLIM WBEMCLI 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1305,7 +1305,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SBLIM WBEMCLI 1.6.1:";; + short | recursive ) echo "Configuration of SBLIM WBEMCLI 1.6.2:";; esac cat <<\_ACEOF @@ -1394,7 +1394,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SBLIM WBEMCLI configure 1.6.1 +SBLIM WBEMCLI configure 1.6.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1408,7 +1408,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by SBLIM WBEMCLI $as_me 1.6.1, which was +It was created by SBLIM WBEMCLI $as_me 1.6.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='sblim-wbemcli' - VERSION='1.6.1' + VERSION='1.6.2' cat >>confdefs.h <<_ACEOF @@ -6907,7 +6907,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SBLIM WBEMCLI $as_me 1.6.1, which was +This file was extended by SBLIM WBEMCLI $as_me 1.6.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6960,7 +6960,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -SBLIM WBEMCLI config.status 1.6.1 +SBLIM WBEMCLI config.status 1.6.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/configure.ac new/sblim-wbemcli-1.6.2/configure.ac --- old/sblim-wbemcli-1.6.1/configure.ac 2009-06-30 04:49:49.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/configure.ac 2011-07-13 23:19:42.000000000 +0200 @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT(SBLIM WBEMCLI, 1.6.1, [email protected],sblim-wbemcli) +AC_INIT(SBLIM WBEMCLI, 1.6.2, [email protected],sblim-wbemcli) AC_CONFIG_SRCDIR([CimXml.cpp]) AC_CANONICAL_HOST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/man/wbemcli.1 new/sblim-wbemcli-1.6.2/man/wbemcli.1 --- old/sblim-wbemcli-1.6.1/man/wbemcli.1 2009-06-30 04:50:34.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/man/wbemcli.1 2011-07-13 23:23:34.000000000 +0200 @@ -11,7 +11,7 @@ permission notice identical to this one. .. -.TH wbemcli 1 "June 2009" "wbemcli Version 1.6.1" +.TH wbemcli 1 "June 2009" "wbemcli Version 1.6.2" .SH NAME wbemcli \- independent command line CIM Client @@ -556,7 +556,7 @@ .SH FILES .TP -.I /usr/local/share/sblim-wbemcli/cacert.pem +.I ${datarootdir}/sblim-wbemcli/cacert.pem The default CA certificate file. Can be overriden with \-cacert. .SH AUTHOR Adrian Schuur <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-wbemcli-1.6.1/sblim-wbemcli.spec new/sblim-wbemcli-1.6.2/sblim-wbemcli.spec --- old/sblim-wbemcli-1.6.1/sblim-wbemcli.spec 2009-06-30 04:50:33.000000000 +0200 +++ new/sblim-wbemcli-1.6.2/sblim-wbemcli.spec 2011-07-13 23:23:33.000000000 +0200 @@ -8,7 +8,7 @@ Summary: SBLIM WBEM Command Line Interface Name: sblim-wbemcli -Version: 1.6.1 +Version: 1.6.2 Release: 1 Group: Systems Management/Base URL: http://www.sblim.org ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
