Index: head/net/ntp/Makefile =================================================================== --- head/net/ntp/Makefile (revision 436755) +++ head/net/ntp/Makefile (revision 436756) @@ -1,86 +1,85 @@ # Created by: andreas # $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/ \ ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/} MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution BUILD_DEPENDS= autogen:devel/autogen LIB_DEPENDS= libevent.so:devel/libevent \ libmd5.so:www/libwww CONFLICTS= ntp-devel-* USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ pkgconfig GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear TEST_TARGET= check SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ scripts/ntp-wait/ntp-wait.in \ scripts/update-leap/update-leap.in perl_OLD_CMD= @PATH_PERL@ .include "Makefile.inc" OPTIONS_DEFINE+= DEBUG NLS THREADS OPTIONS_DEFAULT+= THREADS OPTIONS_SUB= yes DEBUG_CONFIGURE_ENABLE= debugging IPV6_CONFIGURE_ENABLE= ipv6 NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_OFF= ac_cv_lib_intl_gettext=no NLS_USES= gettext-runtime NTP_SIGND_CONFIGURE_ENABLE= ntp-signd NTPSNMPD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd PERL_UTILS_USES= perl5 SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ --with-openssl-libdir=${OPENSSLLIB} SSL_CONFIGURE_OFF= --without-crypto SSL_USES= ssl SSL_BROKEN_OFF= Includes OpenSSL when deselected DEBUG_CONFIGURE_ON= --enable-debug THREADS_CONFIGURE_ENABLE= thread-support THREADS_CONFIGURE_WITH= threads .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_ON= --enable-${D} .endfor .include # XXX Temporary hack. Remember to remove this next commit. post-extract: @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .include Index: head/net/ntp/distinfo =================================================================== --- head/net/ntp/distinfo (revision 436755) +++ head/net/ntp/distinfo (revision 436756) @@ -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 Index: head/net/ntp/files/patch-libntp_libssl__compat.c =================================================================== --- head/net/ntp/files/patch-libntp_libssl__compat.c (revision 436755) +++ head/net/ntp/files/patch-libntp_libssl__compat.c (revision 436756) @@ -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" Index: head/net/ntp/files/patch-ntpd__refclock__mx4200.c =================================================================== --- head/net/ntp/files/patch-ntpd__refclock__mx4200.c (revision 436755) +++ head/net/ntp/files/patch-ntpd__refclock__mx4200.c (revision 436756) @@ -1,25 +1,28 @@ ---- 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... */ - mvprintf(fmt, ap); + vprintf(fmt, ap); 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)