From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 95941158043 for ; Thu, 21 Mar 2024 02:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77A40E29B0; Thu, 21 Mar 2024 02:41:24 +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 0BD61E29AE for ; Thu, 21 Mar 2024 02:41:24 +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 01E54342FFB for ; Thu, 21 Mar 2024 02:41:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BDE41593 for ; Thu, 21 Mar 2024 02:41:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710987953.1149e8e7f329caa0e62f88566d005ccbf11ecec5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/firewalld/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-firewall/firewalld/firewalld-2.0.1.ebuild net-firewall/firewalld/firewalld-2.0.2.ebuild net-firewall/firewalld/firewalld-2.1.0.ebuild net-firewall/firewalld/firewalld-2.1.1-r1.ebuild net-firewall/firewalld/firewalld-2.1.1.ebuild X-VCS-Directories: net-firewall/firewalld/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1149e8e7f329caa0e62f88566d005ccbf11ecec5 X-VCS-Branch: master Date: Thu, 21 Mar 2024 02:41:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3d367193-96ad-430f-bb0a-a8f92ab589dc X-Archives-Hash: 6572969c59d218ce52242eaddf7adb69 commit: 1149e8e7f329caa0e62f88566d005ccbf11ecec5 Author: Cristian Othón Martínez Vera cfuga mx> AuthorDate: Fri Mar 15 22:08:59 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Mar 21 02:25:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1149e8e7 net-firewall/firewalld: CONFIG_NFT_OBJREF removed for kernels > 6.1 Closes: https://bugs.gentoo.org/926685 Signed-off-by: Cristian Othón Martínez Vera cfuga.mx> Closes: https://github.com/gentoo/gentoo/pull/35774 Signed-off-by: Sam James gentoo.org> net-firewall/firewalld/firewalld-2.0.1.ebuild | 8 ++++++-- net-firewall/firewalld/firewalld-2.0.2.ebuild | 6 +++++- net-firewall/firewalld/firewalld-2.1.0.ebuild | 6 +++++- net-firewall/firewalld/firewalld-2.1.1-r1.ebuild | 6 +++++- net-firewall/firewalld/firewalld-2.1.1.ebuild | 6 +++++- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/net-firewall/firewalld/firewalld-2.0.1.ebuild b/net-firewall/firewalld/firewalld-2.0.1.ebuild index 59e47ff9b089..47bd3faa6dc2 100644 --- a/net-firewall/firewalld/firewalld-2.0.1.ebuild +++ b/net-firewall/firewalld/firewalld-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -124,7 +124,6 @@ pkg_setup() { ~NFT_LOG ~NFT_MASQ ~NFT_NAT - ~NFT_OBJREF ~NFT_QUEUE ~NFT_QUOTA ~NFT_REDIR @@ -153,6 +152,11 @@ pkg_setup() { CONFIG_CHECK+=" ~NFT_COUNTER" fi + # bug #926685 + if kernel_is -le 6 1 ; then + CONFIG_CHECK+=" ~NFT_OBJREF" + fi + linux-info_pkg_setup } diff --git a/net-firewall/firewalld/firewalld-2.0.2.ebuild b/net-firewall/firewalld/firewalld-2.0.2.ebuild index 020c5b0d43ae..ce1a6e8dd6b7 100644 --- a/net-firewall/firewalld/firewalld-2.0.2.ebuild +++ b/net-firewall/firewalld/firewalld-2.0.2.ebuild @@ -124,7 +124,6 @@ pkg_setup() { ~NFT_LOG ~NFT_MASQ ~NFT_NAT - ~NFT_OBJREF ~NFT_QUEUE ~NFT_QUOTA ~NFT_REDIR @@ -153,6 +152,11 @@ pkg_setup() { CONFIG_CHECK+=" ~NFT_COUNTER" fi + # bug #926685 + if kernel_is -le 6 1 ; then + CONFIG_CHECK+=" ~NFT_OBJREF" + fi + linux-info_pkg_setup } diff --git a/net-firewall/firewalld/firewalld-2.1.0.ebuild b/net-firewall/firewalld/firewalld-2.1.0.ebuild index be78261c1989..34c0630c75a7 100644 --- a/net-firewall/firewalld/firewalld-2.1.0.ebuild +++ b/net-firewall/firewalld/firewalld-2.1.0.ebuild @@ -124,7 +124,6 @@ pkg_setup() { ~NFT_LOG ~NFT_MASQ ~NFT_NAT - ~NFT_OBJREF ~NFT_QUEUE ~NFT_QUOTA ~NFT_REDIR @@ -153,6 +152,11 @@ pkg_setup() { CONFIG_CHECK+=" ~NFT_COUNTER" fi + # bug #926685 + if kernel_is -le 6 1 ; then + CONFIG_CHECK+=" ~NFT_OBJREF" + fi + linux-info_pkg_setup } diff --git a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild b/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild index 3470957cccc8..aac81d88bbee 100644 --- a/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild +++ b/net-firewall/firewalld/firewalld-2.1.1-r1.ebuild @@ -124,7 +124,6 @@ pkg_setup() { ~NFT_LOG ~NFT_MASQ ~NFT_NAT - ~NFT_OBJREF ~NFT_QUEUE ~NFT_QUOTA ~NFT_REDIR @@ -153,6 +152,11 @@ pkg_setup() { CONFIG_CHECK+=" ~NFT_COUNTER" fi + # bug #926685 + if kernel_is -le 6 1 ; then + CONFIG_CHECK+=" ~NFT_OBJREF" + fi + linux-info_pkg_setup } diff --git a/net-firewall/firewalld/firewalld-2.1.1.ebuild b/net-firewall/firewalld/firewalld-2.1.1.ebuild index be78261c1989..34c0630c75a7 100644 --- a/net-firewall/firewalld/firewalld-2.1.1.ebuild +++ b/net-firewall/firewalld/firewalld-2.1.1.ebuild @@ -124,7 +124,6 @@ pkg_setup() { ~NFT_LOG ~NFT_MASQ ~NFT_NAT - ~NFT_OBJREF ~NFT_QUEUE ~NFT_QUOTA ~NFT_REDIR @@ -153,6 +152,11 @@ pkg_setup() { CONFIG_CHECK+=" ~NFT_COUNTER" fi + # bug #926685 + if kernel_is -le 6 1 ; then + CONFIG_CHECK+=" ~NFT_OBJREF" + fi + linux-info_pkg_setup }