From a836f2fe65b8c1378659c8f4374fd9694f118d1e Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 26 Nov 2024 19:15:44 +0300 Subject: [PATCH] import sblim-sfcc-2.2.8-27.el10 --- .gitignore | 1 + .sblim-sfcc.metadata | 1 + SOURCES/c89.patch | 31 +++ SOURCES/c99.patch | 70 ++++++ SOURCES/sblim-sfcc-2.2.8-docdir-license.patch | 21 ++ SPECS/sblim-sfcc.spec | 229 ++++++++++++++++++ 6 files changed, 353 insertions(+) create mode 100644 .gitignore create mode 100644 .sblim-sfcc.metadata create mode 100644 SOURCES/c89.patch create mode 100644 SOURCES/c99.patch create mode 100644 SOURCES/sblim-sfcc-2.2.8-docdir-license.patch create mode 100644 SPECS/sblim-sfcc.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5eedd00 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/sblim-sfcc-2.2.8.tar.bz2 diff --git a/.sblim-sfcc.metadata b/.sblim-sfcc.metadata new file mode 100644 index 0000000..29660d3 --- /dev/null +++ b/.sblim-sfcc.metadata @@ -0,0 +1 @@ +794e9e15ed54f391f227427445789463560f0990 SOURCES/sblim-sfcc-2.2.8.tar.bz2 diff --git a/SOURCES/c89.patch b/SOURCES/c89.patch new file mode 100644 index 0000000..25fc177 --- /dev/null +++ b/SOURCES/c89.patch @@ -0,0 +1,31 @@ +Add casts required for C89 compatibility. This addresses a build +failure with GCC 14. + +Submitted upstream: + +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 + */ diff --git a/SOURCES/c99.patch b/SOURCES/c99.patch new file mode 100644 index 0000000..6229843 --- /dev/null +++ b/SOURCES/c99.patch @@ -0,0 +1,70 @@ +Submitted upstream: + +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 + #include + #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 + #include + #include "cmcimacs.h" ++#include "show.h" + + extern char *value2Chars(CMPIType type, CMPIValue * value); + void showProperty( CMPIData , char * ); diff --git a/SOURCES/sblim-sfcc-2.2.8-docdir-license.patch b/SOURCES/sblim-sfcc-2.2.8-docdir-license.patch new file mode 100644 index 0000000..25d275b --- /dev/null +++ b/SOURCES/sblim-sfcc-2.2.8-docdir-license.patch @@ -0,0 +1,21 @@ +diff -up sblim-sfcc-2.2.8/Makefile.in.orig sblim-sfcc-2.2.8/Makefile.in +--- sblim-sfcc-2.2.8/Makefile.in.orig 2018-10-11 11:54:07.504330059 +0200 ++++ sblim-sfcc-2.2.8/Makefile.in 2018-10-11 11:54:40.301366853 +0200 +@@ -290,7 +290,7 @@ build_vendor = @build_vendor@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ +-docdir = $(datadir)/doc/sfcc-$(VERSION) ++docdir = $(datadir)/doc/sblim-sfcc + dvidir = @dvidir@ + exec_prefix = @exec_prefix@ + host = @host@ +@@ -355,7 +355,7 @@ dist_man_MANS = man/man3/CMCIClient.3 ma + man/man3/CMPIStatus.3 man/man3/CMPIString.3 \ + man/man3/CMPIValue.3 + +-dist_doc_DATA = README AUTHORS COPYING ++dist_doc_DATA = README AUTHORS + EXTRA_DIST = sfcc.spec + noinst_HEADERS = \ + backend/cimxml/cimXmlParser.h \ diff --git a/SPECS/sblim-sfcc.spec b/SPECS/sblim-sfcc.spec new file mode 100644 index 0000000..935347b --- /dev/null +++ b/SPECS/sblim-sfcc.spec @@ -0,0 +1,229 @@ +# +# $Id: sblim-sfcc.spec,v 1.4 2010/03/03 07:57:28 vcrhonek Exp $ +# +# Package spec for sblim-sfcc +# + +Summary: Small Footprint CIM Client Library +Name: sblim-sfcc +Version: 2.2.8 +Release: 27%{?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++ + +%Description +Small Footprint CIM Client Library Runtime Libraries + +%package devel +Summary: Small Footprint CIM Client Library +Requires: %{name} = %{version}-%{release} + +%Description devel +Small Footprint CIM Client Library Header Files and Link Libraries + + +%prep + +%setup -q +%autopatch -p1 + +%build +chmod a-x backend/cimxml/*.[ch] + +%configure +make %{?_smp_flags} + +%install +make DESTDIR=%{buildroot} install +# remove unused libtool files +rm -rf %{buildroot}/%{_libdir}/*a +# remove rpath +chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libcmpisfcc.so.1.0.0 + +%ldconfig_scriptlets + + +%files +%license COPYING +%{_libdir}/*.so.* +%{_libdir}/libcimcClientXML.so +%{_mandir}/man3/*.3.gz +%{_docdir}/* + +%files devel +%{_includedir}/CimClientLib/* +%{_includedir}/cimc/* +%{_libdir}/libcimcclient.so +%{_libdir}/libcmpisfcc.so + +%changelog +* Tue Nov 26 2024 MSVSphere Packaging Team - 2.2.8-27 +- Rebuilt for MSVSphere 10 + +* Mon Jun 24 2024 Troy Dawson - 2.2.8-27 +- Bump release for June 2024 mass rebuild + +* Thu Feb 01 2024 Vitezslav Crhonek - 2.2.8-26 +- Fix bogus date in changelog, use autopatch + +* Thu Feb 01 2024 Florian Weimer - 2.2.8-25 +- Add pointer casts for GCC 14/C89 compatibility + +* Sat Jan 27 2024 Fedora Release Engineering - 2.2.8-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.2.8-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 25 2023 Vitezslav Crhonek - 2.2.8-22 +- SPDX migration + +* Sat Jan 21 2023 Timm Bäder - 2.2.8-21 +- Add downstream patch to fix c99 incompatibilities +- https://fedoraproject.org/wiki/Changes/PortingToModernC + +* Sat Jan 21 2023 Fedora Release Engineering - 2.2.8-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.2.8-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.2.8-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.2.8-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.2.8-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.8-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 2.2.8-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 2.2.8-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.2.8-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Oct 11 2018 Vitezslav Crhonek - 2.2.8-11 +- Use %%license for file which contains the text of the license +- Change versioned docdir to unversioned and rename the docdir to match + the package name +- Fix license tag + +* Sat Jul 14 2018 Fedora Release Engineering - 2.2.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Feb 27 2018 Vitezslav Crhonek - 2.2.8-9 +- Add BuildRequires gcc and gcc-c++ + +* Fri Feb 09 2018 Fedora Release Engineering - 2.2.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Oct 31 2017 Vitezslav Crhonek - 2.2.8-7 +- Remove Group tag from spec file + +* Thu Aug 03 2017 Fedora Release Engineering - 2.2.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 2.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Dec 03 2014 Vitezslav Crhonek - 2.2.8-1 +- Update to sblim-sfcc-2.2.8 + +* Mon Aug 18 2014 Fedora Release Engineering - 2.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 2.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Mar 31 2014 Vitezslav Crhonek - 2.2.7-1 +- Update to sblim-sfcc-2.2.7 + +* Thu Jan 30 2014 Vitezslav Crhonek - 2.2.6-3 +- Fix -devel requires + +* Wed Jan 29 2014 Vitezslav Crhonek - 2.2.6-2 +- Move libcimcClientXML.so from -devel to main package - it's needed for proper function + +* Tue Oct 15 2013 Vitezslav Crhonek - 2.2.6-1 +- Update to sblim-sfcc-2.2.6 + +* Sun Aug 04 2013 Fedora Release Engineering - 2.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jul 22 2013 Vitezslav Crhonek - 2.2.5-3 +- Remove rpath from libcmpisfcc library again + +* Thu Feb 14 2013 Fedora Release Engineering - 2.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 08 2013 Vitezslav Crhonek - 2.2.5-1 +- Update to sblim-sfcc-2.2.5 + +* Mon Nov 19 2012 Vitezslav Crhonek - 2.2.4-4 +- Remove rpath from libcmpisfcc library + +* Thu Sep 06 2012 Vitezslav Crhonek - 2.2.4-3 +- Fix issues found by fedora-review utility in the spec file + +* Sat Jul 21 2012 Fedora Release Engineering - 2.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jun 19 2012 Vitezslav Crhonek - 2.2.4-1 +- Update to sblim-sfcc-2.2.4 +- Fix source link, remove build root tag + +* Sat Jan 14 2012 Fedora Release Engineering - 2.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Jul 19 2011 Vitezslav Crhonek - 2.2.3-1 +- Update to sblim-sfcc-2.2.3 + +* Tue May 24 2011 Vitezslav Crhonek - 2.2.2-1 +- Update to sblim-sfcc-2.2.2 + +* Wed Feb 09 2011 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Mar 3 2010 Vitezslav Crhonek - 2.2.1-1 +- Update to sblim-sfcc-2.2.1 +- Fix Source field +- Move documentation files from -devel to main package + +* Sun Jul 26 2009 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 2.1.0-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + + +* Tue Aug 19 2008 - 2.1.0-0%{?dist} +- Modified the spec file to adhere to fedora packaging guidelines. + +* Fri Feb 16 2007 - 2.0.0-0 +- Initial Version +