From: Moritz Warning <moritzwarning@web.de>
Date: Thu, 27 Jul 2023 19:03:57 +0000 (+0200)
Subject: nodogsplash: remove opennds from conflicts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=527fe47ceba2336c810a9f9fae033fb0eaa50954;p=feed%2Frouting.git

nodogsplash: remove opennds from conflicts

OpenNDS lists nodogsplash a conflict as well.
This causes a circular reference that is not allowed.

Signed-off-by: Moritz Warning <moritzwarning@web.de>
---

diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile
index 455e30d..8d22f5c 100644
--- a/nodogsplash/Makefile
+++ b/nodogsplash/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nodogsplash
 PKG_VERSION:=5.0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)?
@@ -31,7 +31,6 @@ define Package/nodogsplash
            +iptables-mod-conntrack-extra
   TITLE:=Open public network gateway daemon
   URL:=https://github.com/nodogsplash/nodogsplash
-  CONFLICTS:=opennds
 endef
 
 define Package/nodogsplash/description