diff --git a/dmidecode-3.3.tar.xz b/dmidecode-3.3.tar.xz deleted file mode 100644 index 7e680abe8d652630b9e82e4718b9efef39b8b376..0000000000000000000000000000000000000000 Binary files a/dmidecode-3.3.tar.xz and /dev/null differ diff --git a/dmidecode-3.4.tar.xz b/dmidecode-3.4.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c4e6c69a6ddeeef34e216f32c1e5908aee820e77 Binary files /dev/null and b/dmidecode-3.4.tar.xz differ diff --git a/dmidecode-Fix-crash-with-u-option.patch b/dmidecode-Fix-crash-with-u-option.patch deleted file mode 100644 index 3a271b64c02065ee9918b85b39e066f3161c6763..0000000000000000000000000000000000000000 --- a/dmidecode-Fix-crash-with-u-option.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 11e134e54d15e67a64c39a623f492a28df922517 Mon Sep 17 00:00:00 2001 -From: Jean Delvare -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 -Fixes: da06888d08b9 ("dmidecode: Use the print helpers in dump mode too") -Signed-off-by: Jean Delvare ---- - 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 - diff --git a/dmidecode.spec b/dmidecode.spec index 6fc85df5fa857e0f0fe0043377c49cda224bc40a..518207c170b42c98f14919e63e6d93743c2f93b3 100644 --- a/dmidecode.spec +++ b/dmidecode.spec @@ -1,6 +1,6 @@ Name: dmidecode -Version: 3.3 -Release: 5 +Version: 3.4 +Release: 1 Epoch: 1 Summary: DMI data report tool @@ -8,8 +8,6 @@ License: GPLv2+ URL: https://www.nongnu.org/dmidecode/ 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 BuildRequires: make gcc xz @@ -52,6 +50,9 @@ make %{?_smp_mflags} CFLAGS="%{__global_cflags}" LDFLAGS="%{__global_ldflags}" %{_mandir}/man8/*.8.gz %changelog +* Wed Nov 9 2022 fanrui - 1:3.4-1 +- Update to 3.4 + * Thu Nov 3 2022 wuzx - 1:3.3-4 - Add sw64 architecture