diff options
-rw-r--r-- | net-firewall/firewalld/firewalld-2.0.1.ebuild | 8 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-2.0.2.ebuild | 6 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-2.1.0.ebuild | 6 | ||||
-rw-r--r-- | net-firewall/firewalld/firewalld-2.1.1-r1.ebuild | 6 | ||||
-rw-r--r-- | 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 } |