net/kamailio: update 4.4.3 -> 5.0.1

This is a major release, introducing a consistent set of new features
as well as improvements to existing components.

Reviewed by:	Alexey V. Panfilov <ports@subnets.ru>
Relnotes:	https://www.kamailio.org/w/kamailio-v5-0-0-release-notes/

19 files changed, 95 insertions, 111 deletions

diff --git a/net/kamailio/files/patch-modules__db_berkeley__Makefile b/net/kamailio/files/patch-modules__db_berkeley__Makefile
deleted file mode 100644
index e7134aad1ce5..000000000000
--- a/net/kamailio/files/patch-modules__db_berkeley__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/db_berkeley/Makefile.orig	2015-07-20 13:16:25 UTC
-+++ modules/db_berkeley/Makefile
-@@ -24,7 +24,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
- # extra install for kamailio
- 
- install-berkeley-scripts: $(bin_prefix)/$(bin_dir)
--		BERKELEYDBON=yes make -C ../../utils/kamctl/ install-modules
-+		BERKELEYDBON=yes $(MAKE) -C ../../utils/kamctl/ install-modules
- 
- install-scripts: install-berkeley-scripts
- 
diff --git a/net/kamailio/files/patch-modules__db_oracle__Makefile b/net/kamailio/files/patch-modules__db_oracle__Makefile
deleted file mode 100644
index 992f78d0583f..000000000000
--- a/net/kamailio/files/patch-modules__db_oracle__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/db_oracle/Makefile.orig	2015-07-20 13:16:25 UTC
-+++ modules/db_oracle/Makefile
-@@ -70,7 +70,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
- # extra install for kamailio
- 
- install-oracle-scripts: $(bin_prefix)/$(bin_dir)
--		ORACLEON=yes make -C ../../utils/kamctl/ install-modules
-+		ORACLEON=yes $(MAKE) -C ../../utils/kamctl/ install-modules
- 
- install-scripts: install-oracle-scripts
- 
diff --git a/net/kamailio/files/patch-modules__db_sqlite__Makefile b/net/kamailio/files/patch-modules__db_sqlite__Makefile
deleted file mode 100644
index 3e484f9565a0..000000000000
--- a/net/kamailio/files/patch-modules__db_sqlite__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/db_sqlite/Makefile.orig	2015-07-20 13:16:25 UTC
-+++ modules/db_sqlite/Makefile
-@@ -22,7 +22,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
- # extra install for kamailio
- 
- install-sqlite-scripts: $(bin_prefix)/$(bin_dir)
--		SQLITEON=yes make -C ../../utils/kamctl/ install-modules
-+		SQLITEON=yes $(MAKE) -C ../../utils/kamctl/ install-modules
- 
- install-scripts: install-sqlite-scripts
- 
diff --git a/net/kamailio/files/patch-modules_app__perl_kamailioxs.xs b/net/kamailio/files/patch-modules_app__perl_kamailioxs.xs
deleted file mode 100644
index 807b1474074b..000000000000
--- a/net/kamailio/files/patch-modules_app__perl_kamailioxs.xs
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/app_perl/kamailioxs.xs.orig	2015-07-20 13:16:25 UTC
-+++ modules/app_perl/kamailioxs.xs
-@@ -402,7 +402,7 @@ char *pv_sprintf(struct sip_msg *m, char
-  * - strflag: flag mask to be or-applied for string match
-  */
- 
--inline int sv2int_str(SV *val, int_str *is,
-+static inline int sv2int_str(SV *val, int_str *is,
- 		      unsigned short *flags, unsigned short strflag) {
- 	char *s;
- 	STRLEN len;
diff --git a/net/kamailio/files/patch-modules_ctl_ctl__defaults.h b/net/kamailio/files/patch-modules_ctl_ctl__defaults.h
deleted file mode 100644
index 294f990c8e6f..000000000000
--- a/net/kamailio/files/patch-modules_ctl_ctl__defaults.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/ctl/ctl_defaults.h.orig	2015-07-20 13:16:25 UTC
-+++ modules/ctl/ctl_defaults.h
-@@ -4,10 +4,10 @@
- /*listen by default on: */
- #ifdef SRNAME
- /* this is used when compiling sercmd tool */
--#define DEFAULT_CTL_SOCKET  "unixs:" RUN_DIR "/" SRNAME "_ctl"
-+#define DEFAULT_CTL_SOCKET  "unixs:" "/var/run/" SRNAME "_ctl"
- #else
- /* this is used when compiling sip server */
--#define DEFAULT_CTL_SOCKET  "unixs:" RUN_DIR "/" NAME "_ctl"
-+#define DEFAULT_CTL_SOCKET  "unixs:" "/var/run/" NAME "_ctl"
- #endif
- /* port used by default for tcp/udp if no port is explicitely specified */
- #define DEFAULT_CTL_PORT 2049
diff --git a/net/kamailio/files/patch-Makefile b/net/kamailio/files/patch-src_Makefile
index e2c4fee9a7e4..ea050ea4903d 100644
--- a/net/kamailio/files/patch-Makefile
+++ b/net/kamailio/files/patch-src_Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-07-20 13:16:24 UTC
-+++ Makefile
+--- src/Makefile.orig	2017-04-21 12:46:05 UTC
++++ src/Makefile
 @@ -34,7 +34,7 @@ err_fail?=1
  # whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default
  # ($(MAIN_NAME).cfg will never be overwritten by make install, this is usefull
@@ -9,7 +9,7 @@
  
  #extra modules to exclude
  skip_modules?=
-@@ -646,7 +646,7 @@ sunpkg:
+@@ -649,7 +649,7 @@ sunpkg:
  .PHONY: install
  install: mk_params="compile_for_install=yes"
  install: install-bin install-every-module install-cfg \
@@ -18,17 +18,17 @@
  
  .PHONY: dbinstall
  dbinstall:
-@@ -761,10 +761,10 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
+@@ -764,10 +764,10 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
  				fi ; \
  			fi ; \
  			: ; done; true
 -	@# radius dictionary
 -	@$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME)
--	@$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
+-	@$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)
 -	@echo "config files installed"
 +	# radius dictionary
 +	$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample
-+	$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample
++	$(INSTALL_CFG) ../etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample
 +	echo "config files installed"
  
  install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
diff --git a/net/kamailio/files/patch-Makefile.defs b/net/kamailio/files/patch-src_Makefile.defs
index b801cab84589..ac730a0ad841 100644
--- a/net/kamailio/files/patch-Makefile.defs
+++ b/net/kamailio/files/patch-src_Makefile.defs
@@ -1,6 +1,6 @@
---- Makefile.defs.orig	2015-07-20 13:16:26 UTC
-+++ Makefile.defs
-@@ -197,7 +197,7 @@ YACC := $(shell echo "$${YACC}")
+--- src/Makefile.defs.orig	2017-04-21 13:52:06 UTC
++++ src/Makefile.defs
+@@ -208,7 +208,7 @@ YACC := $(shell echo "$${YACC}")
  
  # find compiler name & version
  ifeq ($(CC),)
@@ -9,7 +9,7 @@
  endif
  LD= $(CC)
  CC_LONGVER:=$(shell if  $(CC) -v 2>/dev/null; then \
-@@ -211,7 +211,7 @@ MKTAGS=ctags
+@@ -222,7 +222,7 @@ MKTAGS=ctags
  #find-out the compiler's name
  
  ifneq (,$(findstring gcc, $(CC_LONGVER)))
@@ -18,7 +18,7 @@
  	RPAREN=)
  	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\
  				sed  -e 's/([^$(RPAREN)]*)//g' \
-@@ -366,7 +366,7 @@ LIBDIR ?=
+@@ -386,7 +386,7 @@ LIBDIR ?=
  ifeq ($(LIBDIR),)
  ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/')
  ifeq ($(ARCHBSZ),64b)
@@ -27,9 +27,18 @@
  else
  	LIBDIR = lib
  endif
-@@ -1693,7 +1693,7 @@ ifeq ($(YACC),)
+@@ -460,7 +460,7 @@ doxygen_dir=doc/doxygen
+ 
+ BASEDIR ?= $(DESTDIR)
+ basedir = $(BASEDIR)
+-RUNBASEDIR ?= $(DESTDIR)
++RUNBASEDIR ?= /
+ runbasedir = $(RUNBASEDIR)
+ 
+ # install location
+@@ -1722,7 +1722,7 @@ ifeq ($(YACC),)
  endif
- YACC_FLAGS=-d -b cfg
+ YACC_FLAGS=-d -b core/cfg
  # on solaris add -lxnet (e.g. LIBS= -lxnet)
 -LIBS= -ldl -lresolv
 +LIBS=
diff --git a/net/kamailio/files/patch-ip__addr.h b/net/kamailio/files/patch-src_core_ip__addr.h
index 433cc851eb26..eb5b5a5b5e75 100644
--- a/net/kamailio/files/patch-ip__addr.h
+++ b/net/kamailio/files/patch-src_core_ip__addr.h
@@ -1,7 +1,7 @@
---- ip_addr.h.orig	2015-09-05 21:17:34 UTC
-+++ ip_addr.h
-@@ -53,6 +53,10 @@ enum comp_methods { COMP_NONE, COMP_SIGC
- #define INADDR_LOOPBACK         (u_int32_t)0x7f000001
+--- src/core/ip_addr.h.orig	2017-04-21 12:46:05 UTC
++++ src/core/ip_addr.h
+@@ -49,6 +49,10 @@ enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PR
+ enum comp_methods { COMP_NONE, COMP_SIGCOMP, COMP_SERGZ };
  #endif
  
 +#ifndef INADDR_LOOPBACK
diff --git a/net/kamailio/files/patch-main.c b/net/kamailio/files/patch-src_main.c
index 4aac88f1a5b3..eacdb2737810 100644
--- a/net/kamailio/files/patch-main.c
+++ b/net/kamailio/files/patch-src_main.c
@@ -1,6 +1,6 @@
---- main.c.orig	2015-07-20 13:16:25 UTC
-+++ main.c
-@@ -353,7 +353,7 @@ int received_dns = 0;
+--- src/main.c.orig	2017-04-21 12:46:05 UTC
++++ src/main.c
+@@ -362,7 +362,7 @@ int received_dns = 0;
  int sr_auto_aliases=1;
  char* working_dir = 0;
  char* chroot_dir = 0;
diff --git a/net/kamailio/files/patch-src_modules_ctl_ctl.c b/net/kamailio/files/patch-src_modules_ctl_ctl.c
new file mode 100644
index 000000000000..1a2103c7c21f
--- /dev/null
+++ b/net/kamailio/files/patch-src_modules_ctl_ctl.c
@@ -0,0 +1,12 @@
+--- src/modules/ctl/ctl.c.orig	2017-04-21 13:48:39 UTC
++++ src/modules/ctl/ctl.c
+@@ -238,8 +238,7 @@ static int mod_init(void)
+ 				return -1;
+ 			}
+ 			strcpy(ctl_socket_path, DEFAULT_CTL_SOCKET_PROTO);
+-			strcat(ctl_socket_path, runtime_dir);
+-			strcat(ctl_socket_path, "/");
++			strcat(ctl_socket_path, "/var/run/");
+ 			strcat(ctl_socket_path, DEFAULT_CTL_SOCKET_NAME);
+ 			add_binrpc_socket(PARAM_STRING, ctl_socket_path);
+ 		}
diff --git a/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h b/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h
new file mode 100644
index 000000000000..4455b720a77f
--- /dev/null
+++ b/net/kamailio/files/patch-src_modules_ctl_ctl__defaults.h
@@ -0,0 +1,11 @@
+--- src/modules/ctl/ctl_defaults.h.orig	2017-04-21 12:46:05 UTC
++++ src/modules/ctl/ctl_defaults.h
+@@ -13,7 +13,7 @@
+ #define DEFAULT_CTL_SOCKET_NAME NAME "_ctl"
+ #endif
+ 
+-#define DEFAULT_CTL_SOCKET DEFAULT_CTL_SOCKET_PROTO RUN_DIR "/" DEFAULT_CTL_SOCKET_NAME
++#define DEFAULT_CTL_SOCKET DEFAULT_CTL_SOCKET_PROTO "/var/run/" DEFAULT_CTL_SOCKET_NAME
+ 
+ /* port used by default for tcp/udp if no port is explicitely specified */
+ #define DEFAULT_CTL_PORT 2049
diff --git a/net/kamailio/files/patch-src_modules_db__berkeley_Makefile b/net/kamailio/files/patch-src_modules_db__berkeley_Makefile
new file mode 100644
index 000000000000..30ad791748ba
--- /dev/null
+++ b/net/kamailio/files/patch-src_modules_db__berkeley_Makefile
@@ -0,0 +1,11 @@
+--- src/modules/db_berkeley/Makefile.orig	2017-04-21 12:46:05 UTC
++++ src/modules/db_berkeley/Makefile
+@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
+ # extra install for kamailio
+ 
+ install-berkeley-scripts: $(bin_prefix)/$(bin_dir)
+-		BERKELEYDBON=yes make -C ../../../utils/kamctl/ install-modules
++		BERKELEYDBON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules
+ 
+ install-scripts: install-berkeley-scripts
+ 
diff --git a/net/kamailio/files/patch-src_modules_db__oracle_Makefile b/net/kamailio/files/patch-src_modules_db__oracle_Makefile
new file mode 100644
index 000000000000..a1cdef378659
--- /dev/null
+++ b/net/kamailio/files/patch-src_modules_db__oracle_Makefile
@@ -0,0 +1,11 @@
+--- src/modules/db_oracle/Makefile.orig	2017-04-21 12:46:05 UTC
++++ src/modules/db_oracle/Makefile
+@@ -70,7 +70,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
+ # extra install for kamailio
+ 
+ install-oracle-scripts: $(bin_prefix)/$(bin_dir)
+-		ORACLEON=yes make -C ../../../utils/kamctl/ install-modules
++		ORACLEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules
+ 
+ install-scripts: install-oracle-scripts
+ 
diff --git a/net/kamailio/files/patch-src_modules_db__sqlite_Makefile b/net/kamailio/files/patch-src_modules_db__sqlite_Makefile
new file mode 100644
index 000000000000..8aff7d996e54
--- /dev/null
+++ b/net/kamailio/files/patch-src_modules_db__sqlite_Makefile
@@ -0,0 +1,11 @@
+--- src/modules/db_sqlite/Makefile.orig	2017-04-21 12:46:06 UTC
++++ src/modules/db_sqlite/Makefile
+@@ -22,7 +22,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
+ # extra install for kamailio
+ 
+ install-sqlite-scripts: $(bin_prefix)/$(bin_dir)
+-		SQLITEON=yes make -C ../../../utils/kamctl/ install-modules
++		SQLITEON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules
+ 
+ install-scripts: install-sqlite-scripts
+ 
diff --git a/net/kamailio/files/patch-modules__tls__Makefile b/net/kamailio/files/patch-src_modules_tls_Makefile
index 26ae1d581834..e86ac2088b84 100644
--- a/net/kamailio/files/patch-modules__tls__Makefile
+++ b/net/kamailio/files/patch-src_modules_tls_Makefile
@@ -1,5 +1,5 @@
---- modules/tls/Makefile.orig	2015-07-20 13:16:26 UTC
-+++ modules/tls/Makefile
+--- src/modules/tls/Makefile.orig	2017-04-21 12:46:06 UTC
++++ src/modules/tls/Makefile
 @@ -8,6 +8,8 @@ include ../../Makefile.defs
  auto_gen=
  NAME=tls.so
