diff --git a/SPECS-EXTENDED/libsmbios/0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch b/SPECS-EXTENDED/libsmbios/0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch deleted file mode 100644 index 604318aaa54..00000000000 --- a/SPECS-EXTENDED/libsmbios/0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 22728f16eb611411258146045030292e1170bfef Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 14 Feb 2018 16:15:28 -0500 -Subject: [PATCH] libsmbios: fix more places with loop iterators with bad types - -In these cases we get: - -../src/libsmbios_c/smbios/smbios_obj.c: In function 'smbios_verify_smbios': -../src/libsmbios_c/smbios/smbios_obj.c:415:31: error: comparison of integer expressions of different signedness: 'unsigned int' and 'long int' [-Werror=sign-compare] - for(unsigned int i = 0; i < length ; ++i ) - ^ -../src/libsmbios_c/smbios/smbios_obj.c: In function 'smbios_verify_smbios3': -../src/libsmbios_c/smbios/smbios_obj.c:436:31: error: comparison of integer expressions of different signedness: 'unsigned int' and 'long int' [-Werror=sign-compare] - for(unsigned int i = 0; i < length ; ++i ) - ^ - -I really don't understand why gcc will complain about it being signed vs -unsigned, but not about the fact that the int can obviously overflow -before the condition being checked against length, a larger type, is -satisfied. - -Signed-off-by: Peter Jones ---- - src/libsmbios_c/smbios/smbios_obj.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libsmbios_c/smbios/smbios_obj.c b/src/libsmbios_c/smbios/smbios_obj.c -index a6f2e1e3525..c932ba59535 100644 ---- a/src/libsmbios_c/smbios/smbios_obj.c -+++ b/src/libsmbios_c/smbios/smbios_obj.c -@@ -412,7 +412,7 @@ bool __hidden smbios_verify_smbios(const char *buf, long length, long *dmi_lengt - bool retval = true; - - u8 checksum = 0; -- for(unsigned int i = 0; i < length ; ++i ) -+ for(long i = 0; i < length ; ++i ) - checksum = (checksum + buf[i]) & 0xFF; - - fnprintf("SMBIOS TEP csum %d.\n", (int)checksum); -@@ -433,7 +433,7 @@ bool __hidden smbios_verify_smbios3(const char *buf, long length, long *dmi_leng - { - struct smbios_table_entry_point_64 *ep; - u8 checksum = 0; -- for(unsigned int i = 0; i < length ; ++i ) -+ for(long i = 0; i < length ; ++i ) - checksum = (checksum + buf[i]) & 0xFF; - - fnprintf("SMBIOS TEP csum %d.\n", (int)checksum); --- -2.14.3 - diff --git a/SPECS-EXTENDED/libsmbios/libsmbios.signatures.json b/SPECS-EXTENDED/libsmbios/libsmbios.signatures.json index 796beae3b0b..249cbd24185 100644 --- a/SPECS-EXTENDED/libsmbios/libsmbios.signatures.json +++ b/SPECS-EXTENDED/libsmbios/libsmbios.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "libsmbios-2.4.2.tar.gz": "ebfe18415e24bbec06d0a9ea1066c8dcd82982555373712713d7e194138650de" + "libsmbios-2.4.3.tar.gz": "36c36a0f6b59190d6b4fef11696886e4511091929a5eb7ae7cf5fea0c32d3f58" } -} +} \ No newline at end of file diff --git a/SPECS-EXTENDED/libsmbios/libsmbios.spec b/SPECS-EXTENDED/libsmbios/libsmbios.spec index ba7345df364..27845b901b7 100644 --- a/SPECS-EXTENDED/libsmbios/libsmbios.spec +++ b/SPECS-EXTENDED/libsmbios/libsmbios.spec @@ -1,24 +1,18 @@ Vendor: Microsoft Corporation Distribution: Azure Linux -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - # these are all substituted by autoconf %define pot_file libsmbios %define lang_dom libsmbios-2.4 Name: libsmbios -Version: 2.4.2 -Release: 8%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: Libsmbios C/C++ shared libraries -License: GPLv2+ or OSL 2.1 +License: GPL-2.0-or-later or OSL-2.1 URL: https://github.com/dell/libsmbios Source0: https://github.com/dell/libsmbios/archive/v%{version}/libsmbios-%{version}.tar.gz -Patch0001: 0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: cppunit-devel @@ -26,10 +20,10 @@ BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: gettext-devel -BuildRequires: git BuildRequires: help2man BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: make BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: strace @@ -94,19 +88,11 @@ This package contains the headers and .a files necessary to compile new client programs against libsmbios. %prep -%setup -q -n libsmbios-%{version} +%autosetup -p1 + find . -type d -exec chmod -f 755 {} \; find doc src -type f -exec chmod -f 644 {} \; chmod 755 src/cppunit/*.sh -git init -git config user.email "%{name}-owner@fedoraproject.org" -git config user.name "Fedora Ninjas" -git config gc.auto 0 -git add . -git commit -a -q -m "%{version} baseline." -git am %{patches} configure chmod +x ./configure %configure - mkdir -p out/libsmbios_c -make CFLAGS+="%{optflags} -Werror" %{?_smp_mflags} 2>&1 | tee build-%{_arch}.log +%make_build CFLAGS+="%{optflags} -Werror" 2>&1 | tee build-%{_arch}.log echo \%doc _build/build-%{_arch}.log > buildlogs.txt @@ -150,28 +135,29 @@ find %{buildroot}/%{_includedir} out/libsmbios_c -exec touch -r $TOPDIR/configur mv out/libsmbios_c out/libsmbios_c-%{_arch} +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_3 +%py_byte_compile %{python3} %{buildroot}%{python3_sitearch}/ + rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot_file}.mo) %find_lang %{lang_dom} %ldconfig_scriptlets - %files -f _build/%{lang_dom}.lang +# Only need to include license once here +%license COPYING-GPL COPYING-OSL %{_libdir}/libsmbios_c.so.* %files -n libsmbios-devel -f _build/buildlogs.txt -%doc COPYING-GPL COPYING-OSL README.md src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt +%license src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt +%doc README.md _build/out/libsmbios_c-%{_arch} %{_includedir}/smbios_c %{_libdir}/libsmbios_c.so %{_libdir}/pkgconfig/*.pc -%doc _build/out/libsmbios_c-%{_arch} %files -n smbios-utils -%doc COPYING-GPL COPYING-OSL README.md -# no other files. %files -n smbios-utils-bin -%doc COPYING-GPL COPYING-OSL README.md -%doc src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt +%license src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt %{_sbindir}/smbios-state-byte-ctl %{_mandir}/man?/smbios-state-byte-ctl.* %{_sbindir}/smbios-get-ut-data @@ -182,12 +168,10 @@ rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot %{_mandir}/man?/smbios-sys-info-lite.* %files -n python3-smbios -%doc COPYING-GPL COPYING-OSL README.md %{python3_sitearch}/* %files -n smbios-utils-python -%doc COPYING-GPL COPYING-OSL README.md -%doc src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt +%license src/bin/getopts_LICENSE.txt src/include/smbios_c/config/boost_LICENSE_1_0_txt %dir %{_sysconfdir}/libsmbios %config(noreplace) %{_sysconfdir}/libsmbios/* @@ -215,6 +199,9 @@ rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot %{_datadir}/smbios-utils %changelog +* Mon Nov 12 2024 Sumit Jena - 2.4.3-1 +- Update to version 2.4.3 + * Fri Oct 15 2021 Pawel Winogrodzki - 2.4.2-8 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index d1159de93cc..18b88ac1c8d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -10941,8 +10941,8 @@ "type": "other", "other": { "name": "libsmbios", - "version": "2.4.2", - "downloadUrl": "https://github.com/dell/libsmbios/archive/v2.4.2/libsmbios-2.4.2.tar.gz" + "version": "2.4.3", + "downloadUrl": "https://github.com/dell/libsmbios/archive/v2.4.3/libsmbios-2.4.3.tar.gz " } } },