From nobody Thu Jan 20 04:46:00 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 4925D1974898; Thu, 20 Jan 2022 04:46: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 4JfVMF1TJZz4VHF; Thu, 20 Jan 2022 04:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642653961; 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=Pp2W02cSWY5Z3S3x/HNIls9hDgll3Fmb9quk2HKVPgQ=; b=SlADq2xUN5ldNlSXpArufLHXmpDJ38AYt88nZmlKp3GhwRLtI5jLHEilX+wCk9GlsmxDCa j1dpV53dIZCpmU7ujxY1bEW+MG3SQgQ8qAw7lHi2BdM7bwCwkDnYpLUktmcp4kk51zdQeH OsTdPspuMS/tS2xZeeml+ZMc9eTVuDUcjAC42vUD7zxtJxp8kYVceR9V8A0bCZOZG04FDK eyXkoo5G2+YjsvMYQURF5VbKupBfS1tVY7QnNgZwZP0klVjCunhcMv9Z8AF4EpaozPKn3C 5mNQmt7wZOdCjFNVLluhno0vk0KuNqi7glGYO2AkZfCORK2+J3hVf0aDrHrfBw== 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 0F43922078; Thu, 20 Jan 2022 04:46: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 20K4k0mE060978; Thu, 20 Jan 2022 04:46:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20K4k0Kn060977; Thu, 20 Jan 2022 04:46:00 GMT (envelope-from git) Date: Thu, 20 Jan 2022 04:46:00 GMT Message-Id: <202201200446.20K4k0Kn060977@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: d4607d318074 - main - net/ntp: Fix stable/12 build 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: d4607d318074fa58c0b3d0172494be40998ae69f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642653961; 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=Pp2W02cSWY5Z3S3x/HNIls9hDgll3Fmb9quk2HKVPgQ=; b=KP6Q/Z2sRPqjpjS5X1zBBoBJ10CNrHziZVI7s5QNAhu53lMn+RhHgt8JHlJgru7D9AnWfF Li0R0rJ+M8dlStZlU140+sXCL4OaFhCJIEmyvYnqaVgYeQhLlWf1ifcld84HmCJATRjc7y 0M/P/CUBMrQLPexU6Xp6iD5iCRW/Iw5B2JVOZSC8P0rJB3zFnYRdU8KnZBsyyWMZ5Q/CJW j+KgaRlW6rDV35E79QFBIWjjIarp5BmE9yjnneIh8VFBzAAEjQaU5arJ/ROUL2OW8NNZZw LdMEaOmoWdyBRPaT81IiJOcfbaNs2umURKNL6IJDxHh1MVXGMpfW9DZ2DjyfGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642653961; a=rsa-sha256; cv=none; b=n1bfJwMCXXKPgMXHvyucRbrPuzrez7B8GKKNv64onuCMML2eckEW3Q6Msq3V1WD0j/yBLf zzGJPaO+a99fHais+9JWl9yS213qeMF8vvELcOSsj5YidYmcHQN3Tnr+1mxTLeXEo+cUGK PnYFof2uFHW6ouKPlZNY4XdCbeeHiVuupmzbY6BODnoDlITEf+v1QMIy3ArZHcHg89RptC qlh8IdAQWc7R+ErhSKuc8gMnDLKWHrTfAxfDzRXT1WXXW+++5xW+M0nIlYOrwauCBlFucH qX1VAdvfe4ZFNAGv+u1VE2c7C7EC2KtHZDQnZBoiuNsG8qOVc2Yz61YxoNuK+w== 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=d4607d318074fa58c0b3d0172494be40998ae69f commit d4607d318074fa58c0b3d0172494be40998ae69f Author: Cy Schubert AuthorDate: 2022-01-20 04:43:52 +0000 Commit: Cy Schubert CommitDate: 2022-01-20 04:43:52 +0000 net/ntp: Fix stable/12 build There should be no minimum to 1300524. Reported by: Scott Allendorf Fixes: a6e356e8f50f92acbdec6156c068e768d1835591 MFH: 2022Q1 --- 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 /*