Fri Aug 19 11:36:25 2022 UTC ()
R-uuid: carry over SunOS build fix from devel/libuuid
(tnn)
diff -r1.5 -r1.6 pkgsrc/devel/R-uuid/distinfo
diff -r0 -r1.1 pkgsrc/devel/R-uuid/patches/patch-src_gen__uuid.c
--- pkgsrc/devel/R-uuid/distinfo 2022/04/23 05:55:28 1.5
+++ pkgsrc/devel/R-uuid/distinfo 2022/08/19 11:36:25 1.6
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.5 2022/04/23 05:55:28 mef Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2022/08/19 11:36:25 tnn Exp $ |
| 2 | | | 2 | |
| 3 | BLAKE2s (R/uuid_1.1-0.tar.gz) = 5a8447923adac90013e08622aa269eb9cb9d8c2c16f55bad8ebe53641e598c6c | | 3 | BLAKE2s (R/uuid_1.1-0.tar.gz) = 5a8447923adac90013e08622aa269eb9cb9d8c2c16f55bad8ebe53641e598c6c |
| 4 | SHA512 (R/uuid_1.1-0.tar.gz) = 0e64565bec3ebd00d4710ab5b06c6a11df6da67e69e51967dd3470849196566a87a2654773593cd74dfcd580fd1f0fe2a57314b27a746fed708551e5b4181c4b | | 4 | SHA512 (R/uuid_1.1-0.tar.gz) = 0e64565bec3ebd00d4710ab5b06c6a11df6da67e69e51967dd3470849196566a87a2654773593cd74dfcd580fd1f0fe2a57314b27a746fed708551e5b4181c4b |
| 5 | Size (R/uuid_1.1-0.tar.gz) = 77959 bytes | | 5 | Size (R/uuid_1.1-0.tar.gz) = 77959 bytes |
| | | 6 | SHA1 (patch-src_gen__uuid.c) = dc9b2e1d0f906a70e4d46620b12ea753924a091c |
$NetBSD: patch-src_gen__uuid.c,v 1.1 2022/08/19 11:36:25 tnn Exp $
Solaris does not have ifr.ifr_hwaddr.
--- src/gen_uuid.c.orig 2022-04-19 04:03:43.000000000 +0000
+++ src/gen_uuid.c
@@ -145,7 +145,7 @@ static int get_node_id(unsigned char *no
for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
-#ifdef SIOCGIFHWADDR
+#if defined(SIOCGIFHWADDR) && !defined(__sun)
if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
continue;
a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;