asterisk16: Update to 16.15.0

Upstream changes:

  bugfixes
  minor improvements
  STIR/SHAKEN support

4 files changed, 32 insertions, 27 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index 7c6504acb6e..300c2a7e71c 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.71 2020/12/04 20:45:03 nia Exp $
+# $NetBSD: Makefile,v 1.72 2020/12/10 13:52:30 gdt Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile
 #       to find out the current sound file versions
 
-DISTNAME=	asterisk-16.12.0
-PKGREVISION=	4
+DISTNAME=	asterisk-16.15.0
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/
 MASTER_SITES+=	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index 54c6b7098a0..e6c0ec25440 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2020/05/01 07:57:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/12/10 13:52:30 gdt Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -60,7 +60,6 @@ include/asterisk/datastore.h
 include/asterisk/devicestate.h
 include/asterisk/dial.h
 include/asterisk/dlinkedlists.h
-include/asterisk/dns_txt.h
 include/asterisk/dns.h
 include/asterisk/dns_core.h
 include/asterisk/dns_internal.h
@@ -71,6 +70,7 @@ include/asterisk/dns_resolver.h
 include/asterisk/dns_srv.h
 include/asterisk/dns_test.h
 include/asterisk/dns_tlsa.h
+include/asterisk/dns_txt.h
 include/asterisk/dnsmgr.h
 include/asterisk/doxygen/architecture.h
 include/asterisk/doxygen/licensing.h
@@ -111,6 +111,7 @@ include/asterisk/linkedlists.h
 include/asterisk/localtime.h
 include/asterisk/lock.h
 include/asterisk/logger.h
+include/asterisk/logger_category.h
 include/asterisk/manager.h
 include/asterisk/max_forwards.h
 include/asterisk/md5.h
@@ -155,6 +156,7 @@ include/asterisk/res_pjsip_presence_xml.h
 include/asterisk/res_pjsip_pubsub.h
 include/asterisk/res_pjsip_session.h
 include/asterisk/res_srtp.h
+include/asterisk/res_stir_shaken.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -213,6 +215,7 @@ include/asterisk/udptl.h
 include/asterisk/ulaw.h
 include/asterisk/unaligned.h
 include/asterisk/uri.h
+include/asterisk/utf8.h
 include/asterisk/utils.h
 include/asterisk/uuid.h
 include/asterisk/vector.h
@@ -499,6 +502,7 @@ lib/asterisk/modules/res_pjsip_sdp_rtp.so
 lib/asterisk/modules/res_pjsip_send_to_voicemail.so
 lib/asterisk/modules/res_pjsip_session.so
 lib/asterisk/modules/res_pjsip_sips_contact.so
+lib/asterisk/modules/res_pjsip_stir_shaken.so
 lib/asterisk/modules/res_pjsip_t38.so
 lib/asterisk/modules/res_pjsip_transport_websocket.so
 lib/asterisk/modules/res_pjsip_xpidf_body_generator.so
@@ -524,6 +528,7 @@ lib/asterisk/modules/res_stasis_playback.so
 lib/asterisk/modules/res_stasis_recording.so
 lib/asterisk/modules/res_stasis_snoop.so
 lib/asterisk/modules/res_statsd.so
