Hello community, here is the log from the commit of package sblim-cmpi-base for openSUSE:Factory checked in at Thu Sep 15 14:13:33 CEST 2011.
-------- --- sblim-cmpi-base/sblim-cmpi-base.changes 2010-01-12 10:42:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/sblim-cmpi-base/sblim-cmpi-base.changes 2011-05-24 10:42:30.000000000 +0200 @@ -1,0 +2,23 @@ +Mon May 24 10:31:42 UTC 2011 - kkae...@novell.com + +- update to 1.6.1 (bnc#694324) + Bugs Fixed: + - 2843613 Missing fclose in sblim-cmpi-base + - 2882514 leak in sblim-cmpi-base-1.5.9/cmpiOSBase_OperatingSystem.c + - 2836926 _osbase_common_init unreliable + - 2610775 ProcessorProvider crashes on exit (bnc#694324) + +- fix license (Eclipse Public License) + +------------------------------------------------------------------- +Mon May 23 14:20:03 UTC 2011 - kkae...@novell.com + +- fix ProcessorProvider crash on exit + (bnc#694324, upstream 2610775) + +------------------------------------------------------------------- +Fri Sep 10 09:17:13 UTC 2010 - kkae...@novell.com + +- fix RH/Fedora build + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sblim-cmpi-base-1.5.9-methods-enable.patch sblim-cmpi-base-1.5.9-missing-fclose.patch sblim-cmpi-base-1.6.0.tar.bz2 New: ---- sblim-cmpi-base-1.6.1-methods-enable.patch sblim-cmpi-base-1.6.1-missing-fclose.patch sblim-cmpi-base-1.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-base.spec ++++++ --- /var/tmp/diff_new_pack.oLRDyG/_old 2011-09-15 14:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.oLRDyG/_new 2011-09-15 14:13:28.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package sblim-cmpi-base (Version 1.6.0) +# spec file for package sblim-cmpi-base # -# Copyright (c) 2010 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 @@ -20,7 +20,7 @@ Name: sblim-cmpi-base BuildRequires: gcc-c++ sblim-cmpi-devel sblim-indication_helper-devel sblim-sfcb sblim-testsuite -Version: 1.6.0 +Version: 1.6.1 Release: 1 Group: System/Management License: Eclipse Public License 1.0 @@ -29,10 +29,10 @@ Url: http://sblim.wiki.sourceforge.net/ Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Source1: sblim-cmpi-base-rpmlintrc -# PATCH-FEATURE-OPENSUSE sblim-cmpi-base-1.5.9-methods-enable.patch [ bnc#470670 ] mhruse...@suse.cz -- Enables methods by default -Patch0: sblim-cmpi-base-1.5.9-methods-enable.patch -# PATCH-FIX-UPSTREAM sblim-cmpi-base-1.5.9-missing-fclose.patch [ bnc#530325 upstream#2843613 ] mhruse...@suse.cz -- Adding missing fclose -Patch1: sblim-cmpi-base-1.5.9-missing-fclose.patch +# PATCH-FEATURE-OPENSUSE sblim-cmpi-base-%{version}-methods-enable.patch [ bnc#470670 ] mhruse...@suse.cz -- Enables methods by default +Patch0: sblim-cmpi-base-%{version}-methods-enable.patch +# PATCH-FIX-UPSTREAM sblim-cmpi-base-%{version}-missing-fclose.patch [ bnc#530325 upstream#2843613 ] mhruse...@suse.cz -- Adding missing fclose +Patch1: sblim-cmpi-base-%{version}-missing-fclose.patch Summary: SBLIM Base Instrumentation %description @@ -86,7 +86,12 @@ %{__make} %install +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +%else %makeinstall docdir=%{_docdir}/%{name} +%endif # don't delete .la's until we sort out if sfcb/openwbem/pegasus use ltdlopen() # %{__rm} %{buildroot}%{_libdir}/{libcmpiOSBase_Common,libdmiinfo}.la # remove unused libtool files @@ -132,7 +137,12 @@ %files %defattr(-,root,root) +%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} +%docdir %{_datadir}/doc/%{name}-%{version} +%doc %{_datadir}/doc/%{name}-%{version} +%else %doc %{_docdir}/%{name} +%endif %dir %{_libdir}/cmpi/ %{_libdir}/cmpi/libcmpiOSBase*.so %{_libdir}/libcmpiOSBase_Common.so.* ++++++ sblim-cmpi-base-1.5.9-methods-enable.patch -> sblim-cmpi-base-1.6.1-methods-enable.patch ++++++ --- sblim-cmpi-base/sblim-cmpi-base-1.5.9-methods-enable.patch 2009-03-09 14:33:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/sblim-cmpi-base/sblim-cmpi-base-1.6.1-methods-enable.patch 2011-05-20 10:48:24.000000000 +0200 @@ -1,5 +1,6 @@ ---- mof/Linux_BaseIndication.registration 2005-06-07 15:12:43.000000000 +0200 -+++ mof/Linux_BaseIndication.registration 2009-03-09 14:08:47.187964574 +0100 +diff -wruN -x '*~' ../orig-sblim-cmpi-base-1.6.1/mof/Linux_BaseIndication.registration ./mof/Linux_BaseIndication.registration +--- ../orig-sblim-cmpi-base-1.6.1/mof/Linux_BaseIndication.registration 2005-06-07 15:12:43.000000000 +0200 ++++ ./mof/Linux_BaseIndication.registration 2011-05-20 10:38:17.000000000 +0200 @@ -1,14 +1,14 @@ # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Linux_Processor root/cimv2 OSBase_ProcessorProvider cmpiOSBase_ProcessorProvider instance ++++++ sblim-cmpi-base-1.5.9-missing-fclose.patch -> sblim-cmpi-base-1.6.1-missing-fclose.patch ++++++ --- sblim-cmpi-base/sblim-cmpi-base-1.5.9-missing-fclose.patch 2009-08-24 17:01:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-cmpi-base/sblim-cmpi-base-1.6.1-missing-fclose.patch 2011-05-20 10:48:24.000000000 +0200 @@ -1,8 +1,7 @@ -Index: OSBase_OperatingSystemStatisticalData.c -=================================================================== ---- OSBase_OperatingSystemStatisticalData.c.orig -+++ OSBase_OperatingSystemStatisticalData.c -@@ -155,6 +155,7 @@ int get_cpu_page_data_24(struct os_stati +diff -wruN -x '*~' ../orig-sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c ./OSBase_OperatingSystemStatisticalData.c +--- ../orig-sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c 2009-08-26 04:03:21.000000000 +0200 ++++ ./OSBase_OperatingSystemStatisticalData.c 2011-05-20 10:38:11.000000000 +0200 +@@ -221,6 +221,7 @@ if ((f = fopen(DATA_FILE,"r")) != NULL) { read_count = fread(buf,sizeof(char),sizeof(buf)-1,f); buf[read_count] = '\0'; ++++++ sblim-cmpi-base-1.6.0.tar.bz2 -> sblim-cmpi-base-1.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/ChangeLog new/sblim-cmpi-base-1.6.1/ChangeLog --- old/sblim-cmpi-base-1.6.0/ChangeLog 2009-07-25 02:39:43.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/ChangeLog 2010-12-21 04:10:32.000000000 +0100 @@ -1,3 +1,42 @@ +2010-12-20 Tyrel Datwyler <tyr...@us.ibm.com> + + * NEWS, OSBase_Processor.c, OSBase_Processor.h, + cmpiOSBase_ProcessorProvider.c: + + Fixed 2610775: ProcessorProvider crashes on exit + +2010-12-20 Tyrel Datwyler <tyr...@us.ibm.com> + + * NEWS, OSBase_Common.c: + + Fixed 2836926: _osbase_common_init unreliable + +2010-01-21 Tyrel Datwyler <tyr...@us.ibm.com> + + * contributions.txt: + + Changed sfcb to sblim-cmpi-base in contributions file + +2009-12-15 Tyrel Datwyler <tyr...@us.ibm.com> + + * NEWS, cmpiOSBase_OperatingSystem.c: + + Fixed 2882514: leak in + sblim-cmpi-base-1.5.9/cmpiOSBase_OperatingSystem.c + +2009-08-25 Tyrel Datwyler <tyr...@us.ibm.com> + + * NEWS, OSBase_OperatingSystemStatisticalData.c, contributions.txt: + + Fixed 2843613: Missing fclose in sblim-cmpi-base (patch by + Michal Hrušecký) + +2009-07-24 Tyrel Datwyler <tyr...@us.ibm.com> + + * ChangeLog, NEWS, configure.ac: + + Updated for 1.6.0 release + 2009-07-24 Tyrel Datwyler <tyr...@us.ibm.com> * COPYING, Makefile.am, NEWS, OSBase_BaseBoard.c, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/NEWS new/sblim-cmpi-base-1.6.1/NEWS --- old/sblim-cmpi-base-1.6.0/NEWS 2009-07-25 02:39:10.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/NEWS 2010-12-21 03:53:43.000000000 +0100 @@ -1,3 +1,12 @@ +Changes in Version 1.6.1 +======================== + +Bugs Fixed: +- 2843613 Missing fclose in sblim-cmpi-base +- 2882514 leak in sblim-cmpi-base-1.5.9/cmpiOSBase_OperatingSystem.c +- 2836926 _osbase_common_init unreliable +- 2610775 ProcessorProvider crashes on exit + Changes in Version 1.6.0 ======================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/OSBase_Common.c new/sblim-cmpi-base-1.6.1/OSBase_Common.c --- old/sblim-cmpi-base-1.6.0/OSBase_Common.c 2009-07-25 02:30:14.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/OSBase_Common.c 2010-12-21 03:35:54.000000000 +0100 @@ -42,6 +42,7 @@ /* ---------------------------------------------------------------------------*/ +#define DEFAULT_HOST_NAME "localhost.localdomain" char * CIM_HOST_NAME = NULL; char * CIM_OS_NAME = NULL; int CIM_OS_TIMEZONE = 999; @@ -155,7 +156,9 @@ _OSBASE_TRACE(4,("--- _init_system_name() called : init")); host = calloc(1,255); - if ( gethostname(host, 255 ) == -1 ) { return; } + if ( gethostname(host, 255 ) == -1 ) { + _OSBASE_TRACE(4,("--- _init_system_name() : gethostname returned -1")); + } /* if host does not contain a '.' we can suppose, that the domain is not * available in the current value. but we try to get the full qualified * hostname. @@ -185,6 +188,9 @@ strcat( CIM_HOST_NAME, "."); strcat( CIM_HOST_NAME, domain ); } + } else { + CIM_HOST_NAME = calloc(1, (strlen(DEFAULT_HOST_NAME) + 1)); + strcpy(CIM_HOST_NAME, DEFAULT_HOST_NAME); } if(host) free(host); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/OSBase_OperatingSystemStatisticalData.c new/sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c --- old/sblim-cmpi-base-1.6.0/OSBase_OperatingSystemStatisticalData.c 2009-07-25 02:30:32.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/OSBase_OperatingSystemStatisticalData.c 2009-08-26 04:03:21.000000000 +0200 @@ -155,6 +155,7 @@ if ((f = fopen(DATA_FILE,"r")) != NULL) { read_count = fread(buf,sizeof(char),sizeof(buf)-1,f); buf[read_count] = '\0'; + fclose(f); /* read cpu data * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/OSBase_Processor.c new/sblim-cmpi-base-1.6.1/OSBase_Processor.c --- old/sblim-cmpi-base-1.6.0/OSBase_Processor.c 2009-07-25 02:30:39.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/OSBase_Processor.c 2010-12-21 03:44:41.000000000 +0100 @@ -56,6 +56,7 @@ #define SAMPLE_PERIOD 60 #define SAMPLE_INTERVAL 10 static int SAMPLE_CPU = 1; +static int running = 1; static pthread_t tid; @@ -123,12 +124,6 @@ struct cpu_sample * cur_ptr; int i; - /* SAMPLE_CPU = 0; */ - /* pthread_join(tid, NULL); */ - - pthread_cancel(tid); - /* sleep(1); */ - for (i = 0; i < num_cpus; i++) { cur_ptr = cpu_samples[i]->next; cpu_samples[i]->next = NULL; @@ -143,6 +138,13 @@ /* free(cpu_loads); */ } +int proc_cancel_thread() { + running = 0; + pthread_join(tid, NULL); + + return 1; +} + int enum_all_processor( struct processorlist ** lptr ) { struct processorlist * lptrhelp = NULL; char ** hdout = NULL; @@ -555,7 +557,7 @@ int count = 0; int i; - while (1) { + while (running) { sleep(SAMPLE_INTERVAL); for (i = 0; i < num_cpus; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/OSBase_Processor.h new/sblim-cmpi-base-1.6.1/OSBase_Processor.h --- old/sblim-cmpi-base-1.6.0/OSBase_Processor.h 2009-07-25 02:30:44.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/OSBase_Processor.h 2010-12-21 03:44:41.000000000 +0100 @@ -58,6 +58,8 @@ void free_processorlist( struct processorlist * ); void free_processor( struct cim_processor * ); +int proc_cancel_thread(); + /* ---------------------------------------------------------------------------*/ #ifdef __cplusplus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/cmpiOSBase_OperatingSystem.c new/sblim-cmpi-base-1.6.1/cmpiOSBase_OperatingSystem.c --- old/sblim-cmpi-base-1.6.0/cmpiOSBase_OperatingSystem.c 2009-07-25 02:27:07.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/cmpiOSBase_OperatingSystem.c 2009-12-15 21:30:06.000000000 +0100 @@ -155,6 +155,9 @@ return 0; } else { + if (fcpuinfo) { + fclose(fcpuinfo); + } return -1; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/cmpiOSBase_ProcessorProvider.c new/sblim-cmpi-base-1.6.1/cmpiOSBase_ProcessorProvider.c --- old/sblim-cmpi-base-1.6.0/cmpiOSBase_ProcessorProvider.c 2009-07-25 02:27:42.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/cmpiOSBase_ProcessorProvider.c 2010-12-21 03:44:41.000000000 +0100 @@ -30,6 +30,7 @@ #include "OSBase_Common.h" #include "cmpiOSBase_Common.h" #include "cmpiOSBase_Processor.h" +#include "OSBase_Processor.h" static const CMPIBroker * _broker; @@ -51,6 +52,7 @@ CMPIStatus OSBase_ProcessorProviderCleanup( CMPIInstanceMI * mi, const CMPIContext * ctx, CMPIBoolean terminate) { _OSBASE_TRACE(1,("--- %s CMPI Cleanup() called",_ClassName)); + proc_cancel_thread(); _OSBASE_TRACE(1,("--- %s CMPI Cleanup() exited",_ClassName)); CMReturn(CMPI_RC_OK); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/configure new/sblim-cmpi-base-1.6.1/configure --- old/sblim-cmpi-base-1.6.0/configure 2009-07-25 02:40:33.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/configure 2010-12-21 04:11:15.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for SBLIM BaseOS Providers Base 1.6.0. +# Generated by GNU Autoconf 2.61 for SBLIM BaseOS Providers Base 1.6.1. # # Report bugs to <sblim-de...@lists.sourceforge.net>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='SBLIM BaseOS Providers Base' PACKAGE_TARNAME='sblim-cmpi-base' -PACKAGE_VERSION='1.6.0' -PACKAGE_STRING='SBLIM BaseOS Providers Base 1.6.0' +PACKAGE_VERSION='1.6.1' +PACKAGE_STRING='SBLIM BaseOS Providers Base 1.6.1' PACKAGE_BUGREPORT='sblim-de...@lists.sourceforge.net' ac_unique_file="OSBase_Common.c" @@ -1407,7 +1407,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 BaseOS Providers Base 1.6.0 to adapt to many kinds of systems. +\`configure' configures SBLIM BaseOS Providers Base 1.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1477,7 +1477,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of SBLIM BaseOS Providers Base 1.6.0:";; + short | recursive ) echo "Configuration of SBLIM BaseOS Providers Base 1.6.1:";; esac cat <<\_ACEOF @@ -1583,7 +1583,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -SBLIM BaseOS Providers Base configure 1.6.0 +SBLIM BaseOS Providers Base configure 1.6.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1597,7 +1597,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 BaseOS Providers Base $as_me 1.6.0, which was +It was created by SBLIM BaseOS Providers Base $as_me 1.6.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2293,7 +2293,7 @@ # Define the identity of the package. PACKAGE='sblim-cmpi-base' - VERSION='1.6.0' + VERSION='1.6.1' cat >>confdefs.h <<_ACEOF @@ -24744,7 +24744,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by SBLIM BaseOS Providers Base $as_me 1.6.0, which was +This file was extended by SBLIM BaseOS Providers Base $as_me 1.6.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24797,7 +24797,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -SBLIM BaseOS Providers Base config.status 1.6.0 +SBLIM BaseOS Providers Base config.status 1.6.1 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-cmpi-base-1.6.0/configure.ac new/sblim-cmpi-base-1.6.1/configure.ac --- old/sblim-cmpi-base-1.6.0/configure.ac 2009-07-25 02:39:25.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/configure.ac 2010-12-21 04:06:15.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(SBLIM BaseOS Providers Base, 1.6.0, sblim-de...@lists.sourceforge.net,sblim-cmpi-base) +AC_INIT(SBLIM BaseOS Providers Base, 1.6.1, sblim-de...@lists.sourceforge.net,sblim-cmpi-base) AC_CONFIG_SRCDIR([OSBase_Common.c]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sblim-cmpi-base-1.6.0/sblim-cmpi-base.spec new/sblim-cmpi-base-1.6.1/sblim-cmpi-base.spec --- old/sblim-cmpi-base-1.6.0/sblim-cmpi-base.spec 2009-07-25 02:41:00.000000000 +0200 +++ new/sblim-cmpi-base-1.6.1/sblim-cmpi-base.spec 2011-01-05 00:20:49.000000000 +0100 @@ -8,7 +8,7 @@ Summary: SBLIM Base Providers Name: sblim-cmpi-base -Version: 1.6.0 +Version: 1.6.1 Release: 1 Group: Systems Management/Base URL: http://www.sblim.org ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
