From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1697754-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BB046158232
for <garchives@archives.gentoo.org>; Fri, 6 Dec 2024 22:43:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F1F16E0992;
Fri, 6 Dec 2024 22:43:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id D7D51E0992
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Dec 2024 22:43:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CCEDA3409EC
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Dec 2024 22:43:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3404811DF
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Dec 2024 22:43:01 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1733524906.6f3f5b08e760089a61e24fcea92753e0c32e7fb8.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firehol/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-firewall/firehol/firehol-3.1.7-r2.ebuild
X-VCS-Directories: net-firewall/firehol/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: 6f3f5b08e760089a61e24fcea92753e0c32e7fb8
X-VCS-Branch: master
Date: Fri, 6 Dec 2024 22:43:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4dae1ee0-c23b-4b51-9ba0-7c1bb67996c7
X-Archives-Hash: 78b1a63a9cdf03caed15276dbcf8f8cd
commit: 6f3f5b08e760089a61e24fcea92753e0c32e7fb8
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Fri Dec 6 16:35:22 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 22:41:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3f5b08
net-firewall/firehol: NF_CONNTRACK_IPV4 removed for kernels > 4.19
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/39606
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
net-firewall/firehol/firehol-3.1.7-r2.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net-firewall/firehol/firehol-3.1.7-r2.ebuild b/net-firewall/firehol/firehol-3.1.7-r2.ebuild
index b1666947f580..701ca0742f2f 100644
--- a/net-firewall/firehol/firehol-3.1.7-r2.ebuild
+++ b/net-firewall/firehol/firehol-3.1.7-r2.ebuild
@@ -46,12 +46,16 @@ pkg_setup() {
~NETFILTER_XT_MATCH_OWNER \
~NETFILTER_XT_MATCH_STATE \
~NF_CONNTRACK \
- ~NF_CONNTRACK_IPV4 \
~NF_CONNTRACK_MARK \
~NF_NAT \
~NF_NAT_FTP \
~NF_NAT_IRC \
"
+
+ if kernel_is -lt 4 19; then
+ CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4"
+ fi
+
linux-info_pkg_setup
}