From owner-svn-ports-head@freebsd.org Thu Mar 23 05:52:00 2017 Return-Path: Delivered-To: svn-ports-head@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 BEDC0D1913F; Thu, 23 Mar 2017 05:52:00 +0000 (UTC) (envelope-from cy@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 96F04CCD; Thu, 23 Mar 2017 05:52:00 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2N5pxE0035408; Thu, 23 Mar 2017 05:51:59 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2N5pxRA035404; Thu, 23 Mar 2017 05:51:59 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201703230551.v2N5pxRA035404@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Thu, 23 Mar 2017 05:51:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436756 - 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Mar 2017 05:52:00 -0000 Author: cy Date: Thu Mar 23 05:51:59 2017 New Revision: 436756 URL: https://svnweb.freebsd.org/changeset/ports/436756 Log: Update 4.2.8p9 --> 4.2.8p10 Modified: head/net/ntp/Makefile head/net/ntp/distinfo head/net/ntp/files/patch-libntp_libssl__compat.c head/net/ntp/files/patch-ntpd__refclock__mx4200.c Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Thu Mar 23 05:47:42 2017 (r436755) +++ head/net/ntp/Makefile Thu Mar 23 05:51:59 2017 (r436756) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p9 -PORTREVISION= 4 +PORTVERSION= 4.2.8p10 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ \ Modified: head/net/ntp/distinfo ============================================================================== --- head/net/ntp/distinfo Thu Mar 23 05:47:42 2017 (r436755) +++ head/net/ntp/distinfo Thu Mar 23 05:51:59 2017 (r436756) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479794099 -SHA256 (ntp-4.2.8p9.tar.gz) = b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 -SIZE (ntp-4.2.8p9.tar.gz) = 7231884 +TIMESTAMP = 1490246780 +SHA256 (ntp-4.2.8p10.tar.gz) = ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f +SIZE (ntp-4.2.8p10.tar.gz) = 6998648 Modified: head/net/ntp/files/patch-libntp_libssl__compat.c ============================================================================== --- head/net/ntp/files/patch-libntp_libssl__compat.c Thu Mar 23 05:47:42 2017 (r436755) +++ head/net/ntp/files/patch-libntp_libssl__compat.c Thu Mar 23 05:51:59 2017 (r436756) @@ -1,11 +1,11 @@ ---- libntp/libssl_compat.c.orig 2016-11-21 12:28:40 UTC -+++ libntp/libssl_compat.c -@@ -23,7 +23,7 @@ - #include "ntp_types.h" +--- libntp/libssl_compat.c.orig 2017-02-01 01:47:13.000000000 -0800 ++++ libntp/libssl_compat.c 2017-03-22 22:29:56.409257000 -0700 +@@ -26,7 +26,7 @@ + /* ----------------------------------------------------------------- */ /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) +-#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L ++#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) /* ----------------------------------------------------------------- */ #include "libssl_compat.h" Modified: head/net/ntp/files/patch-ntpd__refclock__mx4200.c ============================================================================== --- head/net/ntp/files/patch-ntpd__refclock__mx4200.c Thu Mar 23 05:47:42 2017 (r436755) +++ head/net/ntp/files/patch-ntpd__refclock__mx4200.c Thu Mar 23 05:51:59 2017 (r436756) @@ -1,6 +1,6 @@ ---- ntpd/refclock_mx4200.c.orig 2014-12-19 11:56:52 UTC -+++ ntpd/refclock_mx4200.c -@@ -1572,7 +1572,7 @@ mx4200_debug(struct peer *peer, char *fm +--- ntpd/refclock_mx4200.c.orig 2017-03-21 06:04:19.000000000 -0700 ++++ ntpd/refclock_mx4200.c 2017-03-22 22:34:58.631582000 -0700 +@@ -1572,7 +1572,7 @@ * Print debug message to stdout * In the future, we may want to get get more creative... */ @@ -9,17 +9,20 @@ va_end(ap); } -@@ -1613,11 +1613,11 @@ mx4200_send(peer, fmt, va_alist) +@@ -1614,14 +1614,14 @@ + #else + va_start(ap); + #endif /* __STDC__ */ +- n = VSNPRINTF((cp, (size_t)(ep - cp), fmt, ap)); ++ n = vsnprintf(cp, (size_t)(ep - cp), fmt, ap); + va_end(ap); + if (n < 0 || (size_t)n >= (size_t)(ep - cp)) + goto overflow; - cp = buf; - *cp++ = '$'; -- n = VSNPRINTF((cp, sizeof(buf) - 1, fmt, ap)); -+ n = vsnprintf(cp, sizeof(buf) - 1, fmt, ap); ck = mx4200_cksum(cp, n); + cp += n; +- n = SNPRINTF((cp, (size_t)(ep - cp), "*%02X\r\n", ck)); ++ n = snprintf(cp, (size_t)(ep - cp), "*%02X\r\n", ck); + if (n < 0 || (size_t)n >= (size_t)(ep - cp)) + goto overflow; cp += n; - ++n; -- n += SNPRINTF((cp, sizeof(buf) - n - 5, "*%02X\r\n", ck)); -+ n += snprintf(cp, sizeof(buf) - n - 5, "*%02X\r\n", ck); - - m = write(pp->io.fd, buf, (unsigned)n); - if (m < 0)