From: Toke Høiland-Jørgensen <redacted>
Date: Fri, 21 Jan 2022 20:56:16 +0000 (+0100)
Subject: sqm-scripts: Change iptables dependency to iptables-nft
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=698af2eb997d1872d3c4332c19979f9460e105b5;p=openwrt-packages.git

sqm-scripts: Change iptables dependency to iptables-nft

There's only one of the shaper scripts (simple.qos) that uses iptables, and
it should be fine with iptables-nft for compatibility with the new default
nft-based firewall. Confusingly, we still need the iptables-mod-ipopt
package to get the DSCP match module; we never used CONNMARK, though, so
drop the iptables-mod-conntrack-extra dependency while we're at it.

Signed-off-by: Toke Høiland-Jørgensen <redacted>
---

diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile
index f23a0adac..421f6f411 100644
--- a/net/sqm-scripts/Makefile
+++ b/net/sqm-scripts/Makefile
@@ -24,8 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sqm-scripts
   SECTION:=net
   CATEGORY:=Base system
-  DEPENDS:=+tc +kmod-sched-cake +kmod-ifb +iptables \
-	+iptables-mod-ipopt +iptables-mod-conntrack-extra
+  DEPENDS:=+tc +kmod-sched-cake +kmod-ifb +iptables-nft +iptables-mod-ipopt
   TITLE:=SQM Scripts (QoS)
   PKGARCH:=all
 endef