diff --git a/net/kamailio/files/patch-modules_tls_sip-router__cert.sh b/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh
index 404cd62ec24c..859ac63c52f3 100644
--- a/net/kamailio/files/patch-modules_tls_sip-router__cert.sh
+++ b/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh
@@ -1,5 +1,5 @@
---- modules/tls/sip-router_cert.sh.orig	2015-07-20 13:16:26 UTC
-+++ modules/tls/sip-router_cert.sh
+--- src/modules/tls/sip-router_cert.sh.orig	2017-04-21 12:46:06 UTC
++++ src/modules/tls/sip-router_cert.sh
 @@ -197,5 +197,6 @@ if [ $? != 0 ] ; then
  else
  	echo "Private key stored in '$DIR/$KEY_FILENAME'."
diff --git a/net/kamailio/files/patch-modules_websocket_ws__frame.c b/net/kamailio/files/patch-src_modules_websocket_ws__frame.c
index e5c83ea00ff4..a2ccc98cf958 100644
--- a/net/kamailio/files/patch-modules_websocket_ws__frame.c
+++ b/net/kamailio/files/patch-src_modules_websocket_ws__frame.c
@@ -1,5 +1,5 @@
---- modules/websocket/ws_frame.c.orig	2015-09-05 21:18:25 UTC
-+++ modules/websocket/ws_frame.c
+--- src/modules/websocket/ws_frame.c.orig	2017-04-21 12:46:06 UTC
++++ src/modules/websocket/ws_frame.c
 @@ -29,7 +29,7 @@
  #ifdef EMBEDDED_UTF8_DECODE
  #include "utf8_decode.h"
