From nobody Mon Oct 18 17:14:51 2021 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 E8C03180D84A; Mon, 18 Oct 2021 17:14:51 +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 4HY3Qg43lMz4tM8; Mon, 18 Oct 2021 17:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6BFC324637; Mon, 18 Oct 2021 17:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19IHEpfm019687; Mon, 18 Oct 2021 17:14:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19IHEpMd019686; Mon, 18 Oct 2021 17:14:51 GMT (envelope-from git) Date: Mon, 18 Oct 2021 17:14:51 GMT Message-Id: <202110181714.19IHEpMd019686@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: f424bcafb8b7 - main - net/ntp: Use __FreeBSD_version < 1400038 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: f424bcafb8b772537c37d3bbeb0a97c7778cc21c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f424bcafb8b772537c37d3bbeb0a97c7778cc21c commit f424bcafb8b772537c37d3bbeb0a97c7778cc21c Author: Cy Schubert AuthorDate: 2021-10-18 16:43:40 +0000 Commit: Cy Schubert CommitDate: 2021-10-18 17:14:18 +0000 net/ntp: Use __FreeBSD_version < 1400038 __FreeBSD_version < 1400038 is more appropriate as it follows the commit to resolve setrlimit(2) segfaults. MFH: 2021Q4 --- net/ntp/Makefile | 2 +- net/ntp/files/patch-ntpd_ntpd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index abce03d92b90..a1c62f232060 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p15 -PORTREVISION= 2 +PORTREVISION= 3 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/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c index 458a799fbc14..39c7af05780b 100644 --- a/net/ntp/files/patch-ntpd_ntpd.c +++ b/net/ntp/files/patch-ntpd_ntpd.c @@ -5,7 +5,7 @@ #endif /* LIBSECCOMP and KERN_SECCOMP */ -#ifdef __FreeBSD__ -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1400037 ++#if defined(__FreeBSD_version) && __FreeBSD_version < 1400038 #include #ifndef PROC_STACKGAP_CTL /*