kamailio - version bump to 4.2.0

new in sub-packages:

 kamailio:        rtpproxy-ng renamed to rtpengine
 kamailio-extras: tsilo jsonrpc-s
 kamailio-uuid:   new (uuid module)
 kamailio-ev:     new (evapi module)

1 files changed, 40 insertions, 29 deletions

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index d1d4e64a9d..59e3cbd21b 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.5
-pkgrel=2
+pkgver=4.2.0
+pkgrel=0
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 arch="all"
@@ -13,7 +13,7 @@ license="GPL2+"
 depends=""
 makedepends="bison flex expat-dev postgresql-dev pcre-dev mysql-dev
 	libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev
-	lua-dev openldap-dev openssl-dev net-snmp-dev"
+	lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 
 # See Makefile.groups for the list of recommended modules for
@@ -34,12 +34,12 @@ _mod_list_basic="avp async auth benchmark blst cfg_rpc cfgutils corex counters \
 		maxfwd mediaproxy mi_datagram mi_fifo mi_rpc mqueue \
 		nat_traversal nathelper path pike pv ratelimit rr rtimer \
 		rtpproxy sanity sdpops siputils sl statistics textops \
-		textopsx tm tmx topoh xlog rtpproxy-ng stun sipt"
+		textopsx tm tmx topoh xlog rtpengine stun sipt"
 
 # - 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 uac_redirect xhttp \
-		xhttp_rpc xprint"
+		qos sca seas sms sst timer tmrec tsilo uac_redirect xhttp \
+		xhttp_rpc xprint jsonrpc-s nosip"
 
 # - common modules depending on database
 _mod_list_db="acc alias_db auth_db avpops cfg_db db_flatstore \
@@ -74,7 +74,7 @@ _mod_list_postgres="db_postgres"
 _mod_list_unixodbc="db_unixodbc"
 
 # - modules depending on mysql cassandra library
-_mod_list_cassandra="db_cassandra"
+_mod_list_cassandra="db_cassandra ndb_cassandra"
 
 # - modules depending on xml2 library
 _mod_list_cpl="cpl-c"
@@ -115,9 +115,6 @@ _mod_list_outbound="outbound"
 # - modules depending on unistring library
 _mod_list_websocket="websocket"
 
-# - modules depending on openssl library
-_mod_list_stun="stun"
-
 # - modules depending on libval-threads libcrypto libsres libpthread
 _mod_list_dnssec="dnssec"
 
@@ -176,6 +173,19 @@ _mod_list_java="app_java"
 # - modules depending on iptables library
 _mod_list_iptrtpproxy="iptrtpproxy"
 
+# - modules depending on uuid library
+_mod_list_uuid="uuid"
+
+# - modules depending on ev library
+_mod_list_ev="evapi"
+
+# - modules depending on kazoo/rabbitmq
+_mod_list_kazoo="kazoo"
+
+# - modules depending on mongodb
+_mod_list_mongodb="db_mongodb ndb_mongodb"
+
+
 # Alpine Specific
 _mod_list_debugger="$_mod_list_devel benchmark debugger"
 
@@ -189,18 +199,15 @@ _modules="$_module_group_kstandard"
 for _i in db postgres sqlite dbtext mysql \
 	cpl xml unixodbc snmpstats xmpp carrierroute \
 	ldap utils tls presence lua ims outbound debugger \
-	extras websocket authephemeral; do
+	extras websocket authephemeral ev uuid; do
 
    subpackages="$subpackages $pkgname-$_i"
    eval "_modules=\"\$_modules \$_mod_list_$_i\""
 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-fix_180_replies_in_sca_call_info.patch 
-	musl-fixes.patch
-
+	kamailio-4.2-backslash.patch
+	0001-musl-fixes.patch
 	kamailio.cfg
 	kamailio.initd
 	"
@@ -240,7 +247,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	make FLAVOUR=kamailio STUN=1 \
+	make FLAVOUR=kamailio STUN=1 EMBEDDED_UTF_DECODE=1\
 		PREFIX=/usr \
 		CC_EXTRA_OPTS="$CFLAGS -D_GNU_SOURCE" \
 		cfg_target=/etc/kamailio/ \
@@ -414,24 +421,28 @@ authephemeral() {
 		"$_mod_list_authephemeral"
 }
 
