Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

@ -0,0 +1,31 @@
Add casts required for C89 compatibility. This addresses a build
failure with GCC 14.
Submitted upstream: <https://sourceforge.net/p/sblim/bugs/2771/>
diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c
index 940ca57638ceec79..042a9a0c4d5a7abf 100644
--- a/TEST/v2test_ec.c
+++ b/TEST/v2test_ec.c
@@ -83,7 +83,7 @@ int main()
count = enm->ft->hasNext(enm, NULL) ;
while (count > 0) {
data = enm->ft->getNext(enm, NULL);
- showClass(data.value.cls);
+ showClass((CMPIConstClass *) data.value.cls);
/*
* see if we have any more
*/
diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c
index ede95c18a5b48ff8..712c204bd3aac357 100644
--- a/TEST/v2test_ein.c
+++ b/TEST/v2test_ein.c
@@ -93,7 +93,7 @@ int count = 0;
data = enm->ft->getNext(enm, NULL);
- showObjectPath(data.value.ref);
+ showObjectPath((CMPIObjectPath *) data.value.ref);
/*
* see if we have any more
*/

@ -0,0 +1,70 @@
Submitted upstream: <https://sourceforge.net/p/sblim/bugs/2767/>
diff -ruN sblim-sfcc-2.2.8.orig/backend/cimxml/cimXmlParser.h sblim-sfcc-2.2.8/backend/cimxml/cimXmlParser.h
--- sblim-sfcc-2.2.8.orig/backend/cimxml/cimXmlParser.h 2014-11-26 17:26:46.000000000 +0100
+++ sblim-sfcc-2.2.8/backend/cimxml/cimXmlParser.h 2023-01-18 11:29:06.707034147 +0100
@@ -588,6 +588,7 @@
void* parser_calloc(ParserHeap *ph, size_t num, size_t sz);
void* parser_realloc(ParserHeap *ph, void *p, size_t sz);
void* parser_strdup(ParserHeap *ph, const char *s);
+int startParsing(ParserControl *parm);
extern ResponseHdr scanCimXmlResponse(const char *xmlData, CMPIObjectPath *cop);
extern void freeCimXmlResponse(ResponseHdr * hdr);
diff -ruN sblim-sfcc-2.2.8.orig/backend/cimxml/grammar.c sblim-sfcc-2.2.8/backend/cimxml/grammar.c
--- sblim-sfcc-2.2.8.orig/backend/cimxml/grammar.c 2014-11-26 17:26:46.000000000 +0100
+++ sblim-sfcc-2.2.8/backend/cimxml/grammar.c 2023-01-18 11:28:53.914945664 +0100
@@ -27,6 +27,7 @@
static int ct = 0;
static int dontLex = 0;
+extern CMPIType guessType(char *val);
static void parseError(char* tokExp, int tokFound, ParserControl *parm)
{
@@ -48,10 +49,11 @@
}
-void startParsing(ParserControl *parm)
+int startParsing(ParserControl *parm)
{
parseUnion stateUnion;
start(parm, &stateUnion);
+ return 0;
}
static void start(ParserControl *parm, parseUnion *stateUnion)
diff -ruN sblim-sfcc-2.2.8.orig/backend/cimxml/parserUtil.h sblim-sfcc-2.2.8/backend/cimxml/parserUtil.h
--- sblim-sfcc-2.2.8.orig/backend/cimxml/parserUtil.h 2014-11-26 17:26:46.000000000 +0100
+++ sblim-sfcc-2.2.8/backend/cimxml/parserUtil.h 2023-01-17 10:44:29.215845637 +0100
@@ -31,6 +31,7 @@
void setInstProperties(CMPIInstance *ci, XtokProperties *ps);
void setInstQualifiers(CMPIInstance *ci, XtokQualifiers *qs);
void setClassProperties(CMPIConstClass *cls, XtokProperties *ps);
+void setClassMethods(CMPIConstClass *cls, XtokMethods *ms);
void setClassQualifiers(CMPIConstClass *cls, XtokQualifiers *qs);
void addProperty(ParserControl *parm, XtokProperties *ps, XtokProperty *p);
void addParamValue(ParserControl *parm, XtokParamValues *vs, XtokParamValue *v);
diff -ruN sblim-sfcc-2.2.8.orig/TEST/v2test_ec.c sblim-sfcc-2.2.8/TEST/v2test_ec.c
--- sblim-sfcc-2.2.8.orig/TEST/v2test_ec.c 2014-11-26 17:26:46.000000000 +0100
+++ sblim-sfcc-2.2.8/TEST/v2test_ec.c 2023-01-18 11:35:32.990725766 +0100
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <stdlib.h>
#include "cmcimacs.h"
+#include "show.h"
extern char *value2Chars(CMPIType type, CMPIValue * value);
/*
diff -ruN sblim-sfcc-2.2.8.orig/TEST/v2test_ein.c sblim-sfcc-2.2.8/TEST/v2test_ein.c
--- sblim-sfcc-2.2.8.orig/TEST/v2test_ein.c 2014-11-26 17:26:46.000000000 +0100
+++ sblim-sfcc-2.2.8/TEST/v2test_ein.c 2023-01-18 11:44:44.223586290 +0100
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <stdlib.h>
#include "cmcimacs.h"
+#include "show.h"
extern char *value2Chars(CMPIType type, CMPIValue * value);
void showProperty( CMPIData , char * );

@ -7,13 +7,15 @@
Summary: Small Footprint CIM Client Library
Name: sblim-sfcc
Version: 2.2.8
Release: 18%{?dist}
Release: 28%{?dist}
License: EPL-1.0
URL: http://www.sblim.org
Source0: http://downloads.sourceforge.net/project/sblim/%{name}/%{name}-%{version}.tar.bz2
# Patch0: fixes docdir name and removes install of COPYING with license
# which is included through %%license
Patch0: sblim-sfcc-2.2.8-docdir-license.patch
Patch1: c99.patch
Patch2: c89.patch
BuildRequires: make
BuildRequires: curl-devel chrpath
BuildRequires: gcc gcc-c++
@ -32,7 +34,7 @@ Small Footprint CIM Client Library Header Files and Link Libraries
%prep
%setup -q
%patch0 -p1 -b .docdir-license
%autopatch -p1
%build
chmod a-x backend/cimxml/*.[ch]
@ -64,12 +66,43 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0
%{_libdir}/libcmpisfcc.so
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.8-18
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.2.8-28
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.2.8-17
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.2.8-27
- Bump release for June 2024 mass rebuild
* Thu Feb 01 2024 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-26
- Fix bogus date in changelog, use autopatch
* Thu Feb 01 2024 Florian Weimer <fweimer@redhat.com> - 2.2.8-25
- Add pointer casts for GCC 14/C89 compatibility
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Apr 25 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-22
- SPDX migration
* Sat Jan 21 2023 Timm Bäder <tbaeder@redhat.com> - 2.2.8-21
- Add downstream patch to fix c99 incompatibilities
- https://fedoraproject.org/wiki/Changes/PortingToModernC
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save