Date: Mon, 27 May 2024 03:54:06 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 9463faa7a38e - 2024Q2 - net/ntp: Update to 4.2.8p18 Message-ID: <202405270354.44R3s6Fk025024@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9463faa7a38e4c49cb1f41a0390252549c44c9a8 commit 9463faa7a38e4c49cb1f41a0390252549c44c9a8 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-05-10 15:28:19 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-05-27 03:53:48 +0000 net/ntp: Update to 4.2.8p18 (cherry picked from commit a6dbff875fc327a352562c5397b1c1d8fc79822a) --- net/ntp/Makefile | 3 +- net/ntp/distinfo | 6 +-- net/ntp/files/patch-ntpd_ntpd.c | 48 ---------------------- .../files/patch-scripts_build_checkHtmlFileDates | 17 ++++---- net/ntp/pkg-plist | 2 + 5 files changed, 15 insertions(+), 61 deletions(-) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index d23d48942465..dce7244f7f6d 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -1,6 +1,5 @@ PORTNAME= ntp -PORTVERSION= 4.2.8p17 -PORTREVISION= 2 +PORTVERSION= 4.2.8p18 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ diff --git a/net/ntp/distinfo b/net/ntp/distinfo index 4ff912b62a96..d892a22d8d76 100644 --- a/net/ntp/distinfo +++ b/net/ntp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686054066 -SHA256 (ntp-4.2.8p17.tar.gz) = 103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866 -SIZE (ntp-4.2.8p17.tar.gz) = 7120469 +TIMESTAMP = 1716733386 +SHA256 (ntp-4.2.8p18.tar.gz) = cf84c5f3fb1a295284942624d823fffa634144e096cfc4f9969ac98ef5f468e5 +SIZE (ntp-4.2.8p18.tar.gz) = 7210799 diff --git a/net/ntp/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c deleted file mode 100644 index 9cd041eccd42..000000000000 --- a/net/ntp/files/patch-ntpd_ntpd.c +++ /dev/null @@ -1,48 +0,0 @@ ---- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700 -+++ ntpd/ntpd.c 2022-02-18 12:02:30.547638000 -0800 -@@ -145,17 +145,6 @@ - # include <seccomp.h> - #endif /* LIBSECCOMP and KERN_SECCOMP */ - --#ifdef __FreeBSD__ --#include <sys/procctl.h> --#ifndef PROC_STACKGAP_CTL --/* -- * Even if we compile on an older system we can still run on a newer one. -- */ --#define PROC_STACKGAP_CTL 17 --#define PROC_STACKGAP_DISABLE 0x0002 --#endif --#endif -- - #ifdef HAVE_DNSREGISTRATION - # include <dns_sd.h> - DNSServiceRef mdns; -@@ -438,18 +427,6 @@ - char *argv[] - ) - { --# ifdef __FreeBSD__ -- { -- /* -- * We Must disable ASLR stack gap on FreeBSD to avoid a -- * segfault. See PR/241421 and PR/241960. -- */ -- int aslr_var = PROC_STACKGAP_DISABLE; -- -- pid_t my_pid = getpid(); -- procctl(P_PID, my_pid, PROC_STACKGAP_CTL, &aslr_var); -- } --# endif - return ntpdmain(argc, argv); - } - #endif /* !SYS_WINNT */ -@@ -1058,7 +1035,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 diff --git a/net/ntp/files/patch-scripts_build_checkHtmlFileDates b/net/ntp/files/patch-scripts_build_checkHtmlFileDates index cf9f4d541e8a..ae3c4e04e08e 100644 --- a/net/ntp/files/patch-scripts_build_checkHtmlFileDates +++ b/net/ntp/files/patch-scripts_build_checkHtmlFileDates @@ -1,14 +1,15 @@ ---- scripts/build/checkHtmlFileDates.orig 2021-10-15 20:33:38.712582000 -0700 -+++ scripts/build/checkHtmlFileDates 2021-10-15 20:37:19.867441000 -0700 -@@ -1,16 +1,3 @@ - #! /bin/sh +--- scripts/build/checkHtmlFileDates.orig 2024-05-10 08:05:57.221756000 -0700 ++++ scripts/build/checkHtmlFileDates 2024-05-10 08:07:53.965997000 -0700 +@@ -18,17 +18,5 @@ --bk version > /dev/null 2>&1 || exit 0 -- --for i in `find * -type f -name '*.html' -print | grep -v SCCS/` + # Do nothing if the directory is not a BK repo, + # or if BK is not even installed. +-bk status > /dev/null 2>&1 || exit 0 + +-for i in `echo *.html` -do - # echo $i -- set `bk diffs $i | wc -l` +- set `bk diff --normal $i | wc -l` - lines=$1 - case "$lines" in - 0) ;; diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist index 4ffe6ef6b5d7..01dab2b771b7 100644 --- a/net/ntp/pkg-plist +++ b/net/ntp/pkg-plist @@ -21,6 +21,7 @@ sbin/ntptime sbin/sntp sbin/update-leap %%PERL_UTILS%%share/ntp/lib/NTP/Util.pm +%%PORTDOCS%%%%DOCSDIR%%/.datecheck %%PORTDOCS%%%%DOCSDIR%%/access.html %%PORTDOCS%%%%DOCSDIR%%/accopt.html %%PORTDOCS%%%%DOCSDIR%%/assoc.html @@ -118,6 +119,7 @@ sbin/update-leap %%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html %%PORTDOCS%%%%DOCSDIR%%/history.html %%PORTDOCS%%%%DOCSDIR%%/howto.html +%%PORTDOCS%%%%DOCSDIR%%/html/.datecheck %%PORTDOCS%%%%DOCSDIR%%/html/access.html %%PORTDOCS%%%%DOCSDIR%%/html/accopt.html %%PORTDOCS%%%%DOCSDIR%%/html/assoc.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405270354.44R3s6Fk025024>