Index: head/net/ntp/Makefile =================================================================== --- head/net/ntp/Makefile (revision 519021) +++ head/net/ntp/Makefile (revision 519022) @@ -1,93 +1,93 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.2.8p13 -PORTREVISION= 5 +PORTREVISION= 6 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/files/patch-ntpd__ntp.conf.5man =================================================================== --- head/net/ntp/files/patch-ntpd__ntp.conf.5man (revision 519021) +++ head/net/ntp/files/patch-ntpd__ntp.conf.5man (revision 519022) @@ -1,24 +1,36 @@ ---- ntpd/ntp.conf.5man.orig 2016-11-21 05:01:41.000000000 -0800 -+++ ntpd/ntp.conf.5man 2017-03-07 22:50:54.163145000 -0800 -@@ -22,12 +22,6 @@ +--- ntpd/ntp.conf.5man.orig 2019-02-20 09:56:43.000000000 -0800 ++++ ntpd/ntp.conf.5man 2019-12-04 07:09:33.457314000 -0800 +@@ -22,15 +22,9 @@ \- Network Time Protocol (NTP) daemon configuration file format .SH SYNOPSIS \f\*[B-Font]ntp.conf\fP -[\f\*[B-Font]\-\-option-name\f[]] -[\f\*[B-Font]\-\-option-name\f[] \f\*[I-Font]value\f[]] --.sp \n(Ppu --.ne 2 -- --All arguments must be options. .sp \n(Ppu .ne 2 +-All arguments must be options. +-.sp \n(Ppu +-.ne 2 +- + .SH DESCRIPTION + The + \f\*[B-Font]ntp.conf\fP @@ -190,7 +184,7 @@ .NOP \f\*[B-Font]pool\f[] 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. + .TP 7 +@@ -3110,7 +3104,7 @@ + when dropping root (the + \f\*[B-Font]\-i\f[] + option). +-The default is 32 megabytes on non-Linux machines, and \-1 under Linux. ++The default is \-1. + -1 means "do not lock the process into memory". + 0 means "lock whatever memory the process wants into memory". .TP 7 Index: head/net/ntp/files/patch-ntpd__ntp.conf.html =================================================================== --- head/net/ntp/files/patch-ntpd__ntp.conf.html (revision 519021) +++ head/net/ntp/files/patch-ntpd__ntp.conf.html (revision 519022) @@ -1,11 +1,20 @@ --- ntpd/ntp.conf.html.orig 2019-02-20 09:56:39.000000000 -0800 -+++ ntpd/ntp.conf.html 2019-02-21 19:04:30.444506000 -0800 ++++ ntpd/ntp.conf.html 2019-12-04 07:10:45.833804000 -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 @@ + when dropping root (the + -i + option). +-The default is 32 megabytes on non-Linux machines, and -1 under Linux. ++The default -1. + -1 means "do not lock the process into memory". + 0 means "lock whatever memory the process wants into memory".

Index: head/net/ntp-devel/Makefile =================================================================== --- head/net/ntp-devel/Makefile (revision 519021) +++ head/net/ntp-devel/Makefile (revision 519022) @@ -1,92 +1,92 @@ # Created by: andreas # $FreeBSD$ PORTNAME= ntp PORTVERSION= 4.3.99 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ PKGNAMESUFFIX= -devel DISTNAME= ${PORTNAME}-dev-${PORTVERSION:S/P/p/:S/r/-RC/:S/b/-beta/} MAINTAINER= cy@FreeBSD.org COMMENT= The Network Time Protocol Distribution LIB_DEPENDS= libevent.so:devel/libevent CONFLICTS= ntp-[0-9].* openntpd-* USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ pkgconfig gettext-runtime USES+= autoreconf # until rlimit_memlock changes accepted upstream LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder 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 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_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-devel/files/patch-ntpd__ntp.conf.5man =================================================================== --- head/net/ntp-devel/files/patch-ntpd__ntp.conf.5man (revision 519021) +++ head/net/ntp-devel/files/patch-ntpd__ntp.conf.5man (revision 519022) @@ -1,24 +1,36 @@ ---- ntpd/ntp.conf.5man.orig 2016-06-02 06:41:03.000000000 -0700 -+++ ntpd/ntp.conf.5man 2017-03-07 22:54:39.255862000 -0800 -@@ -22,12 +22,6 @@ +--- ntpd/ntp.conf.5man.orig 2019-06-07 02:02:03.000000000 -0700 ++++ ntpd/ntp.conf.5man 2019-12-04 07:13:11.069497000 -0800 +@@ -22,15 +22,9 @@ \- Network Time Protocol (NTP) daemon configuration file format .SH SYNOPSIS \f\*[B-Font]ntp.conf\fP -[\f\*[B-Font]\-\-option-name\f[]] -[\f\*[B-Font]\-\-option-name\f[] \f\*[I-Font]value\f[]] --.sp \n(Ppu --.ne 2 -- --All arguments must be options. .sp \n(Ppu .ne 2 +-All arguments must be options. +-.sp \n(Ppu +-.ne 2 +- + .SH DESCRIPTION + The + \f\*[B-Font]ntp.conf\fP @@ -190,7 +184,7 @@ .NOP \f\*[B-Font]pool\f[] 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. + .TP 7 +@@ -3110,7 +3104,7 @@ + when dropping root (the + \f\*[B-Font]\-i\f[] + option). +-The default is 32 megabytes on non-Linux machines, and \-1 under Linux. ++The default is \-1. + -1 means "do not lock the process into memory". + 0 means "lock whatever memory the process wants into memory". .TP 7 Index: head/net/ntp-devel/files/patch-ntpd__ntp.conf.html =================================================================== --- head/net/ntp-devel/files/patch-ntpd__ntp.conf.html (revision 519021) +++ head/net/ntp-devel/files/patch-ntpd__ntp.conf.html (revision 519022) @@ -1,11 +1,20 @@ ---- ntpd/ntp.conf.html.orig 2019-02-20 09:56:39.000000000 -0800 -+++ ntpd/ntp.conf.html 2019-02-21 19:04:30.444506000 -0800 +--- ntpd/ntp.conf.html.orig 2019-06-07 02:01:58.000000000 -0700 ++++ ntpd/ntp.conf.html 2019-12-04 07:13:39.152812000 -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 @@ + when dropping root (the + -i + option). +-The default is 32 megabytes on non-Linux machines, and -1 under Linux. ++The default is -1. + -1 means "do not lock the process into memory". + 0 means "lock whatever memory the process wants into memory".