main/kamailio: upgrade to 4.0.4

 Also removed:
   fix-sql-module-loading-order.patch (from 3.x days)
   sca.patch (now in 4.0.4 mainline)

3 files changed, 5 insertions, 86 deletions

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index bc152f9999..f8899283e2 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.0.3
-pkgrel=1
+pkgver=4.0.4
+pkgrel=0
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
@@ -191,9 +191,7 @@ for _i in db postgres sqlite dbtext mysql \
 done
 
 source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz
-	fix-sql-module-loading-order.patch
 	kamailio-4.0-backslash.patch
-	sca.patch
 	kamailio.cfg
 	kamailio.initd
 	"
@@ -403,21 +401,15 @@ websocket() {
         "$_mod_list_websocket"
 }
 
-md5sums="60fdf7fa2f1343f029de499a43dc093a  kamailio-4.0.3_src.tar.gz
-53cca39c47399eb2df20a1044d1e29eb  fix-sql-module-loading-order.patch
+md5sums="e625f52d53ed00da97a50b3ecd451b8d  kamailio-4.0.4_src.tar.gz
 7ca9394c4987c83a27f492c5b6b055f0  kamailio-4.0-backslash.patch
-17c056707b20cbb57c193b233e2a625c  sca.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 9c190575e28772a784c4172216d85333  kamailio.initd"
-sha256sums="5d19fe3a76f1a75303ae75321b5bda80633fdd3f0a3eb5e097cb9e5054311c57  kamailio-4.0.3_src.tar.gz
-d2b5518e31e9bfaf4b3f4b38f9c69f5c201255eae1a46e860afd471d123d274b  fix-sql-module-loading-order.patch
+sha256sums="abd6e8a1076d8e58d80a3bb6efc32d784b130796add03961f4bbdbd6f58049a7  kamailio-4.0.4_src.tar.gz
 2cb24070809718deac1a32fd4de73eaea47c685d9608fd06ae6531bd34fe4604  kamailio-4.0-backslash.patch
-35a306ea472d55ea2a06348e175b6a08c3fa08e39380b9d6c4dd330e072d8f47  sca.patch
 8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
 82612cc107e51de6968568a266de25b98e57257926defab7261fd81cbd624e00  kamailio.initd"
-sha512sums="4d712e1aaec54d832fbcc9b4c32a19e61bf19ddc871800d422ca2716a82616424d4a4d66858f923c9129bbe289766892755c191cb2b5ef2d7c110573fffb39af  kamailio-4.0.3_src.tar.gz
-8aeb1d6eb0d83c20b0ad31e74ca68cfa868a215a12b7029167c8913aeb84afa06e1bbc8b43dd3f84ce864a9ca6f04177d73401f99d37d9087c06a8d8431d18fd  fix-sql-module-loading-order.patch
+sha512sums="5b486ca72094edef3f617a5285af5519614d3b470babf78db921cf3c321eccc2314e3bbf745e86929fb51249e25c1d55abd519f4559acbd6cfe5cf527485bb0f  kamailio-4.0.4_src.tar.gz
 f83ca7e4feaa02ba4c97fe8b3ff72857b334b6ba27f90b1cc4a2819c77bf40a1d6b77cc8d9b9afa045da5a1a4706b737b73f93c39c0cdb57c14088ca691afbf9  kamailio-4.0-backslash.patch
-7aaf315c45e44c300772f98602f769ca2a161107fb82b91b2b4bebd39b4321a7b5c5f79f66fba3185c22def70c2ffaca472328630f4c579ec40868cb44903650  sca.patch
 0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg
 babec2a230daea3c579dc581f9a945c70bd1736cdacaaa7a183d902c8d9fbd4f7958cce03424fb65cdf7a1f6aa077ad8aec7e53525e270f88f856caa374505e7  kamailio.initd"
diff --git a/main/kamailio/fix-sql-module-loading-order.patch b/main/kamailio/fix-sql-module-loading-order.patch
deleted file mode 100644
index 5ba87e3288..0000000000
--- a/main/kamailio/fix-sql-module-loading-order.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c
-index dbde735..8efc15c 100644
---- a/lib/srdb1/db_query.c
-+++ b/lib/srdb1/db_query.c
-@@ -54,6 +54,10 @@ int db_do_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op,
- 		LM_ERR("invalid parameter value\n");
- 		return -1;
- 	}
-+	if (sql_buf == NULL) {
-+		if (db_query_init() != 0)
-+			return -2;
-+	}
- 
- 	if (!_c) {
- 		ret = snprintf(sql_buf, sql_buffer_size, "select * from %.*s ", CON_TABLE(_h)->len, CON_TABLE(_h)->s);
-@@ -154,6 +158,10 @@ int db_do_insert_cmd(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v
- 		LM_ERR("invalid parameter value\n");
- 		return -1;
- 	}
-+        if (sql_buf == NULL) {
-+                if (db_query_init() != 0)
-+                        return -2;
-+        }
- 
- 	if(mode==1)
- 		ret = snprintf(sql_buf, sql_buffer_size, "insert delayed into %.*s (",
-@@ -218,6 +226,10 @@ int db_do_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
- 		LM_ERR("invalid parameter value\n");
- 		return -1;
- 	}
-+        if (sql_buf == NULL) {
-+                if (db_query_init() != 0)
-+                        return -2;
-+        }
- 
- 	ret = snprintf(sql_buf, sql_buffer_size, "delete from %.*s", CON_TABLE(_h)->len, CON_TABLE(_h)->s);
- 	if (ret < 0 || ret >= sql_buffer_size) goto error;
-@@ -261,6 +273,10 @@ int db_do_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
- 		LM_ERR("invalid parameter value\n");
- 		return -1;
- 	}
-+        if (sql_buf == NULL) {
-+                if (db_query_init() != 0)
-+                        return -2;
-+        }
- 
- 	ret = snprintf(sql_buf, sql_buffer_size, "update %.*s set ", CON_TABLE(_h)->len, CON_TABLE(_h)->s);
- 	if (ret < 0 || ret >= sql_buffer_size) goto error;
-@@ -306,6 +322,10 @@ int db_do_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v,
- 		LM_ERR("invalid parameter value\n");
- 		return -1;
- 	}
-+        if (sql_buf == NULL) {
-+                if (db_query_init() != 0)
-+                        return -2;
-+        }
- 
- 	ret = snprintf(sql_buf, sql_buffer_size, "replace %.*s (", CON_TABLE(_h)->len, CON_TABLE(_h)->s);
- 	if (ret < 0 || ret >= sql_buffer_size) goto error;
diff --git a/main/kamailio/sca.patch b/main/kamailio/sca.patch
deleted file mode 100644
index d1528aa1b4..0000000000
--- a/main/kamailio/sca.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c
-index 43c7f56..b71bed3 100644
---- a/modules/sca/sca_call_info.c
-+++ b/modules/sca/sca_call_info.c
-@@ -743,7 +743,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info,
- 	     STR_FMT( contact_uri ), STR_FMT( call_id ), call_info->index );
- 
-     if ( !sca_uri_is_shared_appearance( sca, aor )) {
--	return( 0 );
-+	return( 1 );
-     }
- 
-     dialog.id.s = dlg_buf;
-