From nobody Wed Jan 26 22:33:14 2022 X-Original-To: dev-commits-ports-branches@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 1346A197B1FA; Wed, 26 Jan 2022 22:33:15 +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 4Jkdlt6Hxjz3Bsg; Wed, 26 Jan 2022 22:33:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643236394; 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=huy3VHFbad8RVr8znb09W1Vo/EBmG+d7FYwZShcNR78=; b=t5P3TtByQuSB4jXdQmIVoW/6kPfALkkCzci3mkY7FMxiS6xPRZotwrdChH3y81buH/nZHb MT2JyKWzb+lYocNb/0bPl05+ekLB9Vhi/DA994tUSEeNlNBPBRs91A2UQuw7VUPZ0ys3+U xYQ8YCN8O8c5nriJncRuRrZEf5y8T7i3k9Gz0zNRcbOYHjj2Flg7glXC0r70CW+GOPxAZY 7AHwjx4R5weYC268xhUX5aa48CR6aF1pvBArg/RQrdReQZLhn3FDFFtd1Uq4YIQhlteFs6 31AiSqJ2N+sEAhC045nsrpeJA1pp6bznXxYetAsGJeagMvJlSMMvncLtcZtZPA== 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 B6EF72E9D; Wed, 26 Jan 2022 22:33:14 +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 20QMXEJX067692; Wed, 26 Jan 2022 22:33:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QMXEZl067691; Wed, 26 Jan 2022 22:33:14 GMT (envelope-from git) Date: Wed, 26 Jan 2022 22:33:14 GMT Message-Id: <202201262233.20QMXEZl067691@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: f330af79fbae - 2022Q1 - net/ntp: Fix build on older FreeBSD List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: f330af79fbae3022f144a56e80ec6492701a8907 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643236394; 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=huy3VHFbad8RVr8znb09W1Vo/EBmG+d7FYwZShcNR78=; b=Oil063DBMgOxe1Mgaal/XLYy3rWR5r68sGgCkqZmefISp8OK/W1h0o2RGIh+apSpc+NDSu LNysG+tej78+08Han5L70WYUEjf6Om6FMFaxyV9oL9LtU+uOMW7YpUzpHFBO/YeaYFkGbb EOW2XFzoHHOli+j/HDC26Grl04zZ40VpooGQ4RTwhCBJFS4YGgMp5lPv3ymzwoabZ3Lhi9 Gzx0wpw31uXkNCVLKnAA9wueRc7d7CgUk3HU3tgoBcRdBmiGUNH+sTV553OFQ9T/zBFUuk iLD+y3NkBVP+2UYgAOnycQ3u5VDOYtStKjAkMy+iqG6otGw0YKvYFphlv6sH0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643236394; a=rsa-sha256; cv=none; b=RzTzyCuIzQGosfqY/nJgk9fV1FoAkp1sfpO2z4n1+XscKcBN8R0a3Hq7DnvDzIIn5AWpsv QQcgXhgzn+Zl9aeU30Pj/6Hhwu3MKQc6aOZ2qvYOZ98OPe/s7kM0EbHZ18lJKaqzvoQWWu vT+afGHhUcJhz7qk69yAcu54EW1+XZLbnGqhwoEkeovKXgenShraBm4SS3FaGFwBXEv3qr 5ZSZv19VAtZ+lk8L9Vk8VoZmvtKGrgudhPWIsWCD7m2D6Lozxdebc2qhZyhOV9AFSK4uUb 33Xgea+rUx6IL2qrzgbJtZ0cRbYaE9fBdxujo6Qb0ZABYLK12okEqlsVNUQeBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f330af79fbae3022f144a56e80ec6492701a8907 commit f330af79fbae3022f144a56e80ec6492701a8907 Author: Cy Schubert AuthorDate: 2022-01-26 18:18:22 +0000 Commit: Cy Schubert CommitDate: 2022-01-26 22:32:17 +0000 net/ntp: Fix build on older FreeBSD Fix stackgap build on older FreeBSD. PR: 261491 Reported by: tomasz.sowinski@nucleus.malbork.pl (cherry picked from commit 646499bcb3f4f8e8ba96b767d102d674091c674c) --- net/ntp/files/patch-ntpd_ntpd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/ntp/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c index b70026785fcd..477f570f93b6 100644 --- a/net/ntp/files/patch-ntpd_ntpd.c +++ b/net/ntp/files/patch-ntpd_ntpd.c @@ -1,5 +1,5 @@ --- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700 -+++ ntpd/ntpd.c 2022-01-19 20:36:53.477753000 -0800 ++++ ntpd/ntpd.c 2022-01-26 10:14:00.828563000 -0800 @@ -145,7 +145,9 @@ # include #endif /* LIBSECCOMP and KERN_SECCOMP */ @@ -11,12 +11,14 @@ #include #ifndef PROC_STACKGAP_CTL /* -@@ -438,7 +440,7 @@ +@@ -438,7 +440,9 @@ char *argv[] ) { -# ifdef __FreeBSD__ -+# if defined(__FreeBSD_version) && __FreeBSD_version < 1400037 ++# if defined(__FreeBSD_version) && \ ++ ((__FreeBSD_version > 1400000 && __FreeBSD_version < 1400038) || \ ++ __FreeBSD_version < 1300524) { /* * We Must disable ASLR stack gap on FreeBSD to avoid a