Update to sblim-sfcb-1.3.8, Fix unmatched calls of closeLogging() and
startLogging()
This commit is contained in:
parent
a219604aa8
commit
71ed928e59
@ -1 +1,2 @@
|
|||||||
sblim-sfcb-1.3.7.tar.bz2
|
sblim-sfcb-1.3.7.tar.bz2
|
||||||
|
sblim-sfcb-1.3.8.tar.bz2
|
||||||
|
19
sblim-sfcb-1.3.7-close_logging.patch
Normal file
19
sblim-sfcb-1.3.7-close_logging.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff -up sblim-sfcb-1.3.7/cimcClientSfcbLocal.c.orig sblim-sfcb-1.3.7/cimcClientSfcbLocal.c
|
||||||
|
--- sblim-sfcb-1.3.7/cimcClientSfcbLocal.c.orig 2010-05-11 09:08:17.709465965 +0200
|
||||||
|
+++ sblim-sfcb-1.3.7/cimcClientSfcbLocal.c 2010-05-11 09:11:10.133456342 +0200
|
||||||
|
@@ -209,7 +209,6 @@ static CMPIStatus releaseClient(Client *
|
||||||
|
if (cl->connection) CMRelease(cl->connection);
|
||||||
|
|
||||||
|
free(cl);
|
||||||
|
- closeLogging();
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1618,6 +1617,7 @@ int localConnect(ClientEnv* ce, CMPIStat
|
||||||
|
static void* release(ClientEnv* ce)
|
||||||
|
{
|
||||||
|
void *lib=ce->hdl;
|
||||||
|
+ closeLogging();
|
||||||
|
CONNECT_LOCK();
|
||||||
|
if (localConnectCount > 0) localConnectCount -= 1;
|
||||||
|
if (localConnectCount == 0) {
|
@ -1,24 +0,0 @@
|
|||||||
diff -up sblim-sfcb-1.3.7/value.c.orig sblim-sfcb-1.3.7/value.c
|
|
||||||
--- sblim-sfcb-1.3.7/value.c.orig 2010-03-15 16:29:18.072377466 +0100
|
|
||||||
+++ sblim-sfcb-1.3.7/value.c 2010-03-15 16:30:44.887460552 +0100
|
|
||||||
@@ -186,11 +186,19 @@ char *sfcb_value2Chars(CMPIType type, CM
|
|
||||||
case CMPI_filter:
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case CMPI_chars:
|
|
||||||
+ if (value->chars) {
|
|
||||||
+ size = strlen((char *) value->chars);
|
|
||||||
+ p = malloc(size + 3);
|
|
||||||
+ sprintf(p, "\"%s\"", (char *) value->chars);
|
|
||||||
+ return p;
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
case CMPI_string:
|
|
||||||
case CMPI_numericString:
|
|
||||||
case CMPI_booleanString:
|
|
||||||
case CMPI_dateTimeString:
|
|
||||||
- case CMPI_classNameString:
|
|
||||||
if (value->string->hdl) {
|
|
||||||
size = strlen((char *) value->string->hdl);
|
|
||||||
p = malloc(size + 8);
|
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: sblim-sfcb.spec,v 1.4 2010/04/22 12:04:57 vcrhonek Exp $
|
# $Id: sblim-sfcb.spec,v 1.5 2010/06/23 10:31:02 vcrhonek Exp $
|
||||||
#
|
#
|
||||||
# Package spec for sblim-sfcb
|
# Package spec for sblim-sfcb
|
||||||
#
|
#
|
||||||
@ -7,15 +7,15 @@
|
|||||||
Name: sblim-sfcb
|
Name: sblim-sfcb
|
||||||
Summary: Small Footprint CIM Broker
|
Summary: Small Footprint CIM Broker
|
||||||
URL: http://www.sblim.org
|
URL: http://www.sblim.org
|
||||||
Version: 1.3.7
|
Version: 1.3.8
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: EPL
|
License: EPL
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
|
||||||
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
|
||||||
Patch0: %{name}-disable_auto_service_start.patch
|
Patch0: %{name}-disable_auto_service_start.patch
|
||||||
Patch1: sblim-sfcb-1.3.7-value.c.patch
|
Patch1: sblim-sfcb-1.3.7-initscript.patch
|
||||||
Patch2: sblim-sfcb-1.3.7-initscript.patch
|
Patch2: sblim-sfcb-1.3.7-close_logging.patch
|
||||||
Provides: cim-server
|
Provides: cim-server
|
||||||
Requires: cim-schema
|
Requires: cim-schema
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
@ -43,8 +43,8 @@ Programming Interface (CMPI).
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -T -b 0 -n %{name}-%{version}
|
%setup -q -T -b 0 -n %{name}-%{version}
|
||||||
%patch0 -p1 -b .autostart
|
%patch0 -p1 -b .autostart
|
||||||
%patch1 -p1 -b .valuec
|
%patch1 -p1 -b .initscript
|
||||||
%patch2 -p1 -b .initscript
|
%patch2 -p1 -b .close_logging
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
||||||
@ -111,6 +111,10 @@ fi
|
|||||||
#%doc COPYING README
|
#%doc COPYING README
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 23 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.8-1
|
||||||
|
- Update to sblim-sfcb-1.3.8
|
||||||
|
- Fix unmatched calls of closeLogging() and startLogging()
|
||||||
|
|
||||||
* Thu Apr 22 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.7-3
|
* Thu Apr 22 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.7-3
|
||||||
- Fix initscript
|
- Fix initscript
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user