diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2020-03-17 14:40:06 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2020-03-17 16:07:42 -0500 |
| commit | b9221764772881ddd13f5fb603a2187041f8b8f7 (patch) | |
| tree | 18cf7c37ccbabc5786e07991ad37490cfad7feb2 /net-firewall | |
| parent | net-firewall/firewalld: update 0.7.1 package as well (diff) | |
| download | gentoo-b9221764772881ddd13f5fb603a2187041f8b8f7.tar.gz gentoo-b9221764772881ddd13f5fb603a2187041f8b8f7.tar.bz2 gentoo-b9221764772881ddd13f5fb603a2187041f8b8f7.zip | |
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@gentoo.org>
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/firewalld/firewalld-0.7.1-r2.ebuild | 8 | ||||
| -rw-r--r-- | 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 6e94cdf1e284..2c9f20c7fd33 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 6e94cdf1e284..2c9f20c7fd33 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 } |