Update to Asterisk 13.10.0: this is mainly a bug fix release.

The Asterisk Development Team has announced the release of Asterisk 13.10.0.

The release of Asterisk 13.10.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!

The following are the issues resolved in this release:

Improvements made in this release:
-----------------------------------
 * ASTERISK-26088 - Investigate heavy memory utilization by
      res_pjsip_pubsub (Reported by Richard Mudgett)
 * ASTERISK-26011 - [patch]PJSIP: add "via_addr", "via_port",
      "call_id" to contacts (Reported by Alexei Gradinari)
 * ASTERISK-25994 - [patch]res_pjsip: module load priority
      (Reported by Alexei Gradinari)
 * ASTERISK-25931 - PJSIP: add "reg_server" to contacts. (Reported
      by Alexei Gradinari)
 * ASTERISK-25835 - Authentication using 'Username' field from
      Digest (Reported by Ross Beer)
 * ASTERISK-25930 - PJSIP: disable multi domain to improve realtime
      performace (Reported by Alexei Gradinari)

Bugs fixed in this release:
-----------------------------------
 * ASTERISK-26160 - pjsip: Updated->Reachable during qualify
      (Reported by Matt Jordan)
 * ASTERISK-26177 - func_odbc: Database handle is kept when it
      should be released (Reported by Leandro Dardini)
 * ASTERISK-26099 - res_pjsip_pubsub: Crash when sending request
      due to server timeout (Reported by Ross Beer)
 * ASTERISK-26141 - res_fax: fax_v21_session_new leaks reference to
      v21_details (Reported by Corey Farrell)
 * ASTERISK-26140 - res_rtp_asterisk: gcc 6 caught a
      self-comparison (Reported by George Joseph)
 * ASTERISK-26138 - chan_unistim:  Under FreeBSD, chan_unistim
      generates a compile error (Reported by George Joseph)
 * ASTERISK-26128 - Alembic scripts are failing (Reported by Mark
      Michelson)
 * ASTERISK-26139 - test_res_pjsip_scheduler:  Compile failure if
      pjproject isn't installed in a system location (Reported by
      George Joseph)
 * ASTERISK-26130 - [patch] WebRTC: Should use latest DTLS version.
      (Reported by Alexander Traud)
 * ASTERISK-26127 - res_pjsip_session: Crash due to race condition
      between res_pjsip_session unload and timer (Reported by Joshua
      Colp)
 * ASTERISK-26083 - ARI: Announcer channels staying around after
      playback to a bridge is finished (Reported by Per Jensen)
 * ASTERISK-26126 - [patch] leverage 'bindaddr' for TLS in
      http.conf (Reported by Alexander Traud)
 * ASTERISK-26069 - Asterisk truncates To: header, dropping the
      closing '>' (Reported by Vasil Kolev)
 * ASTERISK-26097 - [patch] CLI: show maximum file descriptors
      (Reported by Alexander Traud)
 * ASTERISK-25262 - Memory leak when a caller channel does multiple
      dials and CEL is enabled (Reported by Etienne Lessard)
 * ASTERISK-26092 - [Segfault] in res_rtp_asterisk.c:4268 after
      Remotely bridged channels (Reported by Niklas Larsson)
 * ASTERISK-26096 - res_hep: Crash when configuration file is
      missing (Reported by Niklas Larsson)
 * ASTERISK-26089 - Invalid security events during boot using PJSIP
      Realtime (Reported by Scott Griepentrog)
 * ASTERISK-26074 - res_odbc: Deadlock within UnixODBC (Reported by
      Ross Beer)
 * ASTERISK-26054 - Asterisk crashes (core dump) (Reported by B.
      Davis)
 * ASTERISK-24436 - Missing header in res/res_srtp.c when compiling
      against libsrtp-1.5.0 (Reported by Patrick Laimbock)
 * ASTERISK-26091 - [patch] ar cru creates warning, instead use ar
      cr (Reported by Alexander Traud)
 * ASTERISK-26070 - ari/channels:  Creating a local channel without
      an originator adds all audio formats to it's capabilities
      (Reported by George Joseph)
 * ASTERISK-26078 - core: Memory leak in logging (Reported by
      Etienne Lessard)
 * ASTERISK-26065 - chan_pjsip: MWI NOTIFY contents not ordered
      properly (Reported by Ross Beer)
 * ASTERISK-26063 - ${PJSIP_HEADER(read,Call-ID)} does not work -
      documentation needs clarification for when read/write is
      possible (Reported by Private Name)
 * ASTERISK-25777 - data race in threadpool (Reported by Badalian
      Vyacheslav)
 * ASTERISK-26038 - 'make install' doesn't seem to install OS/X
      init files (Reported by Tzafrir Cohen)
 * ASTERISK-26029 - parking: ast_parking_park_call should return
      parking_space instead of parking_exten (Reported by Diederik de
      Groot)
 * ASTERISK-25938 - res_odbc: MySQL/MariaDB statement
      LAST_INSERT_ID() always returns zero. (Reported by Edwin
      Vandamme)
 * ASTERISK-25941 - chan_pjsip: Crash on an immediate SIP final
      response (Reported by Javier Riveros )
 * ASTERISK-26014 - res_sorcery_astdb: Make tolerant of unknown
      fields (Reported by Joshua Colp)
 * ASTERISK-24986 - keepalive INFO packages ignored by asterisk
      (Reported by Ilya Trikoz)
 * ASTERISK-26034 - T.38 passthrough problem behind firewall due to
      early nosignal packet (Reported by George Joseph)
 * ASTERISK-26030 - call cut because of double Session-Expires
      header in re-invite after proxy authentication is required
      (Reported by George Joseph)
 * ASTERISK-25964 - Outbound registrations created via ARI/push
      configuration do not clean up outbound registrations currently
      in flight (Reported by Matt Jordan)
 * ASTERISK-26005 - res_pjsip: Multiple SIP messages are combined
      into 1 TCP packet (Reported by Ross Beer)
 * ASTERISK-25352 - res_hep_rtcp correlation_id is different then
      res_hep (Reported by Kevin Scott Adams)
 * ASTERISK-26008 - app_followme does not delete recorded name
      prompt (Reported by Tzafrir Cohen)
 * ASTERISK-26007 - res_pjsip: Endpoints deleting early after
      upgrade from 13.8.2 to 13.9 (Reported by Greg Siemon)
 * ASTERISK-25990 - PJSIP TLS registration should respect
      client_uri scheme when generating Contact URI (Reported by
      Sebastian Damm)
 * ASTERISK-25978 - res_pjsip_authenticator_digest: Should not use
      source port in nonce verification (Reported by Mark Michelson)
 * ASTERISK-25993 - pjproject: Allow bundling to not require
      everything it does (Reported by Joshua Colp)
 * ASTERISK-25956 - Compilation error in conditionally compiled
      code in config_options.c (Reported by Chris Trobridge)
 * ASTERISK-25998 - file: Crash when using nativeformats (Reported
      by Joshua Colp)
 * ASTERISK-25826 - PJSIP / Sorcery slow load from realtime
      (Reported by Ross Beer)
 * ASTERISK-25968 - pjproject_bundled:  Configure and make need to
      be re-tested (Reported by George Joseph)
 * ASTERISK-24463 - Voicemail email address corrupt or not sent
      when message is in the process of being recorded during reload
      (Reported by John Campbell)
 * ASTERISK-25970 - Segfault in pjsip_url_compare (Reported by
      Dmitriy Serov)
 * ASTERISK-25963 - func_odbc requires reconnect checks for stale
      connections (Reported by Ross Beer)
 * ASTERISK-25961 - tests/channels/SIP/sip_tls_call: Sporadic crash
      when running test (Reported by Joshua Colp)
 * ASTERISK-16115 - [patch] problem with ringinuse=no, queue
      members receive sometimes two calls (Reported by nik600)
 * ASTERISK-25917 - [patch]app_voicemail: passwordlocation=spooldir
      only works if you manually add secret.conf yourself (Reported by
      Jonathan R. Rose)
 * ASTERISK-25950 - [patch]SIP channel does not send PeerStatus
      events for autocreated peers (Reported by Kirill Katsnelson)
 * ASTERISK-25954 - Manager QueueSummary and QueueStatus Actions
      are case sensitive to QueueName (Reported by Javier Acosta)

