From nobody Mon Nov 01 16:46:48 2021 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 C304D18274FF; Mon, 1 Nov 2021 16:46:48 +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 4Hjf7r58vSz3qYN; Mon, 1 Nov 2021 16:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9214A15183; Mon, 1 Nov 2021 16:46:48 +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 1A1GkmBm095538; Mon, 1 Nov 2021 16:46:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1Gkm5c095537; Mon, 1 Nov 2021 16:46:48 GMT (envelope-from git) Date: Mon, 1 Nov 2021 16:46:48 GMT Message-Id: <202111011646.1A1Gkm5c095537@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: 8ddd812bf22a - main - security/fwanalog: Fix 14-CURRENT 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: 8ddd812bf22acb3819d80b25c059c74a4382d277 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ddd812bf22acb3819d80b25c059c74a4382d277 commit 8ddd812bf22acb3819d80b25c059c74a4382d277 Author: Cy Schubert AuthorDate: 2021-11-01 15:46:54 +0000 Commit: Cy Schubert CommitDate: 2021-11-01 16:46:24 +0000 security/fwanalog: Fix 14-CURRENT build Chase the 14-CURRENT restructure the bool definition. MFH after: 1 week --- security/fwlogwatch/files/patch-main.h | 8 ++++++-- security/fwlogwatch/files/patch-resolve.c | 8 ++++++-- security/fwlogwatch/files/patch-utils.c | 8 ++++++-- security/fwlogwatch/files/patch-whois.c | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/security/fwlogwatch/files/patch-main.h b/security/fwlogwatch/files/patch-main.h index 888039c8e704..532b254b455a 100644 --- a/security/fwlogwatch/files/patch-main.h +++ b/security/fwlogwatch/files/patch-main.h @@ -1,5 +1,5 @@ --- main.h.orig 2016-02-19 06:57:49.938584000 -0800 -+++ main.h 2016-04-21 19:31:22.393058000 -0700 ++++ main.h 2021-11-01 08:41:34.443421000 -0700 @@ -10,9 +10,15 @@ /* Paths */ @@ -16,11 +16,15 @@ /* i18n */ -@@ -377,7 +383,9 @@ +@@ -377,7 +383,13 @@ /* Data structures */ #include +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL diff --git a/security/fwlogwatch/files/patch-resolve.c b/security/fwlogwatch/files/patch-resolve.c index 29f2947a8b64..dd33eb27df8e 100644 --- a/security/fwlogwatch/files/patch-resolve.c +++ b/security/fwlogwatch/files/patch-resolve.c @@ -1,10 +1,14 @@ --- resolve.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ resolve.c 2016-04-21 19:32:37.383666000 -0700 -@@ -5,7 +5,9 @@ ++++ resolve.c 2021-11-01 08:44:17.362963000 -0700 +@@ -5,7 +5,13 @@ #include #include #include +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL #include diff --git a/security/fwlogwatch/files/patch-utils.c b/security/fwlogwatch/files/patch-utils.c index 5a0374545271..1ddfd41c671b 100644 --- a/security/fwlogwatch/files/patch-utils.c +++ b/security/fwlogwatch/files/patch-utils.c @@ -1,11 +1,15 @@ --- utils.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ utils.c 2016-04-21 19:36:08.436094000 -0700 -@@ -9,7 +9,10 @@ ++++ utils.c 2021-11-01 08:45:07.736663000 -0700 +@@ -9,7 +9,14 @@ #include #include #include +#include +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL #include diff --git a/security/fwlogwatch/files/patch-whois.c b/security/fwlogwatch/files/patch-whois.c index 95bd9c3f7900..761baecabf16 100644 --- a/security/fwlogwatch/files/patch-whois.c +++ b/security/fwlogwatch/files/patch-whois.c @@ -1,10 +1,14 @@ --- whois.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ whois.c 2016-04-21 19:33:49.670304000 -0700 -@@ -14,7 +14,9 @@ ++++ whois.c 2021-11-01 08:45:36.119198000 -0700 +@@ -14,7 +14,13 @@ #include #endif +#define _KERNEL ++#include ++#if __FreeBSD_version > 1400038 ++#include ++#endif #include +#undef _KERNEL #include