Index: head/net/ntp/Makefile =================================================================== --- head/net/ntp/Makefile (revision 527799) +++ head/net/ntp/Makefile (revision 527800) @@ -1,93 +1,92 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp -PORTVERSION= 4.2.8p13 -PORTREVISION= 6 +PORTVERSION= 4.2.8p14 CATEGORIES= net 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 LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= ntp-devel-* openntpd-* USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ pkgconfig USES+= autoreconf # until rlimit_memlock changes accepted upstream GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-leap-smear --enable-trustedbsd-mac \ --with-locfile=freebsd --with-memlock=-1 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@ SUB_FILES= pkg-message .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 DEBUG_CONFIGURE_ON= --enable-debug THREADS_CONFIGURE_ENABLE= thread-support THREADS_CONFIGURE_WITH= threads MD5_LIB_DEPENDS= libmd5.so:www/libwww MD5_IMPLIES= SSL .for D in ${NTP_DRIVERS} ${D}_CONFIGURE_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-configure: @${ECHO_CMD} '#define HAVE_CLOSEFROM 1' >> ${WRKSRC}/config.h 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 527799) +++ head/net/ntp/distinfo (revision 527800) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550804538 -SHA256 (ntp-4.2.8p13.tar.gz) = 288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38 -SIZE (ntp-4.2.8p13.tar.gz) = 6949363 +TIMESTAMP = 1583329796 +SHA256 (ntp-4.2.8p14.tar.gz) = 1960e4f081f6aafd108d721bc3ab15f9e8dfd08dc08339aa95bca9d2545e4eb7 +SIZE (ntp-4.2.8p14.tar.gz) = 7007263 Index: head/net/ntp/files/patch-ntpd_ntpd.c =================================================================== --- head/net/ntp/files/patch-ntpd_ntpd.c (revision 527799) +++ head/net/ntp/files/patch-ntpd_ntpd.c (nonexistent) @@ -1,48 +0,0 @@ ---- ntpd/ntpd.c.orig 2019-02-20 09:21:44.000000000 -0800 -+++ ntpd/ntpd.c 2019-11-15 08:03:34.800596000 -0800 -@@ -138,6 +138,17 @@ - # include - #endif /* LIBSECCOMP and KERN_SECCOMP */ - -+#ifdef __FreeBSD__ -+#include -+#ifndef PROC_STACKGAP_CTL -+/* -+ * Even if we compile on an older system we can still run on a newer one. -+ */ -+#define PROC_STACKGAP_CTL 17 -+#define PROC_STACKGAP_DISABLE 0x0002 -+#endif -+#endif -+ - #ifdef HAVE_DNSREGISTRATION - # include - DNSServiceRef mdns; -@@ -402,6 +413,18 @@ - char *argv[] - ) - { -+#ifdef __FreeBSD__ -+ { -+ /* -+ * We Must disable ASLR stack gap on FreeBSD to avoid a -+ * segfault. See PR/241421 and PR/241960. -+ */ -+ int aslr_var = PROC_STACKGAP_DISABLE; -+ -+ pid_t my_pid = getpid(); -+ procctl(P_PID, my_pid, PROC_STACKGAP_CTL, &aslr_var); -+ } -+#endif - return ntpdmain(argc, argv); - } - #endif /* !SYS_WINNT */ -@@ -999,7 +1022,7 @@ - # if defined(HAVE_MLOCKALL) - # ifdef HAVE_SETRLIMIT - ntp_rlimit(RLIMIT_STACK, DFLT_RLIMIT_STACK * 4096, 4096, "4k"); --# ifdef RLIMIT_MEMLOCK -+# if defined(RLIMIT_MEMLOCK) && defined(DFLT_RLIMIT_MEMLOCK) && DFLT_RLIMIT_MEMLOCK != -1 - /* - * The default RLIMIT_MEMLOCK is very low on Linux systems. - * Unless we increase this limit malloc calls are likely to Property changes on: head/net/ntp/files/patch-ntpd_ntpd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ntp/files/patch-include_libssl__compat.h =================================================================== --- head/net/ntp/files/patch-include_libssl__compat.h (revision 527799) +++ head/net/ntp/files/patch-include_libssl__compat.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/libssl_compat.h.orig 2016-11-21 12:28:40 UTC -+++ include/libssl_compat.h -@@ -25,7 +25,7 @@ - #include "openssl/rsa.h" - - /* ----------------------------------------------------------------- */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - /* ----------------------------------------------------------------- */ - - # include Property changes on: head/net/ntp/files/patch-include_libssl__compat.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/ntp/files/patch-ntpd__ntp.conf.html =================================================================== --- head/net/ntp/files/patch-ntpd__ntp.conf.html (revision 527799) +++ head/net/ntp/files/patch-ntpd__ntp.conf.html (revision 527800) @@ -1,20 +1,20 @@ ---- ntpd/ntp.conf.html.orig 2019-02-20 09:56:39.000000000 -0800 -+++ ntpd/ntp.conf.html 2019-12-04 07:10:45.833804000 -0800 +--- ntpd/ntp.conf.html.orig 2020-03-03 17:40:59.000000000 -0800 ++++ ntpd/ntp.conf.html 2020-03-04 06:05:59.693497000 -0800 @@ -280,7 +280,7 @@
pool

For type s addresses, this command mobilizes a persistent client mode association with a number of remote servers. -In this mode the local clock can synchronized to the +In this mode the local clock can be synchronized to the remote server, but the remote server can never be synchronized to the local clock.

-@@ -3094,7 +3094,7 @@ +@@ -3120,7 +3120,7 @@ when dropping root (the -i option). -The default is 32 megabytes on non-Linux machines, and -1 under Linux. -+The default -1. ++The default is -1. -1 means "do not lock the process into memory". 0 means "lock whatever memory the process wants into memory".