diff options
| author | joerg <joerg@pkgsrc.org> | 2018-03-31 20:10:49 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2018-03-31 20:10:49 +0000 |
| commit | 662e63b67b72c835cb732ae3252ee7f5166abfd5 (patch) | |
| tree | adcfc308fc58d345c6a31b6c6532cc7992df9936 | |
| parent | 6adef03f527b47cf2414dfff363b565f5cb9c03d (diff) | |
| download | pkgsrc-662e63b67b72c835cb732ae3252ee7f5166abfd5.tar.gz | |
Fix build on NetBSD/current.
| -rw-r--r-- | net/freeradius/distinfo | 4 | ||||
| -rw-r--r-- | net/freeradius/patches/patch-src_lib_udpfromto.c | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo index 6807a2e1f89..ac06f8cc709 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2017/09/09 22:46:57 joerg Exp $ +$NetBSD: distinfo,v 1.34 2018/03/31 20:10:49 joerg Exp $ SHA1 (freeradius-server-3.0.15.tar.bz2) = f651142a31b514fc80d888fe8ab5040cbfdd546e RMD160 (freeradius-server-3.0.15.tar.bz2) = 46d2d491b71516c6db7659e46e1ec44c7fbf9d1f @@ -11,4 +11,4 @@ SHA1 (patch-main_util.c) = b9cefdb9bc30df0906184e8c0bb883e5258767c3 SHA1 (patch-rlm_krb5_configure) = e97f0efe85c449d3b8a9aa450b6b7d1d0e4c6b89 SHA1 (patch-rlm_perl_configure) = 577d6f0df7322ee12a99aafcdcc2d0b40e89eb69 SHA1 (patch-rlm_yubikey_configure) = ea62cc0e87da014befbd0ad79f68dc852dc0f254 -SHA1 (patch-src_lib_udpfromto.c) = 28322d32ed95c40b59d26072261ea29f5cd2e4da +SHA1 (patch-src_lib_udpfromto.c) = c8fce29e2b481820f1cc2196577f7d38bb549e1c diff --git a/net/freeradius/patches/patch-src_lib_udpfromto.c b/net/freeradius/patches/patch-src_lib_udpfromto.c index a793b0e22bc..28220060978 100644 --- a/net/freeradius/patches/patch-src_lib_udpfromto.c +++ b/net/freeradius/patches/patch-src_lib_udpfromto.c @@ -1,9 +1,9 @@ -$NetBSD: patch-src_lib_udpfromto.c,v 1.1 2017/09/09 22:46:57 joerg Exp $ +$NetBSD: patch-src_lib_udpfromto.c,v 1.2 2018/03/31 20:10:49 joerg Exp $ Only use IP_PKTINFO if the configure checks for the necessary members -passed. +passed. Use either IP_PKTINFO or IP_SENDSRCADDR, but not both. ---- src/lib/udpfromto.c.orig 2017-09-09 18:10:18.070426265 +0000 +--- src/lib/udpfromto.c.orig 2017-07-17 12:43:00.000000000 +0000 +++ src/lib/udpfromto.c @@ -386,11 +386,11 @@ int sendfromto(int s, void *buf, size_t msgh.msg_name = to; @@ -19,3 +19,14 @@ passed. struct cmsghdr *cmsg; struct in_pktinfo *pkt; +@@ -405,9 +405,7 @@ int sendfromto(int s, void *buf, size_t + pkt = (struct in_pktinfo *) CMSG_DATA(cmsg); + memset(pkt, 0, sizeof(*pkt)); + pkt->ipi_spec_dst = s4->sin_addr; +-# endif +- +-# ifdef IP_SENDSRCADDR ++# elif defined(IP_SENDSRCADDR) + struct cmsghdr *cmsg; + struct in_addr *in; + |