From nobody Thu Jan 20 00:49:01 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 A7C7B1970614; Thu, 20 Jan 2022 00:49:01 +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 4JfP5n4KM4z3G64; Thu, 20 Jan 2022 00:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642639741; 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=5PWzoQpEricSa+0ZdMkmIgA1nsRXU6KhrWjDwWVyKB8=; b=TbtGh9tkuYW94noC0gGpc694LbCJC1C9owlUZGmih1oxzwq3p4+La3Zn0VL5KWjOfwc6XF Nqo2BqKIaKdN1e94mmEdEaupi+uF+NcPZPUyOhuyPynmIwxfr8OZgzPXlg0OKmCz6R97+0 A0p7VPLvyMb/yDt5gNwALB0ByThQDpHAH+63UF4uB7KolWXYXsKYCuBuyv/EmkI1U+NnxN uK1HdG0/2wVV6iGqifX4++G6+yT+PZD+WdCE3a5ycSRbZAbkovFqNUcWKuiU+/YeBrPu4b dC2vl3QKglB2w1WNhCSB/J5mR/ChkyANzi03GjJjOLfVQGWVbV9JC/Wdi/4/2g== 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 70C171E959; Thu, 20 Jan 2022 00:49:01 +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 20K0n1Mg039518; Thu, 20 Jan 2022 00:49:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20K0n1jN039517; Thu, 20 Jan 2022 00:49:01 GMT (envelope-from git) Date: Thu, 20 Jan 2022 00:49:01 GMT Message-Id: <202201200049.20K0n1jN039517@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: 46e89c3461ac - 2022Q1 - net/ntp: Reverse "Disable ntpd stack gap" for stable/13 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: 46e89c3461ac097b224f754904bf1bf2e869a1eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642639741; 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=5PWzoQpEricSa+0ZdMkmIgA1nsRXU6KhrWjDwWVyKB8=; b=FZCZXRrkCgr46zO6xuE3Bsw/BVWusQ+2v8rU8M1pMQ+GN2GCsj/KwgPqD4cU6c+c2hSXlO mHD94+kd+BBYfMVF5TYWlRdeMP08BhKkHhOWXQfbfxsAuNQ+DHQjHbOOkA02pdhuiDmvLO moJLEz6ZUoBIifH4OFF4zEphf5uXSWs84dEDI4PHsV7TGufgpmci8JkLqH8wrkjN0yCTeY Gpww2B+r2mBEAca6K0DLb2Ud6yok0h16rZ7hvz81JGQTiLUucKa5MCegz8E/AE6g5ezEWM ZPKCjssFdEFbZOSFpidM2E2ZnPF6XRkZ2aWJhlrPWXAM/fPPPzfsmIW0zEozkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642639741; a=rsa-sha256; cv=none; b=sQ4GqVneIWVT458UGWtjjtqppLORG3N4NeEDAcqnLwVb3mlEYhVkEeXCqRENAzp4s90zlR 8kkP7BM1kGQeBc5UG5Vb3k1tQcKVbk5cAsatXPNXTTfR3nfiQwKc8uB1Yb7qfdlhmdOgdJ lzEXy3hOwQAg4ni1bR+NPtHU7djQ7+QjkLWAnWFYvJGA3FYfO4C+JqGhEEfydLTQoLh//6 XmazV0Oi8KxXM7Q/XgoVKPpEibST1r9RR2jFNHF0B8Ho6RksA4NZxYi9TrYHObsnavBKmg f/UtU59gaflArhY52c4TAy8dft9GPSw8K2fbEs6R877Nj5bxYhPIlG2tqki0Hw== 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=46e89c3461ac097b224f754904bf1bf2e869a1eb commit 46e89c3461ac097b224f754904bf1bf2e869a1eb Author: Cy Schubert AuthorDate: 2022-01-18 17:54:34 +0000 Commit: Cy Schubert CommitDate: 2022-01-20 00:48:49 +0000 net/ntp: Reverse "Disable ntpd stack gap" for stable/13 As stack gap mitigations have been MFCed to stable/13, reverse "Disable ntpd stack gap" for __FreeBSD_version < 1300524 too. (cherry picked from commit a6e356e8f50f92acbdec6156c068e768d1835591) --- net/ntp/Makefile | 2 +- net/ntp/files/patch-ntpd_ntpd.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index a1c62f232060..de084df97545 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ntp PORTVERSION= 4.2.8p15 -PORTREVISION= 3 +PORTREVISION= 4 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 39c7af05780b..da804c897d4d 100644 --- a/net/ntp/files/patch-ntpd_ntpd.c +++ b/net/ntp/files/patch-ntpd_ntpd.c @@ -1,15 +1,17 @@ --- ntpd/ntpd.c.orig 2020-06-23 02:17:48.000000000 -0700 -+++ ntpd/ntpd.c 2021-10-16 07:59:32.497688000 -0700 -@@ -145,7 +145,7 @@ ++++ ntpd/ntpd.c 2022-01-18 09:48:42.075461000 -0800 +@@ -145,7 +145,9 @@ # include #endif /* LIBSECCOMP and KERN_SECCOMP */ -#ifdef __FreeBSD__ -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1400038 ++#if defined(__FreeBSD_version) && \ ++ ((__FreeBSD_version > 1400000 && __FreeBSD_version < 1400038) || \ ++ (__FreeBSD_version > 1300000 && __FreeBSD_version < 1300524)) #include #ifndef PROC_STACKGAP_CTL /* -@@ -438,7 +438,7 @@ +@@ -438,7 +440,7 @@ char *argv[] ) {