Update to Asterisk 10.6.0: this is a bugfix release

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

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

The following is a sample of the issues resolved in this release:

* --- format_mp3: Fix a possible crash in mp3_read().

* --- Fix local channel chains optimizing themselves out of a call.

* --- Re-add LastMsgsSent value for SIP peers

* --- Prevent sip_pvt refleak when an ast_channel outlasts its
      corresponding sip_pvt.

* --- Send more accurate identification information in dialog-info SIP
      NOTIFYs.

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

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

Thank you for your continued support of Asterisk!

3 files changed, 50 insertions, 50 deletions

diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile
index a898a0b8339..7c59f721f91 100644
--- a/comms/asterisk10/Makefile
+++ b/comms/asterisk10/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2012/07/06 21:10:11 jnemeth Exp $
+# $NetBSD: Makefile,v 1.21 2012/07/15 07:51:02 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-10.5.2
+DISTNAME=	asterisk-10.6.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo
index 4c98d4ae532..27a9b41f265 100644
--- a/comms/asterisk10/distinfo
+++ b/comms/asterisk10/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2012/07/06 21:10:11 jnemeth Exp $
+$NetBSD: distinfo,v 1.16 2012/07/15 07:51:02 jnemeth Exp $
 
-SHA1 (asterisk-10.5.2/asterisk-10.5.2.tar.gz) = 81afb0c51a83f9781a46b795b3897954a6eb9e5d
-RMD160 (asterisk-10.5.2/asterisk-10.5.2.tar.gz) = fb192d37f06e172a348a84d11faf2181bf7dbdae
-Size (asterisk-10.5.2/asterisk-10.5.2.tar.gz) = 24971040 bytes
-SHA1 (asterisk-10.5.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-10.5.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-10.5.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-10.6.0/asterisk-10.6.0.tar.gz) = c6707ed2d6b4705d3145d64ad01a9cb15fbc34c3
+RMD160 (asterisk-10.6.0/asterisk-10.6.0.tar.gz) = c0679dc3aeefc68ba11b4019bce0ad58cef13f74
+Size (asterisk-10.6.0/asterisk-10.6.0.tar.gz) = 24997175 bytes
+SHA1 (asterisk-10.6.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-10.6.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-10.6.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
 SHA1 (patch-Makefile) = 1f351f6b3de49ee32be69cd8b8f88571b7ae9e03
 SHA1 (patch-apps_app__dial.c) = 2109ed50406dedc90a300981a3a7500b1397ff3a
 SHA1 (patch-apps_app__followme.c) = a0a507986ec9722337d46fdaaac0a79d23a634e4
@@ -24,7 +24,7 @@ SHA1 (patch-include_asterisk_lock.h) = fc7b4934e5f53a09066802daa054300895cf7bcf
 SHA1 (patch-main_Makefile) = 4b80898802c75937510acf5252c5e82d379f578e
 SHA1 (patch-main_acl.c) = 85cea968f3c3a2651a687661bba2d8131c342d5a
 SHA1 (patch-main_asterisk.c) = 9670f68f5496a74ee359ba45c85757fa894775b6
-SHA1 (patch-main_features.c) = ae9fce5975e83c2e0e8a9d7277898ddc21dd45dc
+SHA1 (patch-main_features.c) = 4624d0349e138da2782779f9a7d7a9b404bd1662
 SHA1 (patch-main_manager.c) = 305204b2602b5775d97e72852859ce793a96df0a
 SHA1 (patch-main_netsock.c) = 68721f0b1e8ed6744d467a39a82473c5d4946f0f
 SHA1 (patch-main_sched.c) = fac7764ef00c05057730b24fcdf833fe77d23ade
diff --git a/comms/asterisk10/patches/patch-main_features.c b/comms/asterisk10/patches/patch-main_features.c
index 6e44a759040..957471403e9 100644
--- a/comms/asterisk10/patches/patch-main_features.c
+++ b/comms/asterisk10/patches/patch-main_features.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_features.c,v 1.2 2012/04/07 20:05:57 jnemeth Exp $
+$NetBSD: patch-main_features.c,v 1.3 2012/07/15 07:51:02 jnemeth Exp $
 
---- main/features.c.orig	2012-02-27 16:05:24.000000000 +0000
+--- main/features.c.orig	2012-07-05 23:05:44.000000000 +0000
 +++ main/features.c
-@@ -1493,14 +1493,14 @@ static int park_call_full(struct ast_cha
+@@ -1547,14 +1547,14 @@ static int park_call_full(struct ast_cha
  		"Channel: %s\r\n"
  		"Parkinglot: %s\r\n"
  		"From: %s\r\n"
@@ -19,43 +19,43 @@ $NetBSD: patch-main_features.c,v 1.2 2012/04/07 20:05:57 jnemeth Exp $
  		S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, "<unknown>"),
  		S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, "<unknown>"),
  		S_COR(chan->connected.id.number.valid, chan->connected.id.number.str, "<unknown>"),
-@@ -2057,7 +2057,7 @@ static int builtin_automonitor(struct as
- 			len = strlen(touch_monitor) + 50;
- 			args = alloca(len);
- 			touch_filename = alloca(len);
--			snprintf(touch_filename, len, "%s-%ld-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), touch_monitor);
-+			snprintf(touch_filename, len, "%s-%jd-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), touch_monitor);
- 			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
- 		} else {
- 			caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
-@@ -2067,7 +2067,7 @@ static int builtin_automonitor(struct as
- 			len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
- 			args = alloca(len);
- 			touch_filename = alloca(len);
--			snprintf(touch_filename, len, "%s-%ld-%s-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), caller_chan_id, callee_chan_id);
-+			snprintf(touch_filename, len, "%s-%jd-%s-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), caller_chan_id, callee_chan_id);
- 			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
- 		}
+@@ -2113,7 +2113,7 @@ static int builtin_automonitor(struct as
+ 		len = strlen(touch_monitor) + 50;
+ 		args = alloca(len);
+ 		touch_filename = alloca(len);
+-		snprintf(touch_filename, len, "%s-%ld-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), touch_monitor);
++		snprintf(touch_filename, len, "%s-%jd-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), touch_monitor);
+ 		snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
+ 	} else {
+ 		caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
+@@ -2123,7 +2123,7 @@ static int builtin_automonitor(struct as
+ 		len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
+ 		args = alloca(len);
+ 		touch_filename = alloca(len);
+-		snprintf(touch_filename, len, "%s-%ld-%s-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), caller_chan_id, callee_chan_id);
++		snprintf(touch_filename, len, "%s-%jd-%s-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), caller_chan_id, callee_chan_id);
+ 		snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
+ 	}
  
-@@ -2173,7 +2173,7 @@ static int builtin_automixmonitor(struct
- 			len = strlen(touch_monitor) + 50;
- 			args = alloca(len);
- 			touch_filename = alloca(len);
--			snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor);
-+			snprintf(touch_filename, len, "auto-%jd-%s", (intmax_t)time(NULL), touch_monitor);
- 			snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
- 		} else {
- 			caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
-@@ -2183,7 +2183,7 @@ static int builtin_automixmonitor(struct
- 			len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
- 			args = alloca(len);
- 			touch_filename = alloca(len);
--			snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id);
-+			snprintf(touch_filename, len, "auto-%jd-%s-%s", (intmax_t)time(NULL), caller_chan_id, callee_chan_id);
- 			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
- 		}
+@@ -2225,7 +2225,7 @@ static int builtin_automixmonitor(struct
+ 		len = strlen(touch_monitor) + 50;
+ 		args = alloca(len);
+ 		touch_filename = alloca(len);
+-		snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor);
++		snprintf(touch_filename, len, "auto-%jd-%s", (intmax_t)time(NULL), touch_monitor);
+ 		snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
+ 	} else {
+ 		caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
+@@ -2235,7 +2235,7 @@ static int builtin_automixmonitor(struct
+ 		len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
+ 		args = alloca(len);
+ 		touch_filename = alloca(len);
+-		snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id);
++		snprintf(touch_filename, len, "auto-%jd-%s-%s", (intmax_t)time(NULL), caller_chan_id, callee_chan_id);
+ 		snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
+ 	}
  
-@@ -6973,10 +6973,10 @@ static char *handle_parkedcalls(struct a
+@@ -7010,10 +7010,10 @@ static char *handle_parkedcalls(struct a
  
  		AST_LIST_LOCK(&curlot->parkings);
  		AST_LIST_TRAVERSE(&curlot->parkings, cur, list) {
@@ -68,7 +68,7 @@ $NetBSD: patch-main_features.c,v 1.2 2012/04/07 20:05:57 jnemeth Exp $
  			++lotparked;
  		}
  		AST_LIST_UNLOCK(&curlot->parkings);
-@@ -7032,7 +7032,7 @@ static int manager_parking_status(struct
+@@ -7069,7 +7069,7 @@ static int manager_parking_status(struct
  				"Exten: %d\r\n"
  				"Channel: %s\r\n"
  				"From: %s\r\n"
@@ -77,7 +77,7 @@ $NetBSD: patch-main_features.c,v 1.2 2012/04/07 20:05:57 jnemeth Exp $
  				"CallerIDNum: %s\r\n"
  				"CallerIDName: %s\r\n"
  				"ConnectedLineNum: %s\r\n"
-@@ -7041,7 +7041,7 @@ static int manager_parking_status(struct
+@@ -7078,7 +7078,7 @@ static int manager_parking_status(struct
  				"\r\n",
  				curlot->name,
  				cur->parkingnum, cur->chan->name, cur->peername,