Update dmidecode to version 3.4

(cherry picked from commit c3951dcb150781ee4b12e52f6b507133ee59b00b)
This commit is contained in:
fanrui 2022-11-09 20:22:56 +08:00 committed by openeuler-sync-bot
parent 49e558372e
commit baf33ca5ee
4 changed files with 5 additions and 38 deletions

Binary file not shown.

BIN
dmidecode-3.4.tar.xz Normal file

Binary file not shown.

View File

@ -1,34 +0,0 @@
From 11e134e54d15e67a64c39a623f492a28df922517 Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Tue, 19 Jan 2021 16:26:01 +0100
Subject: [PATCH] dmidecode: Fix crash with -u option
A segmentation fault was reported with option -u. Turns out to be a
stupid thinko where the buffer offset was reset at the wrong loop
depth.
Reported-by: Jerry Hoemann <jerry.hoemann@hpe.com>
Fixes: da06888d08b9 ("dmidecode: Use the print helpers in dump mode too")
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
dmidecode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dmidecode.c b/dmidecode.c
index 572cb1a..69ea0e8 100644
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -248,9 +248,9 @@ static void dmi_dump(const struct dmi_header *h)
{
int j, l = strlen(s) + 1;
- off = 0;
for (row = 0; row < ((l - 1) >> 4) + 1; row++)
{
+ off = 0;
for (j = 0; j < 16 && j < l - (row << 4); j++)
off += sprintf(raw_data + off,
j ? " %02X" : "%02X",
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: dmidecode Name: dmidecode
Version: 3.3 Version: 3.4
Release: 5 Release: 1
Epoch: 1 Epoch: 1
Summary: DMI data report tool Summary: DMI data report tool
@ -8,8 +8,6 @@ License: GPLv2+
URL: https://www.nongnu.org/dmidecode/ URL: https://www.nongnu.org/dmidecode/
Source0: http://download.savannah.gnu.org/releases/dmidecode/%{name}-%{version}.tar.xz Source0: http://download.savannah.gnu.org/releases/dmidecode/%{name}-%{version}.tar.xz
Patch1: dmidecode-Fix-crash-with-u-option.patch
Patch6000: bugfix-compat_uuid.patch Patch6000: bugfix-compat_uuid.patch
BuildRequires: make gcc xz BuildRequires: make gcc xz
@ -52,6 +50,9 @@ make %{?_smp_mflags} CFLAGS="%{__global_cflags}" LDFLAGS="%{__global_ldflags}"
%{_mandir}/man8/*.8.gz %{_mandir}/man8/*.8.gz
%changelog %changelog
* Wed Nov 9 2022 fanrui<fary.fanrui@huawe.com> - 1:3.4-1
- Update to 3.4
* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 1:3.3-4 * Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 1:3.3-4
- Add sw64 architecture - Add sw64 architecture