New Features made in this release:
-----------------------------------
 * ASTERISK-25904 - PJSIP: add contact.updated event (Reported by
      Alexei Gradinari)

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-13.10.0

Thank you for your continued support of Asterisk!

8 files changed, 48 insertions, 85 deletions

diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile
index c4b4b891154..c4059c6ee20 100644
--- a/comms/asterisk13/Makefile
+++ b/comms/asterisk13/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2016/07/09 06:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/07/24 06:35:50 jnemeth 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-13.9.1
-PKGREVISION=	1
+DISTNAME=	asterisk-13.10.0
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
diff --git a/comms/asterisk13/PLIST b/comms/asterisk13/PLIST
index daf3909452e..6f48feb3d8a 100644
--- a/comms/asterisk13/PLIST
+++ b/comms/asterisk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/06/09 04:41:48 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/07/24 06:35:50 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -112,6 +112,7 @@ include/asterisk/mixmonitor.h
 include/asterisk/mod_format.h
 include/asterisk/module.h
 include/asterisk/monitor.h
+include/asterisk/multicast_rtp.h
 include/asterisk/musiconhold.h
 include/asterisk/named_locks.h
 include/asterisk/netsock.h
@@ -297,7 +298,7 @@ lib/asterisk/modules/chan_bridge_media.so
 lib/asterisk/modules/chan_iax2.so
 ${PLIST.mgcp}lib/asterisk/modules/chan_mgcp.so
 ${PLIST.jabber}lib/asterisk/modules/chan_motif.so
