From b11b772122de6e5cd239cbc39977d8f0b118134f Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 17 Jan 2021 11:50:11 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libsmbios.git#23f987b727dfa2a8cc6923b3022ccf88b05fec7e --- ...re-places-with-loop-iterators-with-b.patch | 51 ------------------- libsmbios.spec | 38 +++++--------- sources | 2 +- 3 files changed, 15 insertions(+), 76 deletions(-) delete mode 100644 0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch diff --git a/0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch b/0001-libsmbios-fix-more-places-with-loop-iterators-with-b.patch deleted file mode 100644 index 604318a..0000000 --- a/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/libsmbios.spec b/libsmbios.spec index 0b6f843..7b9a494 100644 --- a/libsmbios.spec +++ b/libsmbios.spec @@ -3,16 +3,14 @@ %define lang_dom libsmbios-2.4 Name: libsmbios -Version: 2.4.2 -Release: 10%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: Libsmbios C/C++ shared libraries License: GPLv2+ 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 @@ -20,10 +18,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 @@ -88,19 +86,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} - 2.4.3-1 +- Update to 2.4.3 + * Sat Aug 01 2020 Fedora Release Engineering - 2.4.2-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 47b8f10..b721602 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libsmbios-2.4.2.tar.gz) = 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd +SHA512 (libsmbios-2.4.3.tar.gz) = 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad