Date: Fri, 13 Sep 2019 20:25:25 +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: r511987 - in head/net: ntp ntp-devel ntp-devel/files ntp/files Message-ID: <201909132025.x8DKPPL6030753@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Sep 13 20:25:25 2019 New Revision: 511987 URL: https://svnweb.freebsd.org/changeset/ports/511987 Log: Sync with base r352304, no longer locking ntpd in memory. Users who wish to restore historic BSD behaviour can add the following to ntp.conf: rlimit memlock 32 Discussed on: freebsd-current@ between Sept 6-9, 2019 Mentioned in Differential Revision: https://reviews.freebsd.org/D21581 Added: head/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 (contents, props changed) head/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 (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 13 20:25:02 2019 (r511986) +++ head/net/ntp-devel/Makefile Fri Sep 13 20:25:25 2019 (r511987) @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.3.99 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ http://archive.ntp.org/ntp4/ntp-dev/ @@ -19,12 +19,14 @@ 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-locfile=freebsd --with-memlock=-1 TEST_TARGET= check Added: head/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp-devel/files/patch-sntp_m4_ntp__rlimit.m4 Fri Sep 13 20:25:25 2019 (r511987) @@ -0,0 +1,11 @@ +--- sntp/m4/ntp_rlimit.m4.orig 2015-09-23 04:49:10.000000000 -0700 ++++ sntp/m4/ntp_rlimit.m4 2019-09-11 20:36:17.291424000 -0700 +@@ -112,7 +112,7 @@ + yes | no) + ans=$ntp_dflt_rlimit_memlock + ;; +- [[1-9]][[0-9]]*) ;; ++ [[1-9]][[0-9]]*|-1) ;; + *) AC_MSG_ERROR(["--with-memlock requires an integer argument."]) + ;; + esac Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Fri Sep 13 20:25:02 2019 (r511986) +++ head/net/ntp/Makefile Fri Sep 13 20:25:25 2019 (r511987) @@ -3,7 +3,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p13 -PORTREVISION= 1 +PORTREVISION= 2 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/ \ @@ -19,10 +19,11 @@ 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-locfile=freebsd --with-memlock=-1 TEST_TARGET= check Added: head/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 Fri Sep 13 20:25:25 2019 (r511987) @@ -0,0 +1,11 @@ +--- sntp/m4/ntp_rlimit.m4.orig 2015-09-23 04:49:10.000000000 -0700 ++++ sntp/m4/ntp_rlimit.m4 2019-09-11 20:36:17.291424000 -0700 +@@ -112,7 +112,7 @@ + yes | no) + ans=$ntp_dflt_rlimit_memlock + ;; +- [[1-9]][[0-9]]*) ;; ++ [[1-9]][[0-9]]*|-1) ;; + *) AC_MSG_ERROR(["--with-memlock requires an integer argument."]) + ;; + esac
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909132025.x8DKPPL6030753>