From b619c417db1fb95de3b668247e896c070f5fa7b8 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 15 Jan 2021 19:51:02 +0100 Subject: [PATCH 1/2] Revert "asterisk: link in libdl when linking to liblua" This reverts commit 150b85ab350844f1481b9a9d49984b3e16cddd40. OpenWrt upstream updated the lua package so that liblua now is linked to libdl. Signed-off-by: Sebastian Kemper --- net/asterisk/Makefile | 2 +- net/asterisk/patches/150-lua-ldl.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 net/asterisk/patches/150-lua-ldl.patch diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index e93df72..f4c288e 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk PKG_VERSION:=18.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases diff --git a/net/asterisk/patches/150-lua-ldl.patch b/net/asterisk/patches/150-lua-ldl.patch deleted file mode 100644 index a1b470b..0000000 --- a/net/asterisk/patches/150-lua-ldl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2581,7 +2581,7 @@ for ver in ; do - done - - # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix. --AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) -+AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm -ldl]) - - # Accept either RADIUS client library, their APIs are fully compatible, - # just different header filenames and different SONAMEs From 6e8eaf2602e86bed8d3bce0d905144f6412711e4 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 15 Jan 2021 19:59:47 +0100 Subject: [PATCH 2/2] asterisk: add dependency to asterisk-chan-rtp This commit makes asterisk-chan-rtp depend on asterisk-res-rtp-multicast. Without the res-rtp-multicast module chan-rtp cannot be loaded: OpenWrt*CLI> module load chan_rtp.so Unable to load module chan_rtp.so Command 'module load chan_rtp.so' failed. [Jan 9 08:51:01] ERROR[16337]: loader.c:281 module_load_error: Error loading module 'chan_rtp.so': Error relocating /usr/lib/asterisk/modules/chan_rtp.so: ast_multicast_rtp_create_options: symbol not found This issue was mentioned in the OpenWrt forum ([1]). [1] https://forum.openwrt.org/t/asterisk-makes-a-problem-with-loading/84816 Signed-off-by: Sebastian Kemper --- net/asterisk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index f4c288e..a741f75 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk PKG_VERSION:=18.1.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases @@ -853,7 +853,7 @@ $(eval $(call BuildAsteriskModule,chan-mobile,Bluetooth channel,Bluetooth mobile $(eval $(call BuildAsteriskModule,chan-motif,Jingle channel,Motif Jingle channel driver.,+$(PKG_NAME)-res-xmpp,motif.conf,chan_motif,,)) $(eval $(call BuildAsteriskModule,chan-ooh323,H.323 channel,Objective Systems H.323 channel.,,ooh323.conf,chan_ooh323,,)) $(eval $(call BuildAsteriskModule,chan-oss,OSS channel,OSS console channel driver.,,oss.conf,chan_oss,,)) -$(eval $(call BuildAsteriskModule,chan-rtp,RTP media channel,RTP media channel.,,,chan_rtp,,)) +$(eval $(call BuildAsteriskModule,chan-rtp,RTP media channel,RTP media channel.,+asterisk-res-rtp-multicast,,chan_rtp,,)) $(eval $(call BuildAsteriskModule,chan-sip,SIP channel,Session Initiation Protocol.,+$(PKG_NAME)-app-confbridge,sip.conf sip_notify.conf,chan_sip,,)) $(eval $(call BuildAsteriskModule,chan-skinny,Skinny channel,Skinny Client Control Protocol.,,skinny.conf,chan_skinny,,)) $(eval $(call BuildAsteriskModule,chan-unistim,Unistim channel,UNISTIM protocol.,,unistim.conf,chan_unistim,,))