Received: by mail.netbsd.org (Postfix, from userid 605) id 17CE284D52; Sat, 31 Mar 2018 20:10:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1D2EF84D51 for ; Sat, 31 Mar 2018 20:10:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 847_GPd8k38Y for ; Sat, 31 Mar 2018 20:10:49 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 65DA184D40 for ; Sat, 31 Mar 2018 20:10:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 62C00FBEC; Sat, 31 Mar 2018 20:10:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152252704946130" MIME-Version: 1.0 Date: Sat, 31 Mar 2018 20:10:49 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/net/freeradius To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20180331201049.62C00FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_152252704946130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sat Mar 31 20:10:49 UTC 2018 Modified Files: pkgsrc/net/freeradius: distinfo pkgsrc/net/freeradius/patches: patch-src_lib_udpfromto.c Log Message: Fix build on NetBSD/current. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/freeradius/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152252704946130 Content-Disposition: inline Content-Length: 2325 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/freeradius/distinfo diff -u pkgsrc/net/freeradius/distinfo:1.33 pkgsrc/net/freeradius/distinfo:1.34 --- pkgsrc/net/freeradius/distinfo:1.33 Sat Sep 9 22:46:57 2017 +++ pkgsrc/net/freeradius/distinfo Sat Mar 31 20:10:49 2018 @@ -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) = b9cefdb9bc30d 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 Index: pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c diff -u pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c:1.1 pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c:1.2 --- pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c:1.1 Sat Sep 9 22:46:57 2017 +++ pkgsrc/net/freeradius/patches/patch-src_lib_udpfromto.c Sat Mar 31 20:10:49 2018 @@ -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; + --_----------=_152252704946130--