[sblim-sfcb/el5/master] Update the sources to 1.3.8 for 605345 and 559904 BZs
Praveen K Paladugu
praveenp at fedoraproject.org
Fri Aug 13 19:19:02 UTC 2010
commit c18f38bb508a85ba3e1fc17d7ffa85b357f76bf6
Author: Praveen K Paladugu <praveenp at praveenp-dell.us.dell.com>
Date: Fri Aug 13 14:19:39 2010 -0500
Update the sources to 1.3.8 for 605345 and 559904 BZs
.gitignore | 1 +
LocalInterfaceInvokeMethodFix.patch | 41 ----------------
destroyThreadKey.patch | 11 ----
sblim-sfcb-1.3.8-close_logging.patch | 19 +++++++
sblim-sfcb-1.3.8-initscript.patch | 89 ++++++++++++++++++++++++++++++++++
sblim-sfcb.spec | 12 +++--
sources | 2 +-
7 files changed, 118 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6aaccea..14baf25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sblim-sfcb-1.3.4.tar.bz2
+sblim-sfcb-1.3.8.tar.bz2
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-1.3.8-initscript.patch b/sblim-sfcb-1.3.8-initscript.patch
new file mode 100644
index 0000000..34cd927
--- /dev/null
+++ b/sblim-sfcb-1.3.8-initscript.patch
@@ -0,0 +1,89 @@
+diff -up sblim-sfcb-1.3.7/sfcb.init-redhat.in.orig sblim-sfcb-1.3.7/sfcb.init-redhat.in
+--- sblim-sfcb-1.3.7/sfcb.init-redhat.in.orig 2010-04-20 16:02:21.000000000 +0200
++++ sblim-sfcb-1.3.7/sfcb.init-redhat.in 2010-04-22 13:32:36.588476172 +0200
+@@ -13,6 +13,9 @@
+ # Source function library.
+ . /etc/init.d/functions
+
++SFCB_BIN=@sbindir@/sfcbd
++LOCKFILE=/var/lock/subsys/sblim-sfcb
++
+ echo $PATH | grep -q @sbindir@ ||PATH=@sbindir@:$PATH
+
+ if [ -z "$LD_LIBRARY_PATH" ] || echo $LD_LIBRARY_PATH | grep -qv @libdir@
+@@ -22,17 +25,25 @@ then
+ fi
+
+ start() {
++ if [[ $EUID -ne 0 ]]; then
++ echo "sfcb executed under nonprivileged user"
++ exit 4
++ fi
+ echo -n "Starting sfcb: "
+- daemon @sbindir@/sfcbd -d &&
+- touch /var/lock/subsys/sfcb &&
++ daemon $SFCB_BIN -d &&
++ touch $LOCKFILE &&
+ return 0 ||
+ return 1
+ }
+
+ stop() {
++ if [[ $EUID -ne 0 ]]; then
++ echo "sfcb executed under nonprivileged user"
++ exit 4
++ fi
+ echo -n "Shutting down sfcb: "
+ killproc sfcbd &&
+- rm -f /var/lock/subsys/sfcb &&
++ rm -f $LOCKFILE &&
+ return 0 || return 1
+ }
+
+@@ -50,9 +61,30 @@ case "$1" in
+ stop
+ ;;
+ status)
+- status sfcbd
++ pid=`pidofproc $SFCB_BIN`
++ RETVAL=$?
++ if [ "$RETVAL" -eq 0 ]; then
++ echo -n $"sfcb ($pid) is running"
++ exit 0
++ else
++ if [ -e /var/run/tog-pegasus.pid ]; then
++ echo $"sfcb is not running, but pid file exists"
++ exit 1
++ elif [ -e $LOCKFILE ]; then
++ echo $"sfcb is not running, but lock file exists"
++ exit 2
++ else
++ echo $"sfcb is not running"
++ exit 3
++ fi
++ fi
++ echo
+ ;;
+ restart)
++ if [[ $EUID -ne 0 ]]; then
++ echo "sfcb executed under nonprivileged user"
++ exit 4
++ fi
+ stop
+ start
+ ;;
+@@ -60,11 +92,12 @@ case "$1" in
+ reload
+ ;;
+ condrestart)
+- [ -f /var/lock/subsys/sfcb ] && restart || :
++ [ -f $LOCKFILE ] && restart || :
+ ;;
+ *)
+ echo "Usage: sfcb {start|stop|status|reload|restart|condrestart}"
+- exit 1
++ [ "$1" = "usage" ] && exit 0
++ exit 2
+ ;;
+ esac
+ exit $?
diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index ca888ed..e5982c2 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -7,15 +7,15 @@
Name: sblim-sfcb
Summary: Small Footprint CIM Broker
URL: http://www.sblim.org
-Version: 1.3.4
-Release: 12%{dist}
+Version: 1.3.8
+Release: 1%{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: LocalInterfaceInvokeMethodFix.patch
-patch2: destroyThreadKey.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}
@@ -115,6 +115,10 @@ fi
#%doc COPYING README
%changelog
+* Fri Aug 13 2010 <praveen_praveen at dell.com> - 1.3.8-1
+- updated the sources and added patches in response to
+- BZ 605345 and BZ 559904
+
* Wed Sep 30 2009 <praveen_paladugu at dell.com>- 1.3.4-12
- LocalInterfaceInvokeMethodFix: CHARS and string were handled the same.
- They are differentiated in this patch.
diff --git a/sources b/sources
index 2e60ac0..96a744f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-486fe536ad5ac5c58dd60ea03fc1bb21 sblim-sfcb-1.3.4.tar.bz2
+c19c1361447d4402beb3ef8c6e6c5682 sblim-sfcb-1.3.8.tar.bz2
More information about the scm-commits
mailing list