diff options
| author | triaxx <triaxx@pkgsrc.org> | 2020-04-20 19:28:34 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2020-04-20 19:28:34 +0000 |
| commit | e97b228cd5dec0a2e1b1ee803e055738517eb85d (patch) | |
| tree | 2b02b74ebaa14e9c2951ca05a01d546634e58f83 /sysutils | |
| parent | a1ce297a86bd950cda72f0580ff8cdb3c387ad57 (diff) | |
| download | pkgsrc-e97b228cd5dec0a2e1b1ee803e055738517eb85d.tar.gz | |
dmidecode: add missing header
pkgsrc changes:
---------------
* Add missing header for FreeBSD.
* Bump revision.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/dmidecode/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/dmidecode/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/dmidecode/patches/patch-aa | 4 | ||||
| -rw-r--r-- | sysutils/dmidecode/patches/patch-dmidecode.c | 28 |
4 files changed, 24 insertions, 18 deletions
diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile index ae1aaa858c4..3c619d9ce1c 100644 --- a/sysutils/dmidecode/Makefile +++ b/sysutils/dmidecode/Makefile @@ -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/ diff --git a/sysutils/dmidecode/distinfo b/sysutils/dmidecode/distinfo index e8c7ceb5ae5..50b758de540 100644 --- a/sysutils/dmidecode/distinfo +++ b/sysutils/dmidecode/distinfo @@ -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/fde47bb227b8fa817c88d7e10a8eb771c46de1df) = 396611839e85 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 diff --git a/sysutils/dmidecode/patches/patch-aa b/sysutils/dmidecode/patches/patch-aa index 9f70ff099b8..dc9d6f276ff 100644 --- a/sysutils/dmidecode/patches/patch-aa +++ b/sysutils/dmidecode/patches/patch-aa @@ -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 diff --git a/sysutils/dmidecode/patches/patch-dmidecode.c b/sysutils/dmidecode/patches/patch-dmidecode.c index 495eb46aa66..c3e4453b872 100644 --- a/sysutils/dmidecode/patches/patch-dmidecode.c +++ b/sysutils/dmidecode/patches/patch-dmidecode.c @@ -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 ARM64. #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 ARM64. #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 ARM64. + } + + *address = (off_t)addr; -+ eptype = "SMBIOS"; -+ ret = 0; + eptype = "SMBIOS"; + ret = 0; #else - ret = EFI_NOT_FOUND; - #endif |