dmidecode: Update to 3.6

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm
index e4e37cbf5677f7b54fb72b8a5a9e3d837051efb5..157287b5d78fdbf668affddd63321e5b7c769b52 100644 (file)
--- a/dmidecode/dmidecode.nm
+++ b/dmidecode/dmidecode.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = dmidecode
-version    = 3.3
+version    = 3.6
 release    = 1
 
 groups     = Applications/System
@@ -13,11 +13,11 @@ license    = GPLv2+
 summary    = Tool to analyse BIOS DMI data.
 
 description
-       dmidecode reports information about x86 & ia64 hardware as described \
-       in the system BIOS according to the SMBIOS/DMI standard. This \
-       information typically includes system manufacturer, model name, \
-       serial number, BIOS version, asset tag as well as a lot of other \
-       details of varying level of interest and reliability depending on the \
+       dmidecode reports information about x86 & ia64 hardware as described
+       in the system BIOS according to the SMBIOS/DMI standard. This
+       information typically includes system manufacturer, model name,
+       serial number, BIOS version, asset tag as well as a lot of other
+       details of varying level of interest and reliability depending on the
        manufacturer.
 end
 

diff --git a/dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch b/dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch
deleted file mode 100644 (file)
index 497768a..0000000
--- a/dmidecode/patches/dmidecode-3.3-fix_crash_with_u_option.patch
+++ /dev/null
@@ -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: 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",
--- 
-cgit v1.2.1
-

diff --git a/dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch b/dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch
deleted file mode 100644 (file)
index e5f99b4..0000000
--- a/dmidecode/patches/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1117390ccd9cea139638db6f460bb6de70e28f94 Mon Sep 17 00:00:00 2001
-From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
-Date: Tue, 5 Jan 2021 10:36:29 +0100
-Subject: dmidecode: Fix the condition error in ascii_filter
-
-The normal printable ASCII range is 32 to 127 (not included),
-so fix the error in this if condition.
-
-Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
-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 27d5494..864a193 100644
---- a/dmidecode.c
-+++ b/dmidecode.c
-@@ -116,7 +116,7 @@ static void ascii_filter(char *bp, size_t len)
-       size_t i;
- 
-       for (i = 0; i < len; i++)
--              if (bp[i] < 32 || bp[i] == 127)
-+              if (bp[i] < 32 || bp[i] >= 127)
-                       bp[i] = '.';
- }
- 
--- 
-cgit v1.2.1
-