[sblim-sfcb] Update to sblim-sfcb-1.4.5

vcrhonek vcrhonek at fedoraproject.org
Thu Sep 5 11:17:01 UTC 2013 

commit 2db677ed022a07b42b73c659b92c9409bf10e61b
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Sep 5 13:16:33 2013 +0200

    Update to sblim-sfcb-1.4.5

 .gitignore                                     |    1 +
 sblim-sfcb-1.3.10-CMGetCharPtr.patch           |   12 -
 sblim-sfcb-1.3.14-missing-includes.patch       |   26 --
 sblim-sfcb-1.3.15-fix-provider-debugging.patch |   24 +-
 sblim-sfcb-1.3.16-embedded-crash.patch         |  103 ------
 sblim-sfcb-1.3.16-embedded-instance.patch      |  394 ------------------------
 sblim-sfcb-1.3.16-escape.patch                 |   49 ---
 sblim-sfcb-1.3.16-http-header-cmd-check.patch  |   14 -
 sblim-sfcb-1.3.16-invalid-read.patch           |   76 -----
 sblim-sfcb-1.3.16-invalid-read2.patch          |   26 --
 sblim-sfcb-1.3.7-close_logging.patch           |   19 --
 sblim-sfcb-1.4.5-1.fc21.src.rpm                |  Bin 0 -> 1210269 bytes
 sblim-sfcb-1.4.5-service.patch                 |   27 ++
 sblim-sfcb.spec                                |   65 ++---
 sources                                        |    2 +-
 15 files changed, 65 insertions(+), 773 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e162c4..94e1553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ sblim-sfcb-1.3.8.tar.bz2
 /sblim-sfcb-1.3.14.tar.bz2
 /sblim-sfcb-1.3.15.tar.bz2
 /sblim-sfcb-1.3.16.tar.bz2
