Subject: [PATCH] main/kamailio: version bump to 5.4.1

From: Nathan Angelacos <[email-masked]>
Date: Tue, 1 Sep 2020 17:46:00 +0000

New modules added:
  app_python (python2)
  dnssec
  kafka
  mqtt
---
 main/kamailio/APKBUILD | 63 +++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index f90bf91cb2..0820a4eff7 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -4,17 +4,17 @@
 # Maintainer: Nathan Angelacos <[email-masked]>
 
 pkgname=kamailio
-pkgver=5.3.4
-pkgrel=1
+pkgver=5.4.1
+pkgrel=0
 
 # If building from a git snapshot, specify the gitcommit
-# If building a proper release, leave gitcommit blank
+# If building a proper release, leave gitcommit blank or commented
 #_gitcommit=991fe9b28e0e201309048f3b38a135037e40357a
 
-[ ! -z "$_gitcommit" ] && pkgver="$pkgver.$(date +%Y%m%d)"
-[ ! -z "$_gitcommit" ] && _suffix="-${_gitcommit:0:7}"
-[ ! -z "$_gitcommit" ] && builddir="$srcdir/$pkgname-$_gitcommit" || builddir="$srcdir/$pkgname-$pkgver"
-[ -z "$_gitcommit" ] && _gitcommit="$pkgver"
+[ ! -z "${_gitcommit}" ] && pkgver="$pkgver.$(date +%Y%m%d)"
+[ ! -z "${_gitcommit}" ] && _suffix="-${_gitcommit:0:7}"
+[ ! -z "${_gitcommit}" ] && builddir="$srcdir/$pkgname-$_gitcommit" || builddir="$srcdir/$pkgname-$pkgver"
+[ -z "${_gitcommit}" ] && _gitcommit="$pkgver"
 
 pkgdesc="Open Source SIP Server"
 url="https://www.kamailio.org/"
@@ -30,9 +30,9 @@ makedepends="bison db-dev flex freeradius-client-dev expat-dev
 	confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev
 	net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev
 	linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev
-	ruby-dev libmaxminddb-dev libunistring-dev"
+	ruby-dev libmaxminddb-dev libunistring-dev mosquitto-dev librdkafka-dev 
+	dnssec-tools-dev python2-dev"
 source="kamailio-${pkgver}$_suffix.tar.gz::https://github.com/kamailio/kamailio/archive/$_gitcommit.tar.gz
-	jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch
 	kamailio.initd
 	"
 
@@ -40,7 +40,7 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
 
 # secfixes:
 #   5.1.4-r0:
-#     - CVE-2018-14767
+#   - CVE-2018-14767
 
 # See Makefile.groups for the list of recommended modules for
 # each package.  What follows is a simplified version of Makefile.groups
@@ -60,7 +60,8 @@ _mod_list_basic="avp async auth benchmark blst cfg_rpc cfgt cfgutils corex count
 		maxfwd mediaproxy mqueue \
 		nat_traversal nathelper path pike pv ratelimit rr rtimer \
 		rtpproxy sanity sdpops siputils sl smsops statsc statistics \
-		textops textopsx tm tmx topoh topos xlog rtpengine stun sipt"
+		textops textopsx tm tmx topoh topos xlog rtpengine stun sipt \
+		pv_headers kemix dlgs"
 
 # - extra used modules, with no extra dependency
 _mod_list_extras="auth_diameter call_control cnxcc dmq domainpolicy log_custom \
@@ -165,12 +166,21 @@ _mod_list_perl="app_perl db_perlvdb"
 # - modules depending on python3 libarary
 _mod_list_python3="app_python3"
 
+# - modules depending on python2 libarary
+_mod_list_python="app_python"
+
 # - modules depending on ruby library
 _mod_list_ruby="app_ruby"
 
 # - modules depending on rabbitmq
 _mod_list_rabbitmq="rabbitmq"
 
+# - modules depending on rdkafka library
+_mod_list_kafka=kafka
+
+# - modules depending on mqtt mosquitto and ev library
+_mod_list_mqtt=mqtt
+
 # - modules depending on geoip2 library
 _mod_list_geoip2="geoip2"
 
@@ -244,10 +254,10 @@ _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 json websocket authephemeral \
+	extras json websocket authephemeral dnssec \
 	uuid ev memcached redis geoip2 jansson sqlang sipdump \
-	jsdt http_async kazoo rabbitmq sctp radius perl python3 \
-	ruby; do
+	jsdt http_async kazoo rabbitmq sctp radius perl \
+	python python3 mqtt kafka ruby; do
 
 	subpackages="$subpackages $pkgname-$_i"
 	eval "_modules=\"\$_modules \$_mod_list_$_i\""
@@ -513,6 +523,12 @@ python3() {
 		"$_mod_list_python3"
 }
 
+python() {
+	_generic_pkg "Execute embedded Python2 scripts" \
+		"$_mod_list_python"
+}
+
+
 ruby() {
 	_generic_pkg "Execute embedded Ruby scripts" \
 		"$_mod_list_ruby"
@@ -523,16 +539,31 @@ sqlang() {
 		"$_mod_list_sqlang"
 }
 
+mqtt() {
+		_generic_pkg "MQTT publish/subscribe connector" \
+		"$_mod_list_mqtt"
+}
+
+kafka() {
+		_generic_pkg "Produce and send messages to a Kafka server" \
+		"$_mod_list_kafka"
+}
+
+
 rabbitmq() {
 	_generic_pkg "RabbitMQ related modules for Kamailio" \
 		"$_mod_list_rabbitmq"
 }
 
+dnssec() {
+	_generic_pkg "DNSSEC implementation for SIP routing" \
+		"$_mod_list_dnssec"
+}
+
 sipdump() {
 	_generic_pkg "This module writes SIP traffic and some associated details into local files" \
 		"$_mod_list_sipdump"
 }
 
-sha512sums="ed242b6d63e1559ddb9336928e6c52c9242ca67a838f97a32ff30e6a0bc9f271e2f173bad315d64ae6d353b7ce7ced2a85c55bcc41a466e3b6403f487f876f7f  kamailio-5.3.4.tar.gz
-98a8fd556cc0c0b1af3da236ea67690f57fd063e24468e5dc3f33a4b0b61f8a6a464117d6bad83b6ac257eb1cd9f328c172e789d42174c15272aaf5aaa922028  jsonrcc-use-extern-not-to-declare-global-variables-many-times.patch
+sha512sums="dc77f5acae45056d1278788af8db4e58b43c3e2cd3ca6b012f45283d810dfaeb8a514bb2c4a0c109c64b799efd09ef8d41f246fb96c8dd7d84f84135c8473699  kamailio-5.4.1.tar.gz
 0c87bfb78481568c03e603049eb8597a90d24ae2941fc81694181b2326fa9db89fbddaaa3cf08c7bc2f5fa0e7ffac4cf4e2d010d08c4faa6cf6df98593432539  kamailio.initd"
-- 
2.28.0