Sat Mar 20 06:44:11 2021 UTC ()
Add two officially recommended patches to sysutils/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.

- 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.


(msaitoh)
diff -r1.33 -r1.34 pkgsrc/sysutils/dmidecode/Makefile
diff -r1.28 -r1.29 pkgsrc/sysutils/dmidecode/distinfo

cvs diff -r1.33 -r1.34 pkgsrc/sysutils/dmidecode/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/dmidecode/Makefile 2020/11/24 05:31:51 1.33
+++ pkgsrc/sysutils/dmidecode/Makefile 2021/03/20 06:44:11 1.34
@@ -1,19 +1,26 @@ @@ -1,19 +1,26 @@
1# $NetBSD: Makefile,v 1.33 2020/11/24 05:31:51 msaitoh Exp $ 1# $NetBSD: Makefile,v 1.34 2021/03/20 06:44:11 msaitoh Exp $
2# 2#
3 3
4DISTNAME= dmidecode-3.3 4DISTNAME= dmidecode-3.3
 5PKGREVISION= 1
5EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
6CATEGORIES= sysutils 7CATEGORIES= sysutils
7MASTER_SITES= http://download.savannah.gnu.org/releases/dmidecode/ 8MASTER_SITES= https://download.savannah.gnu.org/releases/dmidecode/
8 9
9MAINTAINER= msaitoh@NetBSD.org 10MAINTAINER= msaitoh@NetBSD.org
10HOMEPAGE= https://www.nongnu.org/dmidecode/ 11HOMEPAGE= https://www.nongnu.org/dmidecode/
11COMMENT= Print out DMI (SMBIOS) table in human-readable format 12COMMENT= Print out DMI (SMBIOS) table in human-readable format
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
 15PATCH_SITES= https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=
 16DIST_SUBDIR= dmidecode-patches
 17PATCHFILES= 1117390ccd9cea139638db6f460bb6de70e28f94
 18PATCHFILES+= 11e134e54d15e67a64c39a623f492a28df922517
 19PATCH_DIST_STRIP= -p1
 20
14MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 21MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
15MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 22MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
16 23
17ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-aarch64 24ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-aarch64
18 25
19.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"

cvs diff -r1.28 -r1.29 pkgsrc/sysutils/dmidecode/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/dmidecode/distinfo 2020/11/24 05:31:51 1.28
+++ pkgsrc/sysutils/dmidecode/distinfo 2021/03/20 06:44:11 1.29
@@ -1,8 +1,16 @@ @@ -1,8 +1,16 @@
1$NetBSD: distinfo,v 1.28 2020/11/24 05:31:51 msaitoh Exp $ 1$NetBSD: distinfo,v 1.29 2021/03/20 06:44:11 msaitoh Exp $
2 2
3SHA1 (dmidecode-3.3.tar.xz) = 99b8a9deaf0a003083a5a5fadcb8c016e4ebdaa4 3SHA1 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = 66c67e17ed52317efadab0145b101fbd4341bab0
4RMD160 (dmidecode-3.3.tar.xz) = 0d4eb5f48c1cd3f4fdf8fc82855cde8e8f94d422 4RMD160 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = ffa630e97aa930aefe852ee767d6b079eb810952
5SHA512 (dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 5SHA512 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = c99b623e84419c0cfd996fea032045685b398cb553d098725680ef93b8b56f397bd608a06484ed1b0e4cee45679710101bc9ef156ca6dacaa1dae78606935ae0
6Size (dmidecode-3.3.tar.xz) = 56372 bytes 6Size (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = 830 bytes
 7SHA1 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = d8500fb7bc690adda6060f77f617073193d5e0a1
 8RMD160 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = af28d31066437e7e0824b3ff3252559c4a889634
 9SHA512 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = 47fbe3256bd1c468ddcd34604e81b05087e1dd109c61dfdd6762d7e3d1e1bcf97ec18a7141b90a06bbe08f2f2d5a48ef243900cf0312eeb68c1cad777e83d26c
 10Size (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = 1024 bytes
 11SHA1 (dmidecode-patches/dmidecode-3.3.tar.xz) = 99b8a9deaf0a003083a5a5fadcb8c016e4ebdaa4
 12RMD160 (dmidecode-patches/dmidecode-3.3.tar.xz) = 0d4eb5f48c1cd3f4fdf8fc82855cde8e8f94d422
 13SHA512 (dmidecode-patches/dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
 14Size (dmidecode-patches/dmidecode-3.3.tar.xz) = 56372 bytes
7SHA1 (patch-aa) = 4ffeddeb647d07d8d712bab9983c1530e59e6f37 15SHA1 (patch-aa) = 4ffeddeb647d07d8d712bab9983c1530e59e6f37
8SHA1 (patch-dmidecode.c) = 2d7cbafd979aa7f6a33939eb136dc06e945f4188 16SHA1 (patch-dmidecode.c) = 2d7cbafd979aa7f6a33939eb136dc06e945f4188