!14 [sync] PR-13: fix rpath problem in some binaries

From: @openeuler-sync-bot 
Reviewed-by: @gitee-cmd 
Signed-off-by: @gitee-cmd

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-1.4.9-fix-undefined-symbol.patch

@@ -0,0 +1,24 @@
+diff --git a/providerMgr.c b/providerMgr.c
+index 53fed57..23deaaf 100644
+--- a/providerMgr.c
++++ b/providerMgr.c
+@@ -54,6 +54,7 @@
+ #endif
+ 
+ sigset_t mask, old_mask;
++const char    *sfcBrokerStart;
+ 
+ static pthread_mutex_t resultsocketMutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+diff --git a/sfcBroker.c b/sfcBroker.c
+index 5133cc4..e15a637 100644
+--- a/sfcBroker.c
++++ b/sfcBroker.c
+@@ -52,7 +52,6 @@
+ #include "config.h"
+ #endif
+ 
+-const char    *sfcBrokerStart;
+ 
+ int             sfcBrokerPid = 0;
+ 

sblim-sfcb-1.4.9-sfcbrepos-schema-location.patch

@@ -0,0 +1,44 @@
+diff --git a/man/sfcbrepos.1.pre.in b/man/sfcbrepos.1.pre.in
+index aa910c2..3c6e96a 100644
+--- a/man/sfcbrepos.1.pre.in
++++ b/man/sfcbrepos.1.pre.in
+@@ -26,7 +26,7 @@ Supported command line options are:
+ .TP
+ \fB\-c\fR \fIschemadir\fR
+ Path to obtain the CIM Schema classes.
+-Default is \fI@datadir@/sfcb\fR
++Default is \fI@datadir@/mof/cim-current\fR
+ .TP
+ \fB\-s\fR \fIstagingdir\fR
+ Path to sfcb staging area containing class MOFs and registration files
+@@ -65,7 +65,7 @@ Default is \fIauto\fR, which will auto-detect based on the contents of the
+ Display usage information and exit.
+ .SH FILES
+ .TP
+-\fI@datadir@/sfcb/CIM/CIM_Schema.mof\fR
++\fI@datadir@/mof/cim-current/CIM_Schema.mof\fR
+ CIM Schema
+ .TP
+ \fI@localstatedir@/lib/sfcb/registration/providerRegister\fR
+diff --git a/sfcbrepos.sh.in b/sfcbrepos.sh.in
+index 71a6c38..344e47b 100644
+--- a/sfcbrepos.sh.in
++++ b/sfcbrepos.sh.in
+@@ -59,7 +59,7 @@ then
+     echo -e "\t-X create repository in non-native format as specifed by argument"
+     echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
+     echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
+-    echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
++    echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/mof/cim-current]"
+     echo -e "\t-t create tiny class repository by omitting inheritance information"
+     echo -e "\t-z compress repository with gzip"
+     echo
+@@ -99,7 +99,7 @@ fi
+ 
+ if [ -z "$cimschemadir" ]
+ then
+-    cimschemadir=${DESTDIR}@datadir@/sfcb/CIM
++    cimschemadir=${DESTDIR}@datadir@/mof/cim-current
+ fi
+ 
+ if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&

sblim-sfcb.spec

@@ -2,8 +2,8 @@ Name: sblim-sfcb
 Summary: Small Footprint CIM Broker (SFCB)
 URL: http://sblim.sourceforge.net/wiki/index.php/Sfcb
 Version: 1.4.9
-Release: 14
+Release: 18
-License: EPL
+License: EPL-1.0
 
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 Source1: sfcb.service
@@ -13,12 +13,15 @@ Patch1: sblim-sfcb-1.4.8-default-ecdh-curve-name.patch
 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
+Patch7: sblim-sfcb-1.4.9-fix-undefined-symbol.patch
 
 Provides: cim-server = 0
 Requires: cim-schema sblim-sfcCommon
 BuildRequires: libcurl-devel perl-generators zlib-devel openssl-devel
 BuildRequires: pam-devel cim-schema bison flex sblim-cmpi-devel
-BuildRequires: systemd sblim-sfcCommon-devel openslp-devel gcc
+BuildRequires: systemd sblim-sfcCommon-devel openslp-devel gcc chrpath
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -65,6 +68,13 @@ echo "%{_libdir}/sfcb/*.so" >> _pkg_list
 
 cat _pkg_list
 
+chrpath -d %{buildroot}%{_bindir}/{sfcbinst2mof,sfcbtrace,sfcbmof}
+chrpath -d %{buildroot}%{_sbindir}/sfcbd
+chrpath -d %{buildroot}%{_libdir}/sfcb/*
+
+mkdir -p %{buildroot}/etc/ld.so.conf.d
+echo "%{_libdir}/sfcb" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+
 %pre
 %{_bindir}/getent group sfcb >/dev/null || %{_sbindir}/groupadd -r sfcb
 %{_sbindir}/usermod -a -G sfcb root > /dev/null 2>&1 || :
@@ -86,7 +96,20 @@ if [ $1 -eq 0 ]; then
 fi;
 
 %files -f _pkg_list
+%config(noreplace) /etc/ld.so.conf.d/*
 
 %changelog
+* Wed Sep 08 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.4.9-18
+- fix rpath problem in some binaries
+
+* Fri Aug 27 2021 zhangjiapeng <zhangjiapeng9@huawei.com> - 1.4.9-17
+- fix undefined symbol
+
+* 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
+
 * Fri Feb 14 2020 Senlin Xia <xiasenlin1@huawei.com> - 1.4.9-14
 - Package init

sblim-sfcb.yaml

@@ -1,4 +1,4 @@
-version_control: NA
+version_control: git
-src_repo: NA
+src_repo: https://git.code.sf.net/p/sblim/sfcb
-tag_prefix: NA
+tag_prefix: SFCB_
-seperator: NA
+seperator: _