main/kamailio: Version bump to 4.1.0

New (4.1.x) modules added to the following packages:

kamailio:         gzcompress,rtpproxy-ng,stun,sipt
kamailio-extras:  cnxcc
kamailio-db:      mohqueue
kamailio-ims:     ims-charging
kamailio-authephemeral: auth_ephemeral (no default from upstream)

1 files changed, 101 insertions, 96 deletions

diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 156d1b8a7b..37f6c61db4 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.4
-pkgrel=1
+pkgver=4.1.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 libunistring-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 
 # See sip-router/Makfile.groups for the list of recommended modules for
@@ -23,35 +23,34 @@ install="$pkgname.pre-install $pkgname.pre-upgrade"
 #
 # _mod_list_dbg is not defined in the orginal
 #
-# Move avp from _mod_list_extra to _mod_list_basic, so that we can create
-# a kamailio-extra package
+# Move avp from _mod_list_extras to _mod_list_basic, so that we can create
+# a kamailio-extras package
 #
 # Remove db_text from _mod_list_db because we create a separate dbtext package
 #
 # - basic used modules, with no extra dependency (widespread usage)
 _mod_list_basic="avp async auth benchmark blst cfg_rpc cfgutils corex counters \
-                ctl debugger diversion enum exec ipops kex mangler 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"
+		ctl debugger diversion enum exec gzcompress ipops kex mangler \
+		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"
 
 # - extra used modules, with no extra dependency
-_mod_list_extras="auth_diameter call_control dmq domainpolicy msrp pdb \
-                qos sca seas sms sst timer tmrec uac_redirect xhttp \
-		        xhttp_rpc xprint"
+_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"
 
 # - common modules depending on database
 _mod_list_db="acc alias_db auth_db avpops cfg_db db_flatstore \
-                db_cluster dialog dispatcher domain drouting group \
-                htable imc matrix msilo mtree p_usrloc pdt permissions \
-                pipelimit prefix_route registrar sipcapture siptrace speeddial \
-                sqlops uac uri_db userblacklist usrloc"
-
+		db_cluster dialog dispatcher domain drouting group \
+		htable imc matrix mohqueue msilo mtree p_usrloc pdt permissions \
+		pipelimit prefix_route registrar sipcapture siptrace speeddial \
+		sqlops uac uri_db userblacklist usrloc"
 
 # - common modules depending on database, using UID db schema
 _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \
-                uid_uri_db"
+		uid_uri_db"
 
 # - modules for devel purposes
 _mod_list_devel="malloc_test print print_lib"
@@ -122,13 +121,19 @@ _mod_list_stun="stun"
 # - modules depending on libval-threads libcrypto libsres libpthread
 _mod_list_dnssec="dnssec"
 
+# - modules depending on libsctp                                   
+_mod_list_sctp="sctp"
+
+# - modules depending on openssl library                           
+_mod_list_authephemeral="auth_ephemeral"
+
 # - modules related to SIMPLE presence extensions
 _mod_list_presence="presence presence_conference presence_dialoginfo \
-                    presence_mwi presence_profile presence_reginfo \
-                    presence_xml \
-                    pua pua_bla pua_dialoginfo pua_mi pua_reginfo \
-                    pua_usrloc pua_xmpp \
-                    rls xcap_client xcap_server"
+			presence_mwi presence_profile presence_reginfo \
+			presence_xml \
+			pua pua_bla pua_dialoginfo pua_mi pua_reginfo \
+			pua_usrloc pua_xmpp \
+			rls xcap_client xcap_server"
 
 # - modules depending on lua library
 _mod_list_lua="app_lua"
@@ -159,8 +164,8 @@ _mod_list_mono="app_mono"
 
 # - modules related to IMS extensions
 _mod_list_ims="cdp cdp_avp dialog_ng ims_auth ims_isc ims_icscf ims_qos \
-                ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \
-                ims_usrloc_scscf"
+		ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf \
+		ims_usrloc_scscf ims_charging"
 
 # - modules depending on osp toolkit library
 _mod_list_osp="osp"
@@ -182,18 +187,17 @@ _module_group_kstandard="$_mod_list_basic $_mod_list_dbuid $_mod_list_pcre"
 subpackages="$pkgname-doc"
 _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 dbg \
-    extras websocket; do
-   
+	cpl xml unixodbc snmpstats xmpp carrierroute \
+	ldap utils tls presence lua ims outbound dbg \
+	extras websocket authephemeral; 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
-	0001-websocket-remove-libunistring-dependency.patch
-	musl-fixes.patch
-	kamailio-4.0-backslash.patch
+	kamailio-4.1-backslash.patch
+	0001-4.1-backports-to-2013-12-12.patch
 	kamailio.cfg
 	kamailio.initd
 	"
@@ -235,7 +239,6 @@ build() {
 	cd "$_builddir"
 	make FLAVOUR=kamailio STUN=1 \
 		PREFIX=/usr \
-		CC_EXTRA_OPTS="$CFLAGS -D_GNU_SOURCE" \
 		cfg_target=/etc/kamailio/ \
 		include_modules="$_modules" \
 		LIBDIR=lib \
@@ -254,7 +257,7 @@ package() {
 	mv "$pkgdir"/etc/kamailio/kamailio.cfg \
 		"$pkgdir"/usr/share/doc/kamailio/
 	install -m644 -D "$srcdir"/kamailio.cfg \
-		"$pkgdir"/etc/kamailio/kamailio.cfg 
+		"$pkgdir"/etc/kamailio/kamailio.cfg
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -d -o kamailio "$pkgdir"/var/run/kamailio
@@ -289,134 +292,136 @@ _db_driver() {
 
 
 db() {
-    _generic_pkg "modules using a database backend" "$_mod_list_db"
+	_generic_pkg "modules using a database backend" "$_mod_list_db"
 }
 
 postgres() {
-    _db_driver Postgres postgres postgres pgsql
+	_db_driver Postgres postgres postgres pgsql
 }
 
 mysql() {
-    _db_driver Mysql mysql mysql mysql
+	_db_driver Mysql mysql mysql mysql
 }
 
 sqlite() {
-    _db_driver SQlite sqlite db_sqlite sqlite
+	_db_driver SQlite sqlite db_sqlite sqlite
 }
 
 dbtext() {
-    _db_driver DBText text dbtext dbtext || return 1
-    depends="$depends python"
-    mkdir -p "$subpkgdir"/usr/lib/kamailio/kamctl
-    mv "$pkgdir"/usr/lib/kamailio/kamctl/dbtextdb \
-        "$subpkgdir"/usr/lib/kamailio/kamctl/
+	_db_driver DBText text dbtext dbtext || return 1
+	depends="$depends python"
+	mkdir -p "$subpkgdir"/usr/lib/kamailio/kamctl
+	mv "$pkgdir"/usr/lib/kamailio/kamctl/dbtextdb \
+		"$subpkgdir"/usr/lib/kamailio/kamctl/
 }
 
 
 cpl() {
-    _generic_pkg "CPL (Call Processing Language) interpreter" \
-        "$_mod_list_cpl"
+	_generic_pkg "CPL (Call Processing Language) interpreter" \
+		"$_mod_list_cpl"
 }
 
 xml() {
-    _generic_pkg "XML related modules: $_mod_list_xml" \
-        "$_mod_list_xml" || return 1
-    mkdir -p "$subpkgdir"/usr/share/kamailio
-    mv "$pkgdir"/usr/share/kamailio/xhttp_pi \
-        "$subpkgdir"/usr/share/kamailio || return 1
-    mkdir -p "$subpkgdir"/etc/kamailio/
-    mv "$pkgdir"/etc/kamailio/pi_framework.xml \
-        "$subpkgdir"/etc/kamailio || return 1
+	_generic_pkg "XML related modules: $_mod_list_xml" \
+		"$_mod_list_xml" || return 1
+	mkdir -p "$subpkgdir"/usr/share/kamailio
+	mv "$pkgdir"/usr/share/kamailio/xhttp_pi \
+		"$subpkgdir"/usr/share/kamailio || return 1
+	mkdir -p "$subpkgdir"/etc/kamailio/
+	mv "$pkgdir"/etc/kamailio/pi_framework.xml \
+		"$subpkgdir"/etc/kamailio || return 1
 }
 
 unixodbc() {
-    _generic_pkg "Database drivers for unixodbc" \
-        "$_mod_list_unixodbc"
+	_generic_pkg "Database drivers for unixodbc" \
+		"$_mod_list_unixodbc"
 }
 
 snmpstats() {
-    _generic_pkg "SNMP statistics support" \
-        "$_mod_list_snmpstats" || return 1
-    mkdir -p "$subpkgdir"/usr/share/snmp
-    mv "$_builddir"/modules/snmpstats/mibs \
-       "$subpkgdir"/usr/share/snmp/ || return 1
+	_generic_pkg "SNMP statistics support" \
+		"$_mod_list_snmpstats" || return 1
+	mkdir -p "$subpkgdir"/usr/share/snmp
+	mv "$_builddir"/modules/snmpstats/mibs \
+		"$subpkgdir"/usr/share/snmp/ || return 1
 }
 
 xmpp() {
-    _generic_pkg "XMPP (Jabber) gateway" \
-        "$_mod_list_xmpp"
+	_generic_pkg "XMPP (Jabber) gateway" \
+		"$_mod_list_xmpp"
 }
 
 carrierroute() {
-    _generic_pkg "carrier grade routing functions" \
-        "$_mod_list_carrierroute"
+	_generic_pkg "carrier grade routing functions" \
+		"$_mod_list_carrierroute"
 }
 
 ldap() {
-    _generic_pkg "LDAP search functions" \
-        "$_mod_list_ldap"
+	_generic_pkg "LDAP search functions" \
+		"$_mod_list_ldap"
 }
 
 utils() {
-    _generic_pkg "miscelaneous utility functions" \
-        "$_mod_list_utils"
+	_generic_pkg "miscelaneous utility functions" \
+		"$_mod_list_utils"
 }
 
 tls() {
-    _generic_pkg "TLS support" \
-        "$_mod_list_tls"
+	_generic_pkg "TLS support" \
+		"$_mod_list_tls"
 }
 
 presence() {
-    _generic_pkg "SIP Notify (Presence) support" \
-        "$_mod_list_presence"
+	_generic_pkg "SIP Notify (Presence) support" \
+		"$_mod_list_presence"
 }
 
 lua() {
 	_generic_pkg "Lua script support" \
-        "$_mod_list_lua"
+		"$_mod_list_lua"
 }
 
 ims() {
-    _generic_pkg "IP Multimedia Subsystem (IMS) support" \
-        "$_mod_list_ims"
+	_generic_pkg "IP Multimedia Subsystem (IMS) support" \
+		"$_mod_list_ims"
 }
 
 outbound() {
-    _generic_pkg "RFC 5626 section 5 Outbound suppport" \
-        "$_mod_list_outbound"
+	_generic_pkg "RFC 5626 section 5 Outbound suppport" \
+		"$_mod_list_outbound"
 }
 
 dbg() {
-    _generic_pkg "debugging modules" \
-        "$_mod_list_dbg"
+	_generic_pkg "debugging modules" \
+		"$_mod_list_dbg"
 }
 
 extras() {
-    _generic_pkg "extra modules" \
-        "$_mod_list_extra"
+	_generic_pkg "extra modules" \
+		"$_mod_list_extras"
 }
 
 websocket() {
-    _generic_pkg "websocket support" \
-        "$_mod_list_websocket"
+	_generic_pkg "websocket support" \
+		"$_mod_list_websocket"
+}
+
+authephemeral() {
+	_generic_pkg "auth ephemeral (webrtc)" \
+		"$_mod_list_authephemeral"
 }
 
-md5sums="e625f52d53ed00da97a50b3ecd451b8d  kamailio-4.0.4_src.tar.gz
-6251a5c33373c5276897c8abbbecc619  0001-websocket-remove-libunistring-dependency.patch
-2f26f821280bc65b77231ec3ba6e0472  musl-fixes.patch
-7ca9394c4987c83a27f492c5b6b055f0  kamailio-4.0-backslash.patch
+md5sums="a7d0e685c4890895c6a8623777a111a6  kamailio-4.1.0_src.tar.gz
+2ab22324f307424958cfa786acfd3bc1  kamailio-4.1-backslash.patch
+50071a01fd1b4d1230fca439b2569432  0001-4.1-backports-to-2013-12-12.patch
 a3c959ec568c43a905710e7d25cd8c25  kamailio.cfg
 9c190575e28772a784c4172216d85333  kamailio.initd"
-sha256sums="abd6e8a1076d8e58d80a3bb6efc32d784b130796add03961f4bbdbd6f58049a7  kamailio-4.0.4_src.tar.gz
-bbc06f9ae62b2e8df2c58f9a171f0408e075d5a51e2457e85ef3ca01aa972df9  0001-websocket-remove-libunistring-dependency.patch
-46b92e27006c08cc3511d241d2958b720a8b5de650b7d51339b265b4b0a48474  musl-fixes.patch
-2cb24070809718deac1a32fd4de73eaea47c685d9608fd06ae6531bd34fe4604  kamailio-4.0-backslash.patch
+sha256sums="bea5edb51b42d6ce9b5befdc352cd401e91714cdcb5b21db3c05a40390d22907  kamailio-4.1.0_src.tar.gz
+d74f14413feeebf67cb94c0274f3ef5efd1b59d17c92da264a1e3c3fe0aa83dc  kamailio-4.1-backslash.patch
+4adaeb4327d6bf6b0e459c4a43c95a877929360f50631c742bc4531b059bb465  0001-4.1-backports-to-2013-12-12.patch
 8024266849033a917147827c3579a382f10f3796989bebc6de3d7c80c965fb72  kamailio.cfg
 82612cc107e51de6968568a266de25b98e57257926defab7261fd81cbd624e00  kamailio.initd"
-sha512sums="5b486ca72094edef3f617a5285af5519614d3b470babf78db921cf3c321eccc2314e3bbf745e86929fb51249e25c1d55abd519f4559acbd6cfe5cf527485bb0f  kamailio-4.0.4_src.tar.gz
-a972e57d8d64c104cb3df329442c746588818ed7f148a409d6050bcbbbb021cc1eeb970b59924e0ffb7f9487faacb99cada0dbfb19b0b87f66ca6b2bcf8b8345  0001-websocket-remove-libunistring-dependency.patch
-443b4b4cfcc6d4c55833185829cc43ed11b922169d9f24d8aecfaf3c59d65cb32a2806cdd2e846261767c7ad7cbca0517d52c7e0bf10e55cbe4b5fab2b62e4e8  musl-fixes.patch
-f83ca7e4feaa02ba4c97fe8b3ff72857b334b6ba27f90b1cc4a2819c77bf40a1d6b77cc8d9b9afa045da5a1a4706b737b73f93c39c0cdb57c14088ca691afbf9  kamailio-4.0-backslash.patch
+sha512sums="d364a9f31049ceb01171ded0f5ab23ebbb0386637f5b78a21fda800ef9a90b58ecf6596057fcc72c32e91014251416004309d9095afd63d2af95019764a19f93  kamailio-4.1.0_src.tar.gz
+70b0d6ffb7c728d0aa962cb646713cf5a3c2665a57c2dd85d2f820384235426de59ef202a97d24321c3428aa6af32182091b53c79f82072b2232f0146c9310ff  kamailio-4.1-backslash.patch
+851fb3b3c1a5125ccc0b4c8d9672ed90fb7d20032ee421edc95590d740e0d31ae9b8d8ed1f326ae41ed8fde224bb3f8ee5dd1c8147d48b86d5e7dfd2104ba839  0001-4.1-backports-to-2013-12-12.patch
 0b666bfa10fd0af97b62749f8691cb3f76d9b40d1abe0a33e810e367bd733d2e8189c89f7f23010ec591116aada6e1a8a403b17449fe775038917617f281ad4d  kamailio.cfg
 babec2a230daea3c579dc581f9a945c70bd1736cdacaaa7a183d902c8d9fbd4f7958cce03424fb65cdf7a1f6aa077ad8aec7e53525e270f88f856caa374505e7  kamailio.initd"