From nobody Wed Jan 19 14:26:36 2022 X-Original-To: dev-commits-ports-main@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 685011972E10; Wed, 19 Jan 2022 14:26:37 +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 4Jf7Hc5jxfz3QnQ; Wed, 19 Jan 2022 14:26:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602396; 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=890nfDHamCDsduZ+F8fDk/BWtxq+Clk+CSZFNCP6X08=; b=cXnJGJI3Pw9MoMKSxTGxvIBqZaT8g5gke+Ftg553MFSN2KFkkxpvxZhKs3JHpGXdnGURw5 XAMidmaRMH2ZD1BAtrV9XNKNAhmYFqrtXExl9O64UMcItOjMvs6IkpOqJ322WbOe7dUCxB lzOSXK6g3xCjzWzo28PQclQjYKvjT5MVkgmtZqmnzaKKSdwLMkgh+iAelWiO8wia4has/K Y6TRcKyexDoA95tLqODxeW0V348ZA7VVS0htrzSiRVCZyXOyUdrXgtwgB94soPUHdGUN4O vN8IC/VDDfy0CHoKTOHqSJ5sRV8SGKG5LQXn0hIF4HjEdKS5tzS+YWNdz7Sbgg== 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 77E65167D6; Wed, 19 Jan 2022 14:26:36 +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 20JEQahJ011038; Wed, 19 Jan 2022 14:26:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JEQail011037; Wed, 19 Jan 2022 14:26:36 GMT (envelope-from git) Date: Wed, 19 Jan 2022 14:26:36 GMT Message-Id: <202201191426.20JEQail011037@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: a6e356e8f50f - main - net/ntp: Reverse "Disable ntpd stack gap" for stable/13 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: a6e356e8f50f92acbdec6156c068e768d1835591 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602396; 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=890nfDHamCDsduZ+F8fDk/BWtxq+Clk+CSZFNCP6X08=; b=wOVsbVbjpM+ZPlQbQaQR5kEO9Kg/HLeboS1CeKoc85fUKXgNU7wsu0anEr2yASXogoXKop 2rDei73HcBxrc+FtEEoGscnroThp4ScgDgCoD2EgMGSeZe13CySCbGpPlIDMEdk9YyRj+H MG4RB71fWOZ38S8PgfUulTI3Kme3UieVmMVxrKbeyImFFmKi4rbnJ9Cp5Hhn4sYa04H771 vp5v/Ksd0keyh+SAF4TtqR5y9ubkwc9/uVyt2Mtf7K0ZYASOFVfodovAPyTEfAIfUZLtk2 t9SMCsPdIqUZRohIiJYRBRFVLQgmYzCascDMgdw2NFer7CrbGCWpWU+fqqxp1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642602396; a=rsa-sha256; cv=none; b=n9h9Lk+AzhYaLHlzuztNR58ymJL+iF4Q08en+wRJD9lZN3K8eHUHegbR1JgnpXWBCCvAAz wWOrB73XOl36lyQ8iqLrbWbz7OHmIsaX4KtSMar6t06iiRL8e+0TAdnuTblp8YblB7BTQP y7B5pPKsPz5d1gsTqC+0fjcpubUuPpaue8aD0xpB0brbcWziEnAW5DJ5SQ1seMkSSYc8CX acy16hA4O2cWwHZs3tM4PICjCwfWi574bKCLQALbDO7FcYUqRHFr+mdd6JiDOEha6C3Ic1 kNNTwysTKD6jmZQYrnNQvF5HGYDZVnxtCw6CNhg5dxEPDcVamTsw6287vZCOsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6e356e8f50f92acbdec6156c068e768d1835591 commit a6e356e8f50f92acbdec6156c068e768d1835591 Author: Cy Schubert AuthorDate: 2022-01-18 17:54:34 +0000 Commit: Cy Schubert CommitDate: 2022-01-19 14:26:15 +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. MFH: 2022Q1 --- 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[] ) {