@@ -8,4 +8,4 @@
 +/* #include <unistr.h> */
  #endif
  
- #include "../../events.h"
+ #include "../../core/events.h"
diff --git a/net/kamailio/files/patch-utils__kamcmd__Makefile b/net/kamailio/files/patch-utils__kamcmd__Makefile
deleted file mode 100644
index 74a4f91faa66..000000000000
--- a/net/kamailio/files/patch-utils__kamcmd__Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- utils/kamcmd/Makefile.orig	2015-07-20 13:16:26 UTC
-+++ utils/kamcmd/Makefile
-@@ -12,7 +12,7 @@ else
- 	NAME=kamcmd
- endif
- 
--readline_locations= /usr/include/readline/readline.h \
-+readline_locations= /usr/local/include/readline/readline.h \
- 					$(LOCALBASE)/include/readline/readline.h
- 
- use_readline ?=
-@@ -72,8 +72,8 @@ endif
- endif
- 
- ifeq ($(use_readline),1)
--	DEFS+=-DUSE_READLINE
--	LIBS+=-lreadline -lncurses
-+	DEFS+=-DUSE_READLINE -I${LOCALBASE}/include
-+	LIBS+=-L${LOCALBASE}/lib -lreadline -lncurses
- endif
- 
- 
diff --git a/net/kamailio/files/patch-utils__kamctl__Makefile b/net/kamailio/files/patch-utils_kamctl_Makefile
index 31b892dfc74c..1c660357987e 100644
--- a/net/kamailio/files/patch-utils__kamctl__Makefile
+++ b/net/kamailio/files/patch-utils_kamctl_Makefile
@@ -1,6 +1,6 @@
---- utils/kamctl/Makefile.orig	2015-07-20 13:16:26 UTC
+--- utils/kamctl/Makefile.orig	2017-04-21 12:46:06 UTC
 +++ utils/kamctl/Makefile
-@@ -9,6 +9,8 @@ else
+@@ -8,6 +8,8 @@ else
  kamctltmpdir = $(basedir)
  endif
  
@@ -9,7 +9,7 @@
  all:
  		@echo "No compilation needed for kamctl"
  
-@@ -21,7 +23,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
+@@ -20,7 +22,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
  		$(INSTALL_TOUCH)   $(cfg_prefix)/$(cfg_dir)/kamctlrc.sample
  		$(INSTALL_CFG) kamctlrc \
  			$(cfg_prefix)/$(cfg_dir)/kamctlrc.sample