From: Mieczyslaw Nalewaj <redacted>
Date: Sat, 10 May 2025 21:06:11 +0000 (+0200)
Subject: xtables-addons: nf_conntrack_rtsp: change strlcpy to strscpy
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=5c26a8717b271a56316ff709f9e2d5cbb1bd14d9;p=openwrt-packages.git

xtables-addons: nf_conntrack_rtsp: change strlcpy to strscpy

Change deprecated strlcpy to strscpy
for kernel 6.12 compatibility.

Signed-off-by: Mieczyslaw Nalewaj <redacted>
---

diff --git a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
index befcd06a3..11b137082 100644
--- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
@@ -246,7 +246,7 @@
 +#endif /* _NETFILTER_MIME_H */
 --- /dev/null
 +++ b/extensions/rtsp/nf_conntrack_rtsp.c
-@@ -0,0 +1,756 @@
+@@ -0,0 +1,758 @@
 +/*
 + * RTSP extension for IP connection tracking
 + * (C) 2003 by Tom Marshall <tmarshall at real.com>
@@ -983,7 +983,9 @@
 +			sprintf(tmpname, "rtsp-%d", i);
 +		}
 +
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
++		strscpy(hlpr->name, tmpname, sizeof(hlpr->name));
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
 +		strlcpy(hlpr->name, tmpname, sizeof(hlpr->name));
 +#else
 +		hlpr->name = tmpname;