From patchwork Thu Jan 18 11:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7461 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4TGcM35Qszz3wtq for ; Fri, 19 Jan 2024 11:09:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4TGcM30MhDz100; Fri, 19 Jan 2024 11:09:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TGcM303zKz2xdZ; Fri, 19 Jan 2024 11:09:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4TGcLn74BHz2xcr for ; Fri, 19 Jan 2024 11:09:05 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4TG15f0Qwzznn; Thu, 18 Jan 2024 11:40:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1705578038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bGXPAL5M6E3FAiEtx0ls8K1dKgELLJuoyEeJr3B3s+8=; b=GAtNW9RoUy6psP+abY/+SrSyeqn7+5TZpO9YcJo4wPgZXyp79Caq6n5FZufcobHsTB82qY kqDFzPf1K7UES7CA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1705578038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bGXPAL5M6E3FAiEtx0ls8K1dKgELLJuoyEeJr3B3s+8=; b=uJtxngvLQ4HNtbGy1pHj+69Ft+xJD7Dihv4FnKaiDcd0+AJH/+yKF0VxvrhBjHXkedthIl SWtK9twPGdP/Fpfqw7FM8pS0ql8WNK9mayUOPY1q2wR3akPPQAJ3qriWWQrLDboeJ8eObn E8D7qlrdse7SMVPHi4tgMVpgVNoG6Be5y+7jENM1rYPqxLUhAKDqCkn68NZTbKlK71J1xD nDII94V9uh5myDcQfuAA9Uz7SQCyWl2oE3RohBrJtKzM1X/K4YIK7FGzTF2PQm/Y4C19Cr H+UDmDqbjgUZch8k1wUY/sGj8C1XE8ZSUU9rlbhBcrcaiHRmTFIInjCW2ab7jw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] dmidecode: Update to version 3.5 Date: Thu, 18 Jan 2024 12:40:19 +0100 Message-ID: <20240118114031.6171-2-adolf.belka@ipfire.org> In-Reply-To: <20240118114031.6171-1-adolf.belka@ipfire.org> References: <20240118114031.6171-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: GFOEGUAJSYL7XYXVSIWIJP3DOYXNQ4CV X-Message-ID-Hash: GFOEGUAJSYL7XYXVSIWIJP3DOYXNQ4CV X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 3.3 to 3.5 - Update of rootfile not required - Two patches no longer required as fixes are now in source tarball - Changelog 3.5 (Tue Mar 14 2023) - Decode HPE OEM records 216, 224, 230, 238 and 242. - Fortify entry point length checks. - Add a --no-quirks option. - Drop the CPUID exception list. - Do not let --dump-bin overwrite an existing file. - Ensure /dev/mem is a character device file. - Bug fixes: Fix segmentation fault in HPE OEM record 240 - Minor improvements: Typo fixes Write the whole dump file at once Fix a build warning when USE_MMAP isn't set 3.4 (Mon Jun 27 2022) - Support for SMBIOS 3.4.0. This includes new memory device types, new processor upgrades, new slot types and characteristics, decoding of memory module extended speed, new system slot types, new processor characteristics and new format of Processor ID. - Support for SMBIOS 3.5.0. This includes new processor upgrades, BIOS characteristics, new slot characteristics, new on-board device types, new pointing device interface types, and a new record type (type 45 - Firmware Inventory Information). - Decode HPE OEM records 194, 199, 203, 236, 237, 238 and 240. - Bug fixes: Fix OEM vendor name matching Fix ASCII filtering of strings Fix crash with option -u - Minor improvements: Skip details of uninstalled memory modules Don't display the raw CPU ID in quiet mode Improve the formatting of the manual pages Signed-off-by: Adolf Belka --- lfs/dmidecode | 8 ++--- ...midecode-3.3-fix_crash_with_u_option.patch | 34 ------------------- ..._the_condition_error_in_ascii_filter.patch | 30 ---------------- 3 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 src/patches/dmidecode/dmidecode-3.3-fix_crash_with_u_option.patch delete mode 100644 src/patches/dmidecode/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch diff --git a/lfs/dmidecode b/lfs/dmidecode index f18f6d25d..1408447d2 100644 --- a/lfs/dmidecode +++ b/lfs/dmidecode @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # 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 # @@ -24,7 +24,7 @@ include Config -VER = 3.3 +VER = 3.5 THISAPP = dmidecode-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e +$(DL_FILE)_BLAKE2 = 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -71,8 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(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) diff --git a/src/patches/dmidecode/dmidecode-3.3-fix_crash_with_u_option.patch b/src/patches/dmidecode/dmidecode-3.3-fix_crash_with_u_option.patch deleted file mode 100644 index 497768add..000000000 --- a/src/patches/dmidecode/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 -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 -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", --- -cgit v1.2.1 - diff --git a/src/patches/dmidecode/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch b/src/patches/dmidecode/dmidecode-3.3-fix_the_condition_error_in_ascii_filter.patch deleted file mode 100644 index e5f99b477..000000000 --- a/src/patches/dmidecode/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 -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 -Signed-off-by: Jean Delvare ---- - 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 -