kamailio-4.x: update to version 4.3.0

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/net/kamailio-4.x/Makefile b/net/kamailio-4.x/Makefile
index 886021f9ee7c218172f340ddcf1d1382a3be95e1..1365fed8abaa97b993b8baeb431ecdf16d20fea0 100644 (file)
--- a/net/kamailio-4.x/Makefile
+++ b/net/kamailio-4.x/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio4
-PKG_VERSION:=4.2.4
+PKG_VERSION:=4.3.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
-PKG_MD5SUM:=6c10bc5c4c727bf2bddc8a37ef3f9ae6
+PKG_MD5SUM:=4a6bd2f70f14d94a4ed9a8e6b18f89d7
 PKG_USE_MIPS16:=0
 
 PKG_LICENSE:=GPL-2.0+
@@ -119,12 +119,13 @@ $(eval $(call BuildKamailio4Module,alias_db,Database-backend aliases,,+kamailio4
 $(eval $(call BuildKamailio4Module,auth,Authentication Framework,,))
 $(eval $(call BuildKamailio4Module,auth_db,Database-backend authentication,,+kamailio4-mod-auth +kamailio4-mod-db-sqlite))
 $(eval $(call BuildKamailio4Module,auth_diameter,Diameter-backend authentication,,+kamailio4-mod-sl))
+$(eval $(call BuildKamailio4Module,auth_xkeys,Shared-key authentication,,+kamailio4-mod-auth))
 $(eval $(call BuildKamailio4Module,avpops,AVP operation,,))
 $(eval $(call BuildKamailio4Module,benchmark,Config benchmark,,))
 $(eval $(call BuildKamailio4Module,cfgutils,Config utilities,,))
 $(eval $(call BuildKamailio4Module,cfg_db,Load core and module parameters from database,,+kamailio4-mod-db-sqlite))
 $(eval $(call BuildKamailio4Module,cfg_rpc,Update core and module parameters at runtime via RPC interface,,))
-$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog))
+$(eval $(call BuildKamailio4Module,cnxcc,Limit call duration,,+kamailio4-mod-dialog +libhiredis +libevent))
 $(eval $(call BuildKamailio4Module,corex,Legacy functions,,))
 $(eval $(call BuildKamailio4Module,ctl,BINRPC transport interface,,))
 $(eval $(call BuildKamailio4Module,db_flatstore,Fast writing-only text database-backed,,))
@@ -143,13 +144,17 @@ $(eval $(call BuildKamailio4Module,domain,Multi-domain support,,))
 $(eval $(call BuildKamailio4Module,domainpolicy,Domain policy,,))
 $(eval $(call BuildKamailio4Module,drouting,Dynamic routing module,,))
 $(eval $(call BuildKamailio4Module,enum,ENUM lookup,,))
+$(eval $(call BuildKamailio4Module,evapi,push event details via tcp,,+libev))
 $(eval $(call BuildKamailio4Module,exec,External exec,,))
 $(eval $(call BuildKamailio4Module,group,Database-backend user-groups,,))
 $(eval $(call BuildKamailio4Module,h350,H.350,,+kamailio4-mod-ldap +libopenldap))
 $(eval $(call BuildKamailio4Module,htable,Hash Table,,))
 $(eval $(call BuildKamailio4Module,imc,IM conferencing,,+kamailio4-mod-db-mysql +kamailio4-mod-tm))
 $(eval $(call BuildKamailio4Module,ipops,IP and IPv6 operations,,))
+$(eval $(call BuildKamailio4Module,jansson,Alternative access to JSON document attributes,,+jansson))
+# $(eval $(call BuildKamailio4Module,janssonrpc-c,Alternative JSONRPC server,,+kamailio4-mod-jansson +libevent2))
 $(eval $(call BuildKamailio4Module,json,Access to JSON document attributes,,+libjson-c))
+$(eval $(call BuildKamailio4Module,jsonrpc-s,JSONRPC server over HTTP,,+kamailio4-mod-json +libevent))
 $(eval $(call BuildKamailio4Module,kex,Core extensions,,))
 $(eval $(call BuildKamailio4Module,lcr,Least Cost Routing,,+kamailio4-mod-tm +libpcre))
 $(eval $(call BuildKamailio4Module,ldap,LDAP connector,,+libopenldap))
@@ -162,6 +167,7 @@ $(eval $(call BuildKamailio4Module,msilo,SIP message silo,,+kamailio4-mod-tm))
 $(eval $(call BuildKamailio4Module,msrp,MSRP routing engine,,+kamailio4-mod-tls))
 $(eval $(call BuildKamailio4Module,nathelper,NAT helper,,+kamailio4-mod-usrloc))
 $(eval $(call BuildKamailio4Module,nat_traversal,NAT traversal,,+kamailio4-mod-dialog +kamailio4-mod-sl +kamailio4-mod-tm))
+$(eval $(call BuildKamailio4Module,nosip,non-sip package handling,,+kamailio4-mod-rr))
 $(eval $(call BuildKamailio4Module,path,SIP path insertion,,+kamailio4-mod-rr))
 $(eval $(call BuildKamailio4Module,pdt,Prefix-to-Domain translator,,))
 $(eval $(call BuildKamailio4Module,permissions,Permissions control,,))
@@ -187,6 +193,7 @@ $(eval $(call BuildKamailio4Module,rtimer,Routing Timer,,))
 $(eval $(call BuildKamailio4Module,rtpengine,RTP engine,,+kamailio4-mod-tm))
 $(eval $(call BuildKamailio4Module,rtpproxy,RTP proxy,,+kamailio4-mod-tm))
 $(eval $(call BuildKamailio4Module,sanity,SIP sanity checks,,+kamailio4-mod-sl))
