From e6497a87d42229f62943fe05fa67cd6950df9bb5 Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Wed, 29 Jul 2020 20:13:01 +0200 Subject: [PATCH] kamailio-5.x: bump to 5.4.0 - package two new modules: dlgs and pv_headers - upstream actually provides three more new modules, but two are missing dependencies in OpenWrt and one is related to systemd - use INSTALL_DATA instead of INSTALL_CONF for kamailio configuration files (not talking about /etc/config/kamailio) as they're default configuration - refresh 050-fix-kamailio-utils.patch - drop upstreamed 150-python3-cross-compile.patch - libsrutils is no longer packaged as upstream moved it into the core Signed-off-by: Sebastian Kemper --- net/kamailio-5.x/Makefile | 14 +++-- .../patches/050-fix-kamailio-utils.patch | 4 +- .../patches/150-python3-cross-compile.patch | 54 ------------------- 3 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 net/kamailio-5.x/patches/150-python3-cross-compile.patch diff --git a/net/kamailio-5.x/Makefile b/net/kamailio-5.x/Makefile index eeb5e51..1c89cb2 100644 --- a/net/kamailio-5.x/Makefile +++ b/net/kamailio-5.x/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kamailio5 -PKG_VERSION:=5.3.3 -PKG_RELEASE:=3 +PKG_VERSION:=5.4.0 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz -PKG_HASH:=2443f8aad3584b009b51948dc41982060b9ffc76be8016aa4e7de25b83be5b0a +PKG_HASH:=9ee22d566a7b6f60eaf283e95ee6633046dc87117be03b6cf2bc27293087718b PKG_USE_MIPS16:=0 PKG_LICENSE:=GPL-2.0+ @@ -78,6 +78,7 @@ MODULES_AVAILABLE:= \ dialplan \ dispatcher \ diversion \ + dlgs \ dmq \ dmq_usrloc \ domain \ @@ -157,6 +158,7 @@ MODULES_AVAILABLE:= \ pua_usrloc \ pua_xmpp \ pv \ + pv_headers \ qos \ ratelimit \ regex \ @@ -272,7 +274,7 @@ $(foreach c,kamailio.cfg kamctlrc,$(call Package/kamailio5/install/conffile,$(1) $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/usr/lib/kamailio/modules $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/kamailio/lib{srdb1,srdb2,srutils}.so* \ + $(PKG_INSTALL_DIR)/usr/lib/kamailio/lib{srdb1,srdb2}.so* \ $(1)/usr/lib/kamailio/ $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) \ @@ -307,7 +309,7 @@ endef define Package/kamailio5/install/conffile $(INSTALL_DIR) $(1)/etc/kamailio - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/kamailio/$(2) $(1)/etc/kamailio + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/kamailio/$(2) $(1)/etc/kamailio endef define Package/kamailio5/install/dbfiles @@ -508,6 +510,7 @@ $(eval $(call BuildKamailio5Module,dialog,Dialog support,,+kamailio5-mod-rr +kam $(eval $(call BuildKamailio5Module,dialplan,Dialplan management,,+libpcre)) $(eval $(call BuildKamailio5Module,dispatcher,Dispatcher,,)) $(eval $(call BuildKamailio5Module,diversion,Diversion header insertion,,)) +$(eval $(call BuildKamailio5Module,dlgs,Track active calls in stateless mode,,)) $(eval $(call BuildKamailio5Module,dmq,Distributed Message Queue,,+kamailio5-mod-sl +kamailio5-mod-tm)) $(eval $(call BuildKamailio5Module,dmq_usrloc,DMQ USRLOC replication,,+kamailio5-mod-dmq +kamailio5-mod-usrloc)) $(eval $(call BuildKamailio5Module,domain,Multi-domain support,,)) @@ -587,6 +590,7 @@ $(eval $(call BuildKamailio5Module,pua_rpc,RPC extensions for PUA,,+kamailio5-mo $(eval $(call BuildKamailio5Module,pua_usrloc,PUA User Location,,+kamailio5-mod-pua +kamailio5-mod-usrloc)) $(eval $(call BuildKamailio5Module,pua_xmpp,PUA XMPP,,+kamailio5-mod-presence +kamailio5-mod-pua +kamailio5-mod-xmpp)) $(eval $(call BuildKamailio5Module,pv,Pseudo-Variables,,)) +$(eval $(call BuildKamailio5Module,pv_headers,Flexible SIP header management,,)) $(eval $(call BuildKamailio5Module,qos,QoS control,,+kamailio5-mod-dialog)) $(eval $(call BuildKamailio5Module,ratelimit,Traffic shapping,,)) $(eval $(call BuildKamailio5Module,regex,Regular Expression,,+libpcre)) diff --git a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch index 44276b6..aa72c8e 100644 --- a/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch +++ b/net/kamailio-5.x/patches/050-fix-kamailio-utils.patch @@ -1,8 +1,8 @@ --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc -@@ -160,3 +160,6 @@ +@@ -162,3 +162,6 @@ ## Extra start options - default is: not set - # example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64" + ## example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64" # STARTOPTIONS= + +# Disable colour printing in terminal diff --git a/net/kamailio-5.x/patches/150-python3-cross-compile.patch b/net/kamailio-5.x/patches/150-python3-cross-compile.patch deleted file mode 100644 index 8879545..0000000 --- a/net/kamailio-5.x/patches/150-python3-cross-compile.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit 05af36d34aa2668780aa111878206c6797fa98b0 -Author: Sebastian Kemper -Date: Sun Apr 12 09:37:48 2020 +0200 - - app_python3: update Python3 detection mechanism - - This commit - - - removes the python calls whose output is never actually used. - - - changes the include discovery to use python3(.x)-config. This is - preferable because it also works for cross-compiling. Calling - python3(.x) directly will always provide host flags, which for - cross-compiling is not feasible. - - - updates LDFLAGS discovery to also work with >= Python 3.8. To - achieve this python3(.x)-config is first run with the argument - "--embed". If this does not succeed (exit status 1) - python3(.x)-config is run again without "--embed". This is the - method suggested by Python upstream to provide backwards - compatibility. See [1] for more details. - - [1] https://docs.python.org/3/whatsnew/3.8.html - - Signed-off-by: Sebastian Kemper - -diff --git a/src/modules/app_python3/Makefile b/src/modules/app_python3/Makefile -index 1c9ff1c6b6..d31cd6ab10 100644 ---- a/src/modules/app_python3/Makefile -+++ b/src/modules/app_python3/Makefile -@@ -11,18 +11,16 @@ NAME=app_python3.so - # but no testing has been done with that. - PYTHON3?=python3 - --PYTHON3_VERSION=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('VERSION'))"} --PYTHON3_LIBDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LIBDIR'))"} --PYTHON3_LDFLAGS=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_config_var('LINKFORSHARED'))"} --PYTHON3_INCDIR=${shell ${PYTHON3} -c "import distutils.sysconfig;print(distutils.sysconfig.get_python_inc())"} -- --LIBS=${shell ${PYTHON3}-config --ldflags} -+LIBS=${shell \ -+ tmp_py3_libs=$$(${PYTHON3}-config --ldflags --embed 2>/dev/null) || \ -+ tmp_py3_libs=$$(${PYTHON3}-config --ldflags); \ -+ echo $$tmp_py3_libs} - - ifeq ($(OS), freebsd) - LIBS+=-pthread - endif - --DEFS+=-I${PYTHON3_INCDIR} -+DEFS+=${shell ${PYTHON3}-config --includes} - - include ../../Makefile.modules - -- 2.30.2