[sblim-sfcb/el4/master] Updated the sources and added the loggin, init script patch

Praveen K Paladugu praveenp at fedoraproject.org
Fri Aug 13 19:11:07 UTC 2010


commit 15895db60ce0258f8c63da26c4038fb4d1897d3b
Author: Praveen K Paladugu <praveenp at praveenp-dell.us.dell.com>
Date:   Fri Aug 13 14:11:42 2010 -0500

    Updated the sources and added the loggin, init script patch

 LocalInterfaceInvokeMethodFix.patch                |   41 --------------------
 destroyThreadKey.patch                             |   11 -----
 sblim-sfcb-1.3.8-close_logging.patch               |   19 +++++++++
 ...ript.patch => sblim-sfcb-1.3.8-initscript.patch |    0
 sblim-sfcb.spec                                    |   10 ++++-
 5 files changed, 27 insertions(+), 54 deletions(-)
---
diff --git a/sblim-sfcb-1.3.8-close_logging.patch b/sblim-sfcb-1.3.8-close_logging.patch
new file mode 100644
index 0000000..ca9aa1d
--- /dev/null
+++ b/sblim-sfcb-1.3.8-close_logging.patch
@@ -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) {
diff --git a/sblim-sfcb-initscript.patch b/sblim-sfcb-1.3.8-initscript.patch
similarity index 100%
rename from sblim-sfcb-initscript.patch
rename to sblim-sfcb-1.3.8-initscript.patch
diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index 26ecb9b..70da404 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -8,13 +8,14 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
 Version: 1.3.8
-Release: 1%{dist}
+Release: 2%{dist}
 Group: Applications/System
 License: EPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 patch0:	%{name}-disable_auto_service_start.patch
-patch1: %{name}-initscript.patch
+patch1: %{name}-1.3.8-initscript.patch
+patch2: %{name}-1.3.8-close_logging.patch
 Provides: cim-server
 Requires: cim-schema
 %if 0%{?rhel}
@@ -47,6 +48,7 @@ Programming Interface (CMPI).
 %setup -q -T -b 0 -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -113,6 +115,10 @@ fi
 #%doc COPYING README
 
 %changelog
+* Fri Aug 13 2010 <praveen_praveen at dell.com> - 1.3.8-2
+- Added patch to fix the closing of logging function
+-   from master branch
+
 * Fri Aug 13 2010 <praveen_paladugu at dell.com> - 1.3.8-1
 - Updating the sources in response to BZ 605345 
 - patch to fix the initscript in response to BZ 559904


More information about the scm-commits mailing list