Hello community, here is the log from the commit of package sblim-sfcb for openSUSE:Factory checked in at 2017-12-08 12:56:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sblim-sfcb (Old) and /work/SRC/openSUSE:Factory/.sblim-sfcb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-sfcb" Fri Dec 8 12:56:54 2017 rev:52 rq:548066 version:1.4.9 Changes: -------- --- /work/SRC/openSUSE:Factory/sblim-sfcb/sblim-sfcb.changes 2015-09-19 06:55:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sblim-sfcb.new/sblim-sfcb.changes 2017-12-08 12:56:55.782678268 +0100 @@ -1,0 +2,97 @@ +Mon Dec 4 12:19:22 UTC 2017 - [email protected] + +- Deleted patches: + * sblim-sfcb-1.4.8-fix-bashisms.patch + * sblim-sfcb-1.4.9-fix-null-deref.patch + * sfcbd-alias.patch + All of them got renamed in the change from Nov 28 2018 + +------------------------------------------------------------------- +Mon Dec 4 09:42:11 UTC 2017 - [email protected] + +- Drop version dependency on cmpi-provider-register so we can + install sblim-sfcb on SLE11SP4 +- Merge a few more missing changes from SLE to OpenSUSE + * retain compatibility service link for migration purposes + * do not clobber config paths + * reference correct systemd service name + +------------------------------------------------------------------- +Tue Nov 28 15:13:55 UTC 2017 - [email protected] + +- Merge SLE and openSUSE versions + +- Added patches + * 0011-Return-value-from-non-void-function.patch + * 0012-Configurable-local-socket-group-permission-for-daemo.patch + * 0013-Fix-bashisms-in-scripts.patch + * 0015-Define-UINT16_MAX.patch + * 0016-Externalize-strncpy_kind.patch + * 0017-Add-braces-around-else.patch + * 0018-Adapt-to-bison-3.x-replace-YYPARSE_PARAM.patch + * 0021-revert-upstream-mistake.patch + * 0024-CURLOPT_POSTREDIR-might-not-be-defined.patch + +- Renamed patches + * sblim-sfcb-1.4.9-fix-null-deref.patch to + 0014-Fix-lookupProviders-null-pointer-dereference.patch + * fix_uninitialized_value.patch to + 0019-Fix-uninitialized-value-reported-by-valgrind.patch + * link_certificate_if_missing.patch to + 0020-link-certificate-if-missing.patch + * set_default_content_type.patch to + 0022-Fix-crash-caused-by-NULL-content_type.patch + * sfcbd-alias.patch to + 0023-Alias-sblim-sfcb-service-to-sfcb-and-sfcbd.patch + +- Dropped patches (included in 1.4.9) + * 3340426.patch + * a9dda19.patch + * decd3c6b9.patch + +------------------------------------------------------------------- +Tue Jun 6 12:50:02 UTC 2017 - [email protected] + +- link_certificate_if_missing.patch: create clist.pem as a symlink + to already existing server.pem if it does not exist. This is + needed for upgrades from SLE11SP4 versions that did not use this + certificate (bnc#1041885) +- reintroduce symlink for legacy cmpi-provider-register for + upgrades from SLE11 (bnc#1041885) + +------------------------------------------------------------------- +Mon Mar 6 10:10:28 UTC 2017 - [email protected] + +- revert mistaken change that disabled basic authentication + on default install (bnc#1023820) + +------------------------------------------------------------------- +Thu Jan 5 13:16:00 UTC 2017 - [email protected] + +- reference correct service name for service restarts on upgrades + (bsc#1018324) +- avoid use wildcards to reference single config files + +------------------------------------------------------------------- + +Tue Dec 13 16:52:52 UTC 2016 - [email protected] + +- fix_uninitialized_value.patch: Initialize structure value(s) + before using it (bsc#1015155) +- set_default_content_type.patch: default content type was not + set leading to a crash if Content-Type was not set in the + HTTP request. (bsc#1015155) +- remove sed-generated source file distributed in the tarball +- add support for text/xml mimetype +- no longer overwrite config file on upgrades +- upstream bug fixes: + 3340426.patch - Some associatorname CIM operations hang + a9dda19.patch - CMPIRole not passed to provider context + +------------------------------------------------------------------- +Wed Nov 16 12:15:24 UTC 2016 - [email protected] + +- add sslNoSSLv3 and sslNoTLSv1 configuration options + (decd3c6b9.patch, bsc#923349, bsc#1008130) + +------------------------------------------------------------------- Old: ---- sblim-sfcb-1.4.8-fix-bashisms.patch sblim-sfcb-1.4.9-fix-null-deref.patch sfcbd-alias.patch New: ---- 0011-Return-value-from-non-void-function.patch 0012-Configurable-local-socket-group-permission-for-daemo.patch 0013-Fix-bashisms-in-scripts.patch 0014-Fix-lookupProviders-null-pointer-dereference.patch 0015-Define-UINT16_MAX.patch 0016-Externalize-strncpy_kind.patch 0017-Add-braces-around-else.patch 0018-Adapt-to-bison-3.x-replace-YYPARSE_PARAM.patch 0019-Fix-uninitialized-value-reported-by-valgrind.patch 0020-link-certificate-if-missing.patch 0021-revert-upstream-mistake.patch 0022-Fix-crash-caused-by-NULL-content_type.patch 0023-Alias-sblim-sfcb-service-to-sfcb-and-sfcbd.patch 0024-CURLOPT_POSTREDIR-might-not-be-defined.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-sfcb.spec ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.166628286 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.170628141 +0100 @@ -1,7 +1,7 @@ # # spec file for package sblim-sfcb # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,13 +58,23 @@ Patch9: 0009-Improvide-error-message-if-ClassProvider-for-root-in.patch Patch10: 0010-Enable-authentication-by-default.patch -Patch11: sblim-sfcb-1.4.8-fix-bashisms.patch - +Patch11: 0011-Return-value-from-non-void-function.patch +Patch12: 0012-Configurable-local-socket-group-permission-for-daemo.patch +Patch13: 0013-Fix-bashisms-in-scripts.patch # bsc#942628 lookupProviders() null pointer dereference -Patch12: sblim-sfcb-1.4.9-fix-null-deref.patch - +Patch14: 0014-Fix-lookupProviders-null-pointer-dereference.patch +Patch15: 0015-Define-UINT16_MAX.patch +Patch16: 0016-Externalize-strncpy_kind.patch +Patch17: 0017-Add-braces-around-else.patch +Patch18: 0018-Adapt-to-bison-3.x-replace-YYPARSE_PARAM.patch +Patch19: 0019-Fix-uninitialized-value-reported-by-valgrind.patch +Patch20: 0020-link-certificate-if-missing.patch +Patch21: 0021-revert-upstream-mistake.patch +Patch22: 0022-Fix-crash-caused-by-NULL-content_type.patch # bsc#906070 - add custom names as alias -Patch13: sfcbd-alias.patch +Patch23: 0023-Alias-sblim-sfcb-service-to-sfcb-and-sfcbd.patch +# SLE10's curl is too old +Patch24: 0024-CURLOPT_POSTREDIR-might-not-be-defined.patch Provides: cim-server Provides: cimserver @@ -114,7 +124,7 @@ Requires: cim-schema PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/groupmod -PreReq: cmpi-provider-register > 1.0 +PreReq: cmpi-provider-register %description Small Footprint CIM Broker (sfcb) is a CIM server conforming to the CIM @@ -123,11 +133,12 @@ constrained environments. sfcb supports providers written against the Common Manageability Programming Interface (CMPI). - - %prep %setup -q -n %{name}-%{srcversion} +# remove autogenerated file +rm cimXmlParserProcessed.c + cp %{S:1} . cp %{S:7} . %patch1 -p1 @@ -142,30 +153,23 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 -p0 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 export PATCH_GET=0 %build autoreconf -f -i -# 1.3.6 tarball seems incomplete. (issue #2931327 upstream) -# might be able to remove the following workaround in a future version. -#mkdir -p test/finaltest -#mkdir -p test/TestProviders/tests -#mkdir -p test/commands -#mkdir -p test/wbemcli -#mkdir -p test/xmltest -#mkdir -p test/unittest -#mkdir -p test/slptest -#mkdir -p test/localtests -#touch test/finaltest/Makefile.in -#touch test/TestProviders/tests/Makefile.in -#touch test/commands/Makefile.in -#touch test/wbemcli/Makefile.in -#touch test/xmltest/Makefile.in -#touch test/unittest/Makefile.in -#touch test/slptest/Makefile.in -#touch test/localtests/Makefile.in if test -d mofc; then cd mofc && autoreconf -f -i; cd ..; fi #%%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CIMSCHEMA_SOURCE=%{SOURCE1} CIMSCHEMA_MOF=cimv216.mof CIMSCHEMA_SUBDIRS=y mkdir -p m4 @@ -176,7 +180,14 @@ %endif export SFCB_DIR=`pwd` export SYSTEMDDIR=%{_unitdir} +%if 0%{?suse_version} +%if 0%{?suse_version} <= 1040 +# SLE 10 fails on -fgnu89-inline +export CFLAGS="%optflags" +%else export CFLAGS="%optflags -fgnu89-inline" +%endif +%endif %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 \ --enable-uds $WITH_SLP \ --enable-large_volume_support \ @@ -211,6 +222,9 @@ # remove the default-installed sfcb init script rm -f $RPM_BUILD_ROOT/etc/init.d/sfcb # create /usr/sbin/rcsblim-sfcb, esp. for cmpi-provider-register +# create /usr/sbin/rcsfcb for compatibility with SLE11 upgrades in cmpi-provider-register, just in case... DO NOT REMOVE! +# see bugs: 1041885, 874811 +ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcsfcb ln -sf %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rcsblim-sfcb %else %if 0%{?suse_version} @@ -242,8 +256,8 @@ echo "%dir %{_libdir}/cmpi/" >> _pkg_list echo "%dir %{_sysconfdir}/sfcb/" >> _pkg_list echo "%dir %{_libdir}/sfcb" >> _pkg_list -echo "%config %{_sysconfdir}/sfcb/*" >> _pkg_list -echo "%config %{_sysconfdir}/pam.d/*" >> _pkg_list +echo "%config(noreplace) %{_sysconfdir}/sfcb/sfcb.cfg" >> _pkg_list +echo "%config %{_sysconfdir}/pam.d/sfcb" >> _pkg_list %if 0%{?suse_version} > 1010 echo "%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/sblim-sfcb" >> _pkg_list %endif @@ -276,14 +290,14 @@ # follow http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines %if 0%{?has_systemd} -%service_add_pre sfcbd.service +%service_add_pre sblim-sfcb.service %endif %post test -n "$FIRST_ARG" || FIRST_ARG=$1 %if 0%{?has_systemd} %{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb -%service_add_post sfcbd.service +%service_add_post sblim-sfcb.service %else #removed NWP, placed into init script for first service startup #%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb @@ -300,7 +314,7 @@ %preun %if 0%{?has_systemd} -%service_del_preun sfcbd.service +%service_del_preun sblim-sfcb.service %else %stop_on_removal sfcb %endif @@ -312,7 +326,7 @@ sfcbrepos -f 2> /dev/null || : fi %if 0%{?has_systemd} -%service_del_postun sfcbd.service +%service_del_postun sblim-sfcb.service %else %restart_on_update sfcb %insserv_cleanup ++++++ 0001-Makefile.am-Honor-build-environment.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.190627419 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.190627419 +0100 @@ -1,17 +1,17 @@ -From 156cc6c7f4dea416cddda20d67a591ca2319b79d Mon Sep 17 00:00:00 2001 +From 2d281f4a64a6f3017c771891301dbd84ed4c8eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 18 Aug 2010 11:20:53 +0200 -Subject: [PATCH 01/10] Makefile.am: Honor build environment +Subject: [PATCH 01/25] Makefile.am: Honor build environment --- Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 9554155e3211..d91036fd9462 100644 +index 7b9a222de2e4..6d0f5f10f833 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -555,11 +555,15 @@ dist-hook: +@@ -554,11 +554,15 @@ dist-hook: install-cimschema: getSchema.sh test -d $(DESTDIR)$(sfcbdatadir) || $(mkdir_p) $(DESTDIR)$(sfcbdatadir) @@ -30,5 +30,5 @@ footprint-sloc: -- -2.1.2 +2.15.0 ++++++ 0002-providerMgr-add-prototypes.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.202626986 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.202626986 +0100 @@ -1,7 +1,7 @@ -From 14d64ce544cb7798e495a49f0f0074282114ada9 Mon Sep 17 00:00:00 2001 +From 56c2edf2a1a203b7e738bf452973276805314338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 7 Sep 2010 09:10:06 +0200 -Subject: [PATCH 02/10] providerMgr: add prototypes +Subject: [PATCH 02/25] providerMgr: add prototypes --- providerMgr.c | 6 ++++++ @@ -25,5 +25,5 @@ extern CMPIBroker *Broker; -- -2.1.2 +2.15.0 ++++++ 0003-Enable-broker.LogMessage-and-broker.trace.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.210626697 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.210626697 +0100 @@ -1,7 +1,7 @@ -From 28a7a0f15494cd0dbf25850889c6815b8c4f4b05 Mon Sep 17 00:00:00 2001 +From f1642ce4a36d0aa86ee5c12d13e2224960025cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Thu, 5 Aug 2010 12:23:45 +0200 -Subject: [PATCH 03/10] Enable broker.LogMessage and broker.trace +Subject: [PATCH 03/25] Enable broker.LogMessage and broker.trace --- brokerEnc.c | 18 ++++++++++-------- @@ -42,5 +42,5 @@ } -- -2.1.2 +2.15.0 ++++++ 0004-Check-for-existance-of-autoconfiscate.sh-before-call.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.218626408 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.218626408 +0100 @@ -1,7 +1,7 @@ -From 232be625616c372aad3d1967bcca5a1b20c273c2 Mon Sep 17 00:00:00 2001 +From b172bc9eefc4651c1ba4c3a559dd58930561e46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 30 Mar 2011 11:36:19 +0200 -Subject: [PATCH 04/10] Check for existance of autoconfiscate.sh before calling +Subject: [PATCH 04/25] Check for existance of autoconfiscate.sh before calling it in a sub-directory --- @@ -21,5 +21,5 @@ +if test -f mofc/autoconfiscate.sh; then cd mofc && ./autoconfiscate.sh; fi +if test -f cmpi-devel/autoconfiscate.sh; then cd cmpi-devel && ./autoconfiscate.sh; fi -- -2.1.2 +2.15.0 ++++++ 0005-Define-YYPARSE_PARAM-early-for-cimXmlOps-and-cimXmlP.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.230625975 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.230625975 +0100 @@ -1,7 +1,7 @@ -From a0e3b3f677a5c1079c18fc800b2f769a03ec8bc3 Mon Sep 17 00:00:00 2001 +From 79a7f98644c09cd4f49a0a72d12033973ee8f8b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 16 Jul 2013 11:17:01 +0200 -Subject: [PATCH 05/10] Define YYPARSE_PARAM early for cimXmlOps and +Subject: [PATCH 05/25] Define YYPARSE_PARAM early for cimXmlOps and cimXmlParser --- @@ -22,5 +22,5 @@ # define CMPI_FLAG_ContinueOnError 16 # define CMPI_FLAG_ReturnQueryResultClass 32 -- -2.1.2 +2.15.0 ++++++ 0006-Don-t-crash-if-class-repo-is-not-initialized.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.238625686 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.242625541 +0100 @@ -1,7 +1,7 @@ -From 57b8690c012629816e8e03a82be8ac1612f0bcb7 Mon Sep 17 00:00:00 2001 +From 9a75c16a1c525a6924d47403fd0b520fe9232360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Thu, 8 Aug 2013 12:25:35 +0200 -Subject: [PATCH 06/10] Don't crash if class repo is not initialized +Subject: [PATCH 06/25] Don't crash if class repo is not initialized --- classProviderSf.c | 2 +- @@ -21,5 +21,5 @@ } -- -2.1.2 +2.15.0 ++++++ 0007-Increase-max-trace-msg-len-to-4096.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.250625252 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.250625252 +0100 @@ -1,7 +1,7 @@ -From ab95ffa0a3024e87925b22f6aad8bd44583b5475 Mon Sep 17 00:00:00 2001 +From e4218f055881f8c3454c0b3a6507dbcb84d7771a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 28 Aug 2013 15:20:53 +0200 -Subject: [PATCH 07/10] Increase max trace msg len to 4096 +Subject: [PATCH 07/25] Increase max trace msg len to 4096 --- trace.h | 2 +- @@ -21,5 +21,5 @@ #define TRACE_PROVIDERMGR 1 #define TRACE_PROVIDERDRV 2 -- -2.1.2 +2.15.0 ++++++ 0008-Properly-shut-down-if-provider-crashed.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.262624819 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.266624674 +0100 @@ -1,7 +1,7 @@ -From f3a48e18136840d223b8c60749b21652a4e4cf92 Mon Sep 17 00:00:00 2001 +From 2e79417a544042c65c0a2b6352dcbc78ebbf1590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 15 Nov 2013 12:56:04 -0500 -Subject: [PATCH 08/10] Properly shut down if provider crashed +Subject: [PATCH 08/25] Properly shut down if provider crashed --- sfcBroker.c | 4 +++- @@ -23,5 +23,5 @@ } if (providersStopped) -- -2.1.2 +2.15.0 ++++++ 0009-Improvide-error-message-if-ClassProvider-for-root-in.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.274624386 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.274624386 +0100 @@ -1,7 +1,7 @@ -From 04694ec45951551d080cb6407601af4f9d6fdcf9 Mon Sep 17 00:00:00 2001 +From af5e74b557ed996747489c8da0e7184576fdf229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Mon, 16 Jun 2014 15:35:41 +0200 -Subject: [PATCH 09/10] Improvide error message if ClassProvider for +Subject: [PATCH 09/25] Improvide error message if ClassProvider for root/interop can't start --- @@ -22,5 +22,5 @@ _SFCB_RETURN(); } -- -2.1.2 +2.15.0 ++++++ 0010-Enable-authentication-by-default.patch ++++++ --- /var/tmp/diff_new_pack.CPqKnZ/_old 2017-12-08 12:56:57.286623952 +0100 +++ /var/tmp/diff_new_pack.CPqKnZ/_new 2017-12-08 12:56:57.286623952 +0100 @@ -1,14 +1,14 @@ -From 4898f6cb9db019b1ee6b1083a72eba87768bf3b4 Mon Sep 17 00:00:00 2001 +From bedf3a5a60f7eeb895c167f1eb96e9f8f76fc1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Thu, 27 Nov 2014 13:07:34 +0100 -Subject: [PATCH 10/10] Enable authentication by default +Subject: [PATCH 10/25] Enable authentication by default --- sfcb.cfg.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in -index 77a2155c8d9a..012dbbc549e3 100644 +index fdcfb2e4d548..85f06674507b 100644 --- a/sfcb.cfg.pre.in +++ b/sfcb.cfg.pre.in @@ -93,7 +93,7 @@ sfcbCustomLib: sfcCustomLib @@ -21,5 +21,5 @@ ## Name of of the authenticaion library. Leave off the ".so" ## Default is: sfcBasicAuthentication -- -2.1.2 +2.15.0 ++++++ 0011-Return-value-from-non-void-function.patch ++++++ >From e85bac24c42858701a65bae7ec695ed2ebfb9f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 5 Nov 2010 21:34:14 +0100 Subject: [PATCH 11/25] Return value from non-void function --- cimRsRequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cimRsRequest.c b/cimRsRequest.c index 03f1708100b5..76625b13e58c 100644 --- a/cimRsRequest.c +++ b/cimRsRequest.c @@ -438,6 +438,7 @@ void getSortedKeys(CimRsReq *rsReq) qsort(keyNames, rsReq->keyCount, sizeof(char *),stringsort); // and put it in the request rsReq->sortedKeys=keyNames; + return 0; } RequestHdr -- 2.15.0 ++++++ 0012-Configurable-local-socket-group-permission-for-daemo.patch ++++++ >From 281330e01cafe3d3271767b2fab97f45f9c9d3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 5 Nov 2010 21:48:18 +0100 Subject: [PATCH 12/25] Configurable local socket group permission for daemon clients ([email protected]) In our environment where we use Sfcb, services are run as root. One of the services is a web service that runs worker threads as daemon user. A worker thread connects to Sfcb through the local socket interface in Sfcc. The connection is failing since the local socket file permission is set to 755 for user:group root:root and the worker thread is running as daemon:daemon. Solution: The proposal allows the socket file group permission to be set to a specific group. The group name is defined in the Sfcb configuration file. Once set, the group shall have write permission to the socket file which will allow the local socket connection. By default, the group name is not set and the default permission is used. Security is preserved since the configuration file is writable only by user root (when properly installed). The installation shall be responsible for assigning a trusted group as applicable. --- msgqueue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msgqueue.c b/msgqueue.c index 69d30b391b65..ec62cd73d6d9 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -29,8 +29,8 @@ #include <sys/stat.h> #include <unistd.h> #include <stddef.h> -#include "control.h" #include <grp.h> +#include "control.h" extern unsigned long exFlags; -- 2.15.0 ++++++ 0013-Fix-bashisms-in-scripts.patch ++++++ >From 20b3937ac0b15647ffe3368e573db46f56384b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 10:33:18 +0100 Subject: [PATCH 13/25] Fix bashisms in scripts >From Wed Nov 19 23:37:00 UTC 2014 - Led <[email protected]> --- sfcbrepos.sh.in | 18 +++++++++--------- sfcbstage.sh.in | 8 ++++---- sfcbunstage.sh.in | 8 ++++---- sfcbuuid.sh.in | 6 +++--- xmltest | 26 +++++++++++++++----------- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/sfcbrepos.sh.in b/sfcbrepos.sh.in index 71a6c38413db..176b4e34d51f 100644 --- a/sfcbrepos.sh.in +++ b/sfcbrepos.sh.in @@ -53,15 +53,15 @@ done if [ "$help" = "1" ] then usage - echo -e "\t-h display help message" - echo -e "\t-f force repository creation" - echo -e "\t-i do not migrate instances from previous repository (default=do migrate)" - 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-t create tiny class repository by omitting inheritance information" - echo -e "\t-z compress repository with gzip" + echo " -h display help message" + echo " -f force repository creation" + echo " -i do not migrate instances from previous repository (default=do migrate)" + echo " -X create repository in non-native format as specifed by argument" + echo " -s specify staging directory [@localstatedir@/lib/sfcb/stage]" + echo " -r specify repository directory [@localstatedir@/lib/sfcb/registration]" + echo " -c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]" + echo " -t create tiny class repository by omitting inheritance information" + echo " -z compress repository with gzip" echo echo "Use to create sfcb provider registration and class repository." exit 0 diff --git a/sfcbstage.sh.in b/sfcbstage.sh.in index a63bbe24e92e..c10f6b588d0f 100644 --- a/sfcbstage.sh.in +++ b/sfcbstage.sh.in @@ -40,10 +40,10 @@ done if [ "$help" = "1" ] then usage - echo -e "\t-h display help message" - echo -e "\t-n specify CIM namespace [root/cimv2]" - echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]" - echo -e "\t-r specify sfcb registration file" + echo " -h display help message" + echo " -n specify CIM namespace [root/cimv2]" + echo " -s specify staging directory [@localstatedir@/lib/sfcb/stage]" + echo " -r specify sfcb registration file" echo echo Use this command to copy registration files to the sfcb staging area. exit 0 diff --git a/sfcbunstage.sh.in b/sfcbunstage.sh.in index bceb345dd6c6..87b9b243b838 100644 --- a/sfcbunstage.sh.in +++ b/sfcbunstage.sh.in @@ -41,10 +41,10 @@ done if [ "$help" = "1" ] then usage - echo -e "\t-h display help message" - echo -e "\t-n specify CIM namespace [root/cimv2]" - echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]" - echo -e "\t-r specify sfcb registration file " + echo " -h display help message" + echo " -n specify CIM namespace [root/cimv2]" + echo " -s specify staging directory [@localstatedir@/lib/sfcb/stage]" + echo " -r specify sfcb registration file " echo echo Use this command to remove registration files from the sfcb staging area. exit 0 diff --git a/sfcbuuid.sh.in b/sfcbuuid.sh.in index d3d25455fbbc..5d3e3ecbc92e 100644 --- a/sfcbuuid.sh.in +++ b/sfcbuuid.sh.in @@ -38,9 +38,9 @@ done if [ "$help" = "1" ] then usage - echo -e "\t-h display help message" - echo -e "\t-f force uuid file creation" - echo -e "\t-u specify uuid file name [@localstatedir@/lib/sfcb/uuid]" + echo " -h display help message" + echo " -f force uuid file creation" + echo " -u specify uuid file name [@localstatedir@/lib/sfcb/uuid]" echo echo "Use to create a universally unique identifier for sfcb." exit 0 diff --git a/xmltest b/xmltest index 49c47e8c0916..e316f8a34eb7 100755 --- a/xmltest +++ b/xmltest @@ -30,8 +30,8 @@ if ! which wbemcat > /dev/null; then fi # ---------------------------------------------------------------------------- -function _runxmltest { - typeset _TESTXML=$1 +_runxmltest() { + _TESTXML=$1 _TEST=${_TESTXML%.xml} _TESTDIR=$( dirname $_TEST) @@ -41,8 +41,9 @@ function _runxmltest { echo -n "Running test $_TESTXML ... " # Make sure we will be able to write the result file - if [[ ! -w $_TESTDIR ]]; then - echo "FAILED"; echo -e "\tCannot write to $_TESTDIR" + if [ ! -w $_TESTDIR ]; then + echo "FAILED" + echo " Cannot write to $_TESTDIR" continue fi @@ -52,21 +53,24 @@ function _runxmltest { # Send the test CIM-XML to the CIMOM and save the response, # stripping off the http header wbemcat $_TESTXML | awk '/<\?xml.*/{xml=1} {if (xml) print}' > $_TESTRESULT - if [[ $? -ne 0 ]]; then - echo "FAILED"; echo -e "\twbemcat failed to send CIM-XML request" + if [ $? -ne 0 ]; then + echo "FAILED" + echo " wbemcat failed to send CIM-XML request" _RC=1 continue fi # If we dont yet have the expected result file, then save this response # as the (new) expected result - if [[ ! -f $_TESTOK ]]; then - echo "OK"; echo -e "\tSaving response as $_TESTOK" + if [ ! -f $_TESTOK ]; then + echo "OK" + echo " Saving response as $_TESTOK" mv $_TESTRESULT $_TESTOK # Compare the response XML against the expected XML for differences elif ! diff --brief $_TESTOK $_TESTRESULT > /dev/null; then - echo "FAILED"; echo -e "\tCheck $_TESTRESULT for errors" + echo "FAILED" + echo " Check $_TESTRESULT for errors" _RC=1; continue @@ -78,10 +82,10 @@ function _runxmltest { } # ---------------------------------------------------------------------------- -if [[ -f $1 ]]; then +if [ -f $1 ]; then _runxmltest $1 else - if [[ -d $1 ]]; then + if [ -d $1 ]; then _DIR=$1 else _DIR=./ -- 2.15.0 ++++++ 0014-Fix-lookupProviders-null-pointer-dereference.patch ++++++ >From 596e7e388be0a8cb7786dea7032b1dbfd4ff7869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 10:34:31 +0100 Subject: [PATCH 14/25] Fix lookupProviders() null pointer dereference Tue Sep 1 13:44:19 UTC 2015 - [email protected] --- providerMgr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/providerMgr.c b/providerMgr.c index 6ffe582fb106..47841f9c4b1c 100644 --- a/providerMgr.c +++ b/providerMgr.c @@ -361,6 +361,9 @@ lookupProviders(long type, char *className, char *nameSpace, _SFCB_ENTER(TRACE_PROVIDERMGR, "lookupProviders"); + if (className == NULL) + _SFCB_RETURN(NULL); + id = malloc(strlen(nameSpace) + strlen(className) + 8); strcpy(id, nameSpace); strcat(id, "|"); -- 2.15.0 ++++++ 0015-Define-UINT16_MAX.patch ++++++ >From adc0033b51580d1c3db29c887a88c940a42f64be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 11:57:46 +0100 Subject: [PATCH 15/25] Define UINT16_MAX --- interopServerProvider.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interopServerProvider.c b/interopServerProvider.c index 23ae18246393..eaa8cdd9eb4d 100644 --- a/interopServerProvider.c +++ b/interopServerProvider.c @@ -60,6 +60,10 @@ static const CMPIBroker *_broker; static CMPIStatus invClassSt = { CMPI_RC_ERR_INVALID_CLASS, NULL }; static CMPIInstance *ISinst; //Global instance for IndicationService +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif + // ------------------------------------------------------------------ static char * -- 2.15.0 ++++++ 0016-Externalize-strncpy_kind.patch ++++++ >From 4672ade216628d602b5fe89f2378601d0724393d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 11:58:05 +0100 Subject: [PATCH 16/25] Externalize strncpy_kind() --- control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control.c b/control.c index 95ca2463b821..d83e26895c7b 100644 --- a/control.c +++ b/control.c @@ -83,7 +83,7 @@ long httpReqHandlerTimeout; * Kindly null terminate, always, even if might overwrite * the last char of the truncated string. */ -inline char *strncpy_kind(char *to, char *from, size_t size) { +char *strncpy_kind(char *to, char *from, size_t size) { strncpy(to, from, size); *(to + size - 1) = '\0'; return to; -- 2.15.0 ++++++ 0017-Add-braces-around-else.patch ++++++ >From 56dad2372b0f106c6793c893ad17b3c874ed0a70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 11:58:34 +0100 Subject: [PATCH 17/25] Add braces around else --- interopProvider.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interopProvider.c b/interopProvider.c index 31b67f5af3d6..9088b5ebd6b7 100644 --- a/interopProvider.c +++ b/interopProvider.c @@ -1667,11 +1667,12 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi, if (ha) { if (ha->useCount) { setStatus(&st, CMPI_RC_ERR_FAILED, "Handler in use"); - } else + } else { removeHandler(ha, key); LDcount--; sfcbIndAuditLog("RemoveHandler-> ", CMGetCharPtr(CMObjectPathToString(op, NULL))); + } } else { setStatus(&st, CMPI_RC_ERR_NOT_FOUND, "Handler object not found"); } -- 2.15.0 ++++++ 0018-Adapt-to-bison-3.x-replace-YYPARSE_PARAM.patch ++++++ >From efd7cd785d31072bd1ed32e93293cbba5c8aa92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 11:59:40 +0100 Subject: [PATCH 18/25] Adapt to bison-3.x: replace YYPARSE_PARAM was deprecated since bison 1.875 Adapt yyerror parameters as well --- cimXmlOps.y | 9 ++++----- queryParser.y | 7 +++---- queryStatement.c | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cimXmlOps.y b/cimXmlOps.y index 5f4a7b2f9425..449164b17cdb 100644 --- a/cimXmlOps.y +++ b/cimXmlOps.y @@ -54,8 +54,6 @@ int updateMethodParamTypes(RequestHdr * hdr); // Define the global parser state object: // -#define YYPARSE_PARAM parm -#define YYLEX_PARAM parm #define YYERROR_VERBOSE 1 @@ -72,7 +70,7 @@ extern int noChunking; -extern int yyerror(void* parm, const char*); +extern int yyerror(void *, const char *); extern int yylex (void *lvalp, ParserControl *parm); //extern MsgSegment setInstanceMsgSegment(const CMPIInstance *ci); @@ -1796,8 +1794,9 @@ buildEnumerationCountRequest(void *parm) %} -%pure_parser -%parse-param { void* parm } +%pure-parser +%parse-param { void* parm }; +%lex-param { void *parm }; /* **============================================================================== diff --git a/queryParser.y b/queryParser.y index 64d93595d77c..ce97218dad6e 100644 --- a/queryParser.y +++ b/queryParser.y @@ -6,7 +6,8 @@ **============================================================================== */ - +%parse-param { void *parm }; +%lex-param { void *parm }; %{ /* @@ -67,15 +68,13 @@ #include "queryOperation.h" #include "mlog.h" -#define YYPARSE_PARAM parm -#define YYLEX_PARAM parm #define YYERROR_VERBOSE 1 extern int yylex(void *); extern void sfcQueryErr(char*,char*,char*); extern void yyError(char*); extern void yyerror(char*); -extern void sfcQueryError(const char* s1); +extern void sfcQueryError(void *, const char* s1); extern char * qsStrDup(QLStatement *qs, char *str); extern QLOperand* newNameQueryOperand(QLStatement *qs, char* val); diff --git a/queryStatement.c b/queryStatement.c index 59bab8c83b74..9c5c4daa8002 100644 --- a/queryStatement.c +++ b/queryStatement.c @@ -72,7 +72,7 @@ sfcQueryErr(char *s1, char *s2, char *s3) } void -sfcQueryError(char *s1) +sfcQueryError(void __attribute__ ((unused)) *unused, char *s1) { mlogf(M_ERROR, M_SHOW, "--- %s\n", s1); } -- 2.15.0 ++++++ 0019-Fix-uninitialized-value-reported-by-valgrind.patch ++++++ >From 82e2d743cc0a3016fb8d5371a9c92f862e0f40b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 15:31:33 +0100 Subject: [PATCH 19/25] Fix uninitialized value reported by valgrind Date: Tue Dec 13 17:51:55 CET 2016 Author: Marcus Meissner Bug: 1015155 --- args.c | 1 + cimXmlParser.c | 4 +++- objectImpl.c | 6 +++--- providerDrv.c | 2 +- providerMgr.c | 2 +- result.c | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/args.c b/args.c index 930de17cfb9d..5f867c1e5678 100644 --- a/args.c +++ b/args.c @@ -207,6 +207,7 @@ __new_empty_args(int mm_add, CMPIStatus *rc) *tArgs; int state; + memset(&args, 0, sizeof(args)); args.args = a; tArgs = memAddEncObj(mm_add, &args, sizeof(args), &state); tArgs->mem_state = state; diff --git a/cimXmlParser.c b/cimXmlParser.c index d214099851c8..e5586e63b0b6 100644 --- a/cimXmlParser.c +++ b/cimXmlParser.c @@ -54,7 +54,7 @@ Throw(XmlBuffer __attribute__ ((unused)) *xb, char *msg) static XmlBuffer * newXmlBuffer(char *s) { - XmlBuffer *xb = malloc(sizeof(*xb)); + XmlBuffer *xb = calloc(1, sizeof(*xb)); xb->base = xb->cur = (char *) strdup(s); xb->last = xb->cur + strlen(xb->cur); xb->nulledChar = 0; @@ -1714,6 +1714,8 @@ scanCimXmlRequest(CimRequestContext *ctx, char *xmlData, int *rc) ParserControl control; *rc=0; + memset(&control, 0, sizeof(control)); + XmlBuffer *xmb = newXmlBuffer(xmlData); control.xmb = xmb; control.reqHdr.buffer = xmb; diff --git a/objectImpl.c b/objectImpl.c index e9c889cdeb09..eaed22a821c1 100644 --- a/objectImpl.c +++ b/objectImpl.c @@ -225,12 +225,12 @@ addClStringN(ClObjectHdr * hdr, const char *str, unsigned int length) for (; nmax <= l; nmax *= 2); buf = setStrBufPtr(hdr, - malloc(((nmax - 1) * sizeof(char)) + - sizeof(ClStrBuf))); + calloc(1, ((nmax - 1) * sizeof(char)) + + sizeof(ClStrBuf))); buf->bMax = nmax; buf->bUsed = buf->iUsed = 0; buf->iMax = 16; - setStrIndexPtr(buf, malloc(sizeof(*buf->indexPtr) * 16)); + setStrIndexPtr(buf, calloc(1, sizeof(*buf->indexPtr) * 16)); hdr->flags |= HDR_Rebuild; } diff --git a/providerDrv.c b/providerDrv.c index 75c5ebd2e2ba..d6e2bb3fb0cc 100644 --- a/providerDrv.c +++ b/providerDrv.c @@ -1177,7 +1177,7 @@ makeSafeResponse(BinResponseHdr* hdr, BinResponseHdr** out) len += (hdr->object[i].type == MSG_SEG_CHARS ? PADDED_LEN(hdr->object[i].length) : hdr->object[i].length); } - outHdr = malloc(len +rvl + 8); + outHdr = calloc(1, len +rvl + 8); memcpy(outHdr, hdr, size); if (rvl) { diff --git a/providerMgr.c b/providerMgr.c index 47841f9c4b1c..aeb5093f896c 100644 --- a/providerMgr.c +++ b/providerMgr.c @@ -1341,7 +1341,7 @@ intInvokeProvider(BinRequestContext * ctx, ComSockets sockets) object[i].length); } - buf = malloc(l + 8); + buf = calloc(1, l + 8); if (ctx->noResp & 1) { hdr->options |= BRH_NoResp; diff --git a/result.c b/result.c index d894e417538d..314a7cfff733 100644 --- a/result.c +++ b/result.c @@ -91,7 +91,7 @@ prepResultBuffer(NativeResult * nr, unsigned long length) nr->dMax *= 2; nr->dNext = 0; - nr->data = malloc(nr->dMax); + nr->data = calloc(1, nr->dMax); nr->sMax = nr->dMax / 400; nr->sNext = 0; -- 2.15.0 ++++++ 0020-link-certificate-if-missing.patch ++++++ >From aa8a09947fd938060b604725eafb9d9a4185235f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 15:32:37 +0100 Subject: [PATCH 20/25] link certificate if missing On updates from older versions that did not use clist.pem, we need to properly link the file here or service will not start --- genSslCert.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/genSslCert.sh b/genSslCert.sh index 9bf6320d5525..17e26256f301 100644 --- a/genSslCert.sh +++ b/genSslCert.sh @@ -14,6 +14,13 @@ then echo "WARNING: server.pem SSL Certificate file already exists." echo " old file will be kept intact." DO_SERVER=no + + # On updates from older versions that did not use clist.pem, we + # need to properly link the file here or service will not start + if [ ! -e $TARGETDIR/clist.pem ] + then + ln -s server.pem $TARGETDIR/clist.pem + fi fi if [ -f $TARGETDIR/client.pem ] -- 2.15.0 ++++++ 0021-revert-upstream-mistake.patch ++++++ >From 35c3ef19a00564f53b29ceb325c46f6f886f8f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 15:34:49 +0100 Subject: [PATCH 21/25] revert upstream mistake Author: Adam Majer <[email protected]> Date: Mon Mar 6 11:35:58 CET 2017 BNC: #1023820 Summary: This was done by mistake upstream --- sfcb.cfg.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in index 85f06674507b..82cb4fc30c72 100644 --- a/sfcb.cfg.pre.in +++ b/sfcb.cfg.pre.in @@ -93,7 +93,7 @@ sfcbCustomLib: sfcCustomLib ## Enable basic authentication for HTTP and HTTPS connections ## Default is false -doBasicAuth: true +doBasicAuth: @SFCB_CONF_DOBASICAUTH@ ## Name of of the authenticaion library. Leave off the ".so" ## Default is: sfcBasicAuthentication -- 2.15.0 ++++++ 0022-Fix-crash-caused-by-NULL-content_type.patch ++++++ >From e3fdad047aee848f30c3170cb17f569b0342513d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 15:37:19 +0100 Subject: [PATCH 22/25] Fix crash caused by NULL content_type Author: Adam Majer <[email protected]> Also, allow requests with Content-Type set to text/xml --- cimXmlParser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cimXmlParser.c b/cimXmlParser.c index e5586e63b0b6..9ce87c547b83 100644 --- a/cimXmlParser.c +++ b/cimXmlParser.c @@ -1738,7 +1738,7 @@ scanCimXmlRequest(CimRequestContext *ctx, char *xmlData, int *rc) control.MQs = 0; control.MPQs = 0; - if (strncmp(ctx->contentType,"application/xml",15) !=0 ) { + if (strncmp(ctx->contentType,"application/xml",15) !=0 && strncmp(ctx->contentType,"text/xml",8) != 0) { *rc=1; return control.reqHdr; } -- 2.15.0 ++++++ 0023-Alias-sblim-sfcb-service-to-sfcb-and-sfcbd.patch ++++++ >From 1ab9fcb7361898f117057280225ac9132abfa55b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Tue, 28 Nov 2017 15:40:03 +0100 Subject: [PATCH 23/25] Alias sblim-sfcb service to sfcb and sfcbd --- sblim-sfcb.service.pre.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sblim-sfcb.service.pre.in b/sblim-sfcb.service.pre.in index 3b49da3472f1..11e77f1cd022 100644 --- a/sblim-sfcb.service.pre.in +++ b/sblim-sfcb.service.pre.in @@ -7,3 +7,5 @@ ExecStart=${exec_prefix}/sbin/sfcbd [Install] WantedBy=multi-user.target +Alias=sfcbd +Alias=sfcb -- 2.15.0 ++++++ 0024-CURLOPT_POSTREDIR-might-not-be-defined.patch ++++++ >From 23f2368589f229fd40a5d053b60db3168131082c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 29 Nov 2017 11:03:16 +0100 Subject: [PATCH 24/26] CURLOPT_POSTREDIR might not be defined --- indCIMXMLExport.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c index 60a420b74d1e..36ed1d390363 100644 --- a/indCIMXMLExport.c +++ b/indCIMXMLExport.c @@ -245,7 +245,9 @@ genRequest(CurlData * cd, char *url, char **msg) rv = curl_easy_setopt(cd->mHandle, CURLOPT_FOLLOWLOCATION, 1); rv = curl_easy_setopt(cd->mHandle, CURLOPT_UNRESTRICTED_AUTH, 0); // off for now rv = curl_easy_setopt(cd->mHandle, CURLOPT_MAXREDIRS, 3); // prevent loop +#ifdef CURLOPT_POSTREDIR rv = curl_easy_setopt(cd->mHandle, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL); +#endif } /* -- 2.15.0
