From 0d18846dab8aba7a2c7a0ad3feeae42660fac36f Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 23 Apr 2025 12:42:18 +0200 Subject: [PATCH] xtables-addons: remove not needed iptables install dependency for RTSP helpers The RTSP conntrack and nat does not dependent on iptables, but only on nf_conntrack and nf_nat. The RTSP conntrack module is used as a helper in firewall4 [1]. Previously, it was not possible to install RTSP kernel module without also installing the not needed iptables modules. However, as firewall4 is based on nftables and not on iptables, this dependency is not necessary. [1] https://github.com/openwrt/firewall4/blob/master/root/usr/share/firewall4/helpers#L89 Signed-off-by: Florian Eckert --- net/xtables-addons/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 9e0139dcf..d699c656e 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons PKG_VERSION:=3.27 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=e47ea8febe73c12ecab09d2c93578c5dc72d76f17fdf673397758f519cce6828 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -195,10 +195,20 @@ define Package/iptgeoip/install endef +define KernelPackage/nf-nathelper-rtsp + SUBMENU:=Netfilter Extensions + TITLE:=Conntrack and NAT for rtsp + DEPENDS:=+kmod-nf-conntrack +kmod-nf-nat + FILES:=$(PKG_BUILD_DIR)/extensions/rtsp/nf_conntrack_rtsp.$(LINUX_KMOD_SUFFIX) \ + $(PKG_BUILD_DIR)/extensions/rtsp/nf_nat_rtsp.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoProbe,nf_conntrack_rtsp nf_nat_rtsp) + PROVIDES:=kmod-ipt-nathelper-rtsp +endef + + #$(eval $(call BuildTemplate,SUFFIX,DESCRIPTION,EXTENSION,MODULE,PRIORITY,DEPENDS)) $(eval $(call BuildTemplate,compat-xtables,API compatibilty layer,,compat_xtables,+IPV6:kmod-ip6tables)) -$(eval $(call BuildTemplate,nathelper-rtsp,RTSP Conntrack and NAT,,rtsp/nf_conntrack_rtsp rtsp/nf_nat_rtsp,+kmod-ipt-conntrack-extra +kmod-ipt-nat)) $(eval $(call BuildTemplate,account,ACCOUNT,xt_ACCOUNT,ACCOUNT/xt_ACCOUNT,+kmod-ipt-compat-xtables)) $(eval $(call BuildTemplate,asn,asn,xt_asn,xt_asn,)) @@ -226,3 +236,4 @@ $(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-x $(eval $(call BuildPackage,iptaccount)) $(eval $(call BuildPackage,iptasn)) $(eval $(call BuildPackage,iptgeoip)) +$(eval $(call KernelPackage,nf-nathelper-rtsp))