1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-22 04:17:44 +00:00

Chase r512433, (also chasing src r355388) document that rlimit memlock

is disabled by default.
This commit is contained in:
Cy Schubert 2019-12-04 15:24:02 +00:00
parent 6a5ac4b0e4
commit 0b6ae44462
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=519022
6 changed files with 61 additions and 19 deletions

View File

@ -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/

View File

@ -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
@ -22,3 +25,12 @@
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

View File

@ -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
@ -9,3 +9,12 @@
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 &quot;do not lock the process into memory&quot;.
0 means &quot;lock whatever memory the process wants into memory&quot;.
</p></dd>

View File

@ -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/ \

View File

@ -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
@ -22,3 +25,12 @@
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

View File

@ -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
@ -9,3 +9,12 @@
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 &quot;do not lock the process into memory&quot;.
0 means &quot;lock whatever memory the process wants into memory&quot;.
</p></dd>