+$(eval $(call BuildKamailio4Module,sctp,SCTP support,,+libsctp))
 $(eval $(call BuildKamailio4Module,sipcapture,SIP capture,,))
 $(eval $(call BuildKamailio4Module,siptrace,SIP trace,,))
 $(eval $(call BuildKamailio4Module,siputils,SIP utilities,,+kamailio4-mod-sl))
@@ -197,6 +204,7 @@ $(eval $(call BuildKamailio4Module,sqlops,SQL operations,,))
 $(eval $(call BuildKamailio4Module,statistics,Script statistics,,))
 $(eval $(call BuildKamailio4Module,stun,STUN server support,,))
 $(eval $(call BuildKamailio4Module,sst,SIP Session Timer,,+kamailio4-mod-dialog +kamailio4-mod-sl))
+$(eval $(call BuildKamailio4Module,tcpops,TCP options tweaking operations,,))
 $(eval $(call BuildKamailio4Module,textops,Text operations,,))
 $(eval $(call BuildKamailio4Module,tls,TLS operations,,+libopenssl))
 $(eval $(call BuildKamailio4Module,topoh,Topology hiding,,+kamailio4-mod-rr))
@@ -208,6 +216,7 @@ $(eval $(call BuildKamailio4Module,uri_db,Database-backend SIP URI checking,,))
 $(eval $(call BuildKamailio4Module,userblacklist,User blacklists,,))
 $(eval $(call BuildKamailio4Module,usrloc,User location,,))
 $(eval $(call BuildKamailio4Module,utils,Misc utilities,,+libcurl +libxml2))
+$(eval $(call BuildKamailio4Module,uuid,UUID utilities,,+libuuid))
 $(eval $(call BuildKamailio4Module,xcap_client,XCAP Client,,+libcurl))
 $(eval $(call BuildKamailio4Module,xlog,Advanced logger,,))
 $(eval $(call BuildKamailio4Module,xmlrpc,XML RPC module,,+libxml2))
@@ -233,14 +242,12 @@ PKG_MAKE_ARGS:= \
        CC="$(TARGET_CC)" \
        ARCH="$(ARCH)"  \
        DESTDIR=$(PKG_INSTALL_DIR) \
+       EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib/ -L$(STAGING_DIR)/usr/lib/libevent" \
        quiet=verbose
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-               EXTRA_LIBS=-L$(STAGING_DIR)/usr/lib/ \
-               all
-       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) \
-               install
+       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) all
+       $(MAKE) -C $(PKG_BUILD_DIR) $(PKG_MAKE_ARGS) install
 endef
 
 $(eval $(call BuildPackage,kamailio4))

diff --git a/net/kamailio-4.x/patches/111-include-sys-time-h-in-kamcmd-c.patch b/net/kamailio-4.x/patches/111-include-sys-time-h-in-kamcmd-c.patch
new file mode 100644 (file)
index 0000000..4615889
--- /dev/null
+++ b/net/kamailio-4.x/patches/111-include-sys-time-h-in-kamcmd-c.patch
@@ -0,0 +1,10 @@
+--- a/utils/kamcmd/kamcmd.c
++++ b/utils/kamcmd/kamcmd.c
+@@ -43,6 +43,7 @@
+ #include <errno.h>
+ #include <ctype.h> /* isprint */
+ #include <sys/socket.h>
++#include <sys/time.h> /* struct timeval */
+ #include <sys/un.h> /* unix sock*/
+ #include <netinet/in.h> /* udp sock */
+ #include <sys/uio.h> /* writev */

diff --git a/net/kamailio-4.x/patches/111-include-sys-time-h-in-sercmd-c.patch b/net/kamailio-4.x/patches/111-include-sys-time-h-in-sercmd-c.patch
deleted file mode 100644 (file)
index c4e4487..0000000
--- a/net/kamailio-4.x/patches/111-include-sys-time-h-in-sercmd-c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/utils/sercmd/sercmd.c
-+++ b/utils/sercmd/sercmd.c
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <ctype.h> /* isprint */
- #include <sys/socket.h>
-+#include <sys/time.h> /* struct timeval */
- #include <sys/un.h> /* unix sock*/
- #include <netinet/in.h> /* udp sock */
- #include <sys/uio.h> /* writev */

diff --git a/net/kamailio-4.x/patches/120-libevent-libs.patch b/net/kamailio-4.x/patches/120-libevent-libs.patch
new file mode 100644 (file)
index 0000000..f4d6569
--- /dev/null
+++ b/net/kamailio-4.x/patches/120-libevent-libs.patch
@@ -0,0 +1,13 @@
+Index: kamailio4-4.3.0/modules/cnxcc/Makefile
+===================================================================
+--- kamailio4-4.3.0.orig/modules/cnxcc/Makefile
++++ kamailio4-4.3.0/modules/cnxcc/Makefile
+@@ -8,7 +8,7 @@ include ../../Makefile.defs
+ auto_gen=
+ NAME=cnxcc.so
+ 
+-LIBS=-lhiredis -levent
++LIBS=-lhiredis -levent $(EXTRA_LIBS)
+ DEFS+=-DOPENSER_MOD_INTERFACE
+ SERLIBPATH=../../lib
+ SER_LIBS+=$(SERLIBPATH)/kmi/kmi