CVS commit: pkgsrc/sysutils/dmidecode

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Apr 23 20:18:30 UTC 2022

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

Log Message:
dmidecode: don't pull vendor patches out of cgit, checksum issues

Integrate in patches/patch-dmidecode.c instead. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/dmidecode/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/dmidecode/distinfo
cvs rdiff -u -r1.2 -r1.3 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.36 pkgsrc/sysutils/dmidecode/Makefile:1.37
--- pkgsrc/sysutils/dmidecode/Makefile:1.36     Sat Jul 24 13:23:52 2021
+++ pkgsrc/sysutils/dmidecode/Makefile  Sat Apr 23 20:18:30 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2021/07/24 13:23:52 jmcneill Exp $
+# $NetBSD: Makefile,v 1.37 2022/04/23 20:18:30 tnn Exp $
 #
 
 DISTNAME=      dmidecode-3.3
-PKGREVISION=   2
+PKGREVISION=   3
 EXTRACT_SUFX=  .tar.xz
 CATEGORIES=    sysutils
 MASTER_SITES=  https://download.savannah.gnu.org/releases/dmidecode/
@@ -12,12 +12,6 @@ HOMEPAGE=    https://www.nongnu.org/dmideco
 COMMENT=       Print out DMI (SMBIOS) table in human-readable format
 LICENSE=       gnu-gpl-v2
 
-PATCH_SITES=           https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id=
-DIST_SUBDIR=           dmidecode-patches
-PATCHFILES=            1117390ccd9cea139638db6f460bb6de70e28f94
-PATCHFILES+=           11e134e54d15e67a64c39a623f492a28df922517
-PATCH_DIST_STRIP=      -p1
-
 MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 

Index: pkgsrc/sysutils/dmidecode/distinfo
diff -u pkgsrc/sysutils/dmidecode/distinfo:1.32 pkgsrc/sysutils/dmidecode/distinfo:1.33
--- pkgsrc/sysutils/dmidecode/distinfo:1.32     Tue Oct 26 11:19:31 2021
+++ pkgsrc/sysutils/dmidecode/distinfo  Sat Apr 23 20:18:30 2022
@@ -1,14 +1,8 @@
-$NetBSD: distinfo,v 1.32 2021/10/26 11:19:31 nia Exp $
+$NetBSD: distinfo,v 1.33 2022/04/23 20:18:30 tnn Exp $
 
-BLAKE2s (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = 03c7060fca6ba0daeb042ec11d497eecbcff713e4f98f329fe1e834fb58dc853
-SHA512 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = c99b623e84419c0cfd996fea032045685b398cb553d098725680ef93b8b56f397bd608a06484ed1b0e4cee45679710101bc9ef156ca6dacaa1dae78606935ae0
-Size (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = 830 bytes
-BLAKE2s (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = e1109d2410d174715c9f8626218d7aac7f3527d217e82bf1053383b9ef503537
-SHA512 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = 47fbe3256bd1c468ddcd34604e81b05087e1dd109c61dfdd6762d7e3d1e1bcf97ec18a7141b90a06bbe08f2f2d5a48ef243900cf0312eeb68c1cad777e83d26c
-Size (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = 1024 bytes
-BLAKE2s (dmidecode-patches/dmidecode-3.3.tar.xz) = d3efcc75cb69f5b6f407f274655e5bc40a497ea246a62303a2b38380cc54d488
-SHA512 (dmidecode-patches/dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
-Size (dmidecode-patches/dmidecode-3.3.tar.xz) = 56372 bytes
+BLAKE2s (dmidecode-3.3.tar.xz) = d3efcc75cb69f5b6f407f274655e5bc40a497ea246a62303a2b38380cc54d488
+SHA512 (dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
+Size (dmidecode-3.3.tar.xz) = 56372 bytes
 SHA1 (patch-aa) = 4ffeddeb647d07d8d712bab9983c1530e59e6f37
 SHA1 (patch-config.h) = 6ca6459a79ca207ec8b59f0532b2c1db841dc05c
-SHA1 (patch-dmidecode.c) = 2d7cbafd979aa7f6a33939eb136dc06e945f4188
+SHA1 (patch-dmidecode.c) = c89dd2b2499a0caba49956f0653db3d43cfb5150

Index: pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c
diff -u pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.2 pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.3
--- pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.2     Mon Apr 20 19:28:34 2020
+++ pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c Sat Apr 23 20:18:30 2022
@@ -1,27 +1,49 @@
-$NetBSD: patch-dmidecode.c,v 1.2 2020/04/20 19:28:34 triaxx Exp $
+$NetBSD: patch-dmidecode.c,v 1.3 2022/04/23 20:18:30 tnn 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-04-20 13:13:37.626217000 +0000
+--- dmidecode.c.orig   2020-10-14 12:51:11.000000000 +0000
 +++ dmidecode.c
-@@ -70,8 +70,15 @@
+@@ -71,6 +71,13 @@
  #ifdef __FreeBSD__
  #include <errno.h>
  #include <kenv.h>
 +#include <sys/socket.h>
- #endif
- 
++#endif
++
 +#ifdef __NetBSD__
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
 +#include <errno.h>
-+#endif
-+
+ #endif
+ 
  #include "version.h"
- #include "config.h"
- #include "types.h"
-@@ -5466,6 +5473,9 @@ static int address_from_efi(off_t *address)
+@@ -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
        char linebuf[64];
  #elif defined(__FreeBSD__)
        char addrstr[KENV_MVALLEN + 1];
@@ -31,12 +53,10 @@ $NetBSD: patch-dmidecode.c,v 1.2 2020/04
  #endif
        const char *eptype;
        int ret;
-@@ -5517,6 +5527,23 @@ static int address_from_efi(off_t *address)
-       }
- 
+@@ -5552,6 +5562,23 @@ static int address_from_efi(off_t *addre
        *address = strtoull(addrstr, NULL, 0);
-+      eptype = "SMBIOS";
-+      ret = 0;
+       eptype = "SMBIOS";
+       ret = 0;
 +#elif defined(__NetBSD__)
 +      /*
 +       * On NetBSD, SMBIOS anchor base address on non-x86 is exposed
@@ -52,6 +72,8 @@ $NetBSD: patch-dmidecode.c,v 1.2 2020/04
 +      }
 +
 +      *address = (off_t)addr;
-       eptype = "SMBIOS";
-       ret = 0;
++      eptype = "SMBIOS";
++      ret = 0;
  #else
+       ret = EFI_NOT_FOUND;
+ #endif