-md5sums="623b46e969445494655b1aa5ab5ad4b0  kamailio-4.1.5_src.tar.gz
+ev() {
+	_generic_pkg "Network event broadcast API" \
+		"$_mod_list_ev"
+}
+
+uuid() {
+	_generic_pkg "UUID generator using libuuid" \
+		"$_mod_list_uuid"
+}
+
+md5sums="6b5dc98be07a5d68b3701d7955102d34  kamailio-4.2.0_src.tar.gz
 bad1ac2d4c95043df271d2ea6d37627a  kamailio-4.1-backslash.patch
-6251a5c33373c5276897c8abbbecc619  0001-websocket-remove-libunistring-dependency.patch
-018ce30f5169866d12b395ba30bf3263  0002-fix_180_replies_in_sca_call_info.patch
-558aa761bddb6ac85c152bd767670fcc  musl-fixes.patch
+4685288dc54680597b00f956dc95d4d6  0001-musl-fixes.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 0e0a271fd3ddb7e87c01c26c7d041d59  kamailio.initd"
-sha256sums="e24d078aa2a8500f7cf75120628140218241b1faf9f40ece118f4e6a5ca3b3d3  kamailio-4.1.5_src.tar.gz
+sha256sums="617423cedf740719c21f4731094f1e0b755ae65952979eeea3e8e229a8da21a4  kamailio-4.2.0_src.tar.gz
 d7e59be721ed0ad4621d404493b9a519708d801e9d4914b0164b819fa1abcd13  kamailio-4.1-backslash.patch
-bbc06f9ae62b2e8df2c58f9a171f0408e075d5a51e2457e85ef3ca01aa972df9  0001-websocket-remove-libunistring-dependency.patch
-e7217f214c4bdd8c2dbccfa1036a68749b2e7c0dbad0b10a44a84709e1660a99  0002-fix_180_replies_in_sca_call_info.patch
-4f316e4c1617833111b86aad1e8878b62599e42bb229fe1ef7eee1d4438471e2  musl-fixes.patch
+b98555ff304b51b82c6cf7e01d757b15ea4f05bd2e603c84d4384df6a6be62b6  0001-musl-fixes.patch
 8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
 a90d3ab09a3ed58892e94710a1f80492a61ffad1ccf7ccb5b851bb8f538d32c4  kamailio.initd"
-sha512sums="578870f96d9251e676c2689d7a48d2a0a4fd37e5bfde0d145adfcffea1470d618f1eb0e5012ffe2c63d1b2c9e659128e3cbe50403c94499951b75e59bb223f0e  kamailio-4.1.5_src.tar.gz
+sha512sums="811c19bf55000905a827f6ea956cd1c445fe1522c69b8eaf83d5a5dc5fba250fe84c6841e3e8d0769f225bc94c87f2fdf6349ed0f2521395a52b609bf55842e7  kamailio-4.2.0_src.tar.gz
 a9bb1e8f9f373264b8351ddae099a36a46ddd46fdec09e468d297ba4f64bb4896e7d6e599da70a424e8a28695ab3f3b4ac940afab534593a6b9d08ae462f001a  kamailio-4.1-backslash.patch
-a972e57d8d64c104cb3df329442c746588818ed7f148a409d6050bcbbbb021cc1eeb970b59924e0ffb7f9487faacb99cada0dbfb19b0b87f66ca6b2bcf8b8345  0001-websocket-remove-libunistring-dependency.patch
-558a4dbd2c84a6d0208c5e0a65eacc6241ad20948a5882834d40106f6f1d4b40ec139bf8b513e6e7cb7afee71823f1811d85e2904f9b06720383b5581a1e9aca  0002-fix_180_replies_in_sca_call_info.patch
-9afb7191541b40678ede6dd1bb034b2a6a704659acb54e156096fe0660e08358b0691028b1facfb50608ca2d25714962c92ede62e1f95cb53475c89d96bd33e4  musl-fixes.patch
+dea7ef2ccf01357576045ba375d41301e2447b4454324007c7ca1862322835c57045852017192ca5434b32dd1b7a2e9669209b7111889dab335b74f042d0f11f  0001-musl-fixes.patch
 0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg
 5ddaa059cdef10462c904f061f7bb085e62ad7501e2ed41f797d9e68822bce4e0e5ca09c1586c3901c920f8ce563c8c3ede860752c2b9bdb8f09908388ef337f  kamailio.initd"