Update to 1.8.10.1: this fixes AST-2012-002 and AST-2012-003.

pkgsrc changes: adapt to having iLBC coded included in the asterisk
tarball and newer version of sounds tarball.

----- 1.8.10.0 -----

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

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

* --- Prevent outbound SIP NOTIFY packets from displaying a port of 0 ---

* --- Include iLBC source code for distribution with Asterisk ---

* --- Fix callerid of originated calls ---

* --- Fix outbound DTMF for inband mode of chan_ooh323 ---

* --- Create and initialize udptl only when dialog requests image media ---

* --- Don't prematurely stop SIP session timer ---

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

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

Thank you for your continued support of Asterisk!

----- 1.8.10.1 -----

The Asterisk Development Team has announced security releases for
Asterisk 1.4, 1.6.2, 1.8, and 10. The available security releases
are released as versions 1.4.44, 1.6.2.23, 1.8.10.1, and 10.2.1.

The release of Asterisk 1.8.10.1 and 10.2.1 resolve two issues.
First, they resolve the issue in app_milliwatt, wherein a buffer
can potentially be overrun on the stack, but no remote code execution
is possible.  Second, they resolve an issue in HTTP AMI where digest
authentication information can be used to overrun a buffer on the
stack, allowing for code injection and execution.

These issues and their resolution are described in the security
advisory.

For more information about the details of these vulnerabilities,
please read the security advisories AST-2012-002 and AST-2012-003,
which were released at the same time as this announcement.

For a full list of changes in the current releases, please see the ChangeLogs:

http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-1.8.10.1

The security advisories are available at:

 * http://downloads.asterisk.org/pub/security/AST-2012-002.pdf
 * http://downloads.asterisk.org/pub/security/AST-2012-003.pdf

Thank you for your continued support of Asterisk!

6 files changed, 87 insertions, 52 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 3bada0e988b..8596d6df707 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.27 2012/03/03 12:54:16 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2012/03/22 03:43:42 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.9.3
+DISTNAME=	asterisk-1.8.10.1
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	1
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -190,7 +189,7 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.21.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.22.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/asterisk18/PLIST b/comms/asterisk18/PLIST
index b9163801b02..9c95c6b8157 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/02/16 16:33:36 hans Exp $
+@comment $NetBSD: PLIST,v 1.14 2012/03/22 03:43:42 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -354,13 +354,13 @@ libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.21
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22
 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.21
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22
 libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.21
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.21
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22
 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
@@ -601,8 +601,53 @@ libdata/asterisk/sounds/en/conf-userswilljoin.gsm
 libdata/asterisk/sounds/en/conf-userwilljoin.gsm
 libdata/asterisk/sounds/en/conf-waitforleader.gsm
 libdata/asterisk/sounds/en/conf-youareinconfnum.gsm
+libdata/asterisk/sounds/en/confbridge-begin-glorious-a.gsm
+libdata/asterisk/sounds/en/confbridge-begin-glorious-b.gsm
+libdata/asterisk/sounds/en/confbridge-begin-glorious-c.gsm
+libdata/asterisk/sounds/en/confbridge-begin-leader.gsm
+libdata/asterisk/sounds/en/confbridge-conf-begin.gsm
+libdata/asterisk/sounds/en/confbridge-conf-end.gsm
+libdata/asterisk/sounds/en/confbridge-dec-list-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-dec-list-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-dec-talk-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-dec-talk-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-has-joined.gsm
+libdata/asterisk/sounds/en/confbridge-has-left.gsm
+libdata/asterisk/sounds/en/confbridge-inc-list-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-inc-list-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-inc-talk-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-inc-talk-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-invalid.gsm
 libdata/asterisk/sounds/en/confbridge-join.gsm
+libdata/asterisk/sounds/en/confbridge-leave-in.gsm
+libdata/asterisk/sounds/en/confbridge-leave-out.gsm
 libdata/asterisk/sounds/en/confbridge-leave.gsm
