Date: Fri, 20 Sep 2019 19:39:18 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512433 - in head/net: ntp ntp-devel ntp-devel/files ntp/files Message-ID: <201909201939.x8KJdIRB043043@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Sep 20 19:39:17 2019 New Revision: 512433 URL: https://svnweb.freebsd.org/changeset/ports/512433 Log: 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 Added: head/net/ntp-devel/files/patch-ntpd_ntp.c (contents, props changed) head/net/ntp/files/patch-ntpd_ntp.c (contents, props changed) Modified: head/net/ntp-devel/Makefile (contents, props changed) head/net/ntp/Makefile (contents, props changed) Modified: head/net/ntp-devel/Makefile ============================================================================== --- head/net/ntp-devel/Makefile Fri Sep 20 19:39:07 2019 (r512432) +++ head/net/ntp-devel/Makefile Fri Sep 20 19:39:17 2019 (r512433) @@ -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/ Added: head/net/ntp-devel/files/patch-ntpd_ntp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp-devel/files/patch-ntpd_ntp.c Fri Sep 20 19:39:17 2019 (r512433) @@ -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 Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Fri Sep 20 19:39:07 2019 (r512432) +++ head/net/ntp/Makefile Fri Sep 20 19:39:17 2019 (r512433) @@ -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/ \ Added: head/net/ntp/files/patch-ntpd_ntp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-ntpd_ntp.c Fri Sep 20 19:39:17 2019 (r512433) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909201939.x8KJdIRB043043>