From owner-svn-ports-all@FreeBSD.ORG Mon Dec 22 06:41:31 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D63B84D; Mon, 22 Dec 2014 06:41:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F94B37AF; Mon, 22 Dec 2014 06:41:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBM6fVxX046002; Mon, 22 Dec 2014 06:41:31 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBM6fU98046000; Mon, 22 Dec 2014 06:41:30 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201412220641.sBM6fU98046000@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Mon, 22 Dec 2014 06:41:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375210 - in head/net/ntp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Dec 2014 06:41:31 -0000 Author: cy Date: Mon Dec 22 06:41:29 2014 New Revision: 375210 URL: https://svnweb.freebsd.org/changeset/ports/375210 QAT: https://qat.redports.org/buildarchive/r375210/ Log: Properly address IPV6 loopback check. Submitted by: jmg (via twitter) Added: head/net/ntp/files/patch-ntpd__ntp_io.c (contents, props changed) Deleted: head/net/ntp/files/patch-include__ntp_net.h Modified: head/net/ntp/Makefile Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Mon Dec 22 05:31:48 2014 (r375209) +++ head/net/ntp/Makefile Mon Dec 22 06:41:29 2014 (r375210) @@ -3,6 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \ http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \ @@ -47,10 +48,6 @@ CONFIGURE_ARGS+= --enable-${D} .endif .endfor -.if ${PORT_OPTIONS:MMX4200} -BROKEN= Fails to compile when MX4200 is enabled. -.endif - DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}4 # XXX Temporary hack. Remember to remove this next commit. Added: head/net/ntp/files/patch-ntpd__ntp_io.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-ntpd__ntp_io.c Mon Dec 22 06:41:29 2014 (r375210) @@ -0,0 +1,22 @@ +--- ntpd/ntp_io.c.orig 2014-12-19 03:56:55.000000000 -0800 ++++ ntpd/ntp_io.c 2014-12-21 22:36:02.977441698 -0800 +@@ -3454,15 +3454,15 @@ + if (AF_INET6 == itf->family) { + DPRINTF(1, ("Got an IPv6 packet, from <%s> (%d) to <%s> (%d)\n", + stoa(&rb->recv_srcadr), +- IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr), ++ IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr), + stoa(&itf->sin), +- !IN6_IS_ADDR_LOOPBACK(&itf->sin) ++ !IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr) + )); + } + + if ( AF_INET6 == itf->family +- && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr) +- && !IN6_IS_ADDR_LOOPBACK(&itf->sin) ++ && IN6_IS_ADDR_LOOPBACK(&rb->recv_srcadr.sa6.sin6_addr) ++ && !IN6_IS_ADDR_LOOPBACK(&itf->sin.sa6.sin6_addr) + ) { + packets_dropped++; + DPRINTF(1, ("DROPPING that packet\n"));