diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2019-09-13 20:25:25 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2019-09-13 20:25:25 +0000 |
| commit | 7c01ec153b6edd2f90beccfcad3a4da7853e4474 (patch) | |
| tree | f60f40ad8ae92b074accf08df81797cb17d7b61b /net/ntp | |
| parent | f23446d16862fbb01728a1a4b6fb54812ad597fc (diff) | |
| download | ports-7c01ec153b6edd2f90beccfcad3a4da7853e4474.tar.gz ports-7c01ec153b6edd2f90beccfcad3a4da7853e4474.zip | |
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
Notes
Notes:
svn path=/head/; revision=511987
Diffstat (limited to 'net/ntp')
| -rw-r--r-- | net/ntp/Makefile | 5 | ||||
| -rw-r--r-- | net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/net/ntp/Makefile b/net/ntp/Makefile index a9a7b633ad61..fe585dedb587 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -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 diff --git a/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 b/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 new file mode 100644 index 000000000000..27d1711d0506 --- /dev/null +++ b/net/ntp/files/patch-sntp_m4_ntp__rlimit.m4 @@ -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 |