Hello community,
here is the log from the commit of package sblim-sfcb for openSUSE:Factory
checked in at 2013-08-15 16:17:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sblim-sfcb (Old)
and /work/SRC/openSUSE:Factory/.sblim-sfcb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-sfcb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sblim-sfcb/sblim-sfcb.changes 2013-07-09
21:11:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sblim-sfcb.new/sblim-sfcb.changes
2013-08-15 16:17:28.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 8 09:56:04 UTC 2013 - kkae...@suse.com
+
+- Fix logger for long-lived clients using the sfcblocal interface
+ (bnc#830525, upstream tix#69)
+ Patch: 26000-tix69-bnc830525-No-logger-pipe-for-sfcblocal.patch
+
+-------------------------------------------------------------------
New:
----
26000-tix69-bnc830525-No-logger-pipe-for-sfcblocal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-sfcb.spec ++++++
--- /var/tmp/diff_new_pack.INNAww/_old 2013-08-15 16:17:29.000000000 +0200
+++ /var/tmp/diff_new_pack.INNAww/_new 2013-08-15 16:17:29.000000000 +0200
@@ -50,6 +50,7 @@
Patch6: 0006-Reflect-provider-information-in-ps-via-argv.patch
Patch7: sblim-resource.patch
Patch8:
25000-tix45-bnc820035-HTTP-verb-check-may-fail-producing-501-error.patch
+Patch9: 26000-tix69-bnc830525-No-logger-pipe-for-sfcblocal.patch
Provides: cim-server
Provides: cimserver
%if 0%{?suse_version} >= 1030
@@ -115,6 +116,7 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
export PATCH_GET=0
++++++ 26000-tix69-bnc830525-No-logger-pipe-for-sfcblocal.patch ++++++
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x
autom4te.cache -x .deps -x .libs
../orig-sblim-sfcb-1.3.16/cimcClientSfcbLocal.c ./cimcClientSfcbLocal.c
--- ../orig-sblim-sfcb-1.3.16/cimcClientSfcbLocal.c 2013-08-08
12:45:52.009760302 +0200
+++ ./cimcClientSfcbLocal.c 2013-08-08 12:45:11.032039271 +0200
@@ -1920,7 +1920,7 @@
static void* release(ClientEnv* ce)
{
void *lib=ce->hdl;
- closeLogging();
+ closeLogging(0);
CONNECT_LOCK();
if (localConnectCount > 0) localConnectCount -= 1;
if (localConnectCount == 0) {
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x
autom4te.cache -x .deps -x .libs ../orig-sblim-sfcb-1.3.16/mlog.c ./mlog.c
--- ../orig-sblim-sfcb-1.3.16/mlog.c 2012-09-13 22:32:53.000000000 +0200
+++ ./mlog.c 2013-08-08 12:42:03.024141906 +0200
@@ -129,9 +129,10 @@
* Closes the pipe used for logging and closes out
* the syslog services that are created in startLogging.
*/
-void closeLogging() {
+void closeLogging(int thread) {
int wstat;
closelog();
+ if (thread)
close(logfds[1]);
wait(&wstat); // wait to prevent zombie
}
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x
autom4te.cache -x .deps -x .libs ../orig-sblim-sfcb-1.3.16/mlog.h ./mlog.h
--- ../orig-sblim-sfcb-1.3.16/mlog.h 2012-02-17 23:54:59.000000000 +0100
+++ ./mlog.h 2013-08-08 12:41:40.079177947 +0200
@@ -30,7 +30,7 @@
#define LOG_MSG_MAX 4096
void startLogging(int level, int thread);
-void closeLogging();
+void closeLogging(int thread);
void mlogf(int priority, int errout, const char* fmt, ...);
#endif
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x
autom4te.cache -x .deps -x .libs ../orig-sblim-sfcb-1.3.16/sfcBroker.c
./sfcBroker.c
--- ../orig-sblim-sfcb-1.3.16/sfcBroker.c 2012-11-21 18:18:04.000000000
+0100
+++ ./sfcBroker.c 2013-08-08 12:42:14.248613451 +0200
@@ -244,7 +244,7 @@
uninitSocketPairs();
sunsetControl();
uninitGarbageCollector();
- closeLogging();
+ closeLogging(1);
free((void *)sfcBrokerStart);
pthread_mutex_unlock(&syncMtx);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
