Update to 1.6.1.20. Apparently they decided to do one final bug fix release:

The Asterisk releases for 1.6.0.28 and 1.6.1.20 are the last maintenance
releases for Asterisk branches 1.6.0 and 1.6.1 and have now moved to security
maintenance only.

The releases of Asterisk 1.6.0.28 and 1.6.1.20 resolves several issues reported
by the community, and would have not been possible without your participation.
Thank you!

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

  * Fix issue where MixMonitor() recordings would be shorter than total duration
.
    (Closes issue #17078. Reported,tested by geoff2010. Patched by dhubbard)

  * When StopMonitor() is called, ensure it will not be restarted by a channel
    event.
    (Closes issue #16590. Reported, patched by kkm)

  * Allow hidecalleridname feature to work.
    (Closes issue #17143. Reported, patched by djensen99)

  * Resolve deadlocks in chan_local.
    (Closes issue #17185. Reported, tested by schmoozecom, GameGamer43)

  * Ensure channel state is not incorrectly set in the case of a very early
    answer by chan_dahdi.
    (Closes issue #17067. Reported, patched by tzafrir)

  * Registration fix for SIP realtime. Make sure realtime fields are not empty.
    (Closes issue #17266. Reported, patched by Nick_Lewis. Tested by sberney)

Information about the Asterisk maintenance schedule is available at:
http://www.asterisk.org/asterisk-versions

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

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

4 files changed, 47 insertions, 40 deletions

diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile
index 21d4bbda0e3..6950a56dc6c 100644
--- a/comms/asterisk16/Makefile
+++ b/comms/asterisk16/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2010/05/20 17:14:45 jnemeth Exp $
+# $NetBSD: Makefile,v 1.19 2010/05/22 22:21:45 jnemeth Exp $
 #
 
-DISTNAME=	asterisk-1.6.1.19
+DISTNAME=	asterisk-1.6.1.20
 DIST_SUBDIR=	${PKGNAME_NOREV}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 CATEGORIES=	comms net audio
@@ -176,6 +176,7 @@ 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}/doc/HOWTO_collect_debug_information.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}
diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST
index 947dba9f837..c3bb4d6903c 100644
--- a/comms/asterisk16/PLIST
+++ b/comms/asterisk16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2010/05/20 17:14:45 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.14 2010/05/22 22:21:45 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -270,7 +270,7 @@ libdata/asterisk/images/asterisk-intro.jpg
 libdata/asterisk/images/kpad2.jpg
 libdata/asterisk/keys/freeworlddialup.pub
 libdata/asterisk/keys/iaxtel.pub
-libdata/asterisk/moh/.asterisk-moh-opsound-wav
+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
@@ -284,10 +284,10 @@ libdata/asterisk/phoneprov/000000000000-phone.cfg
 libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
-libdata/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.17
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.17
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17
+libdata/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.18
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.18
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.18
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.18
 libdata/asterisk/sounds/en/agent-alreadyon.gsm
 libdata/asterisk/sounds/en/agent-incorrect.gsm
 libdata/asterisk/sounds/en/agent-loggedoff.gsm
@@ -318,10 +318,14 @@ libdata/asterisk/sounds/en/conf-lockednow.gsm
 libdata/asterisk/sounds/en/conf-muted.gsm
 libdata/asterisk/sounds/en/conf-noempty.gsm
 libdata/asterisk/sounds/en/conf-nonextended.gsm
+libdata/asterisk/sounds/en/conf-now-muted.gsm
+libdata/asterisk/sounds/en/conf-now-recording.gsm
+libdata/asterisk/sounds/en/conf-now-unmuted.gsm
 libdata/asterisk/sounds/en/conf-onlyone.gsm
 libdata/asterisk/sounds/en/conf-onlyperson.gsm
 libdata/asterisk/sounds/en/conf-otherinparty.gsm
 libdata/asterisk/sounds/en/conf-placeintoconf.gsm
+libdata/asterisk/sounds/en/conf-roll-callcomplete.gsm
 libdata/asterisk/sounds/en/conf-thereare.gsm
 libdata/asterisk/sounds/en/conf-unlockednow.gsm
 libdata/asterisk/sounds/en/conf-unmuted.gsm
@@ -383,6 +387,7 @@ libdata/asterisk/sounds/en/digits/9.gsm
 libdata/asterisk/sounds/en/digits/90.gsm
 libdata/asterisk/sounds/en/digits/a-m.gsm
 libdata/asterisk/sounds/en/digits/at.gsm
+libdata/asterisk/sounds/en/digits/billion.gsm
 libdata/asterisk/sounds/en/digits/day-0.gsm
 libdata/asterisk/sounds/en/digits/day-1.gsm
 libdata/asterisk/sounds/en/digits/day-2.gsm
@@ -407,11 +412,21 @@ libdata/asterisk/sounds/en/digits/h-20.gsm
 libdata/asterisk/sounds/en/digits/h-3.gsm
 libdata/asterisk/sounds/en/digits/h-30.gsm
 libdata/asterisk/sounds/en/digits/h-4.gsm
+libdata/asterisk/sounds/en/digits/h-40.gsm
 libdata/asterisk/sounds/en/digits/h-5.gsm
+libdata/asterisk/sounds/en/digits/h-50.gsm
 libdata/asterisk/sounds/en/digits/h-6.gsm
+libdata/asterisk/sounds/en/digits/h-60.gsm
 libdata/asterisk/sounds/en/digits/h-7.gsm
+libdata/asterisk/sounds/en/digits/h-70.gsm
 libdata/asterisk/sounds/en/digits/h-8.gsm
+libdata/asterisk/sounds/en/digits/h-80.gsm
 libdata/asterisk/sounds/en/digits/h-9.gsm
+libdata/asterisk/sounds/en/digits/h-90.gsm
+libdata/asterisk/sounds/en/digits/h-billion.gsm
+libdata/asterisk/sounds/en/digits/h-hundred.gsm
+libdata/asterisk/sounds/en/digits/h-million.gsm
+libdata/asterisk/sounds/en/digits/h-thousand.gsm
 libdata/asterisk/sounds/en/digits/hundred.gsm
 libdata/asterisk/sounds/en/digits/million.gsm
 libdata/asterisk/sounds/en/digits/minus.gsm
@@ -524,6 +539,7 @@ libdata/asterisk/sounds/en/letters/zed.gsm
 libdata/asterisk/sounds/en/minutes.gsm
 libdata/asterisk/sounds/en/pbx-invalid.gsm
 libdata/asterisk/sounds/en/pbx-invalidpark.gsm
+libdata/asterisk/sounds/en/pbx-parkingfailed.gsm
 libdata/asterisk/sounds/en/pbx-transfer.gsm
 libdata/asterisk/sounds/en/phonetic/9_p.gsm
 libdata/asterisk/sounds/en/phonetic/a_p.gsm
@@ -1054,6 +1070,7 @@ share/doc/asterisk/CHANGES
 share/doc/asterisk/COPYING
 share/doc/asterisk/CREDITS
 share/doc/asterisk/ChangeLog
+share/doc/asterisk/HOWTO_collect_debug_information.txt
 share/doc/asterisk/IAX2-security.txt
 share/doc/asterisk/India-CID.txt
 share/doc/asterisk/LICENSE
diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo
index da2a7bbd7c3..4e0c27979d9 100644
--- a/comms/asterisk16/distinfo
+++ b/comms/asterisk16/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.13 2010/05/20 17:14:45 jnemeth Exp $
+$NetBSD: distinfo,v 1.14 2010/05/22 22:21:45 jnemeth Exp $
 
-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 (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = 7d92f9de5ed6de10e34c8e6039f91b45884e46f8
+RMD160 (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = ccb504292e9d5e93d79456ede212b1697e3c213e
+Size (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = 23601410 bytes
+SHA1 (asterisk-1.6.1.20/extract-cfile.awk) = c4f08eee1ab83c041bde1ab91672a4a3c43c28b8
+RMD160 (asterisk-1.6.1.20/extract-cfile.awk) = cd59f8e5807732023d5aec95187e2d5572f400a4
+Size (asterisk-1.6.1.20/extract-cfile.awk) = 667 bytes
+SHA1 (asterisk-1.6.1.20/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
+RMD160 (asterisk-1.6.1.20/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
+Size (asterisk-1.6.1.20/rfc3951.txt) = 373442 bytes
+SHA1 (patch-aa) = 953fcfd1e0da44f9e7e46fed84be9e8b44125ef0
 SHA1 (patch-af) = 09860d714281cb4c65d1a087cf5b16647a16e2fa
 SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
diff --git a/comms/asterisk16/patches/patch-aa b/comms/asterisk16/patches/patch-aa
index be9978fea81..d26588e246f 100644
--- a/comms/asterisk16/patches/patch-aa
+++ b/comms/asterisk16/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
+$NetBSD: patch-aa,v 1.6 2010/05/22 22:21:45 jnemeth Exp $
 
---- Makefile.orig	2009-12-10 21:03:40.000000000 +0000
+--- Makefile.orig	2010-05-03 17:37:13.000000000 +0000
 +++ Makefile
 @@ -123,20 +123,6 @@ DEBUG=-g3
  
@@ -55,18 +55,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 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)
-@@ -464,9 +439,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
- 	rm -f build_tools/menuselect-deps
- 
- datafiles: _all
--	if [ `$(ID) -u` = 0 ]; then \
--		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
--	fi
-+	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)${PREFIX}/lib/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
- # improved a lot.  I'll put it here for now.
-@@ -508,9 +481,10 @@ NEWHEADERS=$(notdir $(wildcard include/a
+@@ -508,9 +483,10 @@ NEWHEADERS=$(notdir $(wildcard include/a
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  installdirs:
@@ -78,7 +67,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  	mkdir -p $(DESTDIR)$(ASTBINDIR)
  	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-@@ -519,6 +493,7 @@ installdirs:
+@@ -519,6 +495,7 @@ installdirs:
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
  	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
@@ -86,7 +75,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  
  bininstall: _all installdirs $(SUBDIRS_INSTALL)
  	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
-@@ -614,22 +589,22 @@ upgrade: bininstall
+@@ -614,22 +591,22 @@ upgrade: bininstall
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -114,7 +103,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  		if [ -f $${dst} ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s $${dst} $$x ; then \
-@@ -645,10 +620,10 @@ samples: adsi
+@@ -645,10 +622,10 @@ samples: adsi
  		echo "Installing file $$x"; \
  		$(INSTALL) -m 644 $$x $${dst} ;\
  	done
@@ -127,7 +116,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  		echo "astetcdir => $(ASTETCDIR)" ; \
  		echo "astmoddir => $(MODULES_DIR)" ; \
  		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
-@@ -701,7 +676,7 @@ samples: adsi
+@@ -705,7 +682,7 @@ samples: adsi
  		echo "pbx_realtime=1.6" ; \
  		echo "res_agi=1.6" ; \
  		echo "app_set=1.6" ; \
@@ -136,7 +125,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  	else \
  		echo "Skipping asterisk.conf creation"; \
  	fi
-@@ -729,7 +704,7 @@ samples: adsi
+@@ -733,7 +710,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 )
@@ -145,7 +134,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
  	for x in images/*.gif; do \
  		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-@@ -835,7 +810,7 @@ uninstall-all: _uninstall
+@@ -841,7 +818,7 @@ uninstall-all: _uninstall
  	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
  	rm -rf $(DESTDIR)$(ASTDATADIR)
  	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
@@ -154,7 +143,7 @@ $NetBSD: patch-aa,v 1.5 2010/05/06 20:10:17 jnemeth Exp $
  	rm -rf $(DESTDIR)$(ASTLOGDIR)
  
  menuconfig: menuselect
-@@ -906,6 +881,7 @@ asterisk.pdf:
+@@ -912,6 +889,7 @@ asterisk.pdf:
  	$(MAKE) -C doc/tex asterisk.pdf
  
  .PHONY: menuselect