+libdata/asterisk/sounds/en/confbridge-lock-extended.gsm
+libdata/asterisk/sounds/en/confbridge-lock-in.gsm
+libdata/asterisk/sounds/en/confbridge-lock-no-join.gsm
+libdata/asterisk/sounds/en/confbridge-lock-out.gsm
+libdata/asterisk/sounds/en/confbridge-locked.gsm
+libdata/asterisk/sounds/en/confbridge-menu-exit-in.gsm
+libdata/asterisk/sounds/en/confbridge-menu-exit-out.gsm
+libdata/asterisk/sounds/en/confbridge-mute-extended.gsm
+libdata/asterisk/sounds/en/confbridge-mute-in.gsm
+libdata/asterisk/sounds/en/confbridge-mute-out.gsm
+libdata/asterisk/sounds/en/confbridge-muted.gsm
+libdata/asterisk/sounds/en/confbridge-only-one.gsm
+libdata/asterisk/sounds/en/confbridge-only-participant.gsm
+libdata/asterisk/sounds/en/confbridge-participants.gsm
+libdata/asterisk/sounds/en/confbridge-pin-bad.gsm
+libdata/asterisk/sounds/en/confbridge-pin.gsm
+libdata/asterisk/sounds/en/confbridge-remove-last-in.gsm
+libdata/asterisk/sounds/en/confbridge-remove-last-out.gsm
+libdata/asterisk/sounds/en/confbridge-removed.gsm
+libdata/asterisk/sounds/en/confbridge-rest-list-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-rest-list-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-rest-talk-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-rest-talk-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-there-are.gsm
+libdata/asterisk/sounds/en/confbridge-unlocked.gsm
+libdata/asterisk/sounds/en/confbridge-unmuted.gsm
 libdata/asterisk/sounds/en/conference-call.gsm
 libdata/asterisk/sounds/en/conference-reservations.gsm
 libdata/asterisk/sounds/en/conference.gsm
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 42d00bcf9dd..62e7d59ce3a 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,17 +1,11 @@
-$NetBSD: distinfo,v 1.22 2012/02/26 23:12:56 jnemeth Exp $
+$NetBSD: distinfo,v 1.23 2012/03/22 03:43:42 jnemeth Exp $
 
