Update to 1.6.2.15. This is primarily a bugfix release.

- disable automatic Lua detection for now until lang/lua/builtin.mk exists

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

* When using chan_skinny, don't crash when parking a non-bridged call.
   (Closes issue #17680. Reported, tested by jmhunter. Patched, tested by DEA)

* Add ability for Asterisk to try both the encoded and unencoded subscription
   URI for a match in hints.
   (Closes issue #17785. Reported, tested by ramonpeek. Patched by tilghman)

* Set the caller id on CDRs when it is set on the parent channel.
   (Closes issue #17569. Reported, patched by tbelder)

* Ensure user portion of SIP URI matches dialplan when using encoded characters
   (Closes issue #17892. Reported by wdoekes. Patched by jpeeler)

* Resolve issue where Party A in an analog 3-way call would continue to hear
   ringback after party C answers.
   (Patched by rmudgett)

* Fix problem with qualify option packets for realtime peers never stopping.
   The option packets not only never stopped, but if a realtime peer was not in
   the peer list multiple options dialogs could accumulate over time.
   (Closes issue #16382. Reported by lftsy. Tested by zerohalo. Patched by
   jpeeler)

* Multiple fixes related to Local channels.

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

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

5 files changed, 45 insertions, 170 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index 6e6d8d5fc66..cf6c87f77d3 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/11/29 04:20:32 jnemeth Exp $
+# $NetBSD: Makefile,v 1.27 2010/12/12 10:19:44 jnemeth Exp $
 #
+# NOTE: when updating this package, there are two places that sound
+#       tarballs need to be checked
 
-DISTNAME=	asterisk-1.6.2.14
+DISTNAME=	asterisk-1.6.2.15
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -9,7 +11,6 @@ CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
 		http://downloads.asterisk.org/pub/telephony/sounds/releases/
-PKGREVISION=	1
 
 OWNER=		jnemeth@NetBSD.org
 HOMEPAGE=	http://www.asterisk.org/
@@ -32,6 +33,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/libdata
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-gtk2
+# XXX remove when lang/lua gets builtin.mk
+CONFIGURE_ARGS+=	--without-lua
 
 INSTALL_TARGET=		install samples
 INSTALLATION_DIRS+=	lib/pkgconfig share/doc/${PKGBASE}
@@ -172,7 +175,8 @@ post-patch:
 .endif
 
 post-install:
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.19.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+# check sounds directory for current versions when upgrading package
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.20.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
 	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index a3fb619b0eb..c175a12a124 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/11/15 05:18:16 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.17 2010/12/12 10:19:44 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -308,10 +308,10 @@ libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.19
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.20
 libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.19
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.19
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.20
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.20
 libdata/asterisk/sounds/en/T-changed-to.gsm
 libdata/asterisk/sounds/en/T-is-not-available.gsm
 libdata/asterisk/sounds/en/T-to-disable-ancmnt.gsm
diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo
index 21fe6471fb3..28eb2ca631a 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.17 2010/11/15 05:18:16 jnemeth Exp $
+$NetBSD: distinfo,v 1.18 2010/12/12 10:19:44 jnemeth Exp $
 
-SHA1 (asterisk-1.6.2.14/asterisk-1.6.2.14.tar.gz) = 452b5b9200b9ac82679102516cb7cbf006c1bd9a
-RMD160 (asterisk-1.6.2.14/asterisk-1.6.2.14.tar.gz) = 96024982e8e298c5ec61c5e3d6322a788060df51
-Size (asterisk-1.6.2.14/asterisk-1.6.2.14.tar.gz) = 23715262 bytes
-SHA1 (asterisk-1.6.2.14/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.6.2.14/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.6.2.14/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (asterisk-1.6.2.14/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
-RMD160 (asterisk-1.6.2.14/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
-Size (asterisk-1.6.2.14/extract-cfile.awk) = 667 bytes
-SHA1 (asterisk-1.6.2.14/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-1.6.2.14/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-1.6.2.14/rfc3951.txt) = 373442 bytes
+SHA1 (asterisk-1.6.2.15/asterisk-1.6.2.15.tar.gz) = ed439320d91c9a21acabb4ea142d3f4d1eb26f55
+RMD160 (asterisk-1.6.2.15/asterisk-1.6.2.15.tar.gz) = 910bd655a42d21969f17e07374ee4159f656e37e
+Size (asterisk-1.6.2.15/asterisk-1.6.2.15.tar.gz) = 23717736 bytes
+SHA1 (asterisk-1.6.2.15/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.6.2.15/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.6.2.15/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-1.6.2.15/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
+RMD160 (asterisk-1.6.2.15/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
+Size (asterisk-1.6.2.15/extract-cfile.awk) = 667 bytes
+SHA1 (asterisk-1.6.2.15/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
+RMD160 (asterisk-1.6.2.15/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
+Size (asterisk-1.6.2.15/rfc3951.txt) = 373442 bytes
 SHA1 (patch-aa) = 8c2a3c75adff34474c8f416bcea5842e771e4631
 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
@@ -22,11 +22,11 @@ SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
 SHA1 (patch-ap) = 309d51a35c600f4898d99ad6ab1c492c47c6a55a
-SHA1 (patch-aq) = 1541e29ab660fa15fe2d7b4154c737b4ab0365bf
+SHA1 (patch-aq) = 450fd3c38bd0b7bf0152b7f457e2999f3ab183c6
 SHA1 (patch-ar) = 44e46336c0b228ab291e025b8bb5ee505f75345a
 SHA1 (patch-as) = a887d37f0829c22d115ff08721893da49e4bfda4
 SHA1 (patch-at) = 7f366ea0075b16c81bb81ba78becc029b3265151
-SHA1 (patch-au) = 55624a65fcd8277d3e4fc5a2622c2a309b9d8254
+SHA1 (patch-au) = 57100ee55338c5ab8be1f8d73d4126d26227786b
 SHA1 (patch-av) = 632c7f9595ed1575b74d97a323ae53343a416254
 SHA1 (patch-aw) = 1342176dd34dd68614edf1085c6997013e93c135
 SHA1 (patch-ax) = b8ff68b628ccadd81b0a2615b610470279d54bf4
diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq
index e2dbb4c9a94..e8846fc8f63 100644
--- a/comms/asterisk16/patches/patch-aq
+++ b/comms/asterisk16/patches/patch-aq
@@ -1,142 +1,13 @@
-$NetBSD: patch-aq,v 1.8 2010/11/15 05:18:16 jnemeth Exp $
+$NetBSD: patch-aq,v 1.9 2010/12/12 10:19:44 jnemeth Exp $
 
---- configure.orig	2010-09-10 01:16:32.000000000 +0000
+--- configure.orig	2010-12-12 06:55:04.000000000 +0000
 +++ configure
-@@ -20838,6 +20838,146 @@ fi
+@@ -15148,6 +15148,17 @@ 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; }
-+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5
-+echo $ECHO_N "checking sys/atomic.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <sys/atomic.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5
-+echo $ECHO_N "checking sys/atomic.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/atomic.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: sys/atomic.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: sys/atomic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;}
-+    ( cat <<\_ASBOX
-+## ------------------------------------------ ##
-+## Report this to https://issues.asterisk.org ##
-+## ------------------------------------------ ##
-+_ASBOX
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
-+echo $ECHO_N "checking for sys/atomic.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_sys_atomic_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_atomic_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_sys_atomic_h = yes; then
++ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_atomic_h" = x""yes; then :
 +
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYS_ATOMIC_H 1
@@ -146,15 +17,15 @@ $NetBSD: patch-aq,v 1.8 2010/11/15 05:18:16 jnemeth Exp $
 +
 +
 +
- { echo "$as_me:$LINENO: checking for int" >&5
- echo $ECHO_N "checking for int... $ECHO_C" >&6; }
- if test "${ac_cv_type_int+set}" = set; then
-@@ -23974,6 +24114,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+ # 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]];'.
+@@ -15981,6 +15992,8 @@ $as_echo_n "checking if \"struct ifaddrs
+ 
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* 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-au b/comms/asterisk16/patches/patch-au
index b4333858e31..07fc757d9e5 100644
--- a/comms/asterisk16/patches/patch-au
+++ b/comms/asterisk16/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.2 2010/09/23 23:30:38 jnemeth Exp $
+$NetBSD: patch-au,v 1.3 2010/12/12 10:19:44 jnemeth Exp $
 
---- sounds/Makefile.orig	2010-07-28 20:02:27.000000000 +0000
+--- sounds/Makefile.orig	2010-10-18 22:01:16.000000000 +0000
 +++ sounds/Makefile
-@@ -134,20 +134,6 @@ endif
+@@ -135,20 +135,6 @@ endif
  all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
  
  have_download:
@@ -15,7 +15,7 @@ $NetBSD: patch-au,v 1.2 2010/09/23 23:30:38 jnemeth Exp $
 -		echo "***                                            ***"; \
 -		echo "*** Please install one of these, or remove any ***"; \
 -		echo "*** extra sound package selections in          ***"; \
--		echo "*** menuselecct before installing Asterisk.    ***"; \
+-		echo "*** menuselect before installing Asterisk.     ***"; \
 -		echo "***                                            ***"; \
 -		echo "**************************************************"; \
 -		exit 1; \