xtables-addons: Support IPTV Timeshift

Solves Issue #10373 and PR #10428

Signed-off-by: Jose Olivera <oliverajeo@gmail.com>
(bumped PKG_RELEASE)
Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile
index 282337a712f86de6ae8d05aef2c2d0465625f617..5ed19e61878036c5e2a3e09d5039c2b0b73c1e4c 100644 (file)
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=xtables-addons
 PKG_VERSION:=3.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_HASH:=045ee3fcfe5d6edb95483cf49e2446ff8cab4bb79411018b18354138b70c5eb5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz

diff --git a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
index c78b03e13943883cbeda4fddd78a3f500e01f9ab..3cb37007180eefd04e426d73aaeb718cfc11160a 100644 (file)
--- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -655,7 +655,7 @@
 +              }
 +
 +              nf_ct_expect_init(rtp_exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+                                nf_ct_l3num(ct), &srvaddr,
++                                nf_ct_l3num(ct), NULL,
 +                                &ct->tuplehash[!dir].tuple.dst.u3,
 +                                IPPROTO_UDP, NULL, &be_loport);
 +
@@ -672,7 +672,7 @@
 +                      }
 +
 +                      nf_ct_expect_init(rtcp_exp, NF_CT_EXPECT_CLASS_DEFAULT,
-+                                        nf_ct_l3num(ct), &srvaddr,
++                                        nf_ct_l3num(ct), NULL,
 +                                        &ct->tuplehash[!dir].tuple.dst.u3,
 +                                        IPPROTO_UDP, NULL, &be_hiport);
 +