Sat Mar 31 20:10:49 2018 UTC ()
Fix build on NetBSD/current.


(joerg)
diff -r1.33 -r1.34 pkgsrc/net/freeradius/distinfo
diff -r1.1 -r1.2 pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c
cvs diff -r1.33 -r1.34 pkgsrc/net/freeradius/distinfo (expand / switch to unified diff)

--- pkgsrc/net/freeradius/distinfo 2017/09/09 22:46:57 1.33
+++ pkgsrc/net/freeradius/distinfo 2018/03/31 20:10:49 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.33 2017/09/09 22:46:57 joerg Exp $ 1$NetBSD: distinfo,v 1.34 2018/03/31 20:10:49 joerg Exp $
2 2
3SHA1 (freeradius-server-3.0.15.tar.bz2) = f651142a31b514fc80d888fe8ab5040cbfdd546e 3SHA1 (freeradius-server-3.0.15.tar.bz2) = f651142a31b514fc80d888fe8ab5040cbfdd546e
4RMD160 (freeradius-server-3.0.15.tar.bz2) = 46d2d491b71516c6db7659e46e1ec44c7fbf9d1f 4RMD160 (freeradius-server-3.0.15.tar.bz2) = 46d2d491b71516c6db7659e46e1ec44c7fbf9d1f
5SHA512 (freeradius-server-3.0.15.tar.bz2) = a2808f0b70b73f11c4c7d00edcb4a56a2ab8f73ce0ff74a9834c8b613ce5ed75ece372f852b0891f68c6a33f50c1bababb76d2eff9326a7fc29fe6b45ec9af88 5SHA512 (freeradius-server-3.0.15.tar.bz2) = a2808f0b70b73f11c4c7d00edcb4a56a2ab8f73ce0ff74a9834c8b613ce5ed75ece372f852b0891f68c6a33f50c1bababb76d2eff9326a7fc29fe6b45ec9af88
6Size (freeradius-server-3.0.15.tar.bz2) = 3038070 bytes 6Size (freeradius-server-3.0.15.tar.bz2) = 3038070 bytes
7SHA1 (patch-ai) = 834fea0886410de30ed489fa39be066fa3fb3186 7SHA1 (patch-ai) = 834fea0886410de30ed489fa39be066fa3fb3186
8SHA1 (patch-configure.ac) = 2e1a979f51122f4c214f11574116a9a7695387d0 8SHA1 (patch-configure.ac) = 2e1a979f51122f4c214f11574116a9a7695387d0
9SHA1 (patch-main_command.c) = 1c79b29eb13df341906c710c8dd41860a27473dd 9SHA1 (patch-main_command.c) = 1c79b29eb13df341906c710c8dd41860a27473dd
10SHA1 (patch-main_util.c) = b9cefdb9bc30df0906184e8c0bb883e5258767c3 10SHA1 (patch-main_util.c) = b9cefdb9bc30df0906184e8c0bb883e5258767c3
11SHA1 (patch-rlm_krb5_configure) = e97f0efe85c449d3b8a9aa450b6b7d1d0e4c6b89 11SHA1 (patch-rlm_krb5_configure) = e97f0efe85c449d3b8a9aa450b6b7d1d0e4c6b89
12SHA1 (patch-rlm_perl_configure) = 577d6f0df7322ee12a99aafcdcc2d0b40e89eb69 12SHA1 (patch-rlm_perl_configure) = 577d6f0df7322ee12a99aafcdcc2d0b40e89eb69
13SHA1 (patch-rlm_yubikey_configure) = ea62cc0e87da014befbd0ad79f68dc852dc0f254 13SHA1 (patch-rlm_yubikey_configure) = ea62cc0e87da014befbd0ad79f68dc852dc0f254
14SHA1 (patch-src_lib_udpfromto.c) = 28322d32ed95c40b59d26072261ea29f5cd2e4da 14SHA1 (patch-src_lib_udpfromto.c) = c8fce29e2b481820f1cc2196577f7d38bb549e1c
cvs diff -r1.1 -r1.2 pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c (expand / switch to unified diff)

--- pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c 2017/09/09 22:46:57 1.1
+++ pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c 2018/03/31 20:10:49 1.2
@@ -1,21 +1,32 @@ @@ -1,21 +1,32 @@
1$NetBSD: patch-src_lib_udpfromto.c,v 1.1 2017/09/09 22:46:57 joerg Exp $ 1$NetBSD: patch-src_lib_udpfromto.c,v 1.2 2018/03/31 20:10:49 joerg Exp $
2 2
3Only use IP_PKTINFO if the configure checks for the necessary members 3Only use IP_PKTINFO if the configure checks for the necessary members
4passed. 4passed. Use either IP_PKTINFO or IP_SENDSRCADDR, but not both.
5 5
6--- src/lib/udpfromto.c.orig 2017-09-09 18:10:18.070426265 +0000 6--- src/lib/udpfromto.c.orig 2017-07-17 12:43:00.000000000 +0000
7+++ src/lib/udpfromto.c 7+++ src/lib/udpfromto.c
8@@ -386,11 +386,11 @@ int sendfromto(int s, void *buf, size_t  8@@ -386,11 +386,11 @@ int sendfromto(int s, void *buf, size_t
9 msgh.msg_name = to; 9 msgh.msg_name = to;
10 msgh.msg_namelen = tolen; 10 msgh.msg_namelen = tolen;
11  11
12-# if defined(IP_PKTINFO) || defined(IP_SENDSRCADDR) 12-# if defined(IP_PKTINFO) || defined(IP_SENDSRCADDR)
13+# if defined(HAVE_IP_PKTINFO) || defined(IP_SENDSRCADDR) 13+# if defined(HAVE_IP_PKTINFO) || defined(IP_SENDSRCADDR)
14 if (from->sa_family == AF_INET) { 14 if (from->sa_family == AF_INET) {
15 struct sockaddr_in *s4 = (struct sockaddr_in *) from; 15 struct sockaddr_in *s4 = (struct sockaddr_in *) from;
16  16
17-# ifdef IP_PKTINFO 17-# ifdef IP_PKTINFO
18+# ifdef HAVE_IP_PKTINFO 18+# ifdef HAVE_IP_PKTINFO
19 struct cmsghdr *cmsg; 19 struct cmsghdr *cmsg;
20 struct in_pktinfo *pkt; 20 struct in_pktinfo *pkt;
21  21
 22@@ -405,9 +405,7 @@ int sendfromto(int s, void *buf, size_t
 23 pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
 24 memset(pkt, 0, sizeof(*pkt));
 25 pkt->ipi_spec_dst = s4->sin_addr;
 26-# endif
 27-
 28-# ifdef IP_SENDSRCADDR
 29+# elif defined(IP_SENDSRCADDR)
 30 struct cmsghdr *cmsg;
 31 struct in_addr *in;
 32