CVS commit: pkgsrc/sysutils/dmidecode

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Apr 20 19:28:34 UTC 2020

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

Log Message:
dmidecode: add missing header

pkgsrc changes:
---------------
* Add missing header for FreeBSD.
* Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/dmidecode/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/sysutils/dmidecode/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/dmidecode/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 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.30 pkgsrc/sysutils/dmidecode/Makefile:1.31
--- pkgsrc/sysutils/dmidecode/Makefile:1.30     Sat Jan 18 23:35:16 2020
+++ pkgsrc/sysutils/dmidecode/Makefile  Mon Apr 20 19:28:34 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2020/01/18 23:35:16 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2020/04/20 19:28:34 triaxx Exp $
 #
 
 DISTNAME=      dmidecode-3.2
-PKGREVISION=   5
+PKGREVISION=   6
 EXTRACT_SUFX=  .tar.xz
 CATEGORIES=    sysutils
 MASTER_SITES=  http://download.savannah.gnu.org/releases/dmidecode/

Index: pkgsrc/sysutils/dmidecode/distinfo
diff -u pkgsrc/sysutils/dmidecode/distinfo:1.25 pkgsrc/sysutils/dmidecode/distinfo:1.26
--- pkgsrc/sysutils/dmidecode/distinfo:1.25     Tue Oct 29 17:27:51 2019
+++ pkgsrc/sysutils/dmidecode/distinfo  Mon Apr 20 19:28:34 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2019/10/29 17:27:51 msaitoh Exp $
+$NetBSD: distinfo,v 1.26 2020/04/20 19:28:34 triaxx Exp $
 
 SHA1 (dmidecode-patches/1d0db85949a5bdd96375f6131d393a11204302a6) = 156610089ffc468c8fe6ce3fc4206f624d0f88aa
 RMD160 (dmidecode-patches/1d0db85949a5bdd96375f6131d393a11204302a6) = 896035dc2c48731b156729c6862e86ad82637003
@@ -24,5 +24,5 @@ SHA1 (dmidecode-patches/fde47bb227b8fa81
 RMD160 (dmidecode-patches/fde47bb227b8fa817c88d7e10a8eb771c46de1df) = 0f7f3565a0cdef72a6bce8a0b993d2aefbc2a185
 SHA512 (dmidecode-patches/fde47bb227b8fa817c88d7e10a8eb771c46de1df) = ef5856934bcbf831cad6f733ecd8d0dad92087f4813579b75f89e5576a8be1df23fd670d2f86b0ac2ff1e084951b05ae15421a0e6e84b2cec76789ddec85e88f
 Size (dmidecode-patches/fde47bb227b8fa817c88d7e10a8eb771c46de1df) = 989 bytes
-SHA1 (patch-aa) = 6c861b3742b1627a1b60dbaea9df0843f2ed603d
-SHA1 (patch-dmidecode.c) = 63cf0302a13603038ee871cc7410009a722eae39
+SHA1 (patch-aa) = c29130893fa1eb59a041b1579628e77fadbcfc68
+SHA1 (patch-dmidecode.c) = 2d7cbafd979aa7f6a33939eb136dc06e945f4188

Index: pkgsrc/sysutils/dmidecode/patches/patch-aa
diff -u pkgsrc/sysutils/dmidecode/patches/patch-aa:1.5 pkgsrc/sysutils/dmidecode/patches/patch-aa:1.6
--- pkgsrc/sysutils/dmidecode/patches/patch-aa:1.5      Mon Feb 20 17:27:33 2012
+++ pkgsrc/sysutils/dmidecode/patches/patch-aa  Mon Apr 20 19:28:34 2020
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2012/02/20 17:27:33 hans Exp $
+$NetBSD: patch-aa,v 1.6 2020/04/20 19:28:34 triaxx Exp $
+
+* Adapt the Makefile to make it compliant with pkgsrc.
 
 --- Makefile.orig      2005-10-03 20:38:20.000000000 +0200
 +++ Makefile

Index: pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c
diff -u pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.1 pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.2
--- pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c:1.1     Tue Oct 23 10:16:12 2018
+++ pkgsrc/sysutils/dmidecode/patches/patch-dmidecode.c Mon Apr 20 19:28:34 2020
@@ -1,11 +1,15 @@
-$NetBSD: patch-dmidecode.c,v 1.1 2018/10/23 10:16:12 jmcneill Exp $
+$NetBSD: patch-dmidecode.c,v 1.2 2020/04/20 19:28:34 triaxx Exp $
 
-Find SMBIOS table address on NetBSD ARM64.
+* Find SMBIOS table address on NetBSD ARM64.
+* Add missing header for FreeBSD.
 
---- dmidecode.c.orig   2018-10-23 09:59:50.281527237 +0000
+--- dmidecode.c.orig   2020-04-20 13:13:37.626217000 +0000
 +++ dmidecode.c
-@@ -72,6 +72,12 @@
+@@ -70,8 +70,15 @@
+ #ifdef __FreeBSD__
+ #include <errno.h>
  #include <kenv.h>
++#include <sys/socket.h>
  #endif
  
 +#ifdef __NetBSD__
@@ -17,7 +21,7 @@ Find SMBIOS table address on NetBSD ARM6
  #include "version.h"
  #include "config.h"
  #include "types.h"
-@@ -5463,6 +5469,9 @@ static int address_from_efi(off_t *addre
+@@ -5466,6 +5473,9 @@ static int address_from_efi(off_t *address)
        char linebuf[64];
  #elif defined(__FreeBSD__)
        char addrstr[KENV_MVALLEN + 1];
@@ -27,10 +31,12 @@ Find SMBIOS table address on NetBSD ARM6
  #endif
        const char *eptype;
        int ret;
-@@ -5516,6 +5525,23 @@ static int address_from_efi(off_t *addre
+@@ -5517,6 +5527,23 @@ static int address_from_efi(off_t *address)
+       }
+ 
        *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
@@ -46,8 +52,6 @@ Find SMBIOS table address on NetBSD ARM6
 +      }
 +
 +      *address = (off_t)addr;
-+      eptype = "SMBIOS";
-+      ret = 0;
+       eptype = "SMBIOS";
+       ret = 0;
  #else
-       ret = EFI_NOT_FOUND;
- #endif