Update to Asterisk 1.8.11.0:

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

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

The release of Asterisk 1.8.11.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-1.8.11.0

Thank you for your continued support of Asterisk!

6 files changed, 45 insertions, 51 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 8596d6df707..2480ee9af55 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2012/03/22 03:43:42 jnemeth Exp $
+# $NetBSD: Makefile,v 1.29 2012/04/07 20:10:45 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.10.1
+DISTNAME=	asterisk-1.8.11.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index 9c95c6b8157..520562aac5f 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2012/03/22 03:43:42 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.15 2012/04/07 20:10:45 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -234,7 +234,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
 ${PLIST.speex}lib/asterisk/modules/codec_speex.so
 lib/asterisk/modules/codec_ulaw.so
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 62e7d59ce3a..81b78216158 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.23 2012/03/22 03:43:42 jnemeth Exp $
+$NetBSD: distinfo,v 1.24 2012/04/07 20:10:45 jnemeth Exp $
 
-SHA1 (asterisk-1.8.10.1/asterisk-1.8.10.1.tar.gz) = 4d4dfba6bbd742328396893aa689173eb670feae
-RMD160 (asterisk-1.8.10.1/asterisk-1.8.10.1.tar.gz) = 6a1a5e02937b8a89b25b06995154c1cd0f345d5f
-Size (asterisk-1.8.10.1/asterisk-1.8.10.1.tar.gz) = 25202101 bytes
-SHA1 (asterisk-1.8.10.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.10.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.10.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = cacabf8a3f8d710a26d53ae3fa041892354ac98d
+RMD160 (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 51b5a9dced4642011b475d8718f404ae5be26018
+Size (asterisk-1.8.11.0/asterisk-1.8.11.0.tar.gz) = 25250286 bytes
+SHA1 (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.8.11.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
 SHA1 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
@@ -16,7 +16,7 @@ SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = aa95464a8bd4a417f313541b465142d2e4c3ee47
 SHA1 (patch-ap) = ed22f6483191f429389c0d3198d30c63b96d4df6
-SHA1 (patch-aq) = d5877b4f28b5490751bafc9c1818ec219c3e45a2
+SHA1 (patch-aq) = edb8a95a6bcfd528c9b6229c3a69109e7baf9cef
 SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
 SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
 SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
@@ -24,7 +24,7 @@ SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f
 SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
 SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
 SHA1 (patch-ax) = 0136483807024ac10f2abb9a9c0e3679b0043add
-SHA1 (patch-ay) = 99dd751ebaa3107abd4d5b0e0353f6b8c59a0122
+SHA1 (patch-ay) = b2e2203037c0d5434f22de8a808f002b61ef8886
 SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
 SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
 SHA1 (patch-bb) = bf1a2bb2ba1eb2ba44a9b26fa9ae0468510a1575
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index ae2d71e9426..b77c926d6bc 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2012/03/22 03:43:42 jnemeth Exp $
+# $NetBSD: options.mk,v 1.10 2012/04/07 20:10:45 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/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index f0408645adc..34a56b20857 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.8 2012/03/22 03:43:42 jnemeth Exp $
+$NetBSD: patch-aq,v 1.9 2012/04/07 20:10:45 jnemeth Exp $
 
---- configure.orig	2012-01-14 16:40:17.000000000 +0000
+--- configure.orig	2012-02-16 19:26:16.000000000 +0000
 +++ configure
-@@ -17130,6 +17130,146 @@ fi
+@@ -25178,6 +25178,146 @@ fi
  
  
  
@@ -149,23 +149,24 @@ $NetBSD: patch-aq,v 1.8 2012/03/22 03:43:42 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]];'.
-@@ -18136,6 +18276,8 @@ $as_echo_n "checking if \"struct ifaddrs
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -29482,6 +29622,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 ()
-@@ -29188,9 +29330,8 @@ if test "x$ac_cv_file__sbin_launchd" = x
- 
- $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+@@ -55700,10 +55842,9 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_SBIN_LAUNCHD 1
+ _ACEOF
  
-+PBX_LAUNCHD=1
- fi
+-fi
 -
--  PBX_LAUNCHD=1
+   PBX_LAUNCHD=1
  fi
++fi
  
  
+ PBX_GTK2=0
diff --git a/comms/asterisk18/patches/patch-ay b/comms/asterisk18/patches/patch-ay
index cc72e1d79cd..5ecdbcfaee4 100644
--- a/comms/asterisk18/patches/patch-ay
+++ b/comms/asterisk18/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
+$NetBSD: patch-ay,v 1.4 2012/04/07 20:10:45 jnemeth Exp $
 
---- main/features.c.orig	2011-08-16 16:31:36.000000000 +0000
+--- main/features.c.orig	2012-02-27 16:03:04.000000000 +0000
 +++ main/features.c
-@@ -1454,14 +1454,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-ay,v 1.3 2011/10/11 03:12:55 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>"),
-@@ -1908,7 +1908,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-ay,v 1.3 2011/10/11 03:12:55 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,
-@@ -1918,7 +1918,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-ay,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
  			snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
  		}
  
-@@ -2024,7 +2024,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-ay,v 1.3 2011/10/11 03:12:55 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,
-@@ -2034,7 +2034,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-ay,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
  			snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
  		}
  
-@@ -6752,10 +6752,10 @@ static char *handle_parkedcalls(struct a
+@@ -6958,10 +6958,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-ay,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
  			++lotparked;
  		}
  		AST_LIST_UNLOCK(&curlot->parkings);
-@@ -6811,7 +6811,7 @@ static int manager_parking_status(struct
+@@ -7017,7 +7017,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-ay,v 1.3 2011/10/11 03:12:55 jnemeth Exp $
  				"CallerIDNum: %s\r\n"
  				"CallerIDName: %s\r\n"
  				"ConnectedLineNum: %s\r\n"
-@@ -6820,7 +6820,7 @@ static int manager_parking_status(struct
+@@ -7026,7 +7026,7 @@ static int manager_parking_status(struct
  				"\r\n",
  				curlot->name,
  				cur->parkingnum, cur->chan->name, cur->peername,