CVS commit: pkgsrc/sysutils/dmidecode

["SAITOH Masanobu" <msaitoh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   msaitoh
Date:           Tue Oct 11 09:12:18 UTC 2022

Modified Files:
        pkgsrc/sysutils/dmidecode: Makefile distinfo
        pkgsrc/sysutils/dmidecode/patches: patch-dmidecode.c

Log Message:
Update dmidecode to 3.4.

CHANGES from 3.3:

Version 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 ans 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


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/dmidecode/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/sysutils/dmidecode/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/dmidecode/Makefile
diff -u pkgsrc/sysutils/dmidecode/Makefile:1.37 pkgsrc/sysutils/dmidecode/Makefile:1.38
--- pkgsrc/sysutils/dmidecode/Makefile:1.37     Sat Apr 23 20:18:30 2022
+++ pkgsrc/sysutils/dmidecode/Makefile  Tue Oct 11 09:12:18 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2022/04/23 20:18:30 tnn Exp $
+# $NetBSD: Makefile,v 1.38 2022/10/11 09:12:18 msaitoh Exp $
 #
 
-DISTNAME=      dmidecode-3.3
-PKGREVISION=   3
+DISTNAME=      dmidecode-3.4
 EXTRACT_SUFX=  .tar.xz
 CATEGORIES=    sysutils
 MASTER_SITES=  https://download.savannah.gnu.org/releases/dmidecode/

Index: pkgsrc/sysutils/dmidecode/distinfo
diff -u pkgsrc/sysutils/dmidecode/distinfo:1.33 pkgsrc/sysutils/dmidecode/distinfo:1.34
--- pkgsrc/sysutils/dmidecode/distinfo:1.33     Sat Apr 23 20:18:30 2022
+++ pkgsrc/sysutils/dmidecode/distinfo  Tue Oct 11 09:12:18 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2022/04/23 20:18:30 tnn Exp $
+$NetBSD: distinfo,v 1.34 2022/10/11 09:12:18 msaitoh Exp $
 
-BLAKE2s (dmidecode-3.3.tar.xz) = d3efcc75cb69f5b6f407f274655e5bc40a497ea246a62303a2b38380cc54d488
-SHA512 (dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
-Size (dmidecode-3.3.tar.xz) = 56372 bytes
+BLAKE2s (dmidecode-3.4.tar.xz) = 4c77dc57ab99615165128047f803e6bf0844e7f97396a6754da4780d39a620c3
+SHA512 (dmidecode-3.4.tar.xz) = 62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
+Size (dmidecode-3.4.tar.xz) = 61420 bytes
 SHA1 (patch-aa) = 4ffeddeb647d07d8d712bab9983c1530e59e6f37
 SHA1 (patch-config.h) = 6ca6459a79ca207ec8b59f0532b2c1db841dc05c
-SHA1 (patch-dmidecode.c) = c89dd2b2499a0caba49956f0653db3d43cfb5150
+SHA1 (patch-dmidecode.c) = fe63079df824753a2aca9b9d0371523a36bb08ce

Index: pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c
diff -u pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.3 pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.4
--- pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.3     Sat Apr 23 20:18:30 2022
+++ pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c Tue Oct 11 09:12:18 2022
@@ -1,14 +1,10 @@
-$NetBSD: patch-dmidecode.c,v 1.3 2022/04/23 20:18:30 tnn Exp $
+$NetBSD: patch-dmidecode.c,v 1.4 2022/10/11 09:12:18 msaitoh Exp $
 
 * Find SMBIOS table address on NetBSD ARM64.
 * Add missing header for FreeBSD.
-* Subject: dmidecode: Fix the condition error in ascii_filter
-  https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=1117390ccd9cea139638db6f460bb6de70e28f94
-* Subject: dmidecode: Fix crash with -u option
-  https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=11e134e54d15e67a64c39a623f492a28df922517
 
---- dmidecode.c.orig   2020-10-14 12:51:11.000000000 +0000
-+++ dmidecode.c
+--- dmidecode.c.orig   2022-06-28 00:06:32.000000000 +0900
++++ dmidecode.c        2022-10-11 18:08:14.158248758 +0900
 @@ -71,6 +71,13 @@
  #ifdef __FreeBSD__
  #include <errno.h>
@@ -23,27 +19,7 @@ $NetBSD: patch-dmidecode.c,v 1.3 2022/04
  #endif
  
  #include "version.h"
-@@ -116,7 +123,7 @@ static void ascii_filter(char *bp, size_
-       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] = '.';
- }
- 
-@@ -248,9 +255,9 @@ static void dmi_dump(const struct dmi_he
-                       {
-                               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",
-@@ -5499,6 +5506,9 @@ static int address_from_efi(off_t *addre
+@@ -5837,6 +5844,9 @@ static int address_from_efi(off_t *addre
        char linebuf[64];
  #elif defined(__FreeBSD__)
        char addrstr[KENV_MVALLEN + 1];
@@ -53,7 +29,7 @@ $NetBSD: patch-dmidecode.c,v 1.3 2022/04
  #endif
        const char *eptype;
        int ret;
-@@ -5552,6 +5562,23 @@ static int address_from_efi(off_t *addre
+@@ -5890,6 +5900,23 @@ static int address_from_efi(off_t *addre
        *address = strtoull(addrstr, NULL, 0);
        eptype = "SMBIOS";
        ret = 0;