+/sblim-sfcb-1.4.5.tar.bz2
diff --git a/sblim-sfcb-1.3.15-fix-provider-debugging.patch b/sblim-sfcb-1.3.15-fix-provider-debugging.patch
index 4eda232..4fbecaa 100644
--- a/sblim-sfcb-1.3.15-fix-provider-debugging.patch
+++ b/sblim-sfcb-1.3.15-fix-provider-debugging.patch
@@ -1,12 +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 -up sblim-sfcb-1.4.5/providerDrv.c.orig sblim-sfcb-1.4.5/providerDrv.c
+--- sblim-sfcb-1.4.5/providerDrv.c.orig	2013-09-04 12:59:22.140813239 +0200
++++ sblim-sfcb-1.4.5/providerDrv.c	2013-09-04 12:59:40.511870274 +0200
+@@ -3585,7 +3585,7 @@ processProviderInvocationRequests(char *
+     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-1.4.5-1.fc21.src.rpm b/sblim-sfcb-1.4.5-1.fc21.src.rpm
new file mode 100644
index 0000000..1ad0c02
Binary files /dev/null and b/sblim-sfcb-1.4.5-1.fc21.src.rpm differ
diff --git a/sblim-sfcb-1.4.5-service.patch b/sblim-sfcb-1.4.5-service.patch
new file mode 100644
index 0000000..1fa10a3
--- /dev/null
+++ b/sblim-sfcb-1.4.5-service.patch
@@ -0,0 +1,27 @@
+diff -up sblim-sfcb-1.4.5/Makefile.in.orig sblim-sfcb-1.4.5/Makefile.in
+--- sblim-sfcb-1.4.5/Makefile.in.orig	2013-09-03 17:00:52.835375562 +0200
++++ sblim-sfcb-1.4.5/Makefile.in	2013-09-03 17:13:40.127512520 +0200
+@@ -626,7 +626,6 @@ initdir = $(sysconfdir)/init.d
+ pamdir = $(sysconfdir)/pam.d
+ sfcblibdir = $(libdir)/sfcb
+ cmpilibdir = $(libdir)/cmpi
+-systemddir = $(prefix)/share/systemd
+ MANFILES = man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
+ 	man/sfcbrepos.1 man/sfcbstage.1 man/sfcbunstage.1 man/sfcbuuid.1 \
+ 	man/wbemcat.1 man/xmltest.1
+@@ -2365,7 +2364,6 @@ unittest:
+ 	cd test && sh check_all.sh
+ 
+ install-data-local:
+-	if test -d $(systemddir); then cp $(srcdir)/sblim-sfcb.service $(systemddir); fi; 
+ 	test -d $(DESTDIR)$(sfcbstatedir)/registration/repository || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/registration/repository
+ 	test -d $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop
+ 	test -d $(DESTDIR)$(sfcbstatedir)/stage/regs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/regs
+@@ -2383,7 +2381,6 @@ install-data-local:
+ uninstall-local:
+ 	rm -f $(DESTDIR)$(sfcbstatedir)/stage/default.reg
+ 	rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/10_interop.mof
+-	rm -f $(systemddir)/sblim-sfcb.service
+ @INDICATIONS_TRUE@	rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/root/interop/20_indication.mof
+ @INDICATIONS_TRUE@	rm -f $(DESTDIR)$(sfcbstatedir)/stage/mofs/indication.mof
+ @DOCS_TRUE@	rm -rf $(DESTDIR)$(sfcbdocdir)/html
diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index ed6b1ed..48dda54 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -7,8 +7,8 @@
 Name: sblim-sfcb
 Summary: Small Footprint CIM Broker
 URL: http://sblim.wiki.sourceforge.net/
-Version: 1.3.16
-Release: 9%{?dist}
+Version: 1.4.5
+Release: 1%{?dist}
 Group: Applications/System
 License: EPL
 Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
@@ -17,31 +17,18 @@ Source1: sfcb.service
 Source2: sfcbdump.1.gz
 Source3: sfcbinst2mof.1.gz
 Source4: sfcbtrace.1.gz
-# Patch0: moves log close to correct place
-Patch0: sblim-sfcb-1.3.7-close_logging.patch
-# Patch1: changes schema location to the path we use
-Patch1: sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
-# Patch2: fixes CMGetCharPtr macro
-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
+# Patch0: changes schema location to the path we use
+Patch0: sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
+# Patch1: Fix provider debugging - variable for stopping wait-for-debugger
 # loop must be volatile
-Patch4: sblim-sfcb-1.3.15-fix-provider-debugging.patch
-# Patch5-7: already upstream, http://sourceforge.net/p/sblim/sfcb-tix/37/
-Patch5: sblim-sfcb-1.3.16-invalid-read.patch
-Patch6: sblim-sfcb-1.3.16-invalid-read2.patch
-Patch7: sblim-sfcb-1.3.16-embedded-crash.patch
-# Patch8: already upstream, http://sourceforge.net/p/sblim/sfcb-tix/44/
-Patch8: sblim-sfcb-1.3.16-escape.patch
-# Patch9: already upstream, http://sourceforge.net/p/sblim/sfcb-tix/49/
-Patch9: sblim-sfcb-1.3.16-embedded-instance.patch
-# Patch10: increase default value of maxMsgLen in sfcb.cfg
-Patch10: sblim-sfcb-1.3.16-maxMsgLen.patch
-# Patch11: fix  CIM clients are sometimes getting HTTP/1.1 501 Not Implemented
-Patch11: sblim-sfcb-1.3.16-http-header-cmd-check.patch
+Patch1: sblim-sfcb-1.3.15-fix-provider-debugging.patch
+# Patch2: increase default value of maxMsgLen in sfcb.cfg
+Patch2: sblim-sfcb-1.3.16-maxMsgLen.patch
+# Patch3: we'll install own service file
+Patch3: sblim-sfcb-1.4.5-service.patch
 Provides: cim-server
 Requires: cim-schema
+Requires: sblim-sfcCommon
 BuildRequires: libcurl-devel
 BuildRequires: zlib-devel
 BuildRequires: openssl-devel
@@ -50,6 +37,7 @@ BuildRequires: cim-schema
 BuildRequires: bison flex
 BuildRequires: sblim-cmpi-devel
 BuildRequires: systemd
+BuildRequires: sblim-sfcCommon-devel
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -64,18 +52,10 @@ Programming Interface (CMPI).
 
 %prep
 %setup -q -T -b 0 -n %{name}-%{version}
-%patch0 -p1 -b .close_logging
-%patch1 -p1 -b .sfcbrepos-schema-location
-%patch2 -p1 -b .CMGetCharPtr
-%patch3 -p1 -b .missing-includes
-%patch4 -p1 -b .fix-provider-debugging
-%patch5 -p1 -b .invalid-read
-%patch6 -p1 -b .invalid-read2
-%patch7 -p1 -b .embedded-crash
-%patch8 -p1 -b .escape
-%patch9 -p1 -b .embedded-instance
-%patch10 -p1 -b .maxMsgLen
-%patch11 -p1 -b .http-header-cmd-check
+%patch0 -p1 -b .sfcbrepos-schema-location
+%patch1 -p1 -b .fix-provider-debugging
+%patch2 -p1 -b .maxMsgLen
+%patch3 -p1 -b .service
 
 %build
 %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE -fPIE -DPIE" LDFLAGS="$LDFLAGS -Wl,-z,now -pie"
@@ -88,8 +68,8 @@ rm $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/sblim-sfcb.service
 # install man pages
-mkdir -p %{buildroot}/%{_mandir}/man1/
-cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{buildroot}/%{_mandir}/man1/
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1/
+cp %{SOURCE2} %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/%{_mandir}/man1/
 # remove unused static libraries and so files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
 
@@ -118,14 +98,14 @@ cat _pkg_list
 %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || :
 /sbin/ldconfig
 %{_bindir}/sfcbrepos -f
-%systemd_post sfcb.service
+%systemd_post sblim-sfcb.service
 
 %preun
-%systemd_preun sfcb.service
+%systemd_preun sblim-sfcb.service
 
 %postun
 /sbin/ldconfig
-%systemd_postun_with_restart sfcb.service
+%systemd_postun_with_restart sblim-sfcb.service
 if [ $1 -eq 0 ]; then
         /usr/sbin/groupdel sfcb > /dev/null 2>&1 || :;
 fi;
@@ -133,6 +113,9 @@ fi;
 %files -f _pkg_list
 
 %changelog
+* Thu Sep 05 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.5-1
+- Update to sblim-sfcb-1.4.5
+
 * Tue Aug 13 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.16-9
 - Build require systemd for unitdir macro
   Resolves: #988777
diff --git a/sources b/sources
index 6c6ab87..5d964e3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 494b9bdd96c1d8d90dafc26cd5534082  sfcb.service
-af2475276af9090f25ef61b01791a1a9  sblim-sfcb-1.3.16.tar.bz2
+64bf48b51f5bbf220b65a88a02fdc02b  sblim-sfcb-1.4.5.tar.bz2

More information about the scm-commits mailing list