main/kamailio version bump 4.1.5

4 files changed, 77 insertions, 81 deletions

diff --git a/main/kamailio/0002-snmpstats-makefile.patch b/main/kamailio/0002-snmpstats-makefile.patch
deleted file mode 100644
index ff41ec7acf..0000000000
--- a/main/kamailio/0002-snmpstats-makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/modules/snmpstats/Makefile
-+++ b/modules/snmpstats/Makefile
-@@ -14,10 +14,10 @@
- 	DEFS +=-I$(LOCALBASE)/include
- 	BUILDAGENTLIBS =-L$(LOCALBASE)/lib -lnetsnmpmibs -lnetsnmpagent \
- 		-lnetsnmphelpers -lnetsnmp
--	INSTALLMIBDIR = $(cfg-prefix)/share/snmp/mibs
-+	INSTALLMIBDIR = $(cfg_prefix)/share/snmp/mibs
- else
- 	BUILDAGENTLIBS = $(shell net-snmp-config --netsnmp-agent-libs)
--	INSTALLMIBDIR = $(cfg-prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
-+	INSTALLMIBDIR = $(cfg_prefix)$(shell net-snmp-config --prefix)/share/snmp/mibs
- endif 
- 
- ifeq ($(EMBEDDED_PERL),1)
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 3ac71b39e8..0dfdbd2a5c 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Nathan Angelacos <nangel@alpinelinux.org>
 pkgname=kamailio
-pkgver=4.1.1
-pkgrel=4
+pkgver=4.1.5
+pkgrel=0
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 arch="all"
@@ -16,7 +16,7 @@ makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev
 	lua-dev openldap-dev openssl-dev net-snmp-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 
-# See sip-router/Makfile.groups for the list of recommended modules for
+# See Makefile.groups for the list of recommended modules for
 # each package.  What follows is a simplified version of Makefile.groups
 #
 # Alpine specific changes:
@@ -198,7 +198,6 @@ done
 source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz
 	kamailio-4.1-backslash.patch
 	0001-websocket-remove-libunistring-dependency.patch
-	0002-snmpstats-makefile.patch
 	musl-fixes.patch
 
 	kamailio.cfg
@@ -414,24 +413,21 @@ authephemeral() {
 		"$_mod_list_authephemeral"
 }
 
-md5sums="af4d79725cef6d404a127216e7637b9b  kamailio-4.1.1_src.tar.gz
-d76c006fd41ceb2e2e02b222c58a953d  kamailio-4.1-backslash.patch
+md5sums="623b46e969445494655b1aa5ab5ad4b0  kamailio-4.1.5_src.tar.gz
+bad1ac2d4c95043df271d2ea6d37627a  kamailio-4.1-backslash.patch
 6251a5c33373c5276897c8abbbecc619  0001-websocket-remove-libunistring-dependency.patch
-5eb40563ffa4f1070d21994f1f7f83dc  0002-snmpstats-makefile.patch
-2f26f821280bc65b77231ec3ba6e0472  musl-fixes.patch
+558aa761bddb6ac85c152bd767670fcc  musl-fixes.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 1d9e153c56569df5c2a47c792527e0da  kamailio.initd"
-sha256sums="79838961ac772523eba610f6a7f47358a00a3297f0c1912c4e74843fe59d3734  kamailio-4.1.1_src.tar.gz
-1be745ef5a1ceaa4d201ba2e9219b53f7ebad417e0cc820c5e41e442670a263e  kamailio-4.1-backslash.patch
+sha256sums="e24d078aa2a8500f7cf75120628140218241b1faf9f40ece118f4e6a5ca3b3d3  kamailio-4.1.5_src.tar.gz
+d7e59be721ed0ad4621d404493b9a519708d801e9d4914b0164b819fa1abcd13  kamailio-4.1-backslash.patch
 bbc06f9ae62b2e8df2c58f9a171f0408e075d5a51e2457e85ef3ca01aa972df9  0001-websocket-remove-libunistring-dependency.patch
-f29b9fb1e89d4178e1541f454e41ccc2e068a1ae9bfaa89a7ef4607489279504  0002-snmpstats-makefile.patch
-46b92e27006c08cc3511d241d2958b720a8b5de650b7d51339b265b4b0a48474  musl-fixes.patch
+4f316e4c1617833111b86aad1e8878b62599e42bb229fe1ef7eee1d4438471e2  musl-fixes.patch
 8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
 26924dfec75a5ff0f669fabfdbf9c16bf35e93ea91ca736a9a6289be6ee21ddd  kamailio.initd"
-sha512sums="98a38d1d30682af2baa8c4d9a5c7428175068004975a37f9054b1d57afc91707a1b8fbf1f58a886af5ce5ad4a15dc82fe498b82e8611e6ac793024593261d403  kamailio-4.1.1_src.tar.gz
-bc5568d9937cd7bff5cb3f2289a6828b1876d86be01c5395c3bcb4b742fd006b8e73f717c2fa8746c15c9ae3a6fca8fd883e6d5d97d54f8bf7f52c907e6988c1  kamailio-4.1-backslash.patch
+sha512sums="578870f96d9251e676c2689d7a48d2a0a4fd37e5bfde0d145adfcffea1470d618f1eb0e5012ffe2c63d1b2c9e659128e3cbe50403c94499951b75e59bb223f0e  kamailio-4.1.5_src.tar.gz
+a9bb1e8f9f373264b8351ddae099a36a46ddd46fdec09e468d297ba4f64bb4896e7d6e599da70a424e8a28695ab3f3b4ac940afab534593a6b9d08ae462f001a  kamailio-4.1-backslash.patch
 a972e57d8d64c104cb3df329442c746588818ed7f148a409d6050bcbbbb021cc1eeb970b59924e0ffb7f9487faacb99cada0dbfb19b0b87f66ca6b2bcf8b8345  0001-websocket-remove-libunistring-dependency.patch
-8b9c456d9d0ce9ae1e81cce8f06cd9d291e68be77a0da07541d55e9f3c15f534b4b52b061aecce1ef37a83030222554335196ec11b9aa5eda0033f0a6241afc9  0002-snmpstats-makefile.patch
-443b4b4cfcc6d4c55833185829cc43ed11b922169d9f24d8aecfaf3c59d65cb32a2806cdd2e846261767c7ad7cbca0517d52c7e0bf10e55cbe4b5fab2b62e4e8  musl-fixes.patch
+9afb7191541b40678ede6dd1bb034b2a6a704659acb54e156096fe0660e08358b0691028b1facfb50608ca2d25714962c92ede62e1f95cb53475c89d96bd33e4  musl-fixes.patch
 0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg
 fa95cbfb1e7d32280cd6cd30e42a955da9561820540ee77b2da8ad1b9d1c7a83820f56be94ba9c2f172ad7bc285e68d8d60a000cde8271810569fa146a26cb15  kamailio.initd"
diff --git a/main/kamailio/kamailio-4.1-backslash.patch b/main/kamailio/kamailio-4.1-backslash.patch
index f40db408d0..52d04efc2b 100644
--- a/main/kamailio/kamailio-4.1-backslash.patch
+++ b/main/kamailio/kamailio-4.1-backslash.patch
@@ -1,6 +1,8 @@
---- kamailio-4.1.1.orig/utils/kamctl/kamdbctl.base
-+++ kamailio-4.1.1/utils/kamctl/kamdbctl.base
-@@ -33,18 +33,18 @@
+diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base
+index b4ed9ad..9552e91 100644
+--- a/utils/kamctl/kamdbctl.base
++++ b/utils/kamctl/kamdbctl.base
+@@ -33,18 +33,18 @@ INSTALL_DBUID_TABLES=${INSTALL_DBUID_TABLES:-ask}
  
  # Used by dbtext and db_berkeley to define tables to be created, used by
  # postgres to do the grants
@@ -19,7 +21,7 @@
 +EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy \
 +		carrierroute carrier_name domain_name carrierfailureroute userblacklist \
 +		globalblacklist htable purplemap uacreg pl_pipes mtree mtrees \
- 		sca_subscriptions mohqcalls mohqueues}
+ 		sca_subscriptions mohqcalls mohqueues rtpproxy}
 -PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap 
 +PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap \
  		pua rls_presentity rls_watchers}
@@ -28,7 +30,7 @@
  		uid_global_attrs uid_uri uid_uri_attrs uid_user_attrs}
  
  # SQL definitions
-@@ -74,16 +74,16 @@
+@@ -74,17 +74,17 @@ GREP=${GREP:-grep}
  SED=${SED:-sed}
  
  # define what modules should be installed
@@ -41,8 +43,10 @@
  PRESENCE_MODULES=${PRESENCE_MODULES:-presence rls}
  
 -EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute
+-		userblacklist htable purple uac pipelimit mtree sca mohqueue
 +EXTRA_MODULES=${EXTRA_MODULES:-imc cpl siptrace domainpolicy carrierroute \
- 		userblacklist htable purple uac pipelimit mtree sca mohqueue}
++		userblacklist htable purple uac pipelimit mtree sca mohqueue \
+ 		rtpproxy}
  
 -DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags
 +DBUID_MODULES=${UID_MODULES:-uid_auth_db uid_avp_db uid_domain uid_gflags \
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>