!10 fix failure caused by GCC upgrade to 10

From: @yaokai13
Reviewed-by: @small_leek
Signed-off-by: @small_leek

sblim-sfcb-1.4.9-fix-multiple-definition.patch

@@ -0,0 +1,91 @@
+From 73dd14c5225ecc81d7ed3cabcd3b233e8552f471 Mon Sep 17 00:00:00 2001
+Date: Fri, 30 Jul 2021 15:12:15 +0800
+Subject: [PATCH] 1
+---
+ control.h     | 2 +-
+ providerMgr.c | 2 ++
+ providerMgr.h | 2 +-
+ sfcBroker.c   | 2 ++
+ trace.c       | 1 +
+ trace.h       | 2 +-
+ 6 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/control.h b/control.h
+index e41e4b9..0cd7724 100644
+--- a/control.h
++++ b/control.h
+@@ -28,7 +28,7 @@ int             getControlUNum(char *id, unsigned int *val);
+ int             getControlULong(char *id, unsigned long *val);
+ int             getControlNum(char *id, long *val);
+ int             getControlBool(char *id, int *val);
+-const char      * sfcBrokerStart;
++extern const char      * sfcBrokerStart;
+ 
+ #endif
+ /* MODELINES */
+diff --git a/providerMgr.c b/providerMgr.c
+index f0df166..8358b8c 100644
+--- a/providerMgr.c
++++ b/providerMgr.c
+@@ -53,6 +53,8 @@
+ #define SFCB_ASM(x)
+ #endif
+ 
++sigset_t mask, old_mask;
++
+ static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+ extern CMPIBroker *Broker;
+diff --git a/providerMgr.h b/providerMgr.h
+index 3cc7745..fbbfecd 100644
+--- a/providerMgr.h
++++ b/providerMgr.h
+@@ -398,7 +398,7 @@ BinResponseHdr **invokeProviders(BinRequestContext * binCtx, int *err,
+ BinResponseHdr *invokeProvider(BinRequestContext * ctx);
+ void            freeResponseHeaders(BinResponseHdr ** resp,
+                                     BinRequestContext * ctx);
+-sigset_t mask, old_mask;
++extern sigset_t mask, old_mask;
+ 
+ #endif
+ /* MODELINES */
+diff --git a/sfcBroker.c b/sfcBroker.c
+index ca043c9..5133cc4 100644
+--- a/sfcBroker.c
++++ b/sfcBroker.c
+@@ -52,6 +52,8 @@
+ #include "config.h"
+ #endif
+ 
++const char    *sfcBrokerStart;
++
+ int             sfcBrokerPid = 0;
+ 
+ extern int      sfcbUseSyslog;
+diff --git a/trace.c b/trace.c
+index d7f30db..41beb17 100644
+--- a/trace.c
++++ b/trace.c
+@@ -48,6 +48,7 @@
+  * ---------------------------------------------------------------------------
+  */
+ 
++int             colorTrace;
+ char           *processName = NULL;
+ int             providerProcess = 0;
+ int             idleThreadId = 0;
+diff --git a/trace.h b/trace.h
+index 2c6d8be..068bebf 100644
+--- a/trace.h
++++ b/trace.h
+@@ -130,7 +130,7 @@ typedef struct traceId {
+ #define CYAN            6
+ #define WHITE           7
+ void            changeTextColor(int reset);
+-int             colorTrace;
++extern int             colorTrace;
+ 
+ #define MAX_MSG_SIZE 1024       /* max length of trace message */
+ 
+-- 
+2.23.0

sblim-sfcb.spec

@@ -2,7 +2,7 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker (SFCB)
 URL: http://sblim.sourceforge.net/wiki/index.php/Sfcb
 Version: 1.4.9
-Release: 15
+Release: 16
 License: EPL
 
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch2: sblim-sfcb-1.4.9-fix-ftbfs.patch
 Patch3: sblim-sfcb-1.4.9-fix-null-deref.patch
 Patch4: sblim-sfcb-1.4.9-fix-null-content-type-crash.patch
 Patch5: sblim-sfcb-1.4.9-sfcbrepos-schema-location.patch
+Patch6: sblim-sfcb-1.4.9-fix-multiple-definition.patch
 
 Provides: cim-server = 0
 Requires: cim-schema sblim-sfcCommon
@@ -89,6 +90,9 @@ fi;
 %files -f _pkg_list
 
 %changelog
+* Fri Jul 30 2021 yaokai13 <yaokai13@huawei.com> - 1.4.9-16
+- Fix failure caused by GCC upgrade to 10
+
 * Tue Mar 16 2021 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.4.9-15
 - Fix default location where sfcbrepos is looking for schema files