rtpengine: update to 13.5.1.3

This release is needed to build against linux 6.18.

Removed upstreamed patches:
101-use-spandsp3.patch
104-daemon-poller-fix-compilation-error-for-pthread-tid.patch

Manually rebased:
100-prevent-systemd-detection.patch

Declare a dependency on BTREE_SUPPORT for rtpengine userspace variants
and ensure the kernel module enables CONFIG_BTREE when built.

This PR depends on openwrt/openwrt#21416

Signed-off-by: John Audia <[email protected]>

Author: graysky2

net/rtpengine/Makefile

@@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=rtpengine
-PKG_VERSION:=11.5.1.49
+PKG_VERSION:=13.5.1.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-mr$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/sipwise/rtpengine/tar.gz/mr$(PKG_VERSION)?
-PKG_HASH:=33e9565ad221ba86bb985d3983a3871edc17c0b4221bc220fdb3715fce0a828a
+PKG_HASH:=3cfefd1e6f84f276c7503e2aca2e2ba9464999fc68558f67db2575a927c4237d
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-mr$(PKG_VERSION)
 
@@ -97,6 +97,7 @@ $(call Package/rtpengine/Template)
   VARIANT:=transcode
   DEPENDS := \
 	  $(patsubst +%,+PACKAGE_rtpengine:%,$(ENGINE_DEPENDS_TRANSCODING)) \
+	  +BTREE_SUPPORT \
 	  +IPV6:libip6tc
 endef
 
@@ -139,6 +140,7 @@ $(call Package/rtpengine/Template)
   CONFLICTS:=rtpengine
   DEPENDS := \
 	  $(patsubst +%,+PACKAGE_rtpengine-no-transcode:%,$(ENGINE_DEPENDS)) \
+	  +BTREE_SUPPORT \
 	  +IPV6:libip6tc
 endef
 
@@ -209,9 +211,11 @@ define KernelPackage/ipt-rtpengine
 $(call Package/rtpengine/Default)
   TITLE:=Sipwise rtpengine netfilter module
   SUBMENU:=Netfilter Extensions
+  KCONFIG:=CONFIG_BTREE
   FILES:=$(PKG_BUILD_DIR)/kernel-module/xt_RTPENGINE.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoProbe,xt_RTPENGINE)
   DEPENDS := \
+	  +BTREE_SUPPORT \
 	  +PACKAGE_kmod-ipt-rtpengine:kmod-crypto-aead \
 	  +PACKAGE_kmod-ipt-rtpengine:kmod-crypto-hash \
 	  +PACKAGE_kmod-ipt-rtpengine:kmod-ipt-core

net/rtpengine/patches/100-prevent-systemd-detection.patch

@@ -1,17 +1,18 @@
---- a/lib/lib.Makefile
-+++ b/lib/lib.Makefile
-@@ -35,10 +35,10 @@ ifeq ($(RTPENGINE_VERSION),)
- endif
- CFLAGS+=	-DRTPENGINE_VERSION="\"$(RTPENGINE_VERSION)\""
+--- a/utils/gen-common-flags
++++ b/utils/gen-common-flags
+@@ -102,10 +102,11 @@ if pkg-config --exists libmosquitto; the
+ fi
 
--# look for libsystemd
--ifeq ($(shell pkg-config --exists libsystemd && echo yes),yes)
--have_libsystemd := yes
--endif
-+# No libsystemd in OpenWrt, but pkg-config could find build host's.
-+#ifeq ($(shell pkg-config --exists libsystemd && echo yes),yes)
-+have_libsystemd := no
-+#endif
- ifeq ($(have_libsystemd),yes)
- CFLAGS+=	$(shell pkg-config --cflags libsystemd)
- CFLAGS+=	-DHAVE_LIBSYSTEMD
+ # look for libsystemd
+-if pkg-config --exists libsystemd; then
+-  gen-pkgconf-flags LIBSYSTEMD        libsystemd
+-  echo "CFLAGS_LIBSYSTEMD += -DHAVE_LIBSYSTEMD"
+-fi
++#  No libsystemd in OpenWrt, but pkg-config could find build host's.
++#if pkg-config --exists libsystemd; then
++#  gen-pkgconf-flags LIBSYSTEMD        libsystemd
++#  echo "CFLAGS_LIBSYSTEMD += -DHAVE_LIBSYSTEMD"
++#fi
+ 
+ # look for liburing
+ if pkg-config --atleast-version=2.3 liburing; then

net/rtpengine/patches/101-use-spandsp3.patch

@@ -1,14 +1,14 @@
 --- a/kernel-module/xt_RTPENGINE.c
 +++ b/kernel-module/xt_RTPENGINE.c
-@@ -3786,7 +3786,6 @@ static inline ssize_t proc_control_read_
+@@ -4716,7 +4716,6 @@ static inline ssize_t proc_control_read_
  	struct rtpengine_table *t;
  	int err;
  	enum rtpengine_command cmd;
 -	char scratchbuf[512];
- 	size_t readlen, writelen, writeoffset;
- 	int i;
 
-@@ -3828,13 +3827,9 @@ static inline ssize_t proc_control_read_
+ 	union {
+ 		struct rtpengine_command_init *init;
+@@ -4761,13 +4760,9 @@ static inline ssize_t proc_control_read_
  		return -ERANGE;
 
  	// do we need an extra large storage buffer?
@@ -25,7 +25,7 @@
 
  	// get our table
  	inode = file->f_path.dentry->d_inode;
-@@ -3947,16 +3942,14 @@ static inline ssize_t proc_control_read_
+@@ -4877,16 +4872,14 @@ static inline ssize_t proc_control_read_
  			goto err_free;
  	}
 

net/rtpengine/patches/102-always-dynamically-allocate-buffer-for-kernel-mod.patch

@@ -1,8 +1,8 @@
 --- a/lib/common.Makefile
 +++ b/lib/common.Makefile
-@@ -34,12 +34,6 @@ $(DAEMONSRCS) $(HASHSRCS):	$(patsubst %,
- 		echo '#line 1' && \
- 		cat ../daemon/"$@" ) > "$@"
+@@ -51,12 +51,6 @@ install:
+ 
+ $(ALLOBJS):	Makefile ../include/* ../lib/*.h ../kernel-module/*.h
 
 -%.8: ../docs/%.md
 -	cat "$<" | sed '/^# /d; s/^##/#/' | \
@@ -11,13 +11,13 @@
 -			-M "date:$(BUILD_DATE)" \
 -			-o "$@"
 
- resample.c codeclib.strhash.c mix.c packet.c:	fix_frame_channel_layout.h
+ resample.c ../lib/codeclib.strhash.c mix.c packet.c:	../lib/fix_frame_channel_layout.h
 
 --- a/daemon/Makefile
 +++ b/daemon/Makefile
-@@ -93,11 +93,8 @@ LIBASM=		mvr2s_x64_avx2.S mvr2s_x64_avx5
+@@ -113,11 +113,8 @@ ifneq ($(have_liburing),yes)
+ LIBSRCS+=	uring.c
  endif
- OBJS=		$(SRCS:.c=.o) $(LIBSRCS:.c=.o) $(LIBASM:.S=.o)
 
 -MDS=		rtpengine.ronn
 -MANS=		$(MDS:.ronn=.8)
@@ -29,9 +29,9 @@
 -	install -m 0644 -D $(TARGET).8 $(DESTDIR)/usr/share/man/man8/$(TARGET).8
 --- a/recording-daemon/Makefile
 +++ b/recording-daemon/Makefile
-@@ -39,11 +39,8 @@ LIBSRCS=	loglib.c auxlib.c rtplib.c code
+@@ -56,11 +56,8 @@ LIBSRCS=	loglib.c auxlib.c rtplib.c code
+ 		dtmflib.c bufferpool.c bencode.c http.c s3utils.c oauth.c
  LIBASM=		mvr2s_x64_avx2.S mvr2s_x64_avx512.S mix_in_x64_avx2.S mix_in_x64_avx512bw.S mix_in_x64_sse2.S
- OBJS=		$(SRCS:.c=.o) $(LIBSRCS:.c=.o) $(LIBASM:.S=.o)
 
 -MDS=		rtpengine-recording.ronn
 -MANS=		$(MDS:.ronn=.8)