commit: b9221764772881ddd13f5fb603a2187041f8b8f7 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Tue Mar 17 19:40:06 2020 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Tue Mar 17 21:07:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9221764
net-firewall/firewalld: remove superfluous kernel checks Closes: https://bugs.gentoo.org/692944 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 8 +++++++- net-firewall/firewalld/firewalld-0.7.3.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild index 6e94cdf1e28..2c9f20c7fd3 100644 --- a/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild +++ b/net-firewall/firewalld/firewalld-0.7.1-r2.ebuild @@ -45,7 +45,13 @@ RESTRICT="test" # bug 650760 PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW" pkg_setup() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK" + local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK" + + # kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944 + if kernel_is -lt 4 19; then + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6" + fi + linux-info_pkg_setup } diff --git a/net-firewall/firewalld/firewalld-0.7.3.ebuild b/net-firewall/firewalld/firewalld-0.7.3.ebuild index 6e94cdf1e28..2c9f20c7fd3 100644 --- a/net-firewall/firewalld/firewalld-0.7.3.ebuild +++ b/net-firewall/firewalld/firewalld-0.7.3.ebuild @@ -45,7 +45,13 @@ RESTRICT="test" # bug 650760 PLOCALES="ar as bg bn_IN ca cs da de el en_GB en_US es et eu fi fr gl gu hi hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW" pkg_setup() { - local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6 ~NETFILTER_XT_MATCH_CONNTRACK" + local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK" + + # kernel >= 4.19 has unified a NF_CONNTRACK module, bug 692944 + if kernel_is -lt 4 19; then + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6" + fi + linux-info_pkg_setup }
