From nobody Thu Jan 20 04:47:55 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 01F4719748EF; Thu, 20 Jan 2022 04:47:56 +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 4JfVPR6cn7z4Vfv; Thu, 20 Jan 2022 04:47:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642654075; 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=gV6IGc9BqP4eaymVt5Q9dJFmHc9P4qo3T1gTBTj9gcw=; b=rrkMCbxYjmkcmF0D3cBK8RtcupP0JeVxf0bDpXH+Qi2n/r6Ey9xHlgx7WZzrwDTjX5+Td+ PKbE6k21gyokZFvgDH7Pey1opegGzZNIcOJmIkCXM/NcteHLDRmYz/THZWV7BIECcuMVYK nTEbTwpQFHGjiEhwJjm7hfBw2+pEoCmh2fvld75rEPAYbpB72nLl+wtgosYjb98us3S0qx 2L3Mbrz7GkgUlZEDWJoZIVsMNp2L244DTkwEcuxaqbR0tBvqJBwX1fTVe/+6zlWC2IwEPf 1D1CBpeiu+7FSTPtImo4XvmEyvd29rw0S0kQWVJ2bdo08wDmXa/ktBrUHfJ2kA== 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 C300021ABD; Thu, 20 Jan 2022 04:47:55 +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 20K4ltFR061221; Thu, 20 Jan 2022 04:47:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20K4ltat061220; Thu, 20 Jan 2022 04:47:55 GMT (envelope-from git) Date: Thu, 20 Jan 2022 04:47:55 GMT Message-Id: <202201200447.20K4ltat061220@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: d371e9cb019d - 2022Q1 - net/ntp: Fix stable/12 build 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: d371e9cb019d093110901af036bed4af8a10010e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642654075; 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=gV6IGc9BqP4eaymVt5Q9dJFmHc9P4qo3T1gTBTj9gcw=; b=OCmwCX6dwRQgRqbhBexdw+2yD4uDsPSBahavUOWIak+2Zvnz1k7FucXncJCQVw3Vs46kCS ooVYU3k1rhFrrn05Td413lvCcSFYhV7tNp8/r83PahS1Vx5yLeNsVnOEw9ldo5Cx/772gH a/5KPlEvPzuh00XgqHtfz5yXL3O06SmnK4K9V0sohI+iAVG5ARo50BHtxCOYy6GKb0Etr7 AMvXtaRFDYR90FTXtazsWqCgSxl6wQ3JxjPNun7LWfumAfBjZlpiCgK5zk4rfM7e0iJ2nf fhxl8kOKpHkJexv/SKPFUhTXNCd9cPfBe5O4relBFR2jv+pR52kr3HbllisdTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642654075; a=rsa-sha256; cv=none; b=pIEBxBBAbwJG+H7GGjN8wHFqFj+5xPgY/cKvbmhNFz6FCyYXmy4lCg2sHwwQ0KWmL3tGTG shdrFUci/E/1mjlyM2R4Vi9zj2FyXlysj7QKuQNUk6LwYr126AAlOHiJpbwCUzteZ60Vw3 mqFWNVEm3eGC5++QGBwZ+ZYPoOdLk7dsaScIp+FilxaI8qwqWC0Bck6i18qBsEGrghsvRd xzfj93WLfycvJR6jaO0Mp6BUakfgWOSPHl9BOi722sLlxzhQbf4et8Vgk4CZ2BSW/zbCIF 6Mv8MRf1T7qNPPchUMHNeKR1n0HIqMB3lUFTSWhjWj+GFARXO2l6tqlRKQ/3tQ== 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=d371e9cb019d093110901af036bed4af8a10010e commit d371e9cb019d093110901af036bed4af8a10010e Author: Cy Schubert AuthorDate: 2022-01-20 04:43:52 +0000 Commit: Cy Schubert CommitDate: 2022-01-20 04:47:43 +0000 net/ntp: Fix stable/12 build There should be no minimum to 1300524. Reported by: Scott Allendorf Fixes: a6e356e8f50f92acbdec6156c068e768d1835591 (cherry picked from commit d4607d318074fa58c0b3d0172494be40998ae69f) --- net/ntp/files/patch-ntpd_ntpd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ntp/files/patch-ntpd_ntpd.c b/net/ntp/files/patch-ntpd_ntpd.c index da804c897d4d..b70026785fcd 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-18 09:48:42.075461000 -0800 ++++ ntpd/ntpd.c 2022-01-19 20:36:53.477753000 -0800 @@ -145,7 +145,9 @@ # include #endif /* LIBSECCOMP and KERN_SECCOMP */ @@ -7,7 +7,7 @@ -#ifdef __FreeBSD__ +#if defined(__FreeBSD_version) && \ + ((__FreeBSD_version > 1400000 && __FreeBSD_version < 1400038) || \ -+ (__FreeBSD_version > 1300000 && __FreeBSD_version < 1300524)) ++ __FreeBSD_version < 1300524) #include #ifndef PROC_STACKGAP_CTL /*