Update to 1.6.2.14

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

 * Fix issue where session timers would be advertised as supported even
   when session-timers=refuse was set in sip.conf. Also fix
   interoperability problems with session timer behavior in Asterisk.
   (Closes issue #17005. Reported by alexcarey. Patched by dvossel)

 * Parse all "Accept" headers for SIP SUBSCRIBE requests.
   (Closes issue #17758. Reported by ibc. Patched by dvossel)

 * Fix issue where queue stats would be reset on reload.
   (Closes issue #17535. Reported by raarts. Patched by tilghman)

 * Fix issue where MoH files were no longer rescanned on during a
   reload.
   (Closes issue #16744. Reported by pj. Patched by Qwell)

 * Fix issue with dialplan pattern matching where the specificity for
   pattern ranges and pattern characters was inconsistent.
   (Closes issue #16903. Reported, patched by Nick_Lewis)

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

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

5 files changed, 170 insertions, 45 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index 450e236f714..2340cbaa780 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/11/10 09:29:13 jnemeth Exp $
+# $NetBSD: Makefile,v 1.25 2010/11/15 05:18:16 jnemeth Exp $
 #
 
-DISTNAME=	asterisk-1.6.2.13
+DISTNAME=	asterisk-1.6.2.14
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -9,7 +9,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=	2
 
 OWNER=		jnemeth@NetBSD.org
 HOMEPAGE=	http://www.asterisk.org/
@@ -101,7 +100,7 @@ SUBST_FILES.configs+=	configs/http.conf.sample
 SUBST_FILES.configs+=	configs/musiconhold.conf.sample
 SUBST_FILES.configs+=	configs/osp.conf.sample
 SUBST_FILES.configs+=	configs/phoneprov.conf.sample
-SUBST_FILES.configs+=	configs/res_config_sqlite.conf
+SUBST_FILES.configs+=	configs/res_config_sqlite.conf.sample
 SUBST_SED.configs+=	-e 's|/var/lib/asterisk|${ASTVARLIBDIR}|'
 SUBST_SED.configs+=	-e "s|/usr/local/man|${ASTMANDIR}|"
 SUBST_SED.configs+=	-e "s|/usr/local|${PREFIX}|"
@@ -192,6 +191,7 @@ post-install:
 	${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}
+	${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/asterisk-mib.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/backtrace.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/building_queues.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index be94ca26071..a3fb619b0eb 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2010/09/23 23:30:38 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.16 2010/11/15 05:18:16 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -88,6 +88,7 @@ include/asterisk/res_odbc.h
 include/asterisk/rtp.h
 include/asterisk/say.h
 include/asterisk/sched.h
+include/asterisk/select.h
 include/asterisk/sha1.h
 include/asterisk/slin.h
 include/asterisk/slinfactory.h
@@ -2416,6 +2417,7 @@ 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/api-1.6.2-changes.txt
 share/doc/asterisk/asterisk-mib.txt
 share/doc/asterisk/asterisk.txt
 share/doc/asterisk/backtrace.txt
diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo
index 06aee472de8..21fe6471fb3 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,23 +1,17 @@
-$NetBSD: distinfo,v 1.16 2010/09/23 23:30:38 jnemeth Exp $
+$NetBSD: distinfo,v 1.17 2010/11/15 05:18:16 jnemeth Exp $
 
-SHA1 (asterisk-1.6.2.13/asterisk-1.6.2.13.tar.gz) = b412d4a8589b5b58bd64e2b7f277712b7cbbfabd
-RMD160 (asterisk-1.6.2.13/asterisk-1.6.2.13.tar.gz) = ebdd776da2e76a247a621748d8aea0c1f0cffc63
-Size (asterisk-1.6.2.13/asterisk-1.6.2.13.tar.gz) = 23679304 bytes
-SHA1 (asterisk-1.6.2.13/asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 719fee72692514fb96a0c619ed1a6b9cabfb5098
-RMD160 (asterisk-1.6.2.13/asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 9740ea2e22dfb819b0528ba0ab5b5b6424039442
-Size (asterisk-1.6.2.13/asterisk-core-sounds-en-gsm-1.4.19.tar.gz) = 1784830 bytes
-SHA1 (asterisk-1.6.2.13/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.6.2.13/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.6.2.13/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (asterisk-1.6.2.13/asterisk-moh-opsound-wav-2.03.tar.gz) = f40fd6ea03dfe8d72ada2540b2288bfdc006381d
-RMD160 (asterisk-1.6.2.13/asterisk-moh-opsound-wav-2.03.tar.gz) = 9566974a836051e08f51412de508d92bf3be7e02
-Size (asterisk-1.6.2.13/asterisk-moh-opsound-wav-2.03.tar.gz) = 15359473 bytes
-SHA1 (asterisk-1.6.2.13/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
-RMD160 (asterisk-1.6.2.13/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
-Size (asterisk-1.6.2.13/extract-cfile.awk) = 667 bytes
-SHA1 (asterisk-1.6.2.13/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-1.6.2.13/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-1.6.2.13/rfc3951.txt) = 373442 bytes
+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 (patch-aa) = 8c2a3c75adff34474c8f416bcea5842e771e4631
 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
@@ -27,8 +21,8 @@ SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
 SHA1 (patch-am) = 98aa4648b867d193ec05d8da14434205f369c17b
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
-SHA1 (patch-ap) = d60274a44e10dc4e70235ac97b7ae21f37ce713e
-SHA1 (patch-aq) = 9020c4327d39276f51215d277c015477ba2cd5bb
+SHA1 (patch-ap) = 309d51a35c600f4898d99ad6ab1c492c47c6a55a
+SHA1 (patch-aq) = 1541e29ab660fa15fe2d7b4154c737b4ab0365bf
 SHA1 (patch-ar) = 44e46336c0b228ab291e025b8bb5ee505f75345a
 SHA1 (patch-as) = a887d37f0829c22d115ff08721893da49e4bfda4
 SHA1 (patch-at) = 7f366ea0075b16c81bb81ba78becc029b3265151
diff --git a/comms/asterisk16/patches/patch-ap b/comms/asterisk16/patches/patch-ap
index 7689271b711..f72f892219e 100644
--- a/comms/asterisk16/patches/patch-ap
+++ b/comms/asterisk16/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
+$NetBSD: patch-ap,v 1.2 2010/11/15 05:18:16 jnemeth Exp $
 
---- configure.ac.orig	2008-12-15 07:48:22.000000000 -0800
+--- configure.ac.orig	2010-09-10 01:16:32.000000000 +0000
 +++ configure.ac
-@@ -568,6 +568,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
+@@ -796,6 +796,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
  AC_CHECK_HEADER([libkern/OSAtomic.h],
                  [AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
  
@@ -10,5 +10,5 @@ $NetBSD: patch-ap,v 1.1.1.1 2009/06/12 09:04:57 jnemeth Exp $
 +                [AC_DEFINE_UNQUOTED([HAVE_SYS_ATOMIC_H], 1, [Define to 1 if sys/atomic.h atomic operations are supported.])])
 +
  AC_CHECK_SIZEOF(int)
- 
- # do the package library checks now
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(long long)
diff --git a/comms/asterisk16/patches/patch-aq b/comms/asterisk16/patches/patch-aq
index 2459c42ac7e..e2dbb4c9a94 100644
--- a/comms/asterisk16/patches/patch-aq
+++ b/comms/asterisk16/patches/patch-aq
@@ -1,13 +1,142 @@
-$NetBSD: patch-aq,v 1.7 2010/09/23 23:30:38 jnemeth Exp $
+$NetBSD: patch-aq,v 1.8 2010/11/15 05:18:16 jnemeth Exp $
 
---- configure.orig	2010-07-27 17:54:54.000000000 +0000
+--- configure.orig	2010-09-10 01:16:32.000000000 +0000
 +++ configure
-@@ -14946,6 +14946,17 @@ fi
+@@ -20838,6 +20838,146 @@ fi
  
  
  
-+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 :
++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
 +
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_SYS_ATOMIC_H 1
@@ -17,15 +146,15 @@ $NetBSD: patch-aq,v 1.7 2010/09/23 23:30:38 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]];'.
-@@ -15558,6 +15569,8 @@ $as_echo_n "checking if \"struct ifaddrs
- 
- 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { 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
  /* 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 ()