main/kamailio: upgrade to version 4.3.0

subpackages:

 kamailio-db - mohqueue v0.11 from github

 kamailio-extras - new modules dmq_usrloc statsd
	rtjson tcpops auth_xkeys

 (new) kamailio-geoip2 - geoip2

 (new) kamailio-jansson - jansson janssonrpc-c

1 files changed, 40 insertions, 47 deletions

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 32721634b7..3b7006b3ff 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -5,15 +5,15 @@
 pkgname=kamailio
 
 # If building from a git snapshot, specify the gitcommit
-# abuild snapshot, then abuild as normal
+# run "abuild snapshot", then abuild as normal
 # If building a proper release, leave gitcommit blank
-#_gitcommit=f9c248a6
+#_gitcommit=e27802533cee
 _giturl="git://github.com/$pkgname/$pkgname.git"
 _gittag=HEAD
 
 
-pkgver=4.2.5
-pkgrel=1
+pkgver=4.3.0
+pkgrel=0
 [ -z "${_gitcommit}" ] && _suffix="_src" || _suffix="-${_gitcommit}"
 
 pkgdesc="Open Source SIP Server"
@@ -27,7 +27,8 @@ depends=""
 makedepends="bison flex expat-dev postgresql-dev pcre-dev mariadb-dev
 	libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev
 	lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev
-	json-c-dev libevent-dev linux-headers libmemcached-dev hiredis-dev"
+	jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev
+	hiredis-dev libmaxminddb-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 
 # See Makefile.groups for the list of recommended modules for
@@ -53,7 +54,8 @@ _mod_list_basic="avp async auth benchmark blst cfg_rpc cfgutils corex counters \
 # - extra used modules, with no extra dependency
 _mod_list_extras="auth_diameter call_control cnxcc dmq domainpolicy msrp pdb \
 		qos sca seas sms sst timer tmrec tsilo uac_redirect xhttp \
-		xhttp_rpc xprint nosip"
+		xhttp_rpc xprint nosip dmq_usrloc statsd rtjson tcpops \
+		auth_xkeys"
 
 # - common modules depending on database
 _mod_list_db="acc alias_db auth_db avpops cfg_db db_flatstore \
@@ -155,8 +157,8 @@ _mod_list_perl="app_perl db_perlvdb"
 # - modules depending on python library
 _mod_list_python="app_python"
 
-# - modules depending on geoip library
-_mod_list_geoip="geoip"
+# - modules depending on geoip2 library
+_mod_list_geoip2="geoip2"
 
 # - modules depending on sqlite library
 _mod_list_sqlite="db_sqlite"
@@ -202,6 +204,10 @@ _mod_list_kazoo="kazoo"
 # - modules depending on mongodb
 _mod_list_mongodb="db_mongodb ndb_mongodb"
 
+# - modules depending on jansson library
+_mod_list_jansson="jansson janssonrpc-c"
+
+
 # Alpine Specific
 _mod_list_debugger="$_mod_list_devel benchmark debugger"
 
@@ -216,27 +222,20 @@ for _i in db postgres sqlite dbtext mysql \
 	cpl xml unixodbc snmpstats xmpp carrierroute \
 	ldap utils tls presence lua ims outbound debugger \
 	extras json websocket authephemeral \
-	uuid ev memcached redis; do
+	uuid ev memcached redis geoip2 jansson; do
 
    subpackages="$subpackages $pkgname-$_i"
    eval "_modules=\"\$_modules \$_mod_list_$_i\""
 done
 
-source="http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}${_suffix}.tar.gz
-	kamailio-4.2-backslash.patch
+source="http://www.kamailio.org/pub/kamailio/$pkgver/src/${pkgname}-${pkgver}${_suffix}.tar.gz
 	0001-musl-fixes.patch
-	kamailio-4.2-ipops-srv-query.patch
-	DMQ-multi-notify.patch
 	0002-mohqueue-v0-11.patch
-	default_ctl.patch
-	kamctl_build.patch
-
+	0003-kamdbctl-backslash.patch
 	kamailio.cfg
 	kamailio.initd
 	"
 
