From 04fb6be197fce919ce9576ee0110f32c4d3f0641 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Tue, 8 Jan 2013 10:22:46 +0100
Subject: [PATCH] Update to sblim-sfcb-1.3.16, Fix provider debugging (patch by
 Radek Novacek)

---
 .gitignore                                     |  1 +
 sblim-sfcb-1.3.15-fix-provider-debugging.patch | 12 ++++++++++++
 sblim-sfcb.spec                                | 12 ++++++++++--
 sources                                        |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 sblim-sfcb-1.3.15-fix-provider-debugging.patch

diff --git a/.gitignore b/.gitignore
index 43cefd4..5e162c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ sblim-sfcb-1.3.8.tar.bz2
 /sblim-sfcb-1.3.14-1.fc18.src.rpm
 /sblim-sfcb-1.3.14.tar.bz2
 /sblim-sfcb-1.3.15.tar.bz2
+/sblim-sfcb-1.3.16.tar.bz2
diff --git a/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/sblim-sfcb-1.3.15-fix-provider-debugging.patch
new file mode 100644
index 0000000..4eda232
--- /dev/null
+++ b/sblim-sfcb-1.3.15-fix-provider-debugging.patch
@@ -0,0 +1,12 @@
+diff -up sblim-sfcb-1.3.16/providerDrv.c.orig sblim-sfcb-1.3.16/providerDrv.c
+--- sblim-sfcb-1.3.16/providerDrv.c.orig	2013-01-07 16:39:58.922924254 +0100
++++ sblim-sfcb-1.3.16/providerDrv.c	2013-01-07 16:40:12.121988127 +0100
+@@ -3116,7 +3116,7 @@ void processProviderInvocationRequests(c
+       rc = spRecvReq(&providerSockets.receive, &parms->requestor,
+                      (void **) &parms->req, &rl, &mqg);
+       if (mqg.rdone) {
+-	int debug_break = 0;
++	volatile int debug_break = 0;
+ 	if (rc!=0) {
+ 	  mlogf(M_ERROR,M_SHOW, "spRecvReq returned error %d. Skipping message.\n", rc);
+ 	  free(parms);
diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index 33cced9..f10ba30 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -7,8 +7,8 @@
 Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://www.sblim.org
-Version: 1.3.15
-Release: 5%{?dist}
+Version: 1.3.16
+Release: 1%{?dist}
 Group: Applications/System
 License: EPL
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
@@ -20,6 +20,9 @@ Patch1: sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
 Patch2: sblim-sfcb-1.3.10-CMGetCharPtr.patch
 # Patch3: adds missing includes
 Patch3: sblim-sfcb-1.3.14-missing-includes.patch
+# Patch4: Fix provider debugging - variable for stopping wait-for-debugger
+# loop must be volatile
+Patch4: sblim-sfcb-1.3.15-fix-provider-debugging.patch
 Source1: sfcb.service
 Provides: cim-server
 Requires: cim-schema
@@ -55,6 +58,7 @@ Programming Interface (CMPI).
 %patch1 -p1 -b .sfcbrepos-schema-location
 %patch2 -p1 -b .CMGetCharPtr
 %patch3 -p1 -b .missing-includes
+%patch4 -p1 -b .fix-provider-debugging
 
 %build
 %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
@@ -116,6 +120,10 @@ fi;
 #%doc COPYING README
 
 %changelog
+* Tue Jan 08 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.16-1
+- Update to sblim-sfcb-1.3.16
+- Fix provider debugging (patch by Radek Novacek)
+
 * Thu Nov 29 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.15-5
 - Comment patches
 
diff --git a/sources b/sources
index c8c1cc3..6c6ab87 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 494b9bdd96c1d8d90dafc26cd5534082  sfcb.service
-117e50f989370376876163e621a59f73  sblim-sfcb-1.3.15.tar.bz2
+af2475276af9090f25ef61b01791a1a9  sblim-sfcb-1.3.16.tar.bz2