From owner-svn-ports-all@freebsd.org Tue Jun 7 18:44:20 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 30D37B6E742; Tue, 7 Jun 2016 18:44:20 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D677111DA; Tue, 7 Jun 2016 18:44:19 +0000 (UTC) (envelope-from naddy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u57IiJtc003236; Tue, 7 Jun 2016 18:44:19 GMT (envelope-from naddy@FreeBSD.org) Received: (from naddy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u57IiIPg003229; Tue, 7 Jun 2016 18:44:18 GMT (envelope-from naddy@FreeBSD.org) Message-Id: <201606071844.u57IiIPg003229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: naddy set sender to naddy@FreeBSD.org using -f From: Christian Weisgerber Date: Tue, 7 Jun 2016 18:44:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416520 - in head/net/openntpd: . 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.22 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: Tue, 07 Jun 2016 18:44:20 -0000 Author: naddy Date: Tue Jun 7 18:44:18 2016 New Revision: 416520 URL: https://svnweb.freebsd.org/changeset/ports/416520 Log: Update to 6.0p1. Notable fixes: * Set MOD_MAXERROR to avoid unsynced time status when using ntp_adjtime. * Hardened TLS for ntpd constraints, enabling server name verification. PR: 210056 Deleted: head/net/openntpd/files/patch-include_signal.h head/net/openntpd/files/patch-src_constraint.c Modified: head/net/openntpd/Makefile head/net/openntpd/distinfo head/net/openntpd/files/patch-src_ntpd.8 head/net/openntpd/files/patch-src_ntpd.conf.5 head/net/openntpd/files/patch-src_server.c Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Tue Jun 7 18:29:50 2016 (r416519) +++ head/net/openntpd/Makefile Tue Jun 7 18:44:18 2016 (r416520) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= openntpd -PORTVERSION= 5.9p1 -PORTREVISION= 1 +PORTVERSION= 6.0p1 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD Modified: head/net/openntpd/distinfo ============================================================================== --- head/net/openntpd/distinfo Tue Jun 7 18:29:50 2016 (r416519) +++ head/net/openntpd/distinfo Tue Jun 7 18:44:18 2016 (r416520) @@ -1,2 +1,3 @@ -SHA256 (openntpd-5.9p1.tar.gz) = 200c04056d4d6441653cac71d515611f3903aa7b15b8f5661a40dab3fb3697b3 -SIZE (openntpd-5.9p1.tar.gz) = 432844 +TIMESTAMP = 1465311084 +SHA256 (openntpd-6.0p1.tar.gz) = b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 +SIZE (openntpd-6.0p1.tar.gz) = 432696 Modified: head/net/openntpd/files/patch-src_ntpd.8 ============================================================================== --- head/net/openntpd/files/patch-src_ntpd.8 Tue Jun 7 18:29:50 2016 (r416519) +++ head/net/openntpd/files/patch-src_ntpd.8 Tue Jun 7 18:44:18 2016 (r416520) @@ -1,4 +1,4 @@ ---- src/ntpd.8.orig 2016-03-28 13:51:51 UTC +--- src/ntpd.8.orig 2016-05-30 22:50:02 UTC +++ src/ntpd.8 @@ -56,7 +56,7 @@ Use .Ar file Modified: head/net/openntpd/files/patch-src_ntpd.conf.5 ============================================================================== --- head/net/openntpd/files/patch-src_ntpd.conf.5 Tue Jun 7 18:29:50 2016 (r416519) +++ head/net/openntpd/files/patch-src_ntpd.conf.5 Tue Jun 7 18:44:18 2016 (r416520) @@ -1,4 +1,4 @@ ---- src/ntpd.conf.5.orig 2016-03-28 13:51:51 UTC +--- src/ntpd.conf.5.orig 2016-05-30 22:50:02 UTC +++ src/ntpd.conf.5 @@ -218,8 +218,8 @@ constraints from "https://www.google.com .Ed Modified: head/net/openntpd/files/patch-src_server.c ============================================================================== --- head/net/openntpd/files/patch-src_server.c Tue Jun 7 18:29:50 2016 (r416519) +++ head/net/openntpd/files/patch-src_server.c Tue Jun 7 18:44:18 2016 (r416520) @@ -1,23 +1,28 @@ ---- src/server.c.orig 2016-03-28 13:51:51 UTC +--- src/server.c.orig 2016-05-30 22:50:02 UTC +++ src/server.c -@@ -36,14 +36,14 @@ setup_listeners(struct servent *se, stru +@@ -35,8 +35,8 @@ setup_listeners(struct servent *se, stru + struct listen_addr *la, *nla, *lap; struct ifaddrs *ifa, *ifap; struct sockaddr *sa; - #ifdef SO_RTABLE +-#ifdef SO_RTABLE - struct if_data *ifd; ++#ifdef SO_SETFIB + struct ifreq ifr; #endif u_int8_t *a6; size_t sa6len = sizeof(struct in6_addr); - u_int new_cnt = 0; - int tos = IPTOS_LOWDELAY; - #ifdef SO_RTABLE +@@ -45,8 +45,8 @@ setup_listeners(struct servent *se, stru + #ifdef IPV6_V6ONLY + int on = 1; + #endif +-#ifdef SO_RTABLE - int rdomain = 0; ++#ifdef SO_SETFIB + int rdomain, fd; #endif TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) { -@@ -56,16 +56,21 @@ setup_listeners(struct servent *se, stru +@@ -59,16 +59,20 @@ setup_listeners(struct servent *se, stru sa = ifap->ifa_addr; if (sa == NULL || SA_LEN(sa) == 0) continue; @@ -30,18 +35,42 @@ if (sa->sa_family != AF_INET && sa->sa_family != AF_INET6) continue; - #ifdef SO_RTABLE +-#ifdef SO_RTABLE ++#ifdef SO_SETFIB + strlcpy(ifr.ifr_name, ifap->ifa_name, + sizeof(ifr.ifr_name)); + + fd = socket(AF_INET, SOCK_DGRAM, 0); -+ if (ioctl(fd, SIOCGIFRDOMAIN, -+ (caddr_t)&ifr) == -1) ++ if (ioctl(fd, SIOCGIFFIB, (caddr_t)&ifr) == -1) + rdomain = 0; + else -+ rdomain = ifr.ifr_rdomainid; ++ rdomain = ifr.ifr_fib; + close(fd); + if (lap->rtable != -1 && rdomain != lap->rtable) continue; #endif +@@ -90,7 +94,7 @@ setup_listeners(struct servent *se, stru + fatal("setup_listeners calloc"); + + memcpy(&la->sa, sa, SA_LEN(sa)); +-#ifdef SO_RTABLE ++#ifdef SO_SETFIB + la->rtable = rdomain; + #endif + +@@ -143,11 +147,11 @@ setup_listeners(struct servent *se, stru + log_warn("setsockopt IPV6_V6ONLY"); + #endif + +-#ifdef SO_RTABLE ++#ifdef SO_SETFIB + if (la->rtable != -1 && +- setsockopt(la->fd, SOL_SOCKET, SO_RTABLE, &la->rtable, ++ setsockopt(la->fd, SOL_SOCKET, SO_SETFIB, &la->rtable, + sizeof(la->rtable)) == -1) +- fatal("setup_listeners setsockopt SO_RTABLE"); ++ fatal("setup_listeners setsockopt SO_SETFIB"); + #endif + + if (bind(la->fd, (struct sockaddr *)&la->sa,