-lib/asterisk/modules/chan_multicast_rtp.so
+lib/asterisk/modules/chan_rtp.so
 lib/asterisk/modules/chan_oss.so
 lib/asterisk/modules/chan_sip.so
 lib/asterisk/modules/chan_skinny.so
diff --git a/comms/asterisk13/distinfo b/comms/asterisk13/distinfo
index 537ade5e500..9b4bbc3967f 100644
--- a/comms/asterisk13/distinfo
+++ b/comms/asterisk13/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2016/06/09 04:41:48 jnemeth Exp $
+$NetBSD: distinfo,v 1.6 2016/07/24 06:35:50 jnemeth Exp $
 
-SHA1 (asterisk-13.9.1/asterisk-13.9.1.tar.gz) = 0300b6b2abe028fde436300a03dd2f5cdbde8c5a
-RMD160 (asterisk-13.9.1/asterisk-13.9.1.tar.gz) = f28b737e411172ae0a3e23beeef68ed2054f0597
-SHA512 (asterisk-13.9.1/asterisk-13.9.1.tar.gz) = a30635930a8b98b5ff5a132897de16b80cfff182e7dcae5d9507ced95a388fff97c624f75b787ebe6775cf6085a043c152d8854e8f0562528a0e01d2ac295d81
-Size (asterisk-13.9.1/asterisk-13.9.1.tar.gz) = 32537561 bytes
-SHA1 (asterisk-13.9.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 831ae6442e23cbef1e7d1c84798778ad0b0524d1
-RMD160 (asterisk-13.9.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = d52df795201c53fc4cd7d99ed41516e312f6f0f3
-SHA512 (asterisk-13.9.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = c7d3c3fd2c854e6776801312d34bf69bbed78a443c16121637f508c5275f18b1d415cbb6e4f6f8c5aa3769cbbfa1a11485b9972053777f3ac39256c2c81729f1
-Size (asterisk-13.9.1/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 4256538 bytes
+SHA1 (asterisk-13.10.0/asterisk-13.10.0.tar.gz) = fc1d21248b875d7fe142d247525cf9c8d4a594f7
+RMD160 (asterisk-13.10.0/asterisk-13.10.0.tar.gz) = d5e992c0abb4e7baaf3f999337f380f2f3076c35
+SHA512 (asterisk-13.10.0/asterisk-13.10.0.tar.gz) = 14758144010ee7a4a2bad03a3ac14ac74b66a48953902d68d768efd8cf0e34d47f6d9c1ee38df13d44f20f457f30539c1765dfd8edeabea05a9d017fa1711090
+Size (asterisk-13.10.0/asterisk-13.10.0.tar.gz) = 32628566 bytes
+SHA1 (asterisk-13.10.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 831ae6442e23cbef1e7d1c84798778ad0b0524d1
+RMD160 (asterisk-13.10.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = d52df795201c53fc4cd7d99ed41516e312f6f0f3
+SHA512 (asterisk-13.10.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = c7d3c3fd2c854e6776801312d34bf69bbed78a443c16121637f508c5275f18b1d415cbb6e4f6f8c5aa3769cbbfa1a11485b9972053777f3ac39256c2c81729f1
+Size (asterisk-13.10.0/asterisk-extra-sounds-en-gsm-1.5.tar.gz) = 4256538 bytes
 SHA1 (patch-Makefile) = 1373ea4cfab46f701cef0f5c61a6a1604e710bf5
 SHA1 (patch-addons_chan__ooh323.c) = 9cba619ced6a4449604faebeac33d91a23519c48
 SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10
@@ -20,19 +20,16 @@ SHA1 (patch-cdr_cdr__pgsql.c) = 02dc677126a8fb00b30f7f073a60b68942281dfe
 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f
 SHA1 (patch-channels_chan__oss.c) = 8a1c32462097f4a58f48a1a994aff5a8ab4c9fb2
 SHA1 (patch-channels_chan__sip.c) = a4abe1dcdec3db719a7fd0e5dbefb9c12f6a37db
-SHA1 (patch-channels_chan__unistim.c) = 838f7206aa64837cc45f61c575e7f4388a4f793c
 SHA1 (patch-codecs_codec__dahdi.c) = 77d43907df17b0c1eeb0a1e9e95811c7ef7ae624
 SHA1 (patch-configure) = 4ec1e504cefadd009ecf3cb8305eae2630f8fefb
 SHA1 (patch-configure.ac) = b635426354a7d72b7a0b19c35e700a53f1d96486
 SHA1 (patch-contrib_scripts_vmail.cgi) = 672827eedf315a82a289c82d1ae8b935166e9319
 SHA1 (patch-funcs_func__env.c) = 0faf9eafe2a5f1701924973a54d0ab49ba62a3b3
 SHA1 (patch-include_asterisk_autoconfig.h.in) = 94de39b7eed7d51ae676415ccaadfdee0cdc4d23
-SHA1 (patch-include_asterisk_compat.h) = d15a5b7a059659b5015e17a9110a2da4497a1077
 SHA1 (patch-include_asterisk_endian.h) = 1fc20d750da7d0a0407c1e1694b8bb21753acdcd
 SHA1 (patch-include_asterisk_lock.h) = ce636ef6102a2a95600cfc8215305507e08fe8f9
-SHA1 (patch-include_asterisk_poll-compat.h) = ff25a81e462cdc37928fddeafe687c650860c746
 SHA1 (patch-include_asterisk_strings.h) = d204488d681e39af6fadf9f054c9e402f4cb8657
-SHA1 (patch-main_Makefile) = ccc971a6fa438120c00246daa5c16fa066607161
+SHA1 (patch-main_Makefile) = 7a4449ca3d8a33adc640436fade268285c7e2191
 SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb
 SHA1 (patch-main_asterisk.c) = 93ae4e31b4ae279e42b5c3661bb5fdb76d9ea161
 SHA1 (patch-main_astmm.c) = 26a98d6fbb567ae619041ebd01a31349a847deab
@@ -40,7 +37,7 @@ SHA1 (patch-main_cdr.c) = 540fbdb354aba100fa37392b879b92a85d1d8620
 SHA1 (patch-main_cel.c) = 22fa21db8e0afa0958d34014f52e2c4fe9c73ba2
 SHA1 (patch-main_http.c) = b36f1f3f0da25456a17888d34ea2bf7b61c1acf4
 SHA1 (patch-main_logger.c) = 321a52b3015af85ea13055953cec5a5d9da05ec8
-SHA1 (patch-main_manager.c) = 8cfdac2aed203573d1c426cea1131fca12b9cd9e
+SHA1 (patch-main_manager.c) = 2e50ec3af30792fd87bf5253a0d99a03f2892957
 SHA1 (patch-main_netsock.c) = 383952a5fd4e1cecf7d1fa304a897d72e52cdf8c
 SHA1 (patch-main_pbx.c) = 8e7ced268edb29238f96418e8b21456364c4ae1f
 SHA1 (patch-main_pbx__builtins.c) = fbe673500404438f4c38c1dd45dbadb04c88cf99
diff --git a/comms/asterisk13/patches/patch-channels_chan__unistim.c b/comms/asterisk13/patches/patch-channels_chan__unistim.c
deleted file mode 100644
index 13e218bb8c1..00000000000
--- a/comms/asterisk13/patches/patch-channels_chan__unistim.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-channels_chan__unistim.c,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
-
---- channels/chan_unistim.c.orig	2015-10-09 21:48:48.000000000 +0000
-+++ channels/chan_unistim.c
-@@ -1021,7 +1021,7 @@ static int get_to_address(int fd, struct
- 	memcpy(&toAddr->sin_addr, &ip_msg.address, sizeof(struct in_addr));
- 	return err;
- #else
--	memcpy(&toAddr, &public_ip, sizeof(&toAddr));
-+	memcpy(toAddr, &public_ip, sizeof(struct sockaddr_in));
- 	return 0;
- #endif
- }
diff --git a/comms/asterisk13/patches/patch-include_asterisk_compat.h b/comms/asterisk13/patches/patch-include_asterisk_compat.h
deleted file mode 100644
index a598a718d8c..00000000000
--- a/comms/asterisk13/patches/patch-include_asterisk_compat.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_asterisk_compat.h,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
-
---- include/asterisk/compat.h.orig	2015-10-09 21:48:48.000000000 +0000
-+++ include/asterisk/compat.h
-@@ -68,7 +68,7 @@
- #endif
- 
- #ifndef AST_POLL_COMPAT
--#include <sys/poll.h>
-+#include <poll.h>
- #else
- #include "asterisk/poll-compat.h"
- #endif
diff --git a/comms/asterisk13/patches/patch-include_asterisk_poll-compat.h b/comms/asterisk13/patches/patch-include_asterisk_poll-compat.h
deleted file mode 100644
index 508d881d40a..00000000000
--- a/comms/asterisk13/patches/patch-include_asterisk_poll-compat.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_asterisk_poll-compat.h,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
-
---- include/asterisk/poll-compat.h.orig	2015-10-09 21:48:48.000000000 +0000
-+++ include/asterisk/poll-compat.h
-@@ -83,7 +83,7 @@
- 
- #ifndef AST_POLL_COMPAT
- 
--#include <sys/poll.h>
-+#include <poll.h>
- 
- #define ast_poll(a, b, c) poll(a, b, c)
- 
diff --git a/comms/asterisk13/patches/patch-main_Makefile b/comms/asterisk13/patches/patch-main_Makefile
index 3a79fc094d2..78ef65eedee 100644
--- a/comms/asterisk13/patches/patch-main_Makefile
+++ b/comms/asterisk13/patches/patch-main_Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-main_Makefile,v 1.3 2016/06/09 04:41:49 jnemeth Exp $
+$NetBSD: patch-main_Makefile,v 1.4 2016/07/24 06:35:50 jnemeth Exp $
 
---- main/Makefile.orig	2016-05-13 17:41:41.000000000 +0000
+--- main/Makefile.orig	2016-07-21 14:54:02.000000000 +0000
 +++ main/Makefile
 @@ -96,6 +96,10 @@ ifeq ($(OSARCH),OpenBSD)
    AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
@@ -13,20 +13,7 @@ $NetBSD: patch-main_Makefile,v 1.3 2016/06/09 04:41:49 jnemeth Exp $
  ifeq ($(OSARCH),SunOS)
    AST_LIBS+=-lpthread -ldl -lrt -lnsl -lsocket -lresolv
    ASTSSL_LIBS+=-L/opt/ssl/lib -L/usr/local/ssl/lib
-@@ -224,11 +228,7 @@ endif
- 
- $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
- 	$(ECHO_PREFIX) echo "   [LN] $< -> $@"
--	$(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \
--		$(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\
--	else \
--		$(LN) -sf $< $@ ;\
--	fi
-+	$(CMD_PREFIX) $(LN) -sf $< $@
- 
- else # Darwin
- ASTSSL_LIB:=libasteriskssl.dylib
-@@ -345,10 +345,10 @@ bininstall:
+@@ -337,10 +341,10 @@ bininstall:
  	$(INSTALL) -m 755 $(MAIN_TGT) "$(DESTDIR)$(ASTSBINDIR)/"
  ifeq ($(AST_ASTERISKSSL),yes)
  ifeq ($(findstring darwin,$(OSARCH)),) # not Darwin
@@ -40,7 +27,7 @@ $NetBSD: patch-main_Makefile,v 1.3 2016/06/09 04:41:49 jnemeth Exp $
  endif
  endif
  ifeq ($(PJPROJECT_BUNDLED),yes)
-@@ -373,9 +373,7 @@ endif
+@@ -365,9 +369,7 @@ endif
  ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.)
  	rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)"
  endif
diff --git a/comms/asterisk13/patches/patch-main_manager.c b/comms/asterisk13/patches/patch-main_manager.c
index 1557f155912..88d3151c458 100644
--- a/comms/asterisk13/patches/patch-main_manager.c
+++ b/comms/asterisk13/patches/patch-main_manager.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_manager.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+$NetBSD: patch-main_manager.c,v 1.2 2016/07/24 06:35:50 jnemeth Exp $
 
---- main/manager.c.orig	2015-10-09 21:48:48.000000000 +0000
+--- main/manager.c.orig	2016-07-21 14:54:02.000000000 +0000
 +++ main/manager.c
-@@ -2440,7 +2448,7 @@ static char *handle_showmanconn(struct a
+@@ -2492,7 +2492,7 @@ static char *handle_showmanconn(struct a
  	struct mansession_session *session;
  	time_t now = time(NULL);
  #define HSMCONN_FORMAT1 "  %-15.15s  %-55.55s  %-10.10s  %-10.10s  %-8.8s  %-8.8s  %-5.5s  %-5.5s\n"
@@ -11,7 +11,7 @@ $NetBSD: patch-main_manager.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
  	int count = 0;
  	struct ao2_iterator i;
  
-@@ -2466,8 +2474,8 @@ static char *handle_showmanconn(struct a
+@@ -2518,8 +2518,8 @@ static char *handle_showmanconn(struct a
  			ao2_lock(session);
  			ast_cli(a->fd, HSMCONN_FORMAT2, session->username,
  				ast_sockaddr_stringify_addr(&session->addr),
@@ -22,7 +22,7 @@ $NetBSD: patch-main_manager.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
  				session->fd,
  				session->inuse,
  				session->readperm,
-@@ -3299,9 +3307,9 @@ static int action_ping(struct mansession
+@@ -3359,9 +3359,9 @@ static int action_ping(struct mansession
  	astman_append(
  		s,
  		"Ping: Pong\r\n"
@@ -34,14 +34,32 @@ $NetBSD: patch-main_manager.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
  	return 0;
  }
  
-@@ -6606,8 +6623,8 @@ int __ast_manager_event_multichan(int ca
+@@ -4492,7 +4492,7 @@ static int action_status(struct mansessi
+ 			"DNID: %s\r\n"
+ 			"EffectiveConnectedLineNum: %s\r\n"
+ 			"EffectiveConnectedLineName: %s\r\n"
+-			"TimeToHangup: %ld\r\n"
++			"TimeToHangup: %jd\r\n"
+ 			"BridgeID: %s\r\n"
+ 			"Linkedid: %s\r\n"
+ 			"Application: %s\r\n"
+@@ -4524,7 +4524,7 @@ static int action_status(struct mansessi
+ 			S_OR(ast_channel_dialed(chan)->number.str, ""),
+ 			S_COR(ast_channel_connected_effective_id(chan).number.valid, ast_channel_connected_effective_id(chan).number.str, "<unknown>"),
+ 			S_COR(ast_channel_connected_effective_id(chan).name.valid, ast_channel_connected_effective_id(chan).name.str, "<unknown>"),
+-			(long)ast_channel_whentohangup(chan)->tv_sec,
++			(intmax_t)ast_channel_whentohangup(chan)->tv_sec,
+ 			bridge ? bridge->uniqueid : "",
+ 			ast_channel_linkedid(chan),
+ 			ast_channel_appl(chan),
+@@ -6700,8 +6700,8 @@ static int __attribute__((format(printf,
  	if (timestampevents) {
  		now = ast_tvnow();
  		ast_str_append(&buf, 0,
--				"Timestamp: %ld.%06lu\r\n",
--				 (long)now.tv_sec, (unsigned long) now.tv_usec);
-+				"Timestamp: %jd.%06lu\r\n",
-+				 (intmax_t)now.tv_sec, (unsigned long) now.tv_usec);
+-			"Timestamp: %ld.%06lu\r\n",
+-			(long)now.tv_sec, (unsigned long) now.tv_usec);
++			"Timestamp: %jd.%06lu\r\n",
++			(intmax_t)now.tv_sec, (unsigned long) now.tv_usec);
  	}
  	if (manager_debug) {
  		static int seq;