From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 12 Apr 2022 21:59:16 +0000 (+0200)
Subject: opennds: remove iptables-legacy CONFLICTS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e64a2b4b29a92a000ee6aaf448af8b594dd79155;p=feed%2Frouting.git

opennds: remove iptables-legacy CONFLICTS

The opennds software interfaces with netfilter using `iptables` commands,
it does not rely on a specific implementation of the iptables frontend.

Furthermore, the semantically wrong conflict with iptables-legacy
introcduces recursive dependencies in the build system, even for people
not using opendns.

Remove the explicit conflict marker for iptables-legacy.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8574cb411a1437ad09f047c0e683a126d8ccdd95)
---

diff --git a/opennds/Makefile b/opennds/Makefile
index ce801f5..773e758 100644
--- a/opennds/Makefile
+++ b/opennds/Makefile
@@ -30,7 +30,7 @@ define Package/opennds
   DEPENDS:=+iptables-nft +kmod-ipt-conntrack +kmod-ipt-nat +libmicrohttpd-no-ssl
   TITLE:=Open public network gateway daemon
   URL:=https://github.com/opennds/opennds
-  CONFLICTS:=nodogsplash nodogsplash2 iptables-legacy
+  CONFLICTS:=nodogsplash nodogsplash2
 endef
 
 define Package/opennds/description