Chase src r352540:

Follow up on ports r511987 (base r352304) which disabled default
mlockall() at startup. Unfortunately though the original tarball
supports this in ./configure (for Linux), to fully support disabling
of mlockall() by default requires a little extra help otherwise the
following is logged in syslog:

        Cannot set RLIMIT_MEMLOCK: Operation not permitted
This commit is contained in:
Cy Schubert 2019-09-20 19:39:17 +00:00
parent 762f607c21
commit 561d1f9f76
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=512433
4 changed files with 24 additions and 2 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= ntp
PORTVERSION= 4.3.99
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= net ipv6
MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
http://archive.ntp.org/ntp4/ntp-dev/

View File

@ -0,0 +1,11 @@
--- ntpd/ntpd.c.orig 2019-06-07 01:59:15.000000000 -0700
+++ ntpd/ntpd.c 2019-09-20 12:13:28.810552000 -0700
@@ -999,7 +999,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

View File

@ -3,7 +3,7 @@
PORTNAME= ntp
PORTVERSION= 4.2.8p13
PORTREVISION= 3
PORTREVISION= 4
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/ \

View File

@ -0,0 +1,11 @@
--- ntpd/ntpd.c.orig 2019-02-20 09:21:44.000000000 -0800
+++ ntpd/ntpd.c 2019-09-20 12:11:54.469651000 -0700
@@ -999,7 +999,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