###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
include Config
-VER = 3.3
+VER = 3.5
THISAPP = dmidecode-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e
+$(DL_FILE)_BLAKE2 = 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/dmidecode-3.3-fix_crash_with_u_option.patch
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
+++ /dev/null
-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
-
+++ /dev/null
-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
-