Hello community,
here is the log from the commit of package sblim-sfcc for openSUSE:Factory
checked in at Thu May 28 03:58:08 CEST 2009.
--------
--- sblim-sfcc/sblim-sfcc.changes 2008-11-12 16:25:18.000000000 +0100
+++ sblim-sfcc/sblim-sfcc.changes 2009-03-05 21:03:37.000000000 +0100
@@ -1,0 +2,13 @@
+Thu Mar 5 20:56:48 CET 2009 - mhrusecky@suse.cz
+
+- update to 2.2.0
+ * Bugs:
+ - 2596921: v2test_ei test fails when using CIMXML interface
+ - 2431835: XML client library not found.
+ - 2270179: Missing includes and values in return statements
+ - 2158091: sfcb modules belong in private dir
+ - 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc
+ - 2102339: Missing ret values in sblim-sfcc
+ * Dropped merged patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sblim-sfcc-2.1.0-cimhostport.patch
sblim-sfcc-2.1.0-includes.patch
sblim-sfcc-2.1.0-retval.patch
sblim-sfcc-2.1.0.tar.bz2
New:
----
sblim-sfcc-2.2.0-missing-includes.patch
sblim-sfcc-2.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-sfcc.spec ++++++
--- /var/tmp/diff_new_pack.lB9099/_old 2009-05-28 03:56:09.000000000 +0200
+++ /var/tmp/diff_new_pack.lB9099/_new 2009-05-28 03:56:09.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package sblim-sfcc (Version 2.1.0)
+# spec file for package sblim-sfcc (Version 2.2.0)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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,19 +19,23 @@
Name: sblim-sfcc
-Version: 2.1.0
-Release: 6
+Version: 2.2.0
+Release: 1
Url: http://sblim.wiki.sourceforge.net/
-License: Other uncritical OpenSource License
+License: Common Public License v1.0
Group: System/Management
Summary: Small Footprint CIM Client Library
Source: %{name}-%{version}.tar.bz2
-Patch0: %{name}-%{version}-includes.patch
-Patch1: %{name}-%{version}-retval.patch
-Patch2: %{name}-%{version}-cimhostport.patch
+# PATCH-FIX-UPSTREAM %{name}-2.2.0-missing-includes.patch [ upstream#2793377 ] mhrusecky@suse.cz -- add missing includes
+# https://sourceforge.net/tracker/?func=detail&aid=2793377&group_id=128809&atid=712784
+Patch0: %{name}-2.2.0-missing-includes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
+%if 0%{?suse_version} > 1020
BuildRequires: libcurl-devel
+%else
+BuildRequires: curl-devel
+%endif
%description
Small Footprint CIM Client Library (sfcc) Runtime Libraries
@@ -43,10 +47,16 @@
SBLIM Project
%package devel
-License: Other uncritical OpenSource License
-Group: System/Management
+License: Other uncritical OpenSource License; Common Public License v1.0
Summary: Small Footprint CIM Client Library
-Requires: %{name} = %{version} glibc-devel
+Group: System/Management
+Requires: %{name} = %{version}
+Requires: glibc-devel
+%if 0%{?suse_version} > 1020
+Requires: libcurl-devel
+%else
+Requires: curl-devel
+%endif
%description devel
Small Footprint CIM Client Library (sfcc) Header Files and Link
@@ -60,9 +70,7 @@
%prep
%setup -q
-%patch0
-%patch1
-%patch2
+%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -92,6 +100,16 @@
%{_libdir}/*.so
%changelog
+* Thu Mar 05 2009 mhrusecky@suse.cz
+- update to 2.2.0
+ * Bugs:
+ - 2596921: v2test_ei test fails when using CIMXML interface
+ - 2431835: XML client library not found.
+ - 2270179: Missing includes and values in return statements
+ - 2158091: sfcb modules belong in private dir
+ - 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc
+ - 2102339: Missing ret values in sblim-sfcc
+ * Dropped merged patches
* Wed Nov 12 2008 prusnak@suse.cz
- added 5 more fixes to retval.patch
- merged implicit-fortify-decl.patch and stdlib.patch into includes.patch
++++++ sblim-sfcc-2.2.0-missing-includes.patch ++++++
diff -Naru sblim-sfcc-2.2.0-bak/cimc/cimcclient.c sblim-sfcc-2.2.0/cimc/cimcclient.c
--- sblim-sfcc-2.2.0-bak/cimc/cimcclient.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/cimc/cimcclient.c 2009-03-05 20:35:59.897492981 +0100
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
/*
* Canonical CIM C API entry points
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_an_2.c sblim-sfcc-2.2.0/TEST/test_an_2.c
--- sblim-sfcc-2.2.0-bak/TEST/test_an_2.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_an_2.c 2009-03-05 20:35:32.074162555 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_as.c sblim-sfcc-2.2.0/TEST/test_as.c
--- sblim-sfcc-2.2.0-bak/TEST/test_as.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_as.c 2009-03-05 20:35:32.077493216 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_as_2.c sblim-sfcc-2.2.0/TEST/test_as_2.c
--- sblim-sfcc-2.2.0-bak/TEST/test_as_2.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_as_2.c 2009-03-05 20:35:32.074162555 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ci.c sblim-sfcc-2.2.0/TEST/test_ci.c
--- sblim-sfcc-2.2.0-bak/TEST/test_ci.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_ci.c 2009-03-05 20:35:32.077493216 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_di.c sblim-sfcc-2.2.0/TEST/test_di.c
--- sblim-sfcc-2.2.0-bak/TEST/test_di.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_di.c 2009-03-05 20:35:32.077493216 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ec.c sblim-sfcc-2.2.0/TEST/test_ec.c
--- sblim-sfcc-2.2.0-bak/TEST/test_ec.c 2009-03-05 20:35:03.697497925 +0100
+++ sblim-sfcc-2.2.0/TEST/test_ec.c 2009-03-05 20:35:32.077493216 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ecn.c sblim-sfcc-2.2.0/TEST/test_ecn.c
--- sblim-sfcc-2.2.0-bak/TEST/test_ecn.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_ecn.c 2009-03-05 20:35:32.077493216 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ecn_ssl.c sblim-sfcc-2.2.0/TEST/test_ecn_ssl.c
--- sblim-sfcc-2.2.0-bak/TEST/test_ecn_ssl.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_ecn_ssl.c 2009-03-05 20:35:32.080827229 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ei.c sblim-sfcc-2.2.0/TEST/test_ei.c
--- sblim-sfcc-2.2.0-bak/TEST/test_ei.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_ei.c 2009-03-05 20:35:32.080827229 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_ein.c sblim-sfcc-2.2.0/TEST/test_ein.c
--- sblim-sfcc-2.2.0-bak/TEST/test_ein.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_ein.c 2009-03-05 20:35:32.080827229 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_gi.c sblim-sfcc-2.2.0/TEST/test_gi.c
--- sblim-sfcc-2.2.0-bak/TEST/test_gi.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_gi.c 2009-03-05 20:35:32.087494138 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_gp.c sblim-sfcc-2.2.0/TEST/test_gp.c
--- sblim-sfcc-2.2.0-bak/TEST/test_gp.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_gp.c 2009-03-05 20:35:32.087494138 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_imos.c sblim-sfcc-2.2.0/TEST/test_imos.c
--- sblim-sfcc-2.2.0-bak/TEST/test_imos.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_imos.c 2009-03-05 20:35:32.090793650 +0100
@@ -21,6 +21,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im1.c sblim-sfcc-2.2.0/TEST/test_im1.c
--- sblim-sfcc-2.2.0-bak/TEST/test_im1.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_im1.c 2009-03-05 20:35:32.087494138 +0100
@@ -21,6 +21,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im2.c sblim-sfcc-2.2.0/TEST/test_im2.c
--- sblim-sfcc-2.2.0-bak/TEST/test_im2.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_im2.c 2009-03-05 20:35:32.087494138 +0100
@@ -21,6 +21,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im3.c sblim-sfcc-2.2.0/TEST/test_im3.c
--- sblim-sfcc-2.2.0-bak/TEST/test_im3.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_im3.c 2009-03-05 20:35:32.090793650 +0100
@@ -21,6 +21,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_im4.c sblim-sfcc-2.2.0/TEST/test_im4.c
--- sblim-sfcc-2.2.0-bak/TEST/test_im4.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_im4.c 2009-03-05 20:35:32.090793650 +0100
@@ -21,6 +21,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_leak.c sblim-sfcc-2.2.0/TEST/test_leak.c
--- sblim-sfcc-2.2.0-bak/TEST/test_leak.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_leak.c 2009-03-05 20:35:32.090793650 +0100
@@ -22,6 +22,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_qualifiers.c sblim-sfcc-2.2.0/TEST/test_qualifiers.c
--- sblim-sfcc-2.2.0-bak/TEST/test_qualifiers.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_qualifiers.c 2009-03-05 20:35:32.090793650 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_qualifiers2.c sblim-sfcc-2.2.0/TEST/test_qualifiers2.c
--- sblim-sfcc-2.2.0-bak/TEST/test_qualifiers2.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_qualifiers2.c 2009-03-05 20:35:32.090793650 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_rf.c sblim-sfcc-2.2.0/TEST/test_rf.c
--- sblim-sfcc-2.2.0-bak/TEST/test_rf.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_rf.c 2009-03-05 20:35:32.094126685 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_rfn.c sblim-sfcc-2.2.0/TEST/test_rfn.c
--- sblim-sfcc-2.2.0-bak/TEST/test_rfn.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_rfn.c 2009-03-05 20:35:32.094126685 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_si.c sblim-sfcc-2.2.0/TEST/test_si.c
--- sblim-sfcc-2.2.0-bak/TEST/test_si.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_si.c 2009-03-05 20:35:32.094126685 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_sp.c sblim-sfcc-2.2.0/TEST/test_sp.c
--- sblim-sfcc-2.2.0-bak/TEST/test_sp.c 2009-03-05 20:35:03.704162599 +0100
+++ sblim-sfcc-2.2.0/TEST/test_sp.c 2009-03-05 20:35:32.094126685 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
diff -Naru sblim-sfcc-2.2.0-bak/TEST/test_xq.c sblim-sfcc-2.2.0/TEST/test_xq.c
--- sblim-sfcc-2.2.0-bak/TEST/test_xq.c 2009-03-05 20:35:03.700830890 +0100
+++ sblim-sfcc-2.2.0/TEST/test_xq.c 2009-03-05 20:35:32.097459790 +0100
@@ -19,6 +19,7 @@
*/
#include
#include
+#include
#include
#include
#include "show.h"
++++++ sblim-sfcc-2.1.0.tar.bz2 -> sblim-sfcc-2.2.0.tar.bz2 ++++++
++++ 25043 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/backend/cimxml/constClass.c new/sblim-sfcc-2.2.0/backend/cimxml/constClass.c
--- old/sblim-sfcc-2.1.0/backend/cimxml/constClass.c 2007-02-07 15:25:02.000000000 +0100
+++ new/sblim-sfcc-2.2.0/backend/cimxml/constClass.c 2008-10-06 17:51:18.000000000 +0200
@@ -151,6 +151,9 @@
if (p) return qualifierFT.getDataQualifier ( p->qualifiers, qname, rc );
CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY );
+ CMPIData ret;
+ ret.state = CMPI_nullValue;
+ return ret;
}
static CMPIData __ccft_getPropertyQualifierAt ( CMPIConstClass * ccls,
@@ -164,6 +167,9 @@
if (p) return qualifierFT.getDataQualifierAt ( p->qualifiers, index, name, rc );
CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY );
+ CMPIData ret;
+ ret.state = CMPI_nullValue;
+ return ret;
}
static unsigned int __ccft_getPropertyQualifierCount ( CMPIConstClass * ccls,
@@ -175,6 +181,7 @@
if (p) return qualifierFT.getQualifierCount ( p->qualifiers, rc );
CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY );
+ return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/backend/cimxml/indicationlistener.c new/sblim-sfcc-2.2.0/backend/cimxml/indicationlistener.c
--- old/sblim-sfcc-2.1.0/backend/cimxml/indicationlistener.c 2008-01-21 11:15:41.000000000 +0100
+++ new/sblim-sfcc-2.2.0/backend/cimxml/indicationlistener.c 2008-11-12 18:22:54.000000000 +0100
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
static int do_listen=1;
@@ -458,6 +459,8 @@
close(connFd);
}
}
+
+ return NULL;
}
static void* start_listen_thread(void *parms)
@@ -465,6 +468,7 @@
struct native_indicationlistener* i;
i = (struct native_indicationlistener*) parms;
establish_listener(i->sslMode, i->port, i);
+ return NULL;
}
static CIMCStatus _ilft_release(CIMCIndicationListener* il)
@@ -475,6 +479,10 @@
if(i) {
free(i);
}
+ CIMCStatus ret;
+ ret.rc = CIMC_RC_OK;
+ ret.msg = NULL;
+ return ret;
}
static CIMCIndicationListener* _ilft_clone(CIMCIndicationListener* il,
@@ -483,6 +491,7 @@
/* not yet implemented. function is just here to comply with the default
* function tables. it is questionable if a clone is needed for an
* indication listener */
+ return NULL;
}
static CIMCStatus _ilft_start(CIMCIndicationListener* il)
@@ -495,11 +504,21 @@
do_listen = 1;
pthread_create(&id, NULL, &start_listen_thread, i);
+
+ CIMCStatus ret;
+ ret.rc = CIMC_RC_OK;
+ ret.msg = NULL;
+ return ret;
}
static CIMCStatus _ilft_stop(CIMCIndicationListener* il)
{
do_listen = 0;
+
+ CIMCStatus ret;
+ ret.rc = CIMC_RC_OK;
+ ret.msg = NULL;
+ return ret;
}
CIMCIndicationListener *newCIMCIndicationListener(int sslMode,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/backend/cimxml/instance.c new/sblim-sfcc-2.2.0/backend/cimxml/instance.c
--- old/sblim-sfcc-2.1.0/backend/cimxml/instance.c 2007-03-07 10:53:05.000000000 +0100
+++ new/sblim-sfcc-2.2.0/backend/cimxml/instance.c 2008-10-06 17:51:18.000000000 +0200
@@ -19,7 +19,7 @@
http://www.opensource.org/licenses/eclipse-1.0.php
\author Frank Scheffler
- $Revision: 1.2 $
+ $Revision: 1.3 $
*/
#include
@@ -186,6 +186,9 @@
if (p) return qualifierFT.getDataQualifier ( p->qualifiers, qname, rc );
CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY );
+ CMPIData ret;
+ ret.state = CMPI_nullValue;
+ return ret;
}
static CMPIData __ift_getPropertyQualifierAt ( CMPIInstance * instance,
@@ -199,6 +202,9 @@
if (p) return qualifierFT.getDataQualifierAt ( p->qualifiers, index, name, rc );
CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY );
+ CMPIData ret;
+ ret.state = CMPI_nullValue;
+ return ret;
}
static unsigned int __ift_getPropertyQualifierCount ( CMPIInstance * instance,
@@ -210,6 +216,7 @@
if (p) return qualifierFT.getQualifierCount ( p->qualifiers, rc );
CMSetStatus ( rc, CMPI_RC_ERR_NO_SUCH_PROPERTY );
+ return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/ChangeLog new/sblim-sfcc-2.2.0/ChangeLog
--- old/sblim-sfcc-2.1.0/ChangeLog 2008-05-02 03:03:05.000000000 +0200
+++ new/sblim-sfcc-2.2.0/ChangeLog 2009-02-13 20:11:59.000000000 +0100
@@ -1,3 +1,51 @@
+2009-02-13 Chris Buccella
+
+ * TEST/v2test_ei.c:
+ Fixed 2596921: v2test_ei test fails when using CIMXML interface
+
+2008-12-16 Michael Chase-Salerno
+ * cimc/cimclient.c:
+ Fixed 2431835: XML client library not found.
+
+2008-11-12 Chris Buccella
+
+ * TEST/*.c, backend/cimxml/indicationlistener.c:
+ Fixed 2270179: Missing includes and values in return statements
+ (patch by Pavol Rusnak)
+
+2008-10-27 Michael Chase-Salerno
+ * Makefile.am
+ Updated 2158091: sfcb modules belong in private dir
+ use $libdir for default
+
+2008-10-23 Michael Chase-Salerno
+ * Makefile.am configure.ac cimc/cimcclient.c
+ Fixed 2158091: sfcb modules belong in private dir
+
+2008-09-06 Sean Swehla
+ * TEST/v2_testein.c
+ Fixed 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc
+ (patch by Pavol Rusnak)
+
+2008-09-06 Sean Swehla
+ * TEST/print-types.c, backend/cimxml/constClass.c,
+ backend/cimxml/indicationlistener.c, backend/cimxml/instance.c
+ Fixed 2102339: Missing ret values in sblim-sfcc
+ (patch by Pavol Rusnak)
+
+2008-06-16 Michael Chase-Salerno
+ * frontend/sfcc/sfcclient.c
+ Better handling of NULL values for slp.
+
+2008-05-16 Michael Chase-Salerno
+
+ * cimc/cimcclient.c
+ Check for valid connection type and return rc=3 and a message
+ if incorrect.
+
+ * TEST/v2test_gc.c
+ Test valid handling of above, and check rc on existing tests
+
2008-05-01 Chris Buccella
* backend/cimxml/client.c, backend/cimxml/property.c,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/cimc/cimcclient.c new/sblim-sfcc-2.2.0/cimc/cimcclient.c
--- old/sblim-sfcc-2.1.0/cimc/cimcclient.c 2007-02-07 19:09:58.000000000 +0100
+++ new/sblim-sfcc-2.2.0/cimc/cimcclient.c 2008-12-16 00:54:25.000000000 +0100
@@ -1,6 +1,6 @@
/*
- * $Id: cimcclient.c,v 1.2 2007/02/07 18:09:58 mihajlov Exp $
+ * $Id: cimcclient.c,v 1.5 2008/12/15 23:54:25 mchasal Exp $
*
* © Copyright IBM Corp. 2007
*
@@ -42,30 +42,41 @@
InitCimcEnv init=NULL;
CIMCEnv *rv=NULL;
- libName[LIBLEN]=0;
- entry[ENTLEN]=0;
- snprintf(libName, LIBLEN, "libcimcClient%s.so",id);
-
- library = dlopen(libName, RTLD_NOW);
- if (library==NULL) {
- *msg=calloc(1,ERRLEN+1);
- *rc=1;
- snprintf(*msg,ERRLEN,"Unable to load %s library %s",libName,dlerror());
- } else {
- snprintf(entry, ENTLEN,"_Create_%s_Env", id);
- init = (InitCimcEnv)dlsym(library, entry);
- if (init==NULL) {
- *msg=calloc(1,ERRLEN+1);
- *rc=2;
- snprintf(*msg,ERRLEN,"Unable to locate entry %s in %s",entry,libName);
- } else {
- *rc=0;
- *msg=NULL;
- rv = init(id,options,rc,msg);
- rv->hdl=library;
- }
- }
- return rv;
+ libName[LIBLEN]=0;
+ entry[ENTLEN]=0;
+
+ if ((strcmp(id, "XML") != 0) && (strcmp(id, "SfcbLocal") != 0)) {
+ *msg=calloc(1,ERRLEN+1);
+ *rc=3;
+ snprintf(*msg,ERRLEN,"Invalid connection type '%s'. Must be 'XML' or 'SfcbLocal'.",id);
+ } else {
+ if (strcmp(id, "SfcbLocal") == 0) {
+ snprintf(libName, LIBLEN, "%s/libcimcClient%s.so",SFCB_LIBDIR,id);
+ } else {
+ snprintf(libName, LIBLEN, "libcimcClient%s.so",id);
+ }
+ library = dlopen(libName, RTLD_NOW);
+ if (library==NULL) {
+ *msg=calloc(1,ERRLEN+1);
+ *rc=1;
+ snprintf(*msg,ERRLEN,"Unable to load %s library %s",libName,dlerror());
+ } else {
+ snprintf(entry, ENTLEN,"_Create_%s_Env", id);
+ init = (InitCimcEnv)dlsym(library, entry);
+ if (init==NULL) {
+ *msg=calloc(1,ERRLEN+1);
+ *rc=2;
+ snprintf(*msg,ERRLEN,"Unable to locate entry %s in %s",entry,libName);
+ } else {
+ *rc=0;
+ *msg=NULL;
+ rv = init(id,options,rc,msg);
+ rv->hdl=library;
+ }
+ }
+ }
+
+ return rv;
}
void ReleaseCIMCEnv(CIMCEnv *env)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/cimc/cimcft.h new/sblim-sfcc-2.2.0/cimc/cimcft.h
--- old/sblim-sfcc-2.1.0/cimc/cimcft.h 2007-12-21 16:10:44.000000000 +0100
+++ new/sblim-sfcc-2.2.0/cimc/cimcft.h 2008-09-09 17:13:09.000000000 +0200
@@ -1,6 +1,6 @@
/*
- * $Id: cimcft.h,v 1.5 2007/12/21 15:10:44 sschuetz Exp $
+ * $Id: cimcft.h,v 1.6 2008/09/09 15:13:09 smswehla Exp $
*
* © Copyright IBM Corp. 2007
*
@@ -64,6 +64,7 @@
CIMCStatus * rc);
CIMCCount (*getPropQualifierCount) (CIMCClass * cc, const char * prop, CIMCStatus * rc);
+ CIMCString *(*getSuperClassName) (CIMCClass * cc, CIMCStatus * rc);
CIMCArray *(*getKeyList) (CIMCClass * cc);
char *(*toString) (CIMCClass * cc);
void (*relocate) (CIMCClass * cc);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/compile new/sblim-sfcc-2.2.0/compile
--- old/sblim-sfcc-2.1.0/compile 2005-12-19 16:38:26.000000000 +0100
+++ new/sblim-sfcc-2.2.0/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/config.h.in new/sblim-sfcc-2.2.0/config.h.in
--- old/sblim-sfcc-2.1.0/config.h.in 2008-05-02 03:02:05.000000000 +0200
+++ new/sblim-sfcc-2.2.0/config.h.in 2009-02-18 00:34:10.000000000 +0100
@@ -118,7 +118,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
@@ -151,5 +151,5 @@
/* Define to rpl_realloc if the replacement function should be used. */
#undef realloc
-/* Define to `unsigned' if does not define. */
+/* Define to `unsigned int' if does not define. */
#undef size_t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/configure.ac new/sblim-sfcc-2.2.0/configure.ac
--- old/sblim-sfcc-2.1.0/configure.ac 2008-05-02 02:58:26.000000000 +0200
+++ new/sblim-sfcc-2.2.0/configure.ac 2009-02-18 00:34:00.000000000 +0100
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(sblim-sfcc, 2.1.0, sblim-devel@lists.sourceforge.net)
+AC_INIT(sblim-sfcc, 2.2.0, sblim-devel@lists.sourceforge.net)
AC_CONFIG_SRCDIR([cimc/cimcclient.c])
AC_CONFIG_HEADER([config.h])
@@ -60,6 +60,14 @@
AC_FUNC_STRFTIME
AC_CHECK_FUNCS([gettimeofday localtime_r memset strcasecmp strdup strncasecmp strstr tzset])
+#SFCB Library location
+# Set with "configure SFCB_LIBDIR=<dir>
+AC_SUBST(SFCB_LIBDIR)
+if test -z "$SFCB_LIBDIR"
+then
+ SFCB_LIBDIR="$libdir/sfcb"
+fi
+
# MELUNIT
AM_CONDITIONAL(HAVE_MELUNIT_CXX,[test 0 = 1 ])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/frontend/sfcc/sfcclient.c new/sblim-sfcc-2.2.0/frontend/sfcc/sfcclient.c
--- old/sblim-sfcc-2.1.0/frontend/sfcc/sfcclient.c 2008-04-24 17:43:45.000000000 +0200
+++ new/sblim-sfcc-2.2.0/frontend/sfcc/sfcclient.c 2008-06-16 23:52:06.000000000 +0200
@@ -241,7 +241,8 @@
case CMPI_booleanString:
case CMPI_dateTimeString:
case CMPI_classNameString:
- return strdup(value->string ? (char*)value->string->hdl : "NULL");
+ return strdup((value->string && value->string->hdl) ?
+ (char*)value->string->hdl : "NULL");
case CMPI_dateTime:
if (value->dateTime) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/INSTALL new/sblim-sfcc-2.2.0/INSTALL
--- old/sblim-sfcc-2.1.0/INSTALL 2005-12-19 16:38:26.000000000 +0100
+++ new/sblim-sfcc-2.2.0/INSTALL 2008-10-05 08:22:50.000000000 +0200
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
@@ -78,7 +81,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +90,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +191,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/Makefile.am new/sblim-sfcc-2.2.0/Makefile.am
--- old/sblim-sfcc-2.1.0/Makefile.am 2008-05-02 02:57:27.000000000 +0200
+++ new/sblim-sfcc-2.2.0/Makefile.am 2008-10-24 17:38:59.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.17 2008/05/02 00:57:27 buccella Exp $
+# $Id: Makefile.am,v 1.18 2008/10/24 15:38:59 mchasal Exp $
docdir=$(datadir)/doc/sfcc-$(VERSION)
@@ -109,6 +109,7 @@
-version-info $(Libcimcclient_CURRENT):$(Libcimcclient_REVISION):$(Libcimcclient_AGE) \
-Wl,--version-script,$(srcdir)/cimc/libcimcclient.Versions
libcimcclient_la_LIBADD = -ldl
+libcimcclient_la_CPPFLAGS = -DSFCB_LIBDIR=\"$(SFCB_LIBDIR)\"
libcmpisfcc_la_CPPFLAGS = -I$(srcdir)/cimc -I$(srcdir)/backend/cimxml -I$(srcdir)/frontend/sfcc
libcmpisfcc_la_LIBADD = -lcimcclient
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/missing new/sblim-sfcc-2.2.0/missing
--- old/sblim-sfcc-2.1.0/missing 2005-12-19 16:38:26.000000000 +0100
+++ new/sblim-sfcc-2.2.0/missing 2008-10-05 08:22:50.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/NEWS new/sblim-sfcc-2.2.0/NEWS
--- old/sblim-sfcc-2.1.0/NEWS 2008-04-23 23:41:34.000000000 +0200
+++ new/sblim-sfcc-2.2.0/NEWS 2009-02-13 20:11:59.000000000 +0100
@@ -1,5 +1,15 @@
Small Footprint CIM Client Library NEWS
+Changes since 2.1
+=================
+Bugs:
+- 2102339: Missing ret values in sblim-sfcc
+- 2102345: missing configuration of CIM-HOST-PORT in sblim-sfcc
+- 2158091: sfcb modules belong in private dir
+- 2270179: Missing includes and values in return statements
+- 2431835: XML client library not found.
+- 2596921: v2test_ei test fails when using CIMXML interface
+
Changes in 2.1
==============
New features:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/README new/sblim-sfcc-2.2.0/README
--- old/sblim-sfcc-2.1.0/README 2008-04-22 15:24:36.000000000 +0200
+++ new/sblim-sfcc-2.2.0/README 2008-10-27 16:00:12.000000000 +0100
@@ -36,6 +36,11 @@
will use a library that is part of sfcb so the application must have the same
authorization as the installer of sfcb.
+If the sfcb libraries have not been installed to the default location
+(<libdir>/sfcb), SFCC will need to be configured to find them. Use
+"configure SFCB_LIBDIR=<dir>" to inform the SFCC build where to find the
+libraries.
+
Applications using SFCC determine which method to use by calling the NewCIMCEnv
library function which establishes the environment for using one of the above
communication methods.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/sfcc.spec new/sblim-sfcc-2.2.0/sfcc.spec
--- old/sblim-sfcc-2.1.0/sfcc.spec 2008-05-02 03:10:58.000000000 +0200
+++ new/sblim-sfcc-2.2.0/sfcc.spec 2009-02-18 00:35:03.000000000 +0100
@@ -8,7 +8,7 @@
Summary: Small Footprint CIM Client Library
Name: sblim-sfcc
-Version: 2.1.0
+Version: 2.2.0
Release: 0
Group: Systems Management/Base
License: EPL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/print-types.c new/sblim-sfcc-2.2.0/TEST/print-types.c
--- old/sblim-sfcc-2.1.0/TEST/print-types.c 2006-09-05 16:54:59.000000000 +0200
+++ new/sblim-sfcc-2.2.0/TEST/print-types.c 2008-10-06 17:51:18.000000000 +0200
@@ -94,4 +94,6 @@
PRINT_TYPE(CMPI_keyValue);
PRINT_TYPE(CMPI_notFound);
PRINT_TYPE(CMPI_badValue);
+
+ return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ec.c new/sblim-sfcc-2.2.0/TEST/v2test_ec.c
--- old/sblim-sfcc-2.1.0/TEST/v2test_ec.c 2008-04-22 15:22:29.000000000 +0200
+++ new/sblim-sfcc-2.2.0/TEST/v2test_ec.c 2008-11-12 18:22:54.000000000 +0100
@@ -61,7 +61,7 @@
if(ce == NULL) {
printf(" local connect failed call to NewCIMCEnv rc = %d , message = [%s] \n",retc,msg) ;
- return ;
+ return 1;
}
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ecn.c new/sblim-sfcc-2.2.0/TEST/v2test_ecn.c
--- old/sblim-sfcc-2.1.0/TEST/v2test_ecn.c 2008-04-22 15:22:29.000000000 +0200
+++ new/sblim-sfcc-2.2.0/TEST/v2test_ecn.c 2008-11-12 18:22:54.000000000 +0100
@@ -66,7 +66,7 @@
printf(" failed call to NewCIMCEnv \n") ;
if(msg)
printf(" NewCIMCEnv error message = [%s] \n",msg) ;
- return ;
+ return 1;
}
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ei.c new/sblim-sfcc-2.2.0/TEST/v2test_ei.c
--- old/sblim-sfcc-2.1.0/TEST/v2test_ei.c 2008-04-24 17:50:34.000000000 +0200
+++ new/sblim-sfcc-2.2.0/TEST/v2test_ei.c 2009-02-13 20:11:58.000000000 +0100
@@ -59,10 +59,10 @@
if(ce == NULL) {
printf(" local connect failed call to NewCIMCEnv message = [%s] \n",msg) ;
- return ;
+ return 1;
}
- client = ce->ft->connect(ce, cim_host, cim_host_port, "5988", cim_host_userid, cim_host_passwd, &status);
+ client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
if(client == NULL)
{
printf(" failed the call to connect \n") ;
@@ -108,6 +108,8 @@
if(client) client->ft->release(client);
if(ce) ce->ft->release(ce);
if(status.msg) CMRelease(status.msg);
+
+ return 0;
}
/* */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_ein.c new/sblim-sfcc-2.2.0/TEST/v2test_ein.c
--- old/sblim-sfcc-2.1.0/TEST/v2test_ein.c 2008-04-24 17:50:34.000000000 +0200
+++ new/sblim-sfcc-2.2.0/TEST/v2test_ein.c 2008-11-12 18:22:54.000000000 +0100
@@ -42,6 +42,7 @@
cim_host_passwd = getenv("CIM_HOST_PASSWD");
if (cim_host_passwd == NULL)
cim_host_passwd = "password";
+ cim_host_port = getenv("CIM_HOST_PORT");
if (cim_host_port == NULL)
cim_host_port = "5988";
@@ -59,7 +60,7 @@
if(ce == NULL) {
printf(" local connect failed call to NewCIMCEnv message = [%s] \n",msg) ;
- return ;
+ return 1;
}
printf("do connect \n") ;
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
@@ -109,6 +110,7 @@
if(ce) ce->ft->release(ce);
if(status.msg) CMRelease(status.msg);
+ return 0;
}
/* */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/sblim-sfcc-2.1.0/TEST/v2test_gc.c new/sblim-sfcc-2.2.0/TEST/v2test_gc.c
--- old/sblim-sfcc-2.1.0/TEST/v2test_gc.c 2008-04-24 17:50:34.000000000 +0200
+++ new/sblim-sfcc-2.2.0/TEST/v2test_gc.c 2008-05-17 00:32:35.000000000 +0200
@@ -71,6 +71,15 @@
printf(" Testing getClass \n") ;
+ printf(" checking with bad input : host = %s userid = %s\n",
+ cim_host,cim_host_userid) ;
+ ce = NewCIMCEnv("bogus",0,&rc,&msg);
+ if (rc == 3) {
+ printf (" bad input caught OK,\n\tmsg = %s\n\n",msg);
+ } else {
+ printf (" bad input NOT caught.\n");
+ }
+
#ifdef v2local
printf(" using SfcbLocal interface : host = %s userid = %s\n",
cim_host,cim_host_userid) ;
@@ -80,27 +89,33 @@
cim_host,cim_host_userid,cim_host_port) ;
ce = NewCIMCEnv("XML",0,&rc,&msg);
#endif
+
+ if (rc == 0 ) {
- client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
+ client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
- op = (CMPIObjectPath *)ce->ft->newObjectPath(ce, "root/cimv2", "CIM_ComputerSystem" , &status);
- class =(CMPIConstClass *) client->ft->getClass(client,(CIMCObjectPath *) op, CMPI_FLAG_IncludeQualifiers, NULL, &status);
+ op = (CMPIObjectPath *)ce->ft->newObjectPath(ce, "root/cimv2", "CIM_ComputerSystem" , &status);
+ class =(CMPIConstClass *) client->ft->getClass(client,(CIMCObjectPath *) op, CMPI_FLAG_IncludeQualifiers, NULL, &status);
- /* Print the results */
- printf( "getClass() rc=%d, msg=%s\n",
+ /* Print the results */
+ printf( "getClass() rc=%d, msg=%s\n",
status.rc, (status.msg)? (char *)status.msg->hdl : NULL);
- if (!status.rc) {
- printf("result:\n");
- showClass(class);
- }
-
- if (class) class->ft->release((CMPIConstClass *)class);
- if (op) op->ft->release(op);
-
- if (client) client->ft->release(client);
- if(ce) ce->ft->release(ce);
- if (status.msg) CMRelease(status.msg);
+ if (!status.rc) {
+ printf("result:\n");
+ showClass(class);
+ }
+
+ if (class) class->ft->release((CMPIConstClass *)class);
+ if (op) op->ft->release(op);
+
+ if (client) client->ft->release(client);
+ if(ce) ce->ft->release(ce);
+ if (status.msg) CMRelease(status.msg);
- return 0;
+ return 0;
+ } else {
+ printf ("Call to NewCIMCEnv failed, rc = %d\n\tmsg = %s\n",rc,msg);
+ return 1;
+ }
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org