From nobody Wed Jan 26 22:30:43 2022 X-Original-To: dev-commits-ports-all@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 E39731977BA9; Wed, 26 Jan 2022 22:30:43 +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 4Jkdhz5TFLz4stT; Wed, 26 Jan 2022 22:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643236243; 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=Auemcgq53sbtvq9S8Wawon0x0u//yd73zfkVYQ3Bf40=; b=jPJ3vLs0Lu2l8KdI/Doz4+nwyG8wDo82j4ndI7xsgzpp4XxlPOw7OavCsWi5GbbTagG7uI aGOkQUIGGK86KLwePpNcsJvGy7wAzbzJu2nES7p72LN00X1/KgcjyrsBZOQ3hoH16yOkhO 2dASA6pd8nQxCOBpX43siSDRSn7jTYSqHRP1xXONk2HgqzzyE9BxOB8+58s32XWKtTcNfo xe4DghSLcrZSMEzhqyvXOaqLw1SIUEIQgn57GPY+x+5Qp/tPYbzcQhk5imU0ehFwEE2J16 lnhwKjTjD+zfF+i+Q0rOkANBdJfXvsVWWY846g8U3RjBeS35Py3Reqs33pfKbA== 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 9B9942D39; Wed, 26 Jan 2022 22:30:43 +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 20QMUhaS065616; Wed, 26 Jan 2022 22:30:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QMUhkX065615; Wed, 26 Jan 2022 22:30:43 GMT (envelope-from git) Date: Wed, 26 Jan 2022 22:30:43 GMT Message-Id: <202201262230.20QMUhkX065615@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: 646499bcb3f4 - main - net/ntp: Fix build on older FreeBSD List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 646499bcb3f4f8e8ba96b767d102d674091c674c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643236243; 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=Auemcgq53sbtvq9S8Wawon0x0u//yd73zfkVYQ3Bf40=; b=yhFquTrznDV8xEXDOynnAGVLI6BBeSBZVSeXuDaORJNE23poCEE2eA7mEY+61RRebJi/bv XbzbZv9PM6PnpeVr3FmYjDIIqo2iH87YkHSqZqD0a2cHD4xS2i/e+3MyuGcYQzFInq95y7 agIodYIlb8K2zN+307mqRwPeOjzBZbHX8Jfis8wHiAW2EZPnsb0yBOGzNWXkB0w2pyHqfi sPC2MZKJXY137H3IN3RoOM6iVOPEEr/h7VDgMmZMQy1wxbHT2kynmxVZwXSDRECgajeJ75 t39Ltyhws7ezRSLN9MvMRtfL/8Zd02eKLrAeIKtY4eynohO+0nc5W+7cDGPBAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643236243; a=rsa-sha256; cv=none; b=eKGp/ukK9u6819JqqDoa+zBAP2JJm10MJx6nlE0Rg7rQhFArgrDFUs0GUVcEHZYRe4pbo2 0zEyfbRd+h7y63aHxz+K1l+JJ4iJj9GlWpz6wjkNrVqMIGpCNVsZQ0zAn263DAXqEacSDA dG4j4ET16FTycEglV6sW0CF8PPGln8zsACD55NAFYnv5mRSNNVRpNSprbl97qt5FRXmjyS 4J9BdOSqFUWESa48hY/nJZeU5NR2ULB0ueFQzIKaDd8+cfV5zRpgYy6nGfouMC6zbLTfCN RDLMuhQM/RtjvJJTYFNfmiRQ3Bq4emg3Tlple51Mld/V9jIbZDyN1AHnilB2vQ== 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=646499bcb3f4f8e8ba96b767d102d674091c674c commit 646499bcb3f4f8e8ba96b767d102d674091c674c Author: Cy Schubert AuthorDate: 2022-01-26 18:18:22 +0000 Commit: Cy Schubert CommitDate: 2022-01-26 22:29:53 +0000 net/ntp: Fix build on older FreeBSD Fix stackgap build on older FreeBSD. PR: 261491 Reported by: tomasz.sowinski@nucleus.malbork.pl MFH: 2022Q1 --- 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