Hello community,
here is the log from the commit of package sblim-sfcb for openSUSE:Factory checked in at 2019-10-03 14:10:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sblim-sfcb (Old)
and /work/SRC/openSUSE:Factory/.sblim-sfcb.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sblim-sfcb"
Thu Oct 3 14:10:16 2019 rev:56 rq:734765 version:1.4.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/sblim-sfcb/sblim-sfcb.changes 2019-03-01 16:48:27.785775546 +0100
+++ /work/SRC/openSUSE:Factory/.sblim-sfcb.new.2352/sblim-sfcb.changes 2019-10-03 14:10:23.707955896 +0200
@@ -1,0 +2,19 @@
+Thu Sep 26 08:28:37 UTC 2019 - Klaus Kämpf
+
+- remove 0011-Return-value-from-non-void-function.patch
+ (function _is_ actually void)
+
+
+- rename service_init_certs.patch to
+ 0025-Generates-certificates-during-service-start.patch
+
+- rename missing_makefile_dependencies.patch to
+ 0026-fix-build-dependencies-for-sfcbinst2mof.patch
+
+- add 0027-Makefile.am-add-autoconfiscate.sh-to-dist.patch
+
+- add 0028-allow-requests-with-Content-Type-set-to-text-xml.patch
+ (was hidden inside 0022-Fix-crash-caused-by-NULL-content_type.patch
+ before)
+
+-------------------------------------------------------------------
Old:
----
0011-Return-value-from-non-void-function.patch
missing_makefile_dependencies.patch
service_init_certs.patch
New:
----
0025-Generates-certificates-during-service-start.patch
0026-fix-build-dependencies-for-sfcbinst2mof.patch
0027-Makefile.am-add-autoconfiscate.sh-to-dist.patch
0028-allow-requests-with-Content-Type-set-to-text-xml.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sblim-sfcb.spec ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.447953992 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.451953982 +0200
@@ -59,7 +59,6 @@
Patch9: 0009-Improvide-error-message-if-ClassProvider-for-root-in.patch
Patch10: 0010-Enable-authentication-by-default.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
@@ -77,8 +76,10 @@
# SLE10's curl is too old
Patch24: 0024-CURLOPT_POSTREDIR-might-not-be-defined.patch
# bsc#1092281 - certificates shouldn't be generated during installation.
-Patch25: service_init_certs.patch
-Patch26: missing_makefile_dependencies.patch
+Patch25: 0025-Generates-certificates-during-service-start.patch
+Patch26: 0026-fix-build-dependencies-for-sfcbinst2mof.patch
+Patch27: 0027-Makefile.am-add-autoconfiscate.sh-to-dist.patch
+Patch28: 0028-allow-requests-with-Content-Type-set-to-text-xml.patch
Provides: cim-server
Provides: cimserver
@@ -155,7 +156,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
+
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -171,6 +172,8 @@
%patch24 -p1
%patch25 -p1
%patch26 -p1
+%patch27 -p1
+%patch28 -p1
export PATCH_GET=0
++++++ 0001-Makefile.am-Honor-build-environment.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.467953941 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.471953930 +0200
@@ -1,7 +1,7 @@
-From 2d281f4a64a6f3017c771891301dbd84ed4c8eca Mon Sep 17 00:00:00 2001
+From b06726e351fdb02dbbfbde842a19f6ebaa45c0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Wed, 18 Aug 2010 11:20:53 +0200
-Subject: [PATCH 01/25] Makefile.am: Honor build environment
+Subject: [PATCH 01/29] Makefile.am: Honor build environment
---
Makefile.am | 8 ++++++--
@@ -30,5 +30,5 @@
footprint-sloc:
--
-2.15.0
+2.23.0
++++++ 0002-providerMgr-add-prototypes.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.483953900 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.483953900 +0200
@@ -1,7 +1,7 @@
-From 56c2edf2a1a203b7e738bf452973276805314338 Mon Sep 17 00:00:00 2001
+From 5d4b1d20b251219fec02f5b214efde6b5aca5334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 7 Sep 2010 09:10:06 +0200
-Subject: [PATCH 02/25] providerMgr: add prototypes
+Subject: [PATCH 02/29] providerMgr: add prototypes
---
providerMgr.c | 6 ++++++
@@ -25,5 +25,5 @@
extern CMPIBroker *Broker;
--
-2.15.0
+2.23.0
++++++ 0003-Enable-broker.LogMessage-and-broker.trace.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.491953879 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.491953879 +0200
@@ -1,7 +1,7 @@
-From f1642ce4a36d0aa86ee5c12d13e2224960025cb5 Mon Sep 17 00:00:00 2001
+From 5eb7827c83724308230d5cd1a9143672176d734f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Thu, 5 Aug 2010 12:23:45 +0200
-Subject: [PATCH 03/25] Enable broker.LogMessage and broker.trace
+Subject: [PATCH 03/29] Enable broker.LogMessage and broker.trace
---
brokerEnc.c | 18 ++++++++++--------
@@ -42,5 +42,5 @@
}
--
-2.15.0
+2.23.0
++++++ 0004-Check-for-existance-of-autoconfiscate.sh-before-call.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.499953858 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.499953858 +0200
@@ -1,7 +1,7 @@
-From b172bc9eefc4651c1ba4c3a559dd58930561e46a Mon Sep 17 00:00:00 2001
+From e1d4b199b4d3c4aa29673f12e22d3df4d50707ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Wed, 30 Mar 2011 11:36:19 +0200
-Subject: [PATCH 04/25] Check for existance of autoconfiscate.sh before calling
+Subject: [PATCH 04/29] 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.15.0
+2.23.0
++++++ 0005-Define-YYPARSE_PARAM-early-for-cimXmlOps-and-cimXmlP.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.507953838 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.511953828 +0200
@@ -1,7 +1,7 @@
-From 79a7f98644c09cd4f49a0a72d12033973ee8f8b5 Mon Sep 17 00:00:00 2001
+From 72371b4c0e0c9831bf3c0bd9c2e763ea3419bee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 16 Jul 2013 11:17:01 +0200
-Subject: [PATCH 05/25] Define YYPARSE_PARAM early for cimXmlOps and
+Subject: [PATCH 05/29] Define YYPARSE_PARAM early for cimXmlOps and
cimXmlParser
---
@@ -22,5 +22,5 @@
# define CMPI_FLAG_ContinueOnError 16
# define CMPI_FLAG_ReturnQueryResultClass 32
--
-2.15.0
+2.23.0
++++++ 0006-Don-t-crash-if-class-repo-is-not-initialized.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.515953817 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.519953807 +0200
@@ -1,7 +1,7 @@
-From 9a75c16a1c525a6924d47403fd0b520fe9232360 Mon Sep 17 00:00:00 2001
+From 636358faaf5e4fe24f69c0fcad20d37f9d164cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Thu, 8 Aug 2013 12:25:35 +0200
-Subject: [PATCH 06/25] Don't crash if class repo is not initialized
+Subject: [PATCH 06/29] Don't crash if class repo is not initialized
---
classProviderSf.c | 2 +-
@@ -21,5 +21,5 @@
}
--
-2.15.0
+2.23.0
++++++ 0007-Increase-max-trace-msg-len-to-4096.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.527953786 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.527953786 +0200
@@ -1,7 +1,7 @@
-From e4218f055881f8c3454c0b3a6507dbcb84d7771a Mon Sep 17 00:00:00 2001
+From a8e1424531e1e6109c91b2b14a9097c2f10e561a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Wed, 28 Aug 2013 15:20:53 +0200
-Subject: [PATCH 07/25] Increase max trace msg len to 4096
+Subject: [PATCH 07/29] Increase max trace msg len to 4096
---
trace.h | 2 +-
@@ -21,5 +21,5 @@
#define TRACE_PROVIDERMGR 1
#define TRACE_PROVIDERDRV 2
--
-2.15.0
+2.23.0
++++++ 0008-Properly-shut-down-if-provider-crashed.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.535953766 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.535953766 +0200
@@ -1,7 +1,7 @@
-From 2e79417a544042c65c0a2b6352dcbc78ebbf1590 Mon Sep 17 00:00:00 2001
+From c4db7466c4f1c037b3aaf8bd777359812f53c884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Fri, 15 Nov 2013 12:56:04 -0500
-Subject: [PATCH 08/25] Properly shut down if provider crashed
+Subject: [PATCH 08/29] Properly shut down if provider crashed
---
sfcBroker.c | 4 +++-
@@ -23,5 +23,5 @@
}
if (providersStopped)
--
-2.15.0
+2.23.0
++++++ 0009-Improvide-error-message-if-ClassProvider-for-root-in.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.543953745 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.543953745 +0200
@@ -1,7 +1,7 @@
-From af5e74b557ed996747489c8da0e7184576fdf229 Mon Sep 17 00:00:00 2001
+From 4c965b726249b351af8a57d89d605667bf0ba736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Mon, 16 Jun 2014 15:35:41 +0200
-Subject: [PATCH 09/25] Improvide error message if ClassProvider for
+Subject: [PATCH 09/29] Improvide error message if ClassProvider for
root/interop can't start
---
@@ -22,5 +22,5 @@
_SFCB_RETURN();
}
--
-2.15.0
+2.23.0
++++++ 0010-Enable-authentication-by-default.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.551953725 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.551953725 +0200
@@ -1,14 +1,14 @@
-From bedf3a5a60f7eeb895c167f1eb96e9f8f76fc1f0 Mon Sep 17 00:00:00 2001
+From 28a2f89de38c1d3d3c9205950638b6aadf243487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Thu, 27 Nov 2014 13:07:34 +0100
-Subject: [PATCH 10/25] Enable authentication by default
+Subject: [PATCH 10/29] 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 fdcfb2e4d548..85f06674507b 100644
+index 77a2155c8d9a..012dbbc549e3 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.15.0
+2.23.0
++++++ 0012-Configurable-local-socket-group-permission-for-daemo.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.559953704 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.559953704 +0200
@@ -1,7 +1,7 @@
-From 281330e01cafe3d3271767b2fab97f45f9c9d3e8 Mon Sep 17 00:00:00 2001
+From d599ef284bb4821970483a81450f1182f3eae59e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Fri, 5 Nov 2010 21:48:18 +0100
-Subject: [PATCH 12/25] Configurable local socket group permission for daemon
+Subject: [PATCH 12/29] Configurable local socket group permission for daemon
clients
(Chris_Poblete@Dell.com)
@@ -42,5 +42,5 @@
extern unsigned long exFlags;
--
-2.15.0
+2.23.0
++++++ 0013-Fix-bashisms-in-scripts.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.567953683 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.567953683 +0200
@@ -1,7 +1,7 @@
-From 20b3937ac0b15647ffe3368e573db46f56384b2d Mon Sep 17 00:00:00 2001
+From 42638b4ae0922f5b765f300bdc20ca67d486272e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 10:33:18 +0100
-Subject: [PATCH 13/25] Fix bashisms in scripts
+Subject: [PATCH 13/29] Fix bashisms in scripts
From Wed Nov 19 23:37:00 UTC 2014 - Led
---
@@ -167,5 +167,5 @@
else
_DIR=./
--
-2.15.0
+2.23.0
++++++ 0014-Fix-lookupProviders-null-pointer-dereference.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.575953663 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.575953663 +0200
@@ -1,7 +1,7 @@
-From 596e7e388be0a8cb7786dea7032b1dbfd4ff7869 Mon Sep 17 00:00:00 2001
+From a35bfcc74f9f239f67876ef6cecb7cbb93eb10f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 10:34:31 +0100
-Subject: [PATCH 14/25] Fix lookupProviders() null pointer dereference
+Subject: [PATCH 14/29] Fix lookupProviders() null pointer dereference
Tue Sep 1 13:44:19 UTC 2015 - mvetter@suse.com
---
@@ -23,5 +23,5 @@
strcpy(id, nameSpace);
strcat(id, "|");
--
-2.15.0
+2.23.0
++++++ 0015-Define-UINT16_MAX.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.583953642 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.587953632 +0200
@@ -1,7 +1,7 @@
-From adc0033b51580d1c3db29c887a88c940a42f64be Mon Sep 17 00:00:00 2001
+From 28aa953b9e4092105415f0bc547fa683d8accb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 11:57:46 +0100
-Subject: [PATCH 15/25] Define UINT16_MAX
+Subject: [PATCH 15/29] Define UINT16_MAX
---
interopServerProvider.c | 4 ++++
@@ -23,5 +23,5 @@
static char *
--
-2.15.0
+2.23.0
++++++ 0016-Externalize-strncpy_kind.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.591953622 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.595953611 +0200
@@ -1,14 +1,14 @@
-From 4672ade216628d602b5fe89f2378601d0724393d Mon Sep 17 00:00:00 2001
+From fdd61c62aa2a5a9b552744d1c9abba0657152da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 11:58:05 +0100
-Subject: [PATCH 16/25] Externalize strncpy_kind()
+Subject: [PATCH 16/29] 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
+index ed0e5df8297f..03bde30115ce 100644
--- a/control.c
+++ b/control.c
@@ -83,7 +83,7 @@ long httpReqHandlerTimeout;
@@ -21,5 +21,5 @@
*(to + size - 1) = '\0';
return to;
--
-2.15.0
+2.23.0
++++++ 0017-Add-braces-around-else.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.603953591 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.603953591 +0200
@@ -1,7 +1,7 @@
-From 56dad2372b0f106c6793c893ad17b3c874ed0a70 Mon Sep 17 00:00:00 2001
+From 42f880d42a7c0c05d1a14c526debd9677f9d3246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 11:58:34 +0100
-Subject: [PATCH 17/25] Add braces around else
+Subject: [PATCH 17/29] Add braces around else
---
interopProvider.c | 3 ++-
@@ -26,5 +26,5 @@
setStatus(&st, CMPI_RC_ERR_NOT_FOUND, "Handler object not found");
}
--
-2.15.0
+2.23.0
++++++ 0018-Adapt-to-bison-3.x-replace-YYPARSE_PARAM.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.607953581 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.607953581 +0200
@@ -1,7 +1,7 @@
-From efd7cd785d31072bd1ed32e93293cbba5c8aa92a Mon Sep 17 00:00:00 2001
+From 3d0c94e9df13b30ceb36538d756b372342f599d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 11:59:40 +0100
-Subject: [PATCH 18/25] Adapt to bison-3.x: replace YYPARSE_PARAM
+Subject: [PATCH 18/29] Adapt to bison-3.x: replace YYPARSE_PARAM
was deprecated since bison 1.875
Adapt yyerror parameters as well
@@ -90,5 +90,5 @@
mlogf(M_ERROR, M_SHOW, "--- %s\n", s1);
}
--
-2.15.0
+2.23.0
++++++ 0019-Fix-uninitialized-value-reported-by-valgrind.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.615953560 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.615953560 +0200
@@ -1,7 +1,7 @@
-From 82e2d743cc0a3016fb8d5371a9c92f862e0f40b1 Mon Sep 17 00:00:00 2001
+From 54cb4e371a1055834ffae32a826f530e8824685c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 15:31:33 +0100
-Subject: [PATCH 19/25] Fix uninitialized value reported by valgrind
+Subject: [PATCH 19/29] Fix uninitialized value reported by valgrind
Date: Tue Dec 13 17:51:55 CET 2016
Author: Marcus Meissner
@@ -109,5 +109,5 @@
nr->sMax = nr->dMax / 400;
nr->sNext = 0;
--
-2.15.0
+2.23.0
++++++ 0020-link-certificate-if-missing.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.619953550 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.619953550 +0200
@@ -1,7 +1,7 @@
-From aa8a09947fd938060b604725eafb9d9a4185235f Mon Sep 17 00:00:00 2001
+From 33bc1de71f52880842d5410a1c08ba5778afb016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 15:32:37 +0100
-Subject: [PATCH 20/25] link certificate if missing
+Subject: [PATCH 20/29] 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
@@ -28,5 +28,5 @@
if [ -f $TARGETDIR/client.pem ]
--
-2.15.0
+2.23.0
++++++ 0021-revert-upstream-mistake.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.627953529 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.627953529 +0200
@@ -1,7 +1,7 @@
-From 35c3ef19a00564f53b29ceb325c46f6f886f8f30 Mon Sep 17 00:00:00 2001
+From 7fbc6ca68526c54abaa310edf8015dc9be64c295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 15:34:49 +0100
-Subject: [PATCH 21/25] revert upstream mistake
+Subject: [PATCH 21/29] revert upstream mistake
Author: Adam Majer
Date: Mon Mar 6 11:35:58 CET 2017
@@ -12,7 +12,7 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
-index 85f06674507b..82cb4fc30c72 100644
+index 012dbbc549e3..48dd667a4710 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -93,7 +93,7 @@ sfcbCustomLib: sfcCustomLib
@@ -25,5 +25,5 @@
## Name of of the authenticaion library. Leave off the ".so"
## Default is: sfcBasicAuthentication
--
-2.15.0
+2.23.0
++++++ 0022-Fix-crash-caused-by-NULL-content_type.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.631953519 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.635953509 +0200
@@ -1,7 +1,7 @@
-From e3fdad047aee848f30c3170cb17f569b0342513d Mon Sep 17 00:00:00 2001
+From dc1cdf3c7251cd1363a1091657b5cb94eb84ea64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 15:37:19 +0100
-Subject: [PATCH 22/25] Fix crash caused by NULL content_type
+Subject: [PATCH 22/29] Fix crash caused by NULL content_type
Author: Adam Majer
@@ -10,11 +10,11 @@
cimXmlParser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: sblim-sfcb-1.4.9/cimXmlParser.c
-===================================================================
---- sblim-sfcb-1.4.9.orig/cimXmlParser.c
-+++ sblim-sfcb-1.4.9/cimXmlParser.c
-@@ -1738,7 +1738,7 @@ scanCimXmlRequest(CimRequestContext *ctx
+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;
@@ -23,16 +23,6 @@
*rc=1;
return control.reqHdr;
}
-Index: sblim-sfcb-1.4.9/httpAdapter.c
-===================================================================
---- sblim-sfcb-1.4.9.orig/httpAdapter.c
-+++ sblim-sfcb-1.4.9/httpAdapter.c
-@@ -1048,7 +1048,7 @@ doHttpRequest(CommHndl conn_fd)
-
- inBuf.authorization = "";
- inBuf.protocol = "HTTP/1.1";
-- inBuf.content_type = NULL;
-+ inBuf.content_type = "application/xml";
- inBuf.content_length = UINT_MAX;
- inBuf.host = NULL;
- inBuf.useragent = "";
+--
+2.23.0
+
++++++ 0023-Alias-sblim-sfcb-service-to-sfcb-and-sfcbd.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.639953498 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.639953498 +0200
@@ -1,7 +1,7 @@
-From 1ab9fcb7361898f117057280225ac9132abfa55b Mon Sep 17 00:00:00 2001
+From 947afbe6fc6931cbe19e031e5c8984e9b7a03e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Tue, 28 Nov 2017 15:40:03 +0100
-Subject: [PATCH 23/25] Alias sblim-sfcb service to sfcb and sfcbd
+Subject: [PATCH 23/29] Alias sblim-sfcb service to sfcb and sfcbd
---
sblim-sfcb.service.pre.in | 2 ++
@@ -15,8 +15,8 @@
[Install]
WantedBy=multi-user.target
-+Alias=sfcbd.service
-+Alias=sfcb.service
++Alias=sfcbd
++Alias=sfcb
--
-2.15.0
+2.23.0
++++++ 0024-CURLOPT_POSTREDIR-might-not-be-defined.patch ++++++
--- /var/tmp/diff_new_pack.rHGeN7/_old 2019-10-03 14:10:24.647953478 +0200
+++ /var/tmp/diff_new_pack.rHGeN7/_new 2019-10-03 14:10:24.647953478 +0200
@@ -1,7 +1,7 @@
-From 23f2368589f229fd40a5d053b60db3168131082c Mon Sep 17 00:00:00 2001
+From 6c40b689c6544f0e29325a76b8efb6253a96d31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Wed, 29 Nov 2017 11:03:16 +0100
-Subject: [PATCH 24/26] CURLOPT_POSTREDIR might not be defined
+Subject: [PATCH 24/29] CURLOPT_POSTREDIR might not be defined
---
indCIMXMLExport.c | 2 ++
@@ -22,5 +22,5 @@
/*
--
-2.15.0
+2.23.0
++++++ 0025-Generates-certificates-during-service-start.patch ++++++
From 804af98f430065166615ceb99365145f5846bfc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Thu, 26 Sep 2019 11:43:46 +0200
Subject: [PATCH 25/29] Generates certificates during service start
sblim-sfcb generated a certificate during installation, which was a
bad idea if you think about golden images like JeOS or public cloud images,
where everybody would have the same certificate.
Moved to ExecStartPre now. Improved log messages.
bsc#1092281
---
genSslCert.sh | 11 ++++++-----
sblim-sfcb.service.pre.in | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/genSslCert.sh b/genSslCert.sh
index 17e26256f301..11d34b1320e1 100644
--- a/genSslCert.sh
+++ b/genSslCert.sh
@@ -7,12 +7,11 @@ DIR=`mktemp -d /var/tmp/sfcb.XXXXXX` || exit 1
trap "rm -rf $DIR" exit
-echo "Generating SSL certificates in $TARGETDIR"
+echo "Checking SSL certificates in $TARGETDIR"
if [ -f $TARGETDIR/server.pem ]
then
- echo "WARNING: server.pem SSL Certificate file already exists."
- echo " old file will be kept intact."
+ echo "server.pem SSL Certificate file already exists."
DO_SERVER=no
# On updates from older versions that did not use clist.pem, we
@@ -25,13 +24,13 @@ fi
if [ -f $TARGETDIR/client.pem ]
then
- echo "WARNING: client.pem SSL Certificate trust store already exists."
- echo " old file will be kept intact."
+ echo "client.pem SSL Certificate trust store already exists."
DO_CLIENT=no
fi
if [ $DO_SERVER = no -a $DO_CLIENT = no ]
then
+ echo "Leaving existing .pem files untouched."
exit 0
fi
@@ -45,6 +44,8 @@ CN=$HOSTNAME
emailAddress=root@$HOSTNAME
EOF
+echo "Generating missing .pem files from sblim-sfcb."
+
openssl req -x509 -days 365 -newkey rsa:2048 \
-nodes -config $DIR/ssl.cnf \
-keyout $DIR/key.pem -out $DIR/cert.pem
diff --git a/sblim-sfcb.service.pre.in b/sblim-sfcb.service.pre.in
index 11e77f1cd022..8ef40c62bece 100644
--- a/sblim-sfcb.service.pre.in
+++ b/sblim-sfcb.service.pre.in
@@ -3,6 +3,7 @@ Description=Small Footprint CIM Broker Service
After=syslog.target
[Service]
+ExecStartPre=${exec_prefix}/share/sfcb/gen_ssl_certs.sh
ExecStart=${exec_prefix}/sbin/sfcbd
[Install]
--
2.23.0
++++++ 0026-fix-build-dependencies-for-sfcbinst2mof.patch ++++++
From c3ea3eaa59d8be19e0c1d28c2ac9eb8074e41b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Thu, 26 Sep 2019 11:39:32 +0200
Subject: [PATCH 26/29] fix build dependencies for sfcbinst2mof
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index 6d0f5f10f833..56933cf0c701 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,6 +360,7 @@ sfcbproc_SOURCES=sfcbproc.c
sfcbinst2mof_SOURCES=sfcbinst2mof.c
sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore
+sfcbinst2mof_DEPENDENCIES=libsfcFileRepository.la libsfcBrokerCore.la
sfcbtrace_SOURCES=sfcbtrace.c
sfcbtrace_LDADD = -lsfcBrokerCore
--
2.23.0
++++++ 0027-Makefile.am-add-autoconfiscate.sh-to-dist.patch ++++++
From 1db719b257591ad7e07a52cf3bda2a101fbb2f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Wed, 18 Aug 2010 10:58:03 +0200
Subject: [PATCH 27/29] Makefile.am: add autoconfiscate.sh to dist
---
Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 56933cf0c701..40bbe8021b4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -388,7 +388,8 @@ man_MANS=$(MANFILES)
EXTRA_DIST=sfcb.cfg.pre.in sfcb.spec sfcbrepos.sh.in sfcbstage.sh.in \
sfcbunstage.sh.in sfcbuuid.sh.in sfcb.init-redhat.in sfcb.init-suse.in \
sfcb.init-none.in cimXmlParser.c footprint.pl test \
- sblim-sfcb.service.pre.in
+ sblim-sfcb.service.pre.in \
+ autoconfiscate.sh
dist_sfcbdata_SCRIPTS=genSslCert.sh getSchema.sh test/stageschema.sh
--
2.23.0
++++++ 0028-allow-requests-with-Content-Type-set-to-text-xml.patch ++++++
From 1a71731aba47b3c89d6b57bff09bb4661d8c9644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?=
Date: Thu, 26 Sep 2019 11:25:29 +0200
Subject: [PATCH 28/29] allow requests with Content-Type set to text/xml
---
httpAdapter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index 2719e6c492fc..81d7226af0c0 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -1048,7 +1048,7 @@ doHttpRequest(CommHndl conn_fd)
inBuf.authorization = "";
inBuf.protocol = "HTTP/1.1";
- inBuf.content_type = NULL;
+ inBuf.content_type = "application/xml";
inBuf.content_length = UINT_MAX;
inBuf.host = NULL;
inBuf.useragent = "";
--
2.23.0