-SHA1 (asterisk-1.8.9.3/asterisk-1.8.9.3.tar.gz) = 013ac12b372b96c0e1f2e968fd5e738eeb5fff76
-RMD160 (asterisk-1.8.9.3/asterisk-1.8.9.3.tar.gz) = 0e118391e0ecc03f5546cd2ec31f47f10af9dc1e
-Size (asterisk-1.8.9.3/asterisk-1.8.9.3.tar.gz) = 24825965 bytes
-SHA1 (asterisk-1.8.9.3/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.9.3/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.9.3/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (asterisk-1.8.9.3/extract-cfile.txt) = b22874814c83a53bcd1a8d96b5911304f304971e
-RMD160 (asterisk-1.8.9.3/extract-cfile.txt) = e7205fe7e95793f3ca6e384edeef1ad5713485e0
-Size (asterisk-1.8.9.3/extract-cfile.txt) = 643 bytes
-SHA1 (asterisk-1.8.9.3/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-1.8.9.3/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-1.8.9.3/rfc3951.txt) = 373442 bytes
+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 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
@@ -22,7 +16,7 @@ SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = aa95464a8bd4a417f313541b465142d2e4c3ee47
 SHA1 (patch-ap) = ed22f6483191f429389c0d3198d30c63b96d4df6
-SHA1 (patch-aq) = c23bcf0a2e6acc78366d22c57b79278fc428e999
+SHA1 (patch-aq) = d5877b4f28b5490751bafc9c1818ec219c3e45a2
 SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
 SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
 SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
@@ -42,5 +36,5 @@ SHA1 (patch-bh) = 9203ea97daab8c64ea47f236b4961763e76eafe6
 SHA1 (patch-bi) = d71662f618a10c3ca4277feb7ad0d659935dee1e
 SHA1 (patch-bj) = a184452adf2c883695e3819c13c584a3db9608d7
 SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
-SHA1 (patch-bl) = ae68a81a758e3b49eb54b7400d8d5c6ed4efa51a
+SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2
 SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index 1be3ea6fd2a..ae2d71e9426 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2012/01/17 06:29:41 jnemeth Exp $
+# $NetBSD: options.mk,v 1.9 2012/03/22 03:43:42 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -44,11 +44,6 @@ CONFIGURE_ARGS+=	--without-unixodbc
 .endif
 
 .if !empty(PKG_OPTIONS:Milbc)
-DISTFILES+=		rfc3951.txt
-SITES.rfc3951.txt=	http://www.ietf.org/rfc/
-DISTFILES+=		extract-cfile.txt
-SITES.extract-cfile.txt=	http://www.ilbcfreeware.org/documentation/
-USE_TOOLS+=		awk tr
 PLIST.ilbc=		yes
 .endif
 
@@ -83,13 +78,6 @@ post-configure:
 	${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
 	cd ${WRKSRC} && make menuselect.makeopts
 
-post-extract:
-.if !empty(PKG_OPTIONS:Milbc)
-	cp ${DISTDIR}/${DIST_SUBDIR}/rfc3951.txt ${WRKSRC}/codecs/ilbc
-	cp ${DISTDIR}/${DIST_SUBDIR}/extract-cfile.txt ${WRKSRC}/codecs/ilbc
-	cd ${WRKSRC}/codecs/ilbc && ${TR} -d '\r' < extract-cfile.txt | ${AWK} -f - rfc3951.txt
-.endif
-
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index 48a1be608d4..f0408645adc 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.7 2012/01/15 03:32:48 jnemeth Exp $
+$NetBSD: patch-aq,v 1.8 2012/03/22 03:43:42 jnemeth Exp $
 
---- configure.orig	2011-10-18 21:26:48.000000000 +0000
+--- configure.orig	2012-01-14 16:40:17.000000000 +0000
 +++ configure
-@@ -24922,6 +24922,146 @@ fi
+@@ -17130,6 +17130,146 @@ fi
  
  
  
@@ -149,18 +149,18 @@ $NetBSD: patch-aq,v 1.7 2012/01/15 03:32:48 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]];'.
-@@ -29226,6 +29366,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -18136,6 +18276,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 ()
-@@ -55374,9 +55516,8 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_SBIN_LAUNCHD 1
- _ACEOF
+@@ -29188,9 +29330,8 @@ if test "x$ac_cv_file__sbin_launchd" = x
+ 
+ $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
  
 +PBX_LAUNCHD=1
  fi
diff --git a/comms/asterisk18/patches/patch-bl b/comms/asterisk18/patches/patch-bl
index a8dc2a91904..74d2faf0b88 100644
--- a/comms/asterisk18/patches/patch-bl
+++ b/comms/asterisk18/patches/patch-bl
@@ -1,8 +1,8 @@
-$NetBSD: patch-bl,v 1.1 2011/06/09 09:17:27 jnemeth Exp $
+$NetBSD: patch-bl,v 1.2 2012/03/22 03:43:42 jnemeth Exp $
 
---- contrib/scripts/autosupport.orig	2011-01-04 21:00:16.000000000 +0000
+--- contrib/scripts/autosupport.orig	2012-01-04 20:00:33.000000000 +0000
 +++ contrib/scripts/autosupport
-@@ -32,7 +32,7 @@ files="n";
+@@ -33,7 +33,7 @@ NONINTERACTIVE=0
  # If a prefix is specified on command-line, add it.
  if (set -u; : $1) 2> /dev/null
  then
@@ -11,3 +11,12 @@ $NetBSD: patch-bl,v 1.1 2011/06/09 09:17:27 jnemeth Exp $
      echo
      echo "Digium autosupport script"
      echo "Copyright (C) 2005-2010, Digium, Inc."
+@@ -53,7 +53,7 @@ then
+     echo "    XXXXXXXX_${TARBALL_OUTPUT_FILE}"
+     echo
+     exit
+-  elif [ $1 == "-n" ] || [ $1 == "--non-interactive" ]; then
++  elif [ $1 = "-n" ] || [ $1 = "--non-interactive" ]; then
+     FILE_PREFIX=
+     NONINTERACTIVE=1
+   else