update to 2.4.3, spec cleanups
This commit is contained in:
Peter Robinson
parent
dbbebf7778
commit
23f987b727
@ -1,51 +0,0 @@
|
||||
From 22728f16eb611411258146045030292e1170bfef Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
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 <pjones@redhat.com>
|
||||
---
|
||||
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
|
||||
|
||||
@ -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,15 +18,14 @@ 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
|
||||
BuildRequires: valgrind
|
||||
BuildRequires: make
|
||||
|
||||
# libsmbios only ever makes sense on intel compatible arches
|
||||
# no DMI tables on ppc, s390, etc.
|
||||
@ -89,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} </dev/null
|
||||
git config --unset user.email
|
||||
git config --unset user.name
|
||||
|
||||
%build
|
||||
# this line lets us build an RPM directly from a git tarball
|
||||
@ -154,22 +143,21 @@ rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot
|
||||
%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
|
||||
@ -180,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/*
|
||||
|
||||
@ -213,6 +199,9 @@ rename %{pot_file}.mo %{lang_dom}.mo $(find %{buildroot}/%{_datadir} -name %{pot
|
||||
%{_datadir}/smbios-utils
|
||||
|
||||
%changelog
|
||||
* Sun Jan 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.4.3-1
|
||||
- Update to 2.4.3
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.2-10
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libsmbios-2.4.2.tar.gz) = 51d1b11447d50b768658473d01bcb6cc7f9dd5c96c26ec343f222115ffb5047ca1f035a0bfb67f94f53165eaea7a0d9b70cf01f03333a30885bbac153bf761bd
|
||||
SHA512 (libsmbios-2.4.3.tar.gz) = 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad
|
||||
|
||||
Loading…
Reference in New Issue
Block a user