Update to Asterisk 10.3.0:

pkgsrc change: eliminate ilbc option now that iLBC codec is always built

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

The release of Asterisk 10.3.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:

* --- Fix potential buffer overrun and memory leak when executing "sip
      show peers"

* --- Fix ACK routing for non-2xx responses.

* --- Remove possible segfaults from res_odbc by adding locks around
      usage of odbc handle

* --- Fix blind transfer parking issues if the dialed extension is not
      recognized as a parking extension.

* --- Copy CDR variables when set during a bridge

* --- push 'outgoing' flag from sig_XXX up to chan_dahdi

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

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

Thank you for your continued support of Asterisk!

6 files changed, 42 insertions, 49 deletions

diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile
index 77958fd4695..b32b50a6c87 100644
--- a/comms/asterisk10/Makefile
+++ b/comms/asterisk10/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/03/25 02:17:47 jnemeth Exp $
+# $NetBSD: Makefile,v 1.11 2012/04/07 20:05:57 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-10.2.1
+DISTNAME=	asterisk-10.3.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/comms/asterisk10/PLIST b/comms/asterisk10/PLIST
index 773003e1d1f..73a9e173813 100644
--- a/comms/asterisk10/PLIST
+++ b/comms/asterisk10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/03/25 02:17:47 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/04/07 20:05:57 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -237,7 +237,7 @@ lib/asterisk/modules/codec_alaw.so
 lib/asterisk/modules/codec_g722.so
 lib/asterisk/modules/codec_g726.so
 lib/asterisk/modules/codec_gsm.so
-${PLIST.ilbc}lib/asterisk/modules/codec_ilbc.so
+lib/asterisk/modules/codec_ilbc.so
 lib/asterisk/modules/codec_lpc10.so
 lib/asterisk/modules/codec_resample.so
 ${PLIST.speex}lib/asterisk/modules/codec_speex.so
diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo
index 563c309b9fb..e3873e7e899 100644
--- a/comms/asterisk10/distinfo
+++ b/comms/asterisk10/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2012/03/25 02:17:47 jnemeth Exp $
+$NetBSD: distinfo,v 1.8 2012/04/07 20:05:57 jnemeth Exp $
 
-SHA1 (asterisk-10.2.1/asterisk-10.2.1.tar.gz) = 1353019ade550eccd7989dc87fa4313f42919fc7
-RMD160 (asterisk-10.2.1/asterisk-10.2.1.tar.gz) = ad4bf33d0d544e3a1ac28d1547c771fc6c80b31f
-Size (asterisk-10.2.1/asterisk-10.2.1.tar.gz) = 25121295 bytes
-SHA1 (asterisk-10.2.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-10.2.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-10.2.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-10.3.0/asterisk-10.3.0.tar.gz) = a381839702e6007b8d6d3412eebda4bd60a3b799
+RMD160 (asterisk-10.3.0/asterisk-10.3.0.tar.gz) = 69449a0232d10d574dfd53f65f76278bba8645aa
+Size (asterisk-10.3.0/asterisk-10.3.0.tar.gz) = 25168737 bytes
+SHA1 (asterisk-10.3.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-10.3.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-10.3.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
 SHA1 (patch-Makefile) = 900252eff84bda22d2cbe09e0f22505531284cbb
 SHA1 (patch-apps_app__dial.c) = 2109ed50406dedc90a300981a3a7500b1397ff3a
 SHA1 (patch-apps_app__followme.c) = a0a507986ec9722337d46fdaaac0a79d23a634e4
@@ -14,7 +14,7 @@ SHA1 (patch-apps_app__sms.c) = 8013727b495dc0ac038eb28b84e9d3839d0bc23d
 SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
 SHA1 (patch-channels_chan__oss.c) = 3a69c29f4106bfabe05f63118d73538e85478e88
 SHA1 (patch-codecs_lpc10_Makefile) = 0c9955e87eb453d70517951114d335d91b3ee73a
-SHA1 (patch-configure) = e6be6277bc8896715a7b984e72d37616e2b29b77
+SHA1 (patch-configure) = bc87d1244016797db123831728208ca27736fca4
 SHA1 (patch-configure.ac) = 27ac6fd657c490689ec06cddf7cd10e9cc8a7927
 SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
@@ -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) = a63520c329df3192ee1b8bc4e2d36070ce450528
+SHA1 (patch-main_features.c) = ae9fce5975e83c2e0e8a9d7277898ddc21dd45dc
 SHA1 (patch-main_manager.c) = 305204b2602b5775d97e72852859ce793a96df0a
 SHA1 (patch-main_netsock.c) = 68721f0b1e8ed6744d467a39a82473c5d4946f0f
 SHA1 (patch-main_sched.c) = fac7764ef00c05057730b24fcdf833fe77d23ade
diff --git a/comms/asterisk10/options.mk b/comms/asterisk10/options.mk
index 7192e7c75f3..9a5b35c6c27 100644
--- a/comms/asterisk10/options.mk
+++ b/comms/asterisk10/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/03/25 02:17:47 jnemeth Exp $
+# $NetBSD: options.mk,v 1.4 2012/04/07 20:05:57 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=		ldap jabber speex
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		zaptel x11 unixodbc ilbc webvmail ldap spandsp jabber
+PLIST_VARS+=		zaptel x11 unixodbc webvmail ldap spandsp jabber
 PLIST_VARS+=		speex
 
 # Asterisk now uses DAHDI, not zaptel; not implemented yet...
