main/kamailio version bump 4.1.5

1 files changed, 55 insertions, 44 deletions

diff --git a/main/kamailio/musl-fixes.patch b/main/kamailio/musl-fixes.patch
index c224335b9a..28df55fda0 100644
--- a/main/kamailio/musl-fixes.patch
+++ b/main/kamailio/musl-fixes.patch
@@ -1,5 +1,7 @@
---- kamailio-4.0.4.orig/modules/ldap/ld_session.h
-+++ kamailio-4.0.4/modules/ldap/ld_session.h
+diff --git a/modules/ldap/ld_session.h b/modules/ldap/ld_session.h
+index 03a4ea5..de7bc0b 100644
+--- a/modules/ldap/ld_session.h
++++ b/modules/ldap/ld_session.h
 @@ -33,6 +33,7 @@
  #ifndef LD_SESSION_H
  #define LD_SESSION_H
@@ -8,31 +10,24 @@
  #include <ldap.h>
  
  #include "iniparser.h"
---- kamailio-4.0.4.orig/modules/xhttp_pi/xhttp_pi_fnc.c
-+++ kamailio-4.0.4/modules/xhttp_pi/xhttp_pi_fnc.c
-@@ -836,7 +836,7 @@
- 			if(vals==NULL||ids==NULL) {LM_ERR("oom\n"); return -1;}
- 			col_vals = vals; col_ids = ids;
- 			vals = &col_vals[size]; ids = &col_ids[size];
--			memset(vals, 0, sizeof(str*)); memset(ids, 0, sizeof(str*));
-+			memset(vals, 0, sizeof(str)); memset(ids, 0, sizeof(str));
- 			/* Retrieve the node attribute */
- 			attr.s = ph_xmlNodeGetAttrContentByName(node,
- 							XHTTP_PI_XML_ID_ATTR);
---- kamailio-4.0.4.orig/io_wait.h
-+++ kamailio-4.0.4/io_wait.h
-@@ -63,7 +63,7 @@
- #endif
- 
- #define _GNU_SOURCE  /* for POLLRDHUP on linux */
--#include <sys/poll.h>
-+#include <poll.h>
- #include <fcntl.h>
- 
- #ifdef HAVE_EPOLL
---- kamailio-4.0.4.orig/modules/tls/tls_server.c
-+++ kamailio-4.0.4/modules/tls/tls_server.c
-@@ -35,7 +35,7 @@
+diff --git a/modules/seas/event_dispatcher.c b/modules/seas/event_dispatcher.c
+index d10cffe..8e1a56a 100644
+--- a/modules/seas/event_dispatcher.c
++++ b/modules/seas/event_dispatcher.c
+@@ -25,7 +25,7 @@
+ #include <string.h>/*strcmp,memset*/
+ #include <errno.h>/*errno*/
+ #include <unistd.h>/*close(),read(),pipe,fork,pid_t*/
+-#include <sys/poll.h>/*poll*/
++#include <poll.h>/*poll*/
+ #include <signal.h>/*signal*/
+ #include <time.h>/*time*/
+ #include <string.h>/*memcmp*/
+diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c
+index cfd09c4..0a27433 100644
+--- a/modules/tls/tls_server.c
++++ b/modules/tls/tls_server.c
+@@ -33,7 +33,7 @@
   */
  
  
@@ -41,25 +36,41 @@
  #include <openssl/err.h>
  #include <openssl/ssl.h>
  #include "../../dprint.h"
---- kamailio-4.0.4.orig/stats.h
-+++ kamailio-4.0.4/stats.h
-@@ -32,7 +32,7 @@
+diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/modules/xhttp_pi/xhttp_pi_fnc.c
+index 5602429..2f8e1f7 100644
+--- a/modules/xhttp_pi/xhttp_pi_fnc.c
++++ b/modules/xhttp_pi/xhttp_pi_fnc.c
+@@ -885,7 +885,7 @@ int ph_getColVals(ph_mod_t *module, ph_cmd_t *cmd,
+ 			if(vals==NULL||ids==NULL) {LM_ERR("oom\n"); return -1;}
+ 			col_vals = vals; col_ids = ids;
+ 			vals = &col_vals[size]; ids = &col_ids[size];
+-			memset(vals, 0, sizeof(str*)); memset(ids, 0, sizeof(str*));
++			memset(vals, 0, sizeof(str)); memset(ids, 0, sizeof(str));
+ 			/* Retrieve the node attribute */
+ 			attr.s = ph_xmlNodeGetAttrContentByName(node,
+ 							XHTTP_PI_XML_ID_ATTR);
+diff --git a/tsend.c b/tsend.c
+index 3a18502..99f0c21 100644
+--- a/tsend.c
++++ b/tsend.c
+@@ -43,7 +43,7 @@
  
- #include <ctype.h>
- #include <sys/mman.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <sys/time.h>
- #include <time.h>
- #include <sys/utsname.h>
---- kamailio-4.0.4.orig/tcp_main.c
-+++ kamailio-4.0.4/tcp_main.c
-@@ -150,7 +150,7 @@
- #ifdef HAVE_SELECT
- #include <sys/select.h>
- #endif
+ #include <string.h>
+ #include <errno.h>
 -#include <sys/poll.h>
 +#include <poll.h>
  
+ #include <sys/types.h>
+ #include <sys/socket.h>
+diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c
+index fb9c0a3..717a78d 100644
+--- a/utils/sercmd/sercmd.c
++++ b/utils/sercmd/sercmd.c
+@@ -49,6 +49,7 @@
+ #include <netdb.h> /* gethostbyname */
+ #include <fcntl.h>
+ #include <time.h> /* time */
++#include <sys/time.h>
  
- #include "ip_addr.h"
+ #ifdef USE_READLINE
+ #include <readline/readline.h>