From nobody Mon May 27 03:54:06 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VnhbL3S7dz5LJcG; Mon, 27 May 2024 03:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VnhbL2bqSz43vH; Mon, 27 May 2024 03:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716782046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B+o6A+L0dWcjSOWE5gWBMa4YAfMDkKCgVWvvPml3F8c=; b=ohR6Wn6i/jVhdKFpeLv9KXK7C+o9eOHb0J9rt02BLJxjL8A/UPh++riYaDLdczdklGly6q empW8ZEefvhxl9ILmZBNlHZHdE1TXBAF/H5RGCsTCWAlKibUb74MowCMk6pkz7j7xT1Kcd fOxndL7waODT93XY/Q5IcOOIZMOAg81jaDJ4qvcx1/YSis1/2KBwnZxBGWsyigmSZHucYv Y15Ct362ucBepSZJAI4SSX6i1KrYvg7ejiwpqFRgc+zhEEsnD0O+3SfZzhbVvt1YPpLohO /mOwgtO6632YbQynoD62cpfP1K7NCf+Cotw7lDx2xYWVMOAkDeOUS1ZqhmCZBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716782046; a=rsa-sha256; cv=none; b=rgX6OtnBX4axi8j6KxGe/XPWcnLkqJuqy5qWLIzEtMNas5ph7Yvd4OJCG8cW9bn4K5nZr0 MuHWrsklNuHUzVC/1BuKkf8xruMJ9JqGi3+F0b2c9OdcYbJ/wl0t+fySWv3tc+Mu4QXoB4 kqRh/R+wxZpMbbYijyT2WDpr2tYjphVBCkupHrdc+LSHFlU9lKz0WmUiSmSTVD0+IvRZOM I4kM+9XjaAkNmR2veGYQ0D27+ZViY576ipjFtTAI2UV1v0o8GCpC12+7MGy8AcQucl+/gV 0RazbW0wXUdplKOwSt3A0Xzt8RzYPANgY1QLjOWC0NshpFwmaePCAz9KxO8SOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716782046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B+o6A+L0dWcjSOWE5gWBMa4YAfMDkKCgVWvvPml3F8c=; b=VDjwrqfJvjNzRfH6CEuJ2wC0EMSHK6ZPRJHeHwo50MGyUFXR19ijAuFy6mkxQubfWPJRaV J6qf1lFPsuC2qOSQ/frieb37Mvmp4spsUS4wkG69Hs1qjU3uTEuF13XdvJy+9/qOoxWTSL Od4FipPdUwpY8pNHO8I9MAJBtjdOo/gsG3uglleNOr8klPwraM2tPYyDwkpZy/OCFD2PMN 1lXAq59tLDWSWs8c/gV+rPQZAwKRQCz7BtUxmjD/roHm+0DJgGKgmLtMdO954YRHauU03p Iuq8gy32VB8fiUbNHFFgcA8RPiW3DLTYRHY7N8rpJVHKhVjKiqfNOaIcKXWuEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VnhbL22fzzStr; Mon, 27 May 2024 03:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44R3s6Yv025027; Mon, 27 May 2024 03:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44R3s6Fk025024; Mon, 27 May 2024 03:54:06 GMT (envelope-from git) Date: Mon, 27 May 2024 03:54:06 GMT Message-Id: <202405270354.44R3s6Fk025024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 9463faa7a38e - 2024Q2 - net/ntp: Update to 4.2.8p18 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q2 X-Git-Reftype: branch X-Git-Commit: 9463faa7a38e4c49cb1f41a0390252549c44c9a8 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=9463faa7a38e4c49cb1f41a0390252549c44c9a8 commit 9463faa7a38e4c49cb1f41a0390252549c44c9a8 Author: Cy Schubert AuthorDate: 2024-05-10 15:28:19 +0000 Commit: Cy Schubert 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 - #endif /* LIBSECCOMP and KERN_SECCOMP */ - --#ifdef __FreeBSD__ --#include --#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 - 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