@@ -43,10 +43,6 @@ CONFIGURE_ARGS+=	--without-ltdl
 CONFIGURE_ARGS+=	--without-unixodbc
 .endif
 
-.if !empty(PKG_OPTIONS:Milbc)
-PLIST.ilbc=		yes
-.endif
-
 .if !empty(PKG_OPTIONS:Mspandsp)
 .  include "../../comms/spandsp/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-spandsp
@@ -71,9 +67,6 @@ post-configure:
 .if !empty(PKG_OPTIONS:Munixodbc)
 	${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts
 .endif
-.if !empty(PKG_OPTIONS:Milbc)
-	${ECHO} "MENUSELECT_CODECS=-codec_ilbc" >> ${WRKSRC}/pkgsrc.makeopts
-.endif
 	# this is a hack to work around a bug in menuselect
 	${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
 	cd ${WRKSRC} && make menuselect.makeopts
diff --git a/comms/asterisk10/patches/patch-configure b/comms/asterisk10/patches/patch-configure
index e41c9a413b8..556c75e6c55 100644
--- a/comms/asterisk10/patches/patch-configure
+++ b/comms/asterisk10/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
+$NetBSD: patch-configure,v 1.3 2012/04/07 20:05:57 jnemeth Exp $
 
---- configure.orig	2012-01-14 16:41:55.000000000 +0000
+--- configure.orig	2012-02-16 19:44:44.000000000 +0000
 +++ configure
-@@ -16480,6 +16480,148 @@ fi
+@@ -24527,6 +24527,148 @@ fi
  
  
  
@@ -151,21 +151,21 @@ $NetBSD: patch-configure,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -17486,6 +17628,8 @@ $as_echo_n "checking if \"struct ifaddrs
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -28831,6 +28973,8 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-  #include <ifaddrs.h>
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
  int
  main ()
-@@ -28858,10 +29002,9 @@ if test "x$ac_cv_file__sbin_launchd" = x
- 
- $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+@@ -55858,10 +56002,10 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SBIN_LAUNCHD 1
+ _ACEOF
  
 -fi
--
+ 
    PBX_LAUNCHD=1
  fi
 +fi
diff --git a/comms/asterisk10/patches/patch-main_features.c b/comms/asterisk10/patches/patch-main_features.c
index 03b99ffbea2..6e44a759040 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.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-main_features.c,v 1.2 2012/04/07 20:05:57 jnemeth Exp $
 
---- main/features.c.orig	2011-10-20 21:58:39.000000000 +0000
+--- main/features.c.orig	2012-02-27 16:05:24.000000000 +0000
 +++ main/features.c
-@@ -1494,14 +1494,14 @@ static int park_call_full(struct ast_cha
+@@ -1493,14 +1493,14 @@ static int park_call_full(struct ast_cha
  		"Channel: %s\r\n"
  		"Parkinglot: %s\r\n"
  		"From: %s\r\n"
@@ -13,13 +13,13 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  		"ConnectedLineNum: %s\r\n"
  		"ConnectedLineName: %s\r\n"
  		"Uniqueid: %s\r\n",
- 		pu->parkingexten, pu->chan->name, pu->parkinglot->name, event_from ? event_from : "",
+ 		pu->parkingexten, chan->name, pu->parkinglot->name, event_from,
 -		(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
 +		(intmax_t)pu->start.tv_sec + (intmax_t)(pu->parkingtime/1000) - (intmax_t)time(NULL),
- 		S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"),
- 		S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"),
- 		S_COR(pu->chan->connected.id.number.valid, pu->chan->connected.id.number.str, "<unknown>"),
-@@ -2053,7 +2053,7 @@ static int builtin_automonitor(struct as
+ 		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);
@@ -28,7 +28,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  			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,
-@@ -2063,7 +2063,7 @@ static int builtin_automonitor(struct as
+@@ -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);
@@ -37,7 +37,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
  		}
  
-@@ -2169,7 +2169,7 @@ static int builtin_automixmonitor(struct
+@@ -2173,7 +2173,7 @@ static int builtin_automixmonitor(struct
  			len = strlen(touch_monitor) + 50;
  			args = alloca(len);
  			touch_filename = alloca(len);
@@ -46,7 +46,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  			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,
-@@ -2179,7 +2179,7 @@ static int builtin_automixmonitor(struct
+@@ -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);
@@ -55,7 +55,7 @@ $NetBSD: patch-main_features.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
  		}
  
-@@ -6922,10 +6922,10 @@ static char *handle_parkedcalls(struct a
+@@ -6973,10 +6973,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.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  			++lotparked;
  		}
  		AST_LIST_UNLOCK(&curlot->parkings);
-@@ -6981,7 +6981,7 @@ static int manager_parking_status(struct
+@@ -7032,7 +7032,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.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  				"CallerIDNum: %s\r\n"
  				"CallerIDName: %s\r\n"
  				"ConnectedLineNum: %s\r\n"
-@@ -6990,7 +6990,7 @@ static int manager_parking_status(struct
+@@ -7041,7 +7041,7 @@ static int manager_parking_status(struct
  				"\r\n",
  				curlot->name,
  				cur->parkingnum, cur->chan->name, cur->peername,