Upgrade to 1.8.4.2. This fixes several security issues including:

AST-2011-002, AST-2011-003, AST-2011-004, AST-2011-005, AST-2011-006,
and AST-2011-007.

pkgsrc changes:
- add patch for autosupport script; == -> =
- patch configure to not unconditionally set PBX_LAUNCHD=1
  - this allows res_timing_kqueue.so to build

This last change brings a timing source to NetBSD which allows IAX
trunking and allows the bridging modules to work, a rather major
piece that was missing.  Note that I haven't extensively tested
it.  But, have at it...

===========================================================================
1.8.4.2:

The Asterisk Development Team has announced the release of Asterisk
version 1.8.4.2, which is a security release for Asterisk 1.8.

The release of Asterisk 1.8.4.2 resolves an issue with SIP URI parsing
which can lead to a remotely exploitable crash:

     Remote Crash Vulnerability in SIP channel driver (AST-2011-007)

The issue and resolution is described in the AST-2011-007 security
advisory.

For more information about the details of this vulnerability, please
read the security advisory AST-2011-007, which was released at the same
time as this announcement.

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

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

Security advisory AST-2011-007 is available at:

http://downloads.asterisk.org/pub/security/AST-2011-007.pdf

===========================================================================
1.8.4.1:

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

The release of Asterisk 1.8.4.1 resolves several issues reported by the
community. Without your help this release would not have been possible.
Thank you!

Below is a list of issues resolved in this release:

 * Fix our compliance with RFC 3261 section 18.2.2. (aka Cisco phone fix)

 * Resolve a change in IPv6 header parsing due to the Cisco phone fix issue.
   This issue was found and reported by the Asterisk test suite.

 * Resolve potential crash when using SIP TLS support.

 * Improve reliability when using SIP TLS.

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

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

===========================================================================
1.8.4:

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

The release of Asterisk 1.8.4 resolves several issues reported by the community.
Without your help this release would not have been possible. Thank you!

Below is a sample of the issues resolved in this release:

 * Use SSLv23_client_method instead of old SSLv2 only.

 * Resolve crash in ast_mutex_init()

 * Resolution of several DTMF based attended transfer issues.

   NOTE: Be sure to read the ChangeLog for more information about these changes.

 * Resolve deadlocks related to device states in chan_sip

 * Resolve an issue with the Asterisk manager interface leaking memory when
   disabled.

 * Support greetingsfolder as documented in voicemail.conf.sample.

 * Fix channel redirect out of MeetMe() and other issues with channel softhangup

 * Fix voicemail sequencing for file based storage.

 * Set hangup cause in local_hangup so the proper return code of 486 instead of
   503 when using Local channels when the far sides returns a busy. Also affects
   CCSS in Asterisk 1.8+.

 * Fix issues with verbose messages not being output to the console.

 * Fix Deadlock with attended transfer of SIP call

Includes changes per AST-2011-005 and AST-2011-006
For a full list of changes in this release candidate, please see the ChangeLog:

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

Information about the security releases are available at:

http://downloads.asterisk.org/pub/security/AST-2011-005.pdf
http://downloads.asterisk.org/pub/security/AST-2011-006.pdf

===========================================================================
1.8.3.3:

The Asterisk Development Team has announced security releases for Asterisk
branches 1.4, 1.6.1, 1.6.2, and 1.8. The available security releases are
released as versions 1.4.40.1, 1.6.1.25, 1.6.2.17.3, and 1.8.3.3.

The releases of Asterisk 1.4.40.1, 1.6.1.25, 1.6.2.17.3, and 1.8.3.3 resolve two
issues:

* File Descriptor Resource Exhaustion (AST-2011-005)
* Asterisk Manager User Shell Access (AST-2011-006)

The issues and resolutions are described in the AST-2011-005 and AST-2011-006
security advisories.

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

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

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

Security advisory AST-2011-005 and AST-2011-006 are available at:

http://downloads.asterisk.org/pub/security/AST-2011-005.pdf
http://downloads.asterisk.org/pub/security/AST-2011-006.pdf

===========================================================================
1.8.3.2:

