svn commit: r519022 - in head/net: ntp ntp-devel ntp-devel/files ntp/files

Cy Schubert cy at FreeBSD.org
Wed Dec 4 15:24:04 UTC 2019 

Author: cy
Date: Wed Dec  4 15:24:02 2019
New Revision: 519022
URL: https://svnweb.freebsd.org/changeset/ports/519022

Log:
  Chase r512433, (also chasing src r355388) document that rlimit memlock
  is disabled by default.

Modified:
  head/net/ntp-devel/Makefile   (contents, props changed)
  head/net/ntp-devel/files/patch-ntpd__ntp.conf.5man   (contents, props changed)
  head/net/ntp-devel/files/patch-ntpd__ntp.conf.html   (contents, props changed)
  head/net/ntp/Makefile   (contents, props changed)
  head/net/ntp/files/patch-ntpd__ntp.conf.5man   (contents, props changed)
  head/net/ntp/files/patch-ntpd__ntp.conf.html   (contents, props changed)

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Wed Dec  4 15:21:49 2019	(r519021)
+++ head/net/ntp-devel/Makefile	Wed Dec  4 15:24:02 2019	(r519022)
@@ -3,7 +3,7 @@
 
 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/

Modified: head/net/ntp-devel/files/patch-ntpd__ntp.conf.5man
==============================================================================
--- head/net/ntp-devel/files/patch-ntpd__ntp.conf.5man	Wed Dec  4 15:21:49 2019	(r519021)
+++ head/net/ntp-devel/files/patch-ntpd__ntp.conf.5man	Wed Dec  4 15:24:02 2019	(r519022)
@@ -1,18 +1,21 @@
---- 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
@@ -21,4 +24,13 @@
 +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

Modified: head/net/ntp-devel/files/patch-ntpd__ntp.conf.html
==============================================================================
--- head/net/ntp-devel/files/patch-ntpd__ntp.conf.html	Wed Dec  4 15:21:49 2019	(r519021)
+++ head/net/ntp-devel/files/patch-ntpd__ntp.conf.html	Wed Dec  4 15:24:02 2019	(r519022)
@@ -1,5 +1,5 @@
---- 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 @@
  <dt><code>pool</code></dt>
  <dd><p>For type s addresses, this command mobilizes a persistent
@@ -8,4 +8,13 @@
 +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.
+ </p></dd>
+@@ -3094,7 +3094,7 @@
+ when dropping root (the
+ <code>-i</code>
+ 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".
  </p></dd>

Modified: head/net/ntp/Makefile
==============================================================================
--- head/net/ntp/Makefile	Wed Dec  4 15:21:49 2019	(r519021)
+++ head/net/ntp/Makefile	Wed Dec  4 15:24:02 2019	(r519022)
@@ -3,7 +3,7 @@
 
 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/ \

Modified: head/net/ntp/files/patch-ntpd__ntp.conf.5man
==============================================================================
--- head/net/ntp/files/patch-ntpd__ntp.conf.5man	Wed Dec  4 15:21:49 2019	(r519021)
+++ head/net/ntp/files/patch-ntpd__ntp.conf.5man	Wed Dec  4 15:24:02 2019	(r519022)
@@ -1,18 +1,21 @@
---- 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
@@ -21,4 +24,13 @@
 +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

Modified: head/net/ntp/files/patch-ntpd__ntp.conf.html
==============================================================================
--- head/net/ntp/files/patch-ntpd__ntp.conf.html	Wed Dec  4 15:21:49 2019	(r519021)
+++ head/net/ntp/files/patch-ntpd__ntp.conf.html	Wed Dec  4 15:24:02 2019	(r519022)
@@ -1,5 +1,5 @@
 --- 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 @@
  <dt><code>pool</code></dt>
  <dd><p>For type s addresses, this command mobilizes a persistent
@@ -8,4 +8,13 @@
 +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.
+ </p></dd>
+@@ -3094,7 +3094,7 @@
+ when dropping root (the
+ <code>-i</code>
+ 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".
  </p></dd>

More information about the svn-ports-head mailing list