-_builddir="$srcdir"/${pkgname}-fb-${_ver}
-
 snapshot() {
         mkdir -p "$srcdir"
         cd "${SRCDEST:-$srcdir}"
@@ -247,7 +246,7 @@ snapshot() {
                 cd $pkgname.git
                 git fetch || return 1
         fi
-        git archive --prefix=$pkgname-$pkgver/ -o "$SRCDEST"/$pkgname-$_ver.tar.gz $_gittag
+        git archive --prefix=$pkgname-$pkgver/ -o "$SRCDEST"/${pkgname}-${pkgver}${_suffix}.tar.gz $_gittag
 }
 
 
@@ -291,6 +290,7 @@ build() {
 		PREFIX=/usr \
 		CC_EXTRA_OPTS="$CFLAGS -D_GNU_SOURCE" \
 		cfg_target=/etc/kamailio/ \
+		run_prefix=$_builddir/var/run/kamailio \
 		include_modules="$_modules" \
 		LIBDIR=lib \
 		DESTDIR="$pkgdir" \
@@ -467,10 +467,15 @@ json() {
 		"$_mod_list_json"
 }
 
-#geoip() {
-#	_generic_pkg "MaxMind GeoIP lookup support" \
-#		"$_mod_list_geoip"
-#}
+jansson() {
+	_generic_pkg "Operations on json strings using jansson library" \
+		"$_mod_list_jansson"
+}
+
+geoip2() {
+	_generic_pkg "MaxMind GeoIP lookup support" \
+		"$_mod_list_geoip2"
+}
 
 ev() {
 	_generic_pkg "Network event broadcast API" \
@@ -492,33 +497,21 @@ redis() {
 		"$_mod_list_redis"
 }
 
-md5sums="5c10c9f12188ce90321fdc5f69398c32  kamailio-4.2.5_src.tar.gz
-bad1ac2d4c95043df271d2ea6d37627a  kamailio-4.2-backslash.patch
-4685288dc54680597b00f956dc95d4d6  0001-musl-fixes.patch
-e9c0ba8192a1a4f2a08a2e2add20e3d7  kamailio-4.2-ipops-srv-query.patch
-7df723eb9e14df28adfff8643d99a1a9  DMQ-multi-notify.patch
-09270d91b68d88b44e043d58d68d5691  0002-mohqueue-v0-11.patch
-841fa62c432c5d8aeb57ad70d2ec3030  default_ctl.patch
-d0052e6054884b9cec955af4480c7c85  kamctl_build.patch
+md5sums="4a6bd2f70f14d94a4ed9a8e6b18f89d7  kamailio-4.3.0_src.tar.gz
+18863791d386659eae6ef0c82a2517ae  0001-musl-fixes.patch
+3b1a7b9e21d5af55827514cadd7cbf71  0002-mohqueue-v0-11.patch
+fe8f61c73264cd1c360f3876f664464d  0003-kamdbctl-backslash.patch
 299706d97e30a4f0d9b4c873df422866  kamailio.cfg
 39dc9355fa7d8fec425d3b17c2fb26e0  kamailio.initd"
-sha256sums="bc19d7a7cc0c3aceb68ac9bb64c2169d8713fe73a2267509954bd36f037810cc  kamailio-4.2.5_src.tar.gz
-d7e59be721ed0ad4621d404493b9a519708d801e9d4914b0164b819fa1abcd13  kamailio-4.2-backslash.patch
-b98555ff304b51b82c6cf7e01d757b15ea4f05bd2e603c84d4384df6a6be62b6  0001-musl-fixes.patch
-7e33c95bdb942e4ed6d54e14476cad2ee7edfc256b1f250e5f133d9e8a9b2a67  kamailio-4.2-ipops-srv-query.patch
-384eeaa5b253228341dc7a74ec61314db4b8f2f1c9c2f3bdf9ba189d2d56911d  DMQ-multi-notify.patch
-45b111be159037b9d96cf6fbc7b0643e8528f99dcd8604a52fbc64656de2c0d3  0002-mohqueue-v0-11.patch
-755efa4ad126c672bc67c53268260b57f7da1f454cdc1a1601778ed7c7d5f0e5  default_ctl.patch
-e00eefed792acbc1ee6eca8fa7389f9973bd53b68fa7abc573f19f1ff26812a1  kamctl_build.patch
+sha256sums="e4bd1d166a58817237809f754b39f3039c60ac0ab60794bb0f7627b6890caec4  kamailio-4.3.0_src.tar.gz
+254ea5d4699417aec49e1aae45398a802067a8967060f2a469e278779d876d22  0001-musl-fixes.patch
+e4cfb439d2969801ca1e0bf890643b4a906c36f8ce7aa08d52a15a10525619b6  0002-mohqueue-v0-11.patch
+46026949a3a367ebaf0c8a7d1ffeeaa3dc67588c94dd8d558991a54996877c1f  0003-kamdbctl-backslash.patch
 8b742ff710ef67ff59ec07a260690ebcdda24fb6f0b7b64dc50433a1bacf99f2  kamailio.cfg
 ba928fa914feea2b95b8c659832e3fbea25eb6ac1ce56e4c23ff58c09f1ec3b8  kamailio.initd"
-sha512sums="737303478eb69da8f0b9782005130a11ef8a9cefb1cb77b5d76e6c066121106e08398861e6096000522d7ddfd7dabd36238d1fdfd4b1e5631048955402393d26  kamailio-4.2.5_src.tar.gz
-a9bb1e8f9f373264b8351ddae099a36a46ddd46fdec09e468d297ba4f64bb4896e7d6e599da70a424e8a28695ab3f3b4ac940afab534593a6b9d08ae462f001a  kamailio-4.2-backslash.patch
-dea7ef2ccf01357576045ba375d41301e2447b4454324007c7ca1862322835c57045852017192ca5434b32dd1b7a2e9669209b7111889dab335b74f042d0f11f  0001-musl-fixes.patch
-b5c048b6e06de0c7514c14d0ec99bbe939eaa956d9d9d3dd5f48b1bcbcff06dbd6498d384427253fb655997a10ec5fa31dcc5cfd2f8cc5c64dcd531649133781  kamailio-4.2-ipops-srv-query.patch
-7ddf6444c15f7338e7aab779ea5b75f4fd936b51cf5d9ba0d09e813566e527f74e59e100661d2b27db99e5fa042614c83e8145e999a8b6bfcfab71c9595bb626  DMQ-multi-notify.patch
-a77e9abdf957a4704477873f57805b07df6390bc2fd24498258c97e6c15b074938d5b7ef6d1cec51b3418ec08e82babdc99d89b51b8c2c440d15f05d5439a261  0002-mohqueue-v0-11.patch
-2321d8afe29b53057ce21e0552dfb80fd6a0e7dc0caf3c4798a8b253518f4c8c546797302933373f4b055a4531329a36ee2d7117b0a88fe39cf153bfef91a656  default_ctl.patch
-4c2c9bde3a4c44feca2863bb03cb031aa55e1c3df21dc7c0acb3a392c34cb36d9a132bcbdf451a0624f8ec202152f1cf238c89280c32f1c04312ce80427a18c6  kamctl_build.patch
+sha512sums="f0964b31eb6b3bc56ec6d45d1f6e94b8016f741d7bf28cf3148ca9525f74a212fb29ee742742fd191df0b363a55e6e31ad8cc4f6339f331b2df7462894ee02de  kamailio-4.3.0_src.tar.gz
+32c8e723ee858b24a3bd1313537e9348bdd895e709041d52199b7d2c4054565f3f8d203458b5a7bd5f4b09a782a972cf87f931de5bb8199e6f9786a3c9bfb3ba  0001-musl-fixes.patch
+dbc230e39b2dc4fbf14f2649a50065947688c55e4d697fdafb8afa70e4ffdd2de91d1ac60d107ee494f59399aa27eaacf3e8411aa6f22459ade2f16a1bd5e232  0002-mohqueue-v0-11.patch
+d96600f1047eac65c0eba34030baa26ee6ee953434ae5808b203cba979fbed616289d40fc588939222371d832f54cbda0a5e8ba9baa16913363e204490758167  0003-kamdbctl-backslash.patch
 c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b  kamailio.cfg
 cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e  kamailio.initd"