he Asterisk Development Team has announced security releases for Asterisk
branches 1.6.1, 1.6.2, and 1.8. The available security releases are
released as versions 1.6.1.24, 1.6.2.17.2, and 1.8.3.2.

** This is a re-release of Asterisk 1.6.1.23, 1.6.2.17.1 and 1.8.3.1 which
    contained a bug which caused duplicate manager entries (issue #18987).

The releases of Asterisk 1.6.1.24, 1.6.2.17.2, and 1.8.3.2 resolve two issues:

  * Resource exhaustion in Asterisk Manager Interface (AST-2011-003)
  * Remote crash vulnerability in TCP/TLS server (AST-2011-004)

The issues and resolutions are described in the AST-2011-003 and AST-2011-004
security advisories.

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

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

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

Security advisory AST-2011-003 and AST-2011-004 are available at:

http://downloads.asterisk.org/pub/security/AST-2011-003.pdf
http://downloads.asterisk.org/pub/security/AST-2011-004.pdf

===========================================================================
1.8.3.1:

The Asterisk Development Team has announced security releases for Asterisk
branches 1.6.1, 1.6.2, and 1.8. The available security releases are
released as versions 1.6.1.23, 1.6.2.17.1, and 1.8.3.1.

The releases of Asterisk 1.6.1.23, 1.6.2.17.1, and 1.8.3.1 resolve two issues:

  * Resource exhaustion in Asterisk Manager Interface (AST-2011-003)
  * Remote crash vulnerability in TCP/TLS server (AST-2011-004)

The issues and resolutions are described in the AST-2011-003 and AST-2011-004
security advisories.

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

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

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

Security advisory AST-2011-003 and AST-2011-004 are available at:

http://downloads.asterisk.org/pub/security/AST-2011-003.pdf
http://downloads.asterisk.org/pub/security/AST-2011-004.pdf

===========================================================================
1.8.3:

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

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

* Resolve duplicated data in the AstDB when using DIALGROUP()

* Ensure the ipaddr field in realtime is large enough to handle IPv6 addresses.

* Reworking parsing of mwi => lines to resolve a segfault. Also add a set of
   unit tests for the function that does the parsing.

* When using cdr_pgsql the billsec field was not populated correctly on
   unanswered calls.

* Resolve memory leak in iCalendar and Exchange calendaring modules.

* This version of Asterisk includes the new Compiler Flags option
   BETTER_BACKTRACES which uses libbfd to search for better symbol information
   within both the Asterisk binary, as well as loaded modules, to assist when
   using inline backtraces to track down problems.

* Resolve issue where no Music On Hold may be triggered when using
   res_timing_dahdi.

* Resolve a memory leak when the Asterisk Manager Interface is disabled.

* Reimplemented fax session reservation to reverse the ABI breakage introduced
   in r297486.

* Fix regression that changed behavior of queues when ringing a queue member.

* Resolve deadlock involving REFER.

Additionally, this release has the changes related to security bulletin
AST-2011-002 which can be found at
http://downloads.asterisk.org/pub/security/AST-2011-002.pdf

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

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

===========================================================================
1.8.2.4:

The Asterisk Development Team has announced security releases for Asterisk
branches 1.4, 1.6.1, 1.6.2, and 1.8. The available security releases are
released as versions 1.4.39.2, 1.6.1.22, 1.6.2.16.2, and 1.8.2.4.

The releases of Asterisk 1.4.39.2, 1.6.1.22, 1.6.2.16.2, and 1.8.2.4 resolve an
issue that when decoding UDPTL packets, multiple stack and heap based arrays can
be made to overflow by specially crafted packets. Systems configured for
T.38 pass through or termination are vulnerable. The issue and resolution are
described in the AST-2011-002 security advisory.

For more information about the details of this vulnerability, please read the
security advisory AST-2011-002, which was released at the same time as this
announcement.

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

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

Security advisory AST-2011-002 is available at:

http://downloads.asterisk.org/pub/security/AST-2011-002.pdf

7 files changed, 95 insertions, 201 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 443e249f537..e2f98254704 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2011/04/28 02:30:11 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/06/09 09:17:27 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.2.3
-#XXX change back with next revision
-#DIST_SUBDIR=	${PKGNAME_NOREV}
-DIST_SUBDIR=	${PKGNAME_NOREV}nb1
-PKGREVISION=	2
+DISTNAME=	asterisk-1.8.4.2
+DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 CATEGORIES=	comms net audio
@@ -46,7 +43,6 @@ INSTALLATION_DIRS+=	${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh
 
 BUILD_DEFS+=		VARBASE
 
-# Running as non-root will come later
 ASTERISK_USER?=		asterisk
 ASTERISK_GROUP?=	asterisk
 PKG_GROUPS=		${ASTERISK_GROUP}
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index f22bd5679ba..fdaa9aa8290 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/02/06 08:30:17 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/06/09 09:17:27 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -326,12 +326,14 @@ lib/asterisk/modules/res_security_log.so
 lib/asterisk/modules/res_smdi.so
 lib/asterisk/modules/res_speech.so
 lib/asterisk/modules/res_stun_monitor.so
+lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
 lib/pkgconfig/asterisk.pc
 libdata/asterisk/documentation/appdocsxml.dtd
 libdata/asterisk/documentation/core-en_US.xml
 libdata/asterisk/images/asterisk-intro.jpg
 libdata/asterisk/images/kpad2.jpg
+libdata/asterisk/moh/.asterisk-moh-opsound-wav-2.03
 libdata/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
 libdata/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
 libdata/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
@@ -345,6 +347,8 @@ libdata/asterisk/phoneprov/000000000000-phone.cfg
 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/.asterisk-core-sounds-en-gsm-1.4.20
 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.20
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 4e423551bde..0266467b411 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.9 2011/01/29 22:50:32 jnemeth Exp $
+$NetBSD: distinfo,v 1.10 2011/06/09 09:17:27 jnemeth Exp $
 
-SHA1 (asterisk-1.8.2.3nb1/asterisk-1.8.2.3.tar.gz) = 98dd583ecb0e150ba02ea4e058c5067e51a0c760
-RMD160 (asterisk-1.8.2.3nb1/asterisk-1.8.2.3.tar.gz) = b3a8d08df7cf93426594f3c97b7f25e77fdc6b1a
-Size (asterisk-1.8.2.3nb1/asterisk-1.8.2.3.tar.gz) = 26796032 bytes
-SHA1 (asterisk-1.8.2.3nb1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.2.3nb1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.2.3nb1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (asterisk-1.8.2.3nb1/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
-RMD160 (asterisk-1.8.2.3nb1/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
-Size (asterisk-1.8.2.3nb1/extract-cfile.awk) = 667 bytes
-SHA1 (asterisk-1.8.2.3nb1/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-1.8.2.3nb1/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-1.8.2.3nb1/rfc3951.txt) = 373442 bytes
-SHA1 (patch-aa) = a157fe745bde7880cbbdcfdf9e4bb4381f1df185
+SHA1 (asterisk-1.8.4.2/asterisk-1.8.4.2.tar.gz) = f5fc8c0c4343ec1d6831b1810602d223af8dc9c9
+RMD160 (asterisk-1.8.4.2/asterisk-1.8.4.2.tar.gz) = 403829a2fcd5f63c2a99e141442cc98fd69f4deb
+Size (asterisk-1.8.4.2/asterisk-1.8.4.2.tar.gz) = 27012984 bytes
+SHA1 (asterisk-1.8.4.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.8.4.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.8.4.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-1.8.4.2/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
+RMD160 (asterisk-1.8.4.2/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
+Size (asterisk-1.8.4.2/extract-cfile.awk) = 667 bytes
+SHA1 (asterisk-1.8.4.2/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
+RMD160 (asterisk-1.8.4.2/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
+Size (asterisk-1.8.4.2/rfc3951.txt) = 373442 bytes
+SHA1 (patch-aa) = cb3a463c51abff717d960ad70f3c13beefe6d5f4
 SHA1 (patch-af) = ebad62fcb31b600d30235cc5e93284c93b2c8af9
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
@@ -22,11 +22,11 @@ SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = 0663a698469550b22bb97ee1b18980bc2bc67495
 SHA1 (patch-ap) = ed22f6483191f429389c0d3198d30c63b96d4df6
-SHA1 (patch-aq) = 407f617d381d2181d9557e429974a9e29b09a074
+SHA1 (patch-aq) = b5b448df41c3751dda6340006811cb35dd304d34
 SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
 SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
 SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
-SHA1 (patch-au) = 57100ee55338c5ab8be1f8d73d4126d26227786b
+SHA1 (patch-au) = 3f69f8bcea685f13008430c0fcb91885b6b72c90
 SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
 SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
 SHA1 (patch-ax) = 3b41e66a8c926e0afc4f73587e3557370e6c5f6e
@@ -42,3 +42,4 @@ SHA1 (patch-bh) = 9203ea97daab8c64ea47f236b4961763e76eafe6
 SHA1 (patch-bi) = d71662f618a10c3ca4277feb7ad0d659935dee1e
 SHA1 (patch-bj) = a184452adf2c883695e3819c13c584a3db9608d7
 SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f
+SHA1 (patch-bl) = ae68a81a758e3b49eb54b7400d8d5c6ed4efa51a
diff --git a/comms/asterisk18/patches/patch-aa b/comms/asterisk18/patches/patch-aa
index d4889a104a2..0cb9cc0c450 100644
--- a/comms/asterisk18/patches/patch-aa
+++ b/comms/asterisk18/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+$NetBSD: patch-aa,v 1.2 2011/06/09 09:17:27 jnemeth Exp $
 
---- Makefile.orig	2010-11-11 22:13:38.000000000 +0000
+--- Makefile.orig	2011-02-01 18:02:06.000000000 +0000
 +++ Makefile
 @@ -126,7 +126,7 @@ DEBUG=-g3
  
@@ -22,7 +22,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
  ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
    ifneq ($(PROC),ultrasparc)
      _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-@@ -449,7 +445,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -442,7 +438,6 @@ dist-clean: distclean
+ 
+ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+ 	@$(MAKE) -C menuselect dist-clean
+-	@$(MAKE) -C sounds dist-clean
+ 	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
+ 	rm -f makeopts.embed_rules
+ 	rm -f config.log config.status config.cache
+@@ -452,7 +447,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  
@@ -31,15 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
  	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
  # Should static HTTP be installed during make samples or even with its own target ala
  # webvoicemail?  There are portions here that *could* be customized but might also be
-@@ -468,7 +464,6 @@ datafiles: _all doc/core-en_US.xml
- 	for x in images/*.jpg; do \
- 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
- 	done
--	$(MAKE) -C sounds install
- 
- doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
- 	@printf "Building Documentation For: "
-@@ -520,7 +515,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(
+@@ -517,7 +512,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(
  installdirs:
  	$(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)"
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
  	$(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
-@@ -547,8 +542,9 @@ installdirs:
+@@ -544,8 +539,9 @@ installdirs:
  	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
  	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
  	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
  	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
  	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
  	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-@@ -640,21 +636,21 @@ upgrade: bininstall
+@@ -637,21 +633,21 @@ upgrade: bininstall
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
  		if [ -f $${dst} ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s $${dst} $$x ; then \
-@@ -682,9 +678,9 @@ samples: adsi
+@@ -679,9 +675,9 @@ samples: adsi
  			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
  			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
@@ -97,26 +97,26 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
 +		rm -f $(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp ; \
  	fi ; \
  	$(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
-@@ -710,7 +706,7 @@ samples: adsi
+ 	build_tools/make_sample_voicemail "$(DESTDIR)$(ASTDATADIR)" "$(DESTDIR)$(ASTSPOOLDIR)"
+@@ -707,7 +703,7 @@ samples: adsi
  webvmail:
  	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
  	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
--	$(INSTALL) -m 4755 contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
-+	$(INSTALL) contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail
+-	$(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
++	$(INSTALL) contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail"
  	$(INSTALL) -d $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
  	for x in images/*.gif; do \
- 		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-@@ -854,7 +850,7 @@ uninstall-all: _uninstall
- 	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
- 	rm -rf $(DESTDIR)$(ASTDATADIR)
- 	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
--	rm -rf $(DESTDIR)$(ASTETCDIR)
-+	rm -rf $(DESTDIR)$(ASTEXAMPLEDIR)
- 	rm -rf $(DESTDIR)$(ASTLOGDIR)
+ 		$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
+@@ -860,7 +856,7 @@ uninstall-all: _uninstall
+ 	rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
+ 	rm -rf "$(DESTDIR)$(ASTDATADIR)"
+ 	rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
+-	rm -rf "$(DESTDIR)$(ASTETCDIR)"
++	rm -rf "$(DESTDIR)$(ASTEXAMPLEDIR)"
+ 	rm -rf "$(DESTDIR)$(ASTLOGDIR)"
  
  menuconfig: menuselect
-@@ -923,6 +919,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -929,6 +925,7 @@ menuselect-tree: $(foreach dir,$(filter-
  	@echo "</menu>" >> $@
  
  .PHONY: menuselect
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index 669684911ba..83ecfe077b9 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,144 +1,13 @@
-$NetBSD: patch-aq,v 1.4 2011/01/29 22:50:32 jnemeth Exp $
+$NetBSD: patch-aq,v 1.5 2011/06/09 09:17:27 jnemeth Exp $
 
-# Reported upstream as https://issues.asterisk.org/view.php?id=18705
-
---- configure.orig	2011-01-12 16:52:31.000000000 +0000
+--- configure.orig	2011-01-27 17:03:01.000000000 +0000
 +++ configure
-@@ -22973,6 +22973,146 @@ fi
+@@ -16429,6 +16429,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
@@ -148,15 +17,26 @@ $NetBSD: patch-aq,v 1.4 2011/01/29 22:50:32 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
-@@ -27494,6 +27634,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]];'.
+@@ -17540,6 +17551,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 ()
+@@ -28885,9 +28898,8 @@ if test "x$ac_cv_file__sbin_launchd" = x
+ 
+ $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
+ 
++PBX_LAUNCHD=1
+ fi
+-
+-  PBX_LAUNCHD=1
+ fi
+ 
+ 
diff --git a/comms/asterisk18/patches/patch-au b/comms/asterisk18/patches/patch-au
index c8847359521..2826005fda8 100644
--- a/comms/asterisk18/patches/patch-au
+++ b/comms/asterisk18/patches/patch-au
@@ -1,9 +1,9 @@
-$NetBSD: patch-au,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
+$NetBSD: patch-au,v 1.2 2011/06/09 09:17:27 jnemeth Exp $
 
---- sounds/Makefile.orig	2010-10-18 22:01:16.000000000 +0000
+--- sounds/Makefile.orig	2010-12-29 19:28:36.000000000 +0000
 +++ sounds/Makefile
-@@ -135,20 +135,6 @@ endif
- all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
+@@ -150,20 +150,6 @@ prefixcmd:
+ 	@$(PREFIXCMD)
  
  have_download:
 -	@if test "$(DOWNLOAD)" = ":" ; then \
diff --git a/comms/asterisk18/patches/patch-bl b/comms/asterisk18/patches/patch-bl
new file mode 100644
index 00000000000..a8dc2a91904
--- /dev/null
+++ b/comms/asterisk18/patches/patch-bl
@@ -0,0 +1,13 @@
+$NetBSD: patch-bl,v 1.1 2011/06/09 09:17:27 jnemeth Exp $
+
+--- contrib/scripts/autosupport.orig	2011-01-04 21:00:16.000000000 +0000
++++ contrib/scripts/autosupport
+@@ -32,7 +32,7 @@ files="n";
+ # If a prefix is specified on command-line, add it.
+ if (set -u; : $1) 2> /dev/null
+ then
+-  if [ $1 == "-h" ] || [ $1 == "--help" ]; then
++  if [ $1 = "-h" ] || [ $1 = "--help" ]; then
+     echo
+     echo "Digium autosupport script"
+     echo "Copyright (C) 2005-2010, Digium, Inc."