Date: Mon, 22 Dec 2014 06:41:30 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375210 - in head/net/ntp: . files Message-ID: <201412220641.sBM6fU98046000@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412220641.sBM6fU98046000>