Update to Asterisk 1.6.1.19. 1.6.1.18 and 1.6.1.19 are primarily

bug fix releases.  At this point the 1.6.1 series is going to
security fixes only.  That means this package will be moving to
the 1.6.2 series in the near future.

-----
1.6.1.18:

The following are a few of the issues resolved by community developers:

  * Make sure to clear red alarm after polarity reversal.
    (Closes issue #14163. Reported, patched by jedi98. Tested by mattbrown,
     Chainsaw, mikeeccleston)

  * Fix problem with duplicate TXREQ packets in chan_iax2.
    (Closes issue #16904. Reported, patched by rain. Tested by rain, dvossel)

  *  Update documentation to not imply we support overriding options.
     (Closes issue #16855. Reported by davidw)

  * Modify queued frames from Local channels to not set the other side to up.
    (Closes issue #16816. Reported, tested by jamhed)

  *  For T.38 reINVITEs treat a 606 the same as a 488.
     (Closes issue #16792. Reported, patched by vrban)

For a full list of changes in this releases, please see the ChangeLog:
http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.1.18

-----
1.6.1.19:

The following are a few of the issues resolved by community developers:

  * Fix building CDR and CEL SQLite3 modules.
    (Closes issue #17017. Reported by alephlg. Patched by seanbright)

  * Resolve crash in SLAtrunk when the specified trunk doesn't exist.
    (Reported in #asterisk-dev by philipp64. Patched by seanbright)

  * Update code to reflect that handle_speechset has 4 arguments.
    (Closes issue #17093. Reported, patched by gpatri. Tested by pabelanger,
     mmichelson)

  * Pass the PID of the Asterisk process, not the PID of the canary.
    (Closes issue #17065. Reported by globalnetinc. Patched by makoto. Tested by
     frawd, globalnetinc)

  * Resolve a deadlock in chan_local.
    (Closes issue #16840. Reported, patched by bzing2, russell. Tested by bzing2)

For a full list of changes in this releases, please see the ChangeLog:
http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-1.6.1.19

7 files changed, 51 insertions, 55 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index e85b92ecb5a..21d4bbda0e3 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/05/07 23:57:56 jnemeth Exp $
+# $NetBSD: Makefile,v 1.18 2010/05/20 17:14:45 jnemeth Exp $
 #
 
-DISTNAME=	asterisk-1.6.1.17
+DISTNAME=	asterisk-1.6.1.19
 DIST_SUBDIR=	${PKGNAME_NOREV}
-PKGREVISION=	4
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
@@ -177,9 +176,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/UPGRADE-1.6.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADE.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/Zaptel-to-DAHDI.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/asterisk-1.6.1.14-summary.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/asterisk-1.6.1.16-summary.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/asterisk-1.6.1.17-summary.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/India-CID.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/PEERING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
@@ -217,7 +213,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/video.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/video_console.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/voicemail_odbc_postgresql.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index ff41c5db200..947dba9f837 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/05/07 23:57:56 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/05/20 17:14:45 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -945,6 +945,9 @@ libdata/asterisk/static-http/docs/node277.html
 libdata/asterisk/static-http/docs/node278.html
 libdata/asterisk/static-http/docs/node279.html
 libdata/asterisk/static-http/docs/node28.html
+libdata/asterisk/static-http/docs/node280.html
+libdata/asterisk/static-http/docs/node281.html
+libdata/asterisk/static-http/docs/node282.html
 libdata/asterisk/static-http/docs/node29.html
 libdata/asterisk/static-http/docs/node3.html
 libdata/asterisk/static-http/docs/node30.html
@@ -1062,9 +1065,6 @@ share/doc/asterisk/UPGRADE-1.4.txt
 share/doc/asterisk/UPGRADE-1.6.txt
 share/doc/asterisk/UPGRADE.txt
 share/doc/asterisk/Zaptel-to-DAHDI.txt
-share/doc/asterisk/asterisk-1.6.1.14-summary.txt
-share/doc/asterisk/asterisk-1.6.1.16-summary.txt
-share/doc/asterisk/${PKGNAME}-summary.txt
 share/doc/asterisk/asterisk-mib.txt
 share/doc/asterisk/backtrace.txt
 share/doc/asterisk/callfiles.txt
diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo
index 8da24efd651..da2a7bbd7c3 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,31 +1,31 @@
-$NetBSD: distinfo,v 1.12 2010/05/07 03:40:24 jnemeth Exp $
+$NetBSD: distinfo,v 1.13 2010/05/20 17:14:45 jnemeth Exp $
 
-SHA1 (asterisk-1.6.1.17/asterisk-1.6.1.17.tar.gz) = 7af18a384f7832d8818e0548263681b3e839447f
-RMD160 (asterisk-1.6.1.17/asterisk-1.6.1.17.tar.gz) = 86c54a56b9d5c7565c9d3d54c0d6cd043e9decd3
-Size (asterisk-1.6.1.17/asterisk-1.6.1.17.tar.gz) = 23519546 bytes
-SHA1 (asterisk-1.6.1.17/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
-RMD160 (asterisk-1.6.1.17/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
-Size (asterisk-1.6.1.17/extract-cfile.awk) = 667 bytes
-SHA1 (asterisk-1.6.1.17/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-1.6.1.17/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-1.6.1.17/rfc3951.txt) = 373442 bytes
+SHA1 (asterisk-1.6.1.19/asterisk-1.6.1.19.tar.gz) = a97f8f37b768fef88bc73ee066a0743978672a87
+RMD160 (asterisk-1.6.1.19/asterisk-1.6.1.19.tar.gz) = df5ba06911f76cc54646c516c65c5e4ec4692f3d
+Size (asterisk-1.6.1.19/asterisk-1.6.1.19.tar.gz) = 23600478 bytes
+SHA1 (asterisk-1.6.1.19/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
+RMD160 (asterisk-1.6.1.19/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
+Size (asterisk-1.6.1.19/extract-cfile.awk) = 667 bytes
+SHA1 (asterisk-1.6.1.19/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
+RMD160 (asterisk-1.6.1.19/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
+Size (asterisk-1.6.1.19/rfc3951.txt) = 373442 bytes
 SHA1 (patch-aa) = a9925349ba9b08c350d86d9d88e02185083c133b
 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
 SHA1 (patch-ak) = adee75b7716a8794de1b8cb054af7a5a8f0e5ffd
-SHA1 (patch-al) = 76a3132a0e81479c9519b1c976460f837b67f4a3
+SHA1 (patch-al) = 44b3efd044b9a49c002ab944372698eec6dd1913
 SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
 SHA1 (patch-ap) = d60274a44e10dc4e70235ac97b7ae21f37ce713e
-SHA1 (patch-aq) = fae6f9af6fa9f6daf68e8df5cf2d56afca624bc3
+SHA1 (patch-aq) = e9966b8893e71183aeabd5b045668a6ae394cbb3
 SHA1 (patch-ar) = 44e46336c0b228ab291e025b8bb5ee505f75345a
 SHA1 (patch-as) = a887d37f0829c22d115ff08721893da49e4bfda4
 SHA1 (patch-at) = 7f366ea0075b16c81bb81ba78becc029b3265151
 SHA1 (patch-au) = 47330b597a484b5d29aeca466243369a121b2b3c
-SHA1 (patch-av) = d90ae8aac1d85471cbf22f3cb62315ebbd22a94a
-SHA1 (patch-aw) = 310153eed541d1a6a0c7859f6c032478cd2ff67a
+SHA1 (patch-av) = 632c7f9595ed1575b74d97a323ae53343a416254
+SHA1 (patch-aw) = 1342176dd34dd68614edf1085c6997013e93c135
 SHA1 (patch-ax) = 865376102295e1afc316cc12e87965211449b306
 SHA1 (patch-ay) = 39a2ae198ff2989c501dd4374e1ea57a3d52dda9
 SHA1 (patch-az) = 917cc8868708ce9c022a0268debd90f51f88bdad
diff --git a/comms/asterisk16/patches/patch-al b/comms/asterisk16/patches/patch-al
index 6ddad7cf5bb..9753f445583 100644
--- a/comms/asterisk16/patches/patch-al
+++ b/comms/asterisk16/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
+$NetBSD: patch-al,v 1.2 2010/05/20 17:14:45 jnemeth Exp $
 
---- pbx/pbx_dundi.c.orig	2008-11-02 16:39:04.000000000 -0800
+--- pbx/pbx_dundi.c.orig	2010-03-30 16:10:41.000000000 +0000
 +++ pbx/pbx_dundi.c
 @@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
  #include <pthread.h>
@@ -10,4 +10,4 @@ $NetBSD: patch-al,v 1.1.1.1 2009/06/12 09:04:56 jnemeth Exp $
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__DragonFly__)
  #include <net/if_dl.h>
  #include <ifaddrs.h>
- #endif
+ #include <signal.h>
diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq
index 1eb2ed9bcaa..7f09ebe02c2 100644
--- a/comms/asterisk16/patches/patch-aq
+++ b/comms/asterisk16/patches/patch-aq
@@ -1,11 +1,13 @@
-$NetBSD: patch-aq,v 1.5 2010/03/01 07:06:48 jnemeth Exp $
+$NetBSD: patch-aq,v 1.6 2010/05/20 17:14:45 jnemeth Exp $
 
---- configure.orig	2009-12-28 15:31:22.000000000 +0000
+--- configure.orig	2010-01-25 21:53:37.000000000 +0000
 +++ configure
-@@ -13761,6 +13761,146 @@ fi
- 
+@@ -19494,6 +19494,146 @@ _ACEOF
  
+ fi
  
++ 
++ 
 +if test "${ac_cv_header_sys_atomic_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
 +echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; }
@@ -144,17 +146,15 @@ $NetBSD: patch-aq,v 1.5 2010/03/01 07:06:48 jnemeth Exp $
 +
 +fi
 +
-+
-+
- # 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]];'.
-@@ -14172,6 +14312,8 @@ $as_echo_n "checking if \"struct ifaddrs
  
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ 
+ { echo "$as_me:$LINENO: checking for int" >&5
+@@ -20769,6 +20909,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 ()
diff --git a/comms/asterisk16/patches/patch-av b/comms/asterisk16/patches/patch-av
index 073ce711108..b8ebde66091 100644
--- a/comms/asterisk16/patches/patch-av
+++ b/comms/asterisk16/patches/patch-av
@@ -1,19 +1,19 @@
-$NetBSD: patch-av,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-av,v 1.2 2010/05/20 17:14:45 jnemeth Exp $
 
---- apps/app_dial.c.orig	2009-02-11 14:48:11.000000000 -0800
+--- apps/app_dial.c.orig	2010-03-31 17:51:39.000000000 +0000
 +++ apps/app_dial.c
-@@ -1236,12 +1236,12 @@ static void end_bridge_callback(void *da
+@@ -1303,12 +1303,12 @@ static void end_bridge_callback(void *da
  
  	ast_channel_lock(chan);
  	if (chan->cdr->answer.tv_sec) {
--		snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
-+		snprintf(buf, sizeof(buf), "%jd", (intmax_t) (end - chan->cdr->answer.tv_sec));
+-		snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
++		snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->answer.tv_sec));
  		pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
  	}
  
  	if (chan->cdr->start.tv_sec) {
--		snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
-+		snprintf(buf, sizeof(buf), "%jd", (intmax_t) (end - chan->cdr->start.tv_sec));
+-		snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
++		snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->start.tv_sec));
  		pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
  	}
  	ast_channel_unlock(chan);
diff --git a/comms/asterisk16/patches/patch-aw b/comms/asterisk16/patches/patch-aw
index 27be9240554..ee8012efacd 100644
--- a/comms/asterisk16/patches/patch-aw
+++ b/comms/asterisk16/patches/patch-aw
@@ -1,19 +1,19 @@
-$NetBSD: patch-aw,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-aw,v 1.2 2010/05/20 17:14:45 jnemeth Exp $
 
---- apps/app_followme.c.orig	2009-01-07 10:30:39.000000000 -0800
+--- apps/app_followme.c.orig	2010-03-20 17:50:53.000000000 +0000
 +++ apps/app_followme.c
 @@ -885,12 +885,12 @@ static void end_bridge_callback(void *da
  
  	ast_channel_lock(chan);
  	if (chan->cdr->answer.tv_sec) {
--		snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
-+		snprintf(buf, sizeof(buf), "%jd", (intmax_t) (end - chan->cdr->answer.tv_sec));
+-		snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
++		snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->answer.tv_sec));
  		pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
  	}
  
  	if (chan->cdr->start.tv_sec) {
--		snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
-+		snprintf(buf, sizeof(buf), "%jd", (intmax_t) (end - chan->cdr->start.tv_sec));
+-		snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
++		snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->start.tv_sec));
  		pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
  	}
  	ast_channel_unlock(chan);