diff --git a/net/rtpengine/Makefile b/net/rtpengine/Makefile index bf64ed38..6c033813 100644 --- a/net/rtpengine/Makefile +++ b/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 diff --git a/net/rtpengine/patches/100-prevent-systemd-detection.patch b/net/rtpengine/patches/100-prevent-systemd-detection.patch index 33c1727c..26ac651b 100644 --- a/net/rtpengine/patches/100-prevent-systemd-detection.patch +++ b/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 diff --git a/net/rtpengine/patches/101-use-spandsp3.patch b/net/rtpengine/patches/101-use-spandsp3.patch deleted file mode 100644 index 1e753597..00000000 --- a/net/rtpengine/patches/101-use-spandsp3.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/daemon/Makefile -+++ b/daemon/Makefile -@@ -32,7 +32,7 @@ CFLAGS+= $(shell pkg-config --cflags lib - CFLAGS+= $(shell pkg-config --cflags libavutil) - CFLAGS+= $(shell pkg-config --cflags libswresample) - CFLAGS+= $(shell pkg-config --cflags libavfilter) --CFLAGS+= $(shell pkg-config --cflags spandsp) -+CFLAGS+= $(shell pkg-config --cflags spandsp3) - CFLAGS+= $(shell pkg-config --cflags opus) - CFLAGS+= -DWITH_TRANSCODING - CFLAGS+= $(shell mysql_config --cflags) -@@ -68,7 +68,7 @@ LDLIBS+= $(shell pkg-config --libs libav - LDLIBS+= $(shell pkg-config --libs libavutil) - LDLIBS+= $(shell pkg-config --libs libswresample) - LDLIBS+= $(shell pkg-config --libs libavfilter) --LDLIBS+= $(shell pkg-config --libs spandsp) -+LDLIBS+= $(shell pkg-config --libs spandsp3) - LDLIBS+= $(shell pkg-config --libs opus) - LDLIBS+= $(shell mysql_config --libs) - endif diff --git a/net/rtpengine/patches/102-always-dynamically-allocate-buffer-for-kernel-mod.patch b/net/rtpengine/patches/102-always-dynamically-allocate-buffer-for-kernel-mod.patch index 7d67fee0..554bca8a 100644 --- a/net/rtpengine/patches/102-always-dynamically-allocate-buffer-for-kernel-mod.patch +++ b/net/rtpengine/patches/102-always-dynamically-allocate-buffer-for-kernel-mod.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; } diff --git a/net/rtpengine/patches/103-no-docs.patch b/net/rtpengine/patches/103-no-docs.patch index b93af2bf..657c7d08 100644 --- a/net/rtpengine/patches/103-no-docs.patch +++ b/net/rtpengine/patches/103-no-docs.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) diff --git a/net/rtpengine/patches/104-daemon-poller-fix-compilation-error-for-pthread-tid.patch b/net/rtpengine/patches/104-daemon-poller-fix-compilation-error-for-pthread-tid.patch deleted file mode 100644 index 7f1e4e5f..00000000 --- a/net/rtpengine/patches/104-daemon-poller-fix-compilation-error-for-pthread-tid.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 77e2cd4b250e806701081a8b262aa0a804423659 Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Fri, 21 Nov 2025 15:39:53 +0100 -Subject: [PATCH] daemon: poller: fix compilation error for pthread tid - -Fix compilation error for pthread tid wrong init. - -poller.c: In function 'poller_map_add': -poller.c:54:18: error: initialization of 'pthread_t' {aka 'struct __pthread *'} from 'int' makes pointer from integer without a cast [-Wint-conversion] - 54 | - | - -Setting to -1 is wrong and actually not useful as it gets set right -after if map is not NULL. - -Signed-off-by: Christian Marangi ---- - lib/poller.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/poller.c -+++ b/lib/poller.c -@@ -51,7 +51,7 @@ struct poller_map *poller_map_new(void) - } - - static void poller_map_add(struct poller_map *map) { -- pthread_t tid = -1; -+ pthread_t tid; - struct poller *p; - if (!map) - return;