commit:     34661ada368076b6dfa3904d47102bad870b5595
Author:     Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Mon Oct 16 11:44:40 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 13:22:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34661ada

app-containers/lxd: add missing nftables dependency

At least one functional firewall implementation has to be present at
runtime to setup a bridge network.

Closes: https://bugs.gentoo.org/915650
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/33355
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/lxd/lxd-4.0.9-r4.ebuild | 9 +++++++--
 app-containers/lxd/lxd-5.0.2-r3.ebuild | 9 +++++++--
 app-containers/lxd/lxd-5.17.ebuild     | 9 +++++++--
 app-containers/lxd/lxd-5.18.ebuild     | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app-containers/lxd/lxd-4.0.9-r4.ebuild 
b/app-containers/lxd/lxd-4.0.9-r4.ebuild
index 246f3a898406..c15490e20960 100644
--- a/app-containers/lxd/lxd-4.0.9-r4.ebuild
+++ b/app-containers/lxd/lxd-4.0.9-r4.ebuild
@@ -27,8 +27,13 @@ DEPEND="acct-group/lxd
        sys-libs/libcap
        virtual/udev"
 RDEPEND="${DEPEND}
-       net-firewall/ebtables
-       net-firewall/iptables[ipv6(+)?]
+       || (
+                       net-firewall/nftables[json]
+                       (
+                               net-firewall/ebtables
+                               net-firewall/iptables[ipv6(+)?]
+                       )
+       )
        sys-apps/iproute2[ipv6(+)?]
        sys-fs/fuse:*
        sys-fs/lxcfs

diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild 
b/app-containers/lxd/lxd-5.0.2-r3.ebuild
index 3949502b2989..8d110b892d9d 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -27,8 +27,13 @@ DEPEND="acct-group/lxd
        sys-libs/libcap
        virtual/udev"
 RDEPEND="${DEPEND}
-       net-firewall/ebtables
-       net-firewall/iptables
+       || (
+                       net-firewall/nftables[json]
+                       (
+                               net-firewall/ebtables
+                               net-firewall/iptables
+                       )
+       )
        sys-apps/iproute2
        sys-fs/fuse:*
        >=sys-fs/lxcfs-5.0.0

diff --git a/app-containers/lxd/lxd-5.17.ebuild 
b/app-containers/lxd/lxd-5.17.ebuild
index 76c54a54d503..ea17b562f52c 100644
--- a/app-containers/lxd/lxd-5.17.ebuild
+++ b/app-containers/lxd/lxd-5.17.ebuild
@@ -28,8 +28,13 @@ DEPEND="acct-group/lxd
        sys-libs/libcap
        virtual/udev"
 RDEPEND="${DEPEND}
-       net-firewall/ebtables
-       net-firewall/iptables
+       || (
+                       net-firewall/nftables[json]
+                       (
+                               net-firewall/ebtables
+                               net-firewall/iptables
+                       )
+       )
        sys-apps/iproute2
        sys-fs/fuse:3
        >=sys-fs/lxcfs-5.0.0

diff --git a/app-containers/lxd/lxd-5.18.ebuild 
b/app-containers/lxd/lxd-5.18.ebuild
index de51e5e5b7dd..a7b9cee3c03f 100644
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -28,8 +28,13 @@ DEPEND="acct-group/lxd
        sys-libs/libcap
        virtual/udev"
 RDEPEND="${DEPEND}
-       net-firewall/ebtables
-       net-firewall/iptables
+       || (
+                       net-firewall/nftables[json]
+                       (
+                               net-firewall/ebtables
+                               net-firewall/iptables
+                       )
+       )
        sys-apps/iproute2
        sys-fs/fuse:3
        >=sys-fs/lxcfs-5.0.0

Reply via email to