+lib/asterisk/modules/res_stir_shaken.so
 lib/asterisk/modules/res_stun_monitor.so
 ${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
@@ -2636,6 +2641,7 @@ share/examples/asterisk/sorcery.conf
 share/examples/asterisk/ss7.timers
 share/examples/asterisk/stasis.conf
 share/examples/asterisk/statsd.conf
+share/examples/asterisk/stir_shaken.conf
 share/examples/asterisk/telcordia-1.adsi
 share/examples/asterisk/test_sorcery.conf
 share/examples/asterisk/udptl.conf
diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo
index dfe73be76ed..832f17a48c6 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.36 2020/08/13 09:24:25 ryoon Exp $
+$NetBSD: distinfo,v 1.37 2020/12/10 13:52:30 gdt Exp $
 
-SHA1 (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 85f67fbba2401f45ace3d47eff6affa36521682c
-RMD160 (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 99779e3f6e977752c1e2a851ee5360c9b0215d04
-SHA512 (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 1fc41b92d070efd4a7ea5db1a36c83bdb6dbbe7d9b5087b0a887ba3d6875e81ba1b71a79b216138b242f0349a176baf6745480ff6fb7ed47c62dda4b09b6a891
-Size (asterisk-16.12.0/asterisk-16.12.0.tar.gz) = 27727347 bytes
-SHA1 (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9
-RMD160 (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106
-SHA512 (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
-Size (asterisk-16.12.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
-SHA1 (asterisk-16.12.0/pjproject-2.10.md5) = 1f91cf11ef1df14344817905e165cc1908668d18
-RMD160 (asterisk-16.12.0/pjproject-2.10.md5) = c33bbef404923860a41e34520871c0fa7533a01d
-SHA512 (asterisk-16.12.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054
-Size (asterisk-16.12.0/pjproject-2.10.md5) = 110 bytes
-SHA1 (asterisk-16.12.0/pjproject-2.10.tar.bz2) = 0c691fa3562d4daad4b4374df61e8325ac15cc55
-RMD160 (asterisk-16.12.0/pjproject-2.10.tar.bz2) = 9ffe871976a67e4d29d45fdb2c1fc26b2925ef86
-SHA512 (asterisk-16.12.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e
-Size (asterisk-16.12.0/pjproject-2.10.tar.bz2) = 7339188 bytes
+SHA1 (asterisk-16.15.0/asterisk-16.15.0.tar.gz) = a2499cc75ad181a39c2a16c4a1999aafd2d984a8
+RMD160 (asterisk-16.15.0/asterisk-16.15.0.tar.gz) = 8fcd344bf2ee36b0fc2b8bc9634cfca3c45f5be7
+SHA512 (asterisk-16.15.0/asterisk-16.15.0.tar.gz) = 42e3ac65a9e21f1769e52978619567874c612a37739a00f62d52d921c98ea0c3fe7e5b00029916dc6b840670772d47765f0f3f6aaab97fcafd5e574517968313
+Size (asterisk-16.15.0/asterisk-16.15.0.tar.gz) = 27807885 bytes
+SHA1 (asterisk-16.15.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9
+RMD160 (asterisk-16.15.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106
+SHA512 (asterisk-16.15.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
+Size (asterisk-16.15.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
+SHA1 (asterisk-16.15.0/pjproject-2.10.md5) = 1f91cf11ef1df14344817905e165cc1908668d18
+RMD160 (asterisk-16.15.0/pjproject-2.10.md5) = c33bbef404923860a41e34520871c0fa7533a01d
+SHA512 (asterisk-16.15.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054
+Size (asterisk-16.15.0/pjproject-2.10.md5) = 110 bytes
+SHA1 (asterisk-16.15.0/pjproject-2.10.tar.bz2) = 0c691fa3562d4daad4b4374df61e8325ac15cc55
+RMD160 (asterisk-16.15.0/pjproject-2.10.tar.bz2) = 9ffe871976a67e4d29d45fdb2c1fc26b2925ef86
+SHA512 (asterisk-16.15.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e
+Size (asterisk-16.15.0/pjproject-2.10.tar.bz2) = 7339188 bytes
 SHA1 (patch-Makefile) = f7630acc724e1beb422226318611d5f3f79be82b
 SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23
 SHA1 (patch-channels_Makefile) = b32bb8439ae07ed361ab7cb811b4766a27f09ec9
@@ -30,7 +30,7 @@ SHA1 (patch-main_pbx__builtins.c) = 7c1d518f05afc1523b247f50b0363e25832c8636
 SHA1 (patch-main_stdtime_localtime.c) = d530bea8f93667a07b707e6fb01c6744aa264d40
 SHA1 (patch-main_utils.c) = ab85be3687dd7f39b742bd5e4036f9e297f3e272
 SHA1 (patch-pbx_pbx__dundi.c) = d2a50650a19463304c81fc19c460565b94f91b72
-SHA1 (patch-res_res__rtp__asterisk.c) = ea63841700ca31653c7ddcc8d296348b9ee68964
+SHA1 (patch-res_res__rtp__asterisk.c) = feb320521a545be615133777374825e17e428c93
 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54
 SHA1 (patch-tests_test__locale.c) = f3f1edc86356f2a7b4d3493433c772e164c77f66
 SHA1 (patch-utils_Makefile) = 4b4be483c20768d640efae5c18fc6f6770eb8c0c
diff --git a/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c b/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c
index e46ccf0e1b3..820d216a519 100644
--- a/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c
+++ b/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-res_res__rtp__asterisk.c,v 1.2 2020/05/01 07:57:36 ryoon Exp $
+$NetBSD: patch-res_res__rtp__asterisk.c,v 1.3 2020/12/10 13:52:30 gdt Exp $
 
---- res/res_rtp_asterisk.c.orig	2020-04-30 14:11:40.000000000 +0000
+--- res/res_rtp_asterisk.c.orig	2020-11-19 12:34:40.000000000 +0000
 +++ res/res_rtp_asterisk.c
 @@ -63,6 +63,10 @@
  #include <ifaddrs.h>
@@ -11,9 +11,9 @@ $NetBSD: patch-res_res__rtp__asterisk.c,v 1.2 2020/05/01 07:57:36 ryoon Exp $
 +}
 +
  #include "asterisk/options.h"
+ #include "asterisk/logger_category.h"
  #include "asterisk/stun.h"
- #include "asterisk/pbx.h"
-@@ -3581,7 +3585,7 @@ static void rtp_add_candidates_to_ice(st
+@@ -3623,7 +3627,7 @@ static void rtp_add_candidates_to_ice(st
  	}
  
  	/* If configured to use a STUN server to get our external mapped address do so */