Update to Asterisk 1.8.21.0: this is a bug fix update

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

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

* --- Fix issue where chan_mobile fails to bind to first available port

* --- Fix station ringback; trunk hangup issues in SLA

* --- Fix Queue Log Reporting Every Call COMPLETECALLER With "h"
      Extension Present

* --- Fix Record-Route parsing for large headers.

* --- Fix AMI redirect action with two channels failing to redirect
      both channels.

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

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

Thank you for your continued support of Asterisk!

5 files changed, 169 insertions, 50 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 3fda31a075f..54749bf8c33 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.61 2013/04/10 05:24:38 jnemeth Exp $
+# $NetBSD: Makefile,v 1.62 2013/04/18 16:55:22 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.20.2
+DISTNAME=	asterisk-1.8.21.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -110,7 +110,7 @@ PLIST.mgcp= yes
 .include "options.mk"
 
 # check sounds/Makefile for current version when upgrading package
-DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
+DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.13.tar.gz
 
 # Override default paths in config files
 SUBST_CLASSES+=		configs
@@ -195,9 +195,9 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.22.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.23.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
+	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index 6a11b8a34ca..c94989107e9 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2012/09/30 19:29:05 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/04/18 16:55:22 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -356,13 +356,19 @@ 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.22
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
 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.22
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11
-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/CHANGES-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
+libdata/asterisk/sounds/en/OfficeSpace.gsm
+libdata/asterisk/sounds/en/Randulo-allison.gsm
+libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
+libdata/asterisk/sounds/en/SIP_Test_Success.gsm
 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
@@ -385,6 +391,7 @@ libdata/asterisk/sounds/en/access-denied.gsm
 libdata/asterisk/sounds/en/access-granted.gsm
 libdata/asterisk/sounds/en/accessible-through-system.gsm
 libdata/asterisk/sounds/en/account-balance-is.gsm
+libdata/asterisk/sounds/en/account_number.gsm
 libdata/asterisk/sounds/en/accounting.gsm
 libdata/asterisk/sounds/en/accounts-payable.gsm
 libdata/asterisk/sounds/en/accounts-receivable.gsm
@@ -395,6 +402,7 @@ libdata/asterisk/sounds/en/address.gsm
 libdata/asterisk/sounds/en/administration.gsm
 libdata/asterisk/sounds/en/advised-to-seek-shelter.gsm
 libdata/asterisk/sounds/en/after-the-tone.gsm
+libdata/asterisk/sounds/en/after_tone.gsm
 libdata/asterisk/sounds/en/afternoon.gsm
 libdata/asterisk/sounds/en/agent-alreadyon.gsm
 libdata/asterisk/sounds/en/agent-incorrect.gsm
@@ -420,6 +428,7 @@ libdata/asterisk/sounds/en/and-area-code.gsm
 libdata/asterisk/sounds/en/and-or.gsm
 libdata/asterisk/sounds/en/and-prs-pound-whn-finished.gsm
 libdata/asterisk/sounds/en/and.gsm
+libdata/asterisk/sounds/en/andnowstandby.gsm
 libdata/asterisk/sounds/en/another-time.gsm
 libdata/asterisk/sounds/en/approaching.gsm
 libdata/asterisk/sounds/en/approximately.gsm
@@ -446,6 +455,7 @@ libdata/asterisk/sounds/en/at-customers-request.gsm
 libdata/asterisk/sounds/en/at-following-number.gsm
 libdata/asterisk/sounds/en/at-sign.gsm
 libdata/asterisk/sounds/en/at-tone-time-exactly.gsm
+libdata/asterisk/sounds/en/at_tone.gsm
 libdata/asterisk/sounds/en/athletics.gsm
 libdata/asterisk/sounds/en/atlanta.gsm
 libdata/asterisk/sounds/en/atlantic.gsm
@@ -459,6 +469,7 @@ libdata/asterisk/sounds/en/available.gsm
 libdata/asterisk/sounds/en/avg-speed-answer.gsm
 libdata/asterisk/sounds/en/away-naughty-boy.gsm
 libdata/asterisk/sounds/en/away-naughty-girl.gsm
+libdata/asterisk/sounds/en/awkward.gsm
 libdata/asterisk/sounds/en/backslash.gsm
 libdata/asterisk/sounds/en/bad.gsm
 libdata/asterisk/sounds/en/baltimore.gsm
@@ -476,8 +487,10 @@ libdata/asterisk/sounds/en/believe-its-free.gsm
 libdata/asterisk/sounds/en/billing-and-collections.gsm
 libdata/asterisk/sounds/en/billing.gsm
 libdata/asterisk/sounds/en/billionth.gsm
+libdata/asterisk/sounds/en/binary.gsm
 libdata/asterisk/sounds/en/bits.gsm
 libdata/asterisk/sounds/en/blue-eyed-polar-bear.gsm
+libdata/asterisk/sounds/en/bombsquad.gsm
 libdata/asterisk/sounds/en/bookstore.gsm
 libdata/asterisk/sounds/en/boston.gsm
 libdata/asterisk/sounds/en/box.gsm
@@ -528,6 +541,7 @@ libdata/asterisk/sounds/en/central.gsm
 libdata/asterisk/sounds/en/cents-per-minute.gsm
 libdata/asterisk/sounds/en/cents.gsm
 libdata/asterisk/sounds/en/ceo-office.gsm
+libdata/asterisk/sounds/en/challenge_try_again.gsm
 libdata/asterisk/sounds/en/chance-of.gsm
 libdata/asterisk/sounds/en/changing.gsm
 libdata/asterisk/sounds/en/channel-insecure-warn.gsm
@@ -545,12 +559,14 @@ libdata/asterisk/sounds/en/clearing.gsm
 libdata/asterisk/sounds/en/cleveland.gsm
 libdata/asterisk/sounds/en/clli.gsm
 libdata/asterisk/sounds/en/close-parenthesis.gsm
+libdata/asterisk/sounds/en/closed.gsm
 libdata/asterisk/sounds/en/clouds.gsm
 libdata/asterisk/sounds/en/cloudy.gsm
 libdata/asterisk/sounds/en/collections.gsm
 libdata/asterisk/sounds/en/colorado-springs.gsm
 libdata/asterisk/sounds/en/colorado.gsm
 libdata/asterisk/sounds/en/columbus.gsm
+libdata/asterisk/sounds/en/comedyclub.gsm
 libdata/asterisk/sounds/en/comma.gsm
 libdata/asterisk/sounds/en/communications.gsm
 libdata/asterisk/sounds/en/company-dir-411.gsm
@@ -559,7 +575,15 @@ libdata/asterisk/sounds/en/compliance.gsm
 libdata/asterisk/sounds/en/computer-friend1.gsm
 libdata/asterisk/sounds/en/computer-friend2.gsm
 libdata/asterisk/sounds/en/conditions.gsm
+libdata/asterisk/sounds/en/conf-1-to-list-users.gsm
+libdata/asterisk/sounds/en/conf-2-to-kick-nonadmin.gsm
+libdata/asterisk/sounds/en/conf-3-mute-or-unmute-nonadmin.gsm
+libdata/asterisk/sounds/en/conf-4-to-record-conf.gsm
+libdata/asterisk/sounds/en/conf-8-for-more-options.gsm
+libdata/asterisk/sounds/en/conf-8-to-exit-return-to-conf.gsm
 libdata/asterisk/sounds/en/conf-adminmenu-162.gsm
+libdata/asterisk/sounds/en/conf-adminmenu-18.gsm
+libdata/asterisk/sounds/en/conf-adminmenu-menu8.gsm
 libdata/asterisk/sounds/en/conf-adminmenu.gsm
 libdata/asterisk/sounds/en/conf-banned.gsm
 libdata/asterisk/sounds/en/conf-enteringno.gsm
@@ -666,8 +690,11 @@ libdata/asterisk/sounds/en/core-sounds-en.txt
 libdata/asterisk/sounds/en/could-lose-a-few-pounds.gsm
 libdata/asterisk/sounds/en/counseling-services.gsm
 libdata/asterisk/sounds/en/count.gsm
+libdata/asterisk/sounds/en/countdown.gsm
 libdata/asterisk/sounds/en/crash.gsm
+libdata/asterisk/sounds/en/crashing_conf.gsm
 libdata/asterisk/sounds/en/current-time-is.gsm
+libdata/asterisk/sounds/en/current_account_balance.gsm
 libdata/asterisk/sounds/en/currently.gsm
 libdata/asterisk/sounds/en/customer-accounts.gsm
 libdata/asterisk/sounds/en/customer-relations.gsm
@@ -838,6 +865,8 @@ libdata/asterisk/sounds/en/divided-by.gsm
 libdata/asterisk/sounds/en/dns.gsm
 libdata/asterisk/sounds/en/do-not-disturb.gsm
 libdata/asterisk/sounds/en/doing-enum-lookup.gsm
+libdata/asterisk/sounds/en/donotcall1.gsm
+libdata/asterisk/sounds/en/donotcall2.gsm
 libdata/asterisk/sounds/en/dont-know-who-sent.gsm
 libdata/asterisk/sounds/en/doppler-radar.gsm
 libdata/asterisk/sounds/en/down.gsm
@@ -854,6 +883,7 @@ libdata/asterisk/sounds/en/eighteenth.gsm
 libdata/asterisk/sounds/en/eighth.gsm
 libdata/asterisk/sounds/en/eightieth.gsm
 libdata/asterisk/sounds/en/el-paso.gsm
+libdata/asterisk/sounds/en/eletelephony.gsm
 libdata/asterisk/sounds/en/eleventh.gsm
 libdata/asterisk/sounds/en/email.gsm
 libdata/asterisk/sounds/en/emergency.gsm
@@ -868,11 +898,13 @@ libdata/asterisk/sounds/en/enter-ext-of-person.gsm
 libdata/asterisk/sounds/en/enter-num-blacklist.gsm
 libdata/asterisk/sounds/en/enter-password.gsm
 libdata/asterisk/sounds/en/enter-phone-number10.gsm
+libdata/asterisk/sounds/en/enter_account.gsm
 libdata/asterisk/sounds/en/entering-conf-number.gsm
 libdata/asterisk/sounds/en/entr-num-rmv-blklist.gsm
 libdata/asterisk/sounds/en/enum-lookup-failed.gsm
 libdata/asterisk/sounds/en/enum-lookup-successful.gsm
 libdata/asterisk/sounds/en/error-number.gsm
+libdata/asterisk/sounds/en/error.gsm
 libdata/asterisk/sounds/en/est-hold-time-is.gsm
 libdata/asterisk/sounds/en/euro.gsm
 libdata/asterisk/sounds/en/european.gsm
@@ -888,6 +920,7 @@ libdata/asterisk/sounds/en/fahrenheit.gsm
 libdata/asterisk/sounds/en/falling.gsm
 libdata/asterisk/sounds/en/fast.gsm
 libdata/asterisk/sounds/en/feature-not-avail-line.gsm
+libdata/asterisk/sounds/en/feeling_lucky_punk.gsm
 libdata/asterisk/sounds/en/feet.gsm
 libdata/asterisk/sounds/en/female.gsm
 libdata/asterisk/sounds/en/fifteenth.gsm
@@ -903,6 +936,8 @@ libdata/asterisk/sounds/en/florida.gsm
 libdata/asterisk/sounds/en/fog.gsm
 libdata/asterisk/sounds/en/foggy.gsm
 libdata/asterisk/sounds/en/followed-by.gsm
+libdata/asterisk/sounds/en/followed_hash.gsm
+libdata/asterisk/sounds/en/followed_pound.gsm
 libdata/asterisk/sounds/en/followme/call-from.gsm
 libdata/asterisk/sounds/en/followme/no-recording.gsm
 libdata/asterisk/sounds/en/followme/options.gsm
@@ -929,6 +964,7 @@ libdata/asterisk/sounds/en/for-the-weather.gsm
 libdata/asterisk/sounds/en/for-wakeup-call.gsm
 libdata/asterisk/sounds/en/for-yes-press.gsm
 libdata/asterisk/sounds/en/for.gsm
+libdata/asterisk/sounds/en/forget_about_it.gsm
 libdata/asterisk/sounds/en/fort-worth.gsm
 libdata/asterisk/sounds/en/fortieth.gsm
 libdata/asterisk/sounds/en/fourteenth.gsm
@@ -943,6 +979,10 @@ libdata/asterisk/sounds/en/ftp.gsm
 libdata/asterisk/sounds/en/gale.gsm
 libdata/asterisk/sounds/en/gambling-drunk.gsm
 libdata/asterisk/sounds/en/georgia.gsm
+libdata/asterisk/sounds/en/get-in-line-sales-guy.gsm
+libdata/asterisk/sounds/en/get_bleep_outta.gsm
+libdata/asterisk/sounds/en/get_information.gsm
+libdata/asterisk/sounds/en/get_information_first.gsm
 libdata/asterisk/sounds/en/gigabits.gsm
 libdata/asterisk/sounds/en/gigabytes.gsm
 libdata/asterisk/sounds/en/gigahertz.gsm
@@ -955,6 +995,10 @@ libdata/asterisk/sounds/en/good-evening.gsm
 libdata/asterisk/sounds/en/good-morning.gsm
 libdata/asterisk/sounds/en/good.gsm
 libdata/asterisk/sounds/en/goodbye.gsm
+libdata/asterisk/sounds/en/goodbye_for_the_best.gsm
+libdata/asterisk/sounds/en/goodbye_love.gsm
+libdata/asterisk/sounds/en/got_kidding.gsm
+libdata/asterisk/sounds/en/grammar.gsm
 libdata/asterisk/sounds/en/greater-than.gsm
 libdata/asterisk/sounds/en/groovy.gsm
 libdata/asterisk/sounds/en/ha/ac.gsm
@@ -1082,10 +1126,12 @@ libdata/asterisk/sounds/en/ha/xmas-lights.gsm
 libdata/asterisk/sounds/en/ha/xmas-tree.gsm
 libdata/asterisk/sounds/en/ha/yard.gsm
 libdata/asterisk/sounds/en/hail.gsm
+libdata/asterisk/sounds/en/hal_goodbye.gsm
 libdata/asterisk/sounds/en/half.gsm
 libdata/asterisk/sounds/en/hang-on-a-second-angry.gsm
 libdata/asterisk/sounds/en/hang-on-a-second.gsm
 libdata/asterisk/sounds/en/hangup-try-again.gsm
+libdata/asterisk/sounds/en/happy_saved.gsm
 libdata/asterisk/sounds/en/has-arrived-at.gsm
 libdata/asterisk/sounds/en/has-been-changed-to.gsm
 libdata/asterisk/sounds/en/has-been-cleared.gsm
@@ -1197,6 +1243,7 @@ libdata/asterisk/sounds/en/just-kidding-not-upset2.gsm
 libdata/asterisk/sounds/en/kansas-city.gsm
 libdata/asterisk/sounds/en/kansas.gsm
 libdata/asterisk/sounds/en/kentucky.gsm
+libdata/asterisk/sounds/en/keywords_cross_fingers.gsm
 libdata/asterisk/sounds/en/kilobits.gsm
 libdata/asterisk/sounds/en/kilobytes.gsm
 libdata/asterisk/sounds/en/kilohertz.gsm
@@ -1278,6 +1325,7 @@ libdata/asterisk/sounds/en/letters/z.gsm
 libdata/asterisk/sounds/en/letters/zed.gsm
 libdata/asterisk/sounds/en/library.gsm
 libdata/asterisk/sounds/en/lightning.gsm
+libdata/asterisk/sounds/en/like_to_tell_valid_ext.gsm
 libdata/asterisk/sounds/en/limit-simul-calls.gsm
 libdata/asterisk/sounds/en/lines-complaining-customers.gsm
 libdata/asterisk/sounds/en/linux.gsm
@@ -1307,6 +1355,7 @@ libdata/asterisk/sounds/en/management.gsm
 libdata/asterisk/sounds/en/manufacturing.gsm
 libdata/asterisk/sounds/en/marketing.gsm
 libdata/asterisk/sounds/en/marryme.gsm
+libdata/asterisk/sounds/en/martini.gsm
 libdata/asterisk/sounds/en/maryland.gsm
 libdata/asterisk/sounds/en/massachusetts.gsm
 libdata/asterisk/sounds/en/mathematics.gsm
@@ -1320,6 +1369,7 @@ libdata/asterisk/sounds/en/menu.gsm
 libdata/asterisk/sounds/en/mesa.gsm
 libdata/asterisk/sounds/en/message-from.gsm
 libdata/asterisk/sounds/en/message-number.gsm
+libdata/asterisk/sounds/en/messages_curious.gsm
 libdata/asterisk/sounds/en/meter.gsm
 libdata/asterisk/sounds/en/meters.gsm
 libdata/asterisk/sounds/en/miami.gsm
@@ -1332,7 +1382,9 @@ libdata/asterisk/sounds/en/miles-per-hour.gsm
 libdata/asterisk/sounds/en/miles.gsm
 libdata/asterisk/sounds/en/millionth.gsm
 libdata/asterisk/sounds/en/milwaukee.gsm
+libdata/asterisk/sounds/en/mind_repeating.gsm
 libdata/asterisk/sounds/en/minimum.gsm
+libdata/asterisk/sounds/en/minions-not-answering-leave-message.gsm
 libdata/asterisk/sounds/en/minneapolis.gsm
 libdata/asterisk/sounds/en/minnesota.gsm
 libdata/asterisk/sounds/en/minute.gsm
@@ -1341,6 +1393,7 @@ libdata/asterisk/sounds/en/missed.gsm
 libdata/asterisk/sounds/en/mississippi.gsm
 libdata/asterisk/sounds/en/missouri.gsm
 libdata/asterisk/sounds/en/misty.gsm
+libdata/asterisk/sounds/en/mode.gsm
 libdata/asterisk/sounds/en/monitored.gsm
 libdata/asterisk/sounds/en/montana.gsm
 libdata/asterisk/sounds/en/month.gsm
@@ -1370,6 +1423,7 @@ libdata/asterisk/sounds/en/new-jersey.gsm
 libdata/asterisk/sounds/en/new-mexico.gsm
 libdata/asterisk/sounds/en/new-orleans.gsm
 libdata/asterisk/sounds/en/new-york.gsm
+libdata/asterisk/sounds/en/night.gsm
 libdata/asterisk/sounds/en/nineteenth.gsm
 libdata/asterisk/sounds/en/ninetieth.gsm
 libdata/asterisk/sounds/en/ninth.gsm
@@ -1382,8 +1436,14 @@ libdata/asterisk/sounds/en/no-info-about-number.gsm
 libdata/asterisk/sounds/en/no-longer-in-service.gsm
 libdata/asterisk/sounds/en/no-reply-no-mailbox.gsm
 libdata/asterisk/sounds/en/no-route-exists-to-dest.gsm
+libdata/asterisk/sounds/en/no_invite_to_conf.gsm
+libdata/asterisk/sounds/en/no_longer_conf.gsm
+libdata/asterisk/sounds/en/no_problem_help.gsm
+libdata/asterisk/sounds/en/no_worries_try_again.gsm
 libdata/asterisk/sounds/en/nobody-but-chickens.gsm
 libdata/asterisk/sounds/en/node.gsm
+libdata/asterisk/sounds/en/none_of_my_business1.gsm
+libdata/asterisk/sounds/en/none_of_my_business2.gsm
 libdata/asterisk/sounds/en/north-carolina.gsm
 libdata/asterisk/sounds/en/north-dakota.gsm
 libdata/asterisk/sounds/en/north.gsm
@@ -1397,6 +1457,10 @@ libdata/asterisk/sounds/en/not-rqsted-wakeup.gsm
 libdata/asterisk/sounds/en/not-taking-your-call.gsm
 libdata/asterisk/sounds/en/not-yet-assigned.gsm
 libdata/asterisk/sounds/en/not-yet-connected.gsm
+libdata/asterisk/sounds/en/not_me.gsm
+libdata/asterisk/sounds/en/not_pass.gsm
+libdata/asterisk/sounds/en/not_siri.gsm
+libdata/asterisk/sounds/en/not_you.gsm
 libdata/asterisk/sounds/en/nothing-recorded.gsm
 libdata/asterisk/sounds/en/now.gsm
 libdata/asterisk/sounds/en/num-not-in-db.gsm
@@ -1407,9 +1471,11 @@ libdata/asterisk/sounds/en/number.gsm
 libdata/asterisk/sounds/en/oakland.gsm
 libdata/asterisk/sounds/en/octothorpe.gsm
 libdata/asterisk/sounds/en/off-duty.gsm
+libdata/asterisk/sounds/en/off.gsm
 libdata/asterisk/sounds/en/office-code.gsm
 libdata/asterisk/sounds/en/office-iguanas.gsm
 libdata/asterisk/sounds/en/office.gsm
+libdata/asterisk/sounds/en/ogm_home.gsm
 libdata/asterisk/sounds/en/ohio.gsm
 libdata/asterisk/sounds/en/oklahoma-city.gsm
 libdata/asterisk/sounds/en/oklahoma.gsm
@@ -1425,6 +1491,7 @@ libdata/asterisk/sounds/en/oops1.gsm
 libdata/asterisk/sounds/en/oops2.gsm
 libdata/asterisk/sounds/en/oops3.gsm
 libdata/asterisk/sounds/en/open-parenthesis.gsm
+libdata/asterisk/sounds/en/open.gsm
 libdata/asterisk/sounds/en/operations.gsm
 libdata/asterisk/sounds/en/option-is-invalid.gsm
 libdata/asterisk/sounds/en/option-not-implemented.gsm
@@ -1447,6 +1514,7 @@ libdata/asterisk/sounds/en/partially.gsm
 libdata/asterisk/sounds/en/partly.gsm
 libdata/asterisk/sounds/en/pascal.gsm
 libdata/asterisk/sounds/en/pascal2.gsm
+libdata/asterisk/sounds/en/passwords_not_match.gsm
 libdata/asterisk/sounds/en/patchy.gsm
 libdata/asterisk/sounds/en/pbx-invalid.gsm
 libdata/asterisk/sounds/en/pbx-invalidpark.gsm
@@ -1494,6 +1562,7 @@ libdata/asterisk/sounds/en/phonetic/z_p.gsm
 libdata/asterisk/sounds/en/physics.gsm
 libdata/asterisk/sounds/en/pin-invalid.gsm
 libdata/asterisk/sounds/en/pin-number-accepted.gsm
+libdata/asterisk/sounds/en/pin_number.gsm
 libdata/asterisk/sounds/en/ping.gsm
 libdata/asterisk/sounds/en/pipe.gsm
 libdata/asterisk/sounds/en/planning.gsm
@@ -1504,6 +1573,8 @@ libdata/asterisk/sounds/en/please-enter-the.gsm
 libdata/asterisk/sounds/en/please-enter-your.gsm
 libdata/asterisk/sounds/en/please-hang-up-and-dial-operator.gsm
 libdata/asterisk/sounds/en/please-hang-up-and-try-again.gsm
+libdata/asterisk/sounds/en/please-hold-minion-connect.gsm
+libdata/asterisk/sounds/en/please-hold-while-minion.gsm
 libdata/asterisk/sounds/en/please-try-again-later.gsm
 libdata/asterisk/sounds/en/please-try-again.gsm
 libdata/asterisk/sounds/en/please-try.gsm
@@ -1516,6 +1587,7 @@ libdata/asterisk/sounds/en/pls-entr-num-uwish2-call.gsm
 libdata/asterisk/sounds/en/pls-hold-process-tx.gsm
 libdata/asterisk/sounds/en/pls-hold-silent30.gsm
 libdata/asterisk/sounds/en/pls-hold-while-try.gsm
+libdata/asterisk/sounds/en/pls-listen-options-changed.gsm
 libdata/asterisk/sounds/en/pls-lv-msg-will-contact.gsm
 libdata/asterisk/sounds/en/pls-rcrd-name-at-tone.gsm
 libdata/asterisk/sounds/en/pls-stay-on-line.gsm
@@ -1556,6 +1628,16 @@ libdata/asterisk/sounds/en/press-button-again.gsm
 libdata/asterisk/sounds/en/press-enter.gsm
 libdata/asterisk/sounds/en/press-escape.gsm
 libdata/asterisk/sounds/en/press-hash.gsm
+libdata/asterisk/sounds/en/press-or-say-0.gsm
+libdata/asterisk/sounds/en/press-or-say-1.gsm
+libdata/asterisk/sounds/en/press-or-say-2.gsm
+libdata/asterisk/sounds/en/press-or-say-3.gsm
+libdata/asterisk/sounds/en/press-or-say-4.gsm
+libdata/asterisk/sounds/en/press-or-say-5.gsm
+libdata/asterisk/sounds/en/press-or-say-6.gsm
+libdata/asterisk/sounds/en/press-or-say-7.gsm
+libdata/asterisk/sounds/en/press-or-say-8.gsm
+libdata/asterisk/sounds/en/press-or-say-9.gsm
 libdata/asterisk/sounds/en/press-pound-save-changes.gsm
 libdata/asterisk/sounds/en/press-pound-to-login-star-to-hangup.gsm
 libdata/asterisk/sounds/en/press-pound.gsm
@@ -1565,7 +1647,10 @@ libdata/asterisk/sounds/en/press-star.gsm
 libdata/asterisk/sounds/en/press-the-space-bar.gsm
 libdata/asterisk/sounds/en/press-tilde.gsm
 libdata/asterisk/sounds/en/press.gsm
+libdata/asterisk/sounds/en/press_pound_hash.gsm
+libdata/asterisk/sounds/en/press_pound_hash_key.gsm
 libdata/asterisk/sounds/en/pressure.gsm
+libdata/asterisk/sounds/en/prime_number.gsm
 libdata/asterisk/sounds/en/printing.gsm
 libdata/asterisk/sounds/en/priv-callee-options.gsm
 libdata/asterisk/sounds/en/priv-callpending.gsm
@@ -1601,6 +1686,7 @@ libdata/asterisk/sounds/en/privacy-your-callerid-is.gsm
 libdata/asterisk/sounds/en/product.gsm
 libdata/asterisk/sounds/en/production.gsm
 libdata/asterisk/sounds/en/projects.gsm
+libdata/asterisk/sounds/en/prompt-not-found.gsm
 libdata/asterisk/sounds/en/protocol.gsm
 libdata/asterisk/sounds/en/public-relations.gsm
 libdata/asterisk/sounds/en/purchasing.gsm
@@ -1609,6 +1695,7 @@ libdata/asterisk/sounds/en/q-dot-931.gsm
 libdata/asterisk/sounds/en/q-dot-9thirty1.gsm
 libdata/asterisk/sounds/en/quality-assurance.gsm
 libdata/asterisk/sounds/en/quality-control.gsm
+libdata/asterisk/sounds/en/quality_control.gsm
 libdata/asterisk/sounds/en/quarter.gsm
 libdata/asterisk/sounds/en/queue-callswaiting.gsm
 libdata/asterisk/sounds/en/queue-holdtime.gsm
@@ -1637,12 +1724,14 @@ libdata/asterisk/sounds/en/receiving.gsm
 libdata/asterisk/sounds/en/reception.gsm
 libdata/asterisk/sounds/en/recorded.gsm
 libdata/asterisk/sounds/en/registrar.gsm
+libdata/asterisk/sounds/en/regret_not_saved.gsm
 libdata/asterisk/sounds/en/remote-already-in-this-mode-2.gsm
 libdata/asterisk/sounds/en/remote-already-in-this-mode.gsm
 libdata/asterisk/sounds/en/remote-base.gsm
 libdata/asterisk/sounds/en/removed.gsm
 libdata/asterisk/sounds/en/repair.gsm
 libdata/asterisk/sounds/en/repeat-only.gsm
+libdata/asterisk/sounds/en/repeat_pin.gsm
 libdata/asterisk/sounds/en/repeater.gsm
 libdata/asterisk/sounds/en/research-and-development.gsm
 libdata/asterisk/sounds/en/research.gsm
@@ -1657,9 +1746,11 @@ libdata/asterisk/sounds/en/room-service.gsm
 libdata/asterisk/sounds/en/route-sip.gsm
 libdata/asterisk/sounds/en/rqsted-wakeup-for.gsm
 libdata/asterisk/sounds/en/sacramento.gsm
+libdata/asterisk/sounds/en/said_hold_on.gsm
 libdata/asterisk/sounds/en/saint-louis.gsm
 libdata/asterisk/sounds/en/sales-floor.gsm
 libdata/asterisk/sounds/en/sales.gsm
+libdata/asterisk/sounds/en/saleshell.gsm
 libdata/asterisk/sounds/en/san-antonio.gsm
 libdata/asterisk/sounds/en/san-diego.gsm
 libdata/asterisk/sounds/en/san-francisco.gsm
@@ -1677,6 +1768,7 @@ libdata/asterisk/sounds/en/secretary.gsm
 libdata/asterisk/sounds/en/security.gsm
 libdata/asterisk/sounds/en/self-destruct-in.gsm
 libdata/asterisk/sounds/en/self-destruct.gsm
+libdata/asterisk/sounds/en/sendhelp.gsm
 libdata/asterisk/sounds/en/server.gsm
 libdata/asterisk/sounds/en/service-not-implemented.gsm
 libdata/asterisk/sounds/en/service.gsm
@@ -1724,6 +1816,13 @@ libdata/asterisk/sounds/en/sorry-mailbox-full.gsm
 libdata/asterisk/sounds/en/sorry-youre-having-problems.gsm
 libdata/asterisk/sounds/en/sorry.gsm
 libdata/asterisk/sounds/en/sorry2.gsm
+libdata/asterisk/sounds/en/sorry_caller_number.gsm
+libdata/asterisk/sounds/en/sorry_didnt_get.gsm
+libdata/asterisk/sounds/en/sorry_didnt_quite_get.gsm
+libdata/asterisk/sounds/en/sorry_login_incorrect.gsm
+libdata/asterisk/sounds/en/sorry_missed.gsm
+libdata/asterisk/sounds/en/sorry_no_messages.gsm
+libdata/asterisk/sounds/en/sorrydave.gsm
 libdata/asterisk/sounds/en/south-carolina.gsm
 libdata/asterisk/sounds/en/south-dakota.gsm
 libdata/asterisk/sounds/en/south.gsm
@@ -1765,20 +1864,24 @@ libdata/asterisk/sounds/en/station.gsm
 libdata/asterisk/sounds/en/status.gsm
 libdata/asterisk/sounds/en/step-in-stream.gsm
 libdata/asterisk/sounds/en/sterling.gsm
+libdata/asterisk/sounds/en/still_on_phone.gsm
 libdata/asterisk/sounds/en/store-accounting.gsm
 libdata/asterisk/sounds/en/storm.gsm
 libdata/asterisk/sounds/en/sun.gsm
 libdata/asterisk/sounds/en/sunny.gsm
 libdata/asterisk/sounds/en/support.gsm
+libdata/asterisk/sounds/en/sure_help.gsm
 libdata/asterisk/sounds/en/swap.gsm
 libdata/asterisk/sounds/en/system-crashed.gsm
 libdata/asterisk/sounds/en/system-status-msg.gsm
 libdata/asterisk/sounds/en/system.gsm
 libdata/asterisk/sounds/en/systems.gsm
+libdata/asterisk/sounds/en/talkin_me.gsm
 libdata/asterisk/sounds/en/talking-to-myself.gsm
 libdata/asterisk/sounds/en/target-attendant.gsm
 libdata/asterisk/sounds/en/tcp.gsm
 libdata/asterisk/sounds/en/technical-support.gsm
+libdata/asterisk/sounds/en/telemarketercalling.gsm
 libdata/asterisk/sounds/en/telephone-in-your-pocket.gsm
 libdata/asterisk/sounds/en/telephone-in-your-pocket2.gsm
 libdata/asterisk/sounds/en/telephone-number.gsm
@@ -1797,6 +1900,8 @@ libdata/asterisk/sounds/en/test-tones-follow.gsm
 libdata/asterisk/sounds/en/texas.gsm
 libdata/asterisk/sounds/en/thank-you-cooperation.gsm
 libdata/asterisk/sounds/en/thank-you-for-calling.gsm
+libdata/asterisk/sounds/en/thank_you_calling.gsm
+libdata/asterisk/sounds/en/thanks-annoyance.gsm
 libdata/asterisk/sounds/en/thanks-for-calling-today.gsm
 libdata/asterisk/sounds/en/thanks-for-using.gsm
 libdata/asterisk/sounds/en/that-is-not-rec-phn-num.gsm
@@ -1832,6 +1937,7 @@ libdata/asterisk/sounds/en/thunderstorm.gsm
 libdata/asterisk/sounds/en/tide.gsm
 libdata/asterisk/sounds/en/time.gsm
 libdata/asterisk/sounds/en/times.gsm
+libdata/asterisk/sounds/en/timewarp.gsm
 libdata/asterisk/sounds/en/to-accept-recording.gsm
 libdata/asterisk/sounds/en/to-be-called-back.gsm
 libdata/asterisk/sounds/en/to-blklist-last-caller.gsm
@@ -1882,6 +1988,7 @@ libdata/asterisk/sounds/en/to-send-a-reply.gsm
 libdata/asterisk/sounds/en/to-snooze-for.gsm
 libdata/asterisk/sounds/en/to-use-def-attendant.gsm
 libdata/asterisk/sounds/en/tomorrow-night.gsm
+libdata/asterisk/sounds/en/tone_time.gsm
 libdata/asterisk/sounds/en/tones-that-follow-are-for-the-deaf.gsm
 libdata/asterisk/sounds/en/tonight.gsm
 libdata/asterisk/sounds/en/too-low.gsm
@@ -1894,6 +2001,7 @@ libdata/asterisk/sounds/en/trading-desk.gsm
 libdata/asterisk/sounds/en/traffic.gsm
 libdata/asterisk/sounds/en/training.gsm
 libdata/asterisk/sounds/en/transfer.gsm
+libdata/asterisk/sounds/en/transfer_to_agent.gsm
 libdata/asterisk/sounds/en/transportation.gsm
 libdata/asterisk/sounds/en/travel.gsm
 libdata/asterisk/sounds/en/treasury.gsm
@@ -1921,9 +2029,12 @@ libdata/asterisk/sounds/en/uh-oh2.gsm
 libdata/asterisk/sounds/en/uk.gsm
 libdata/asterisk/sounds/en/unavailable.gsm
 libdata/asterisk/sounds/en/unconditional.gsm
+libdata/asterisk/sounds/en/unicorn_blood.gsm
+libdata/asterisk/sounds/en/unicorn_blood_MIXDOWN.gsm
 libdata/asterisk/sounds/en/unidentified-no-callback.gsm
 libdata/asterisk/sounds/en/units.gsm
 libdata/asterisk/sounds/en/unix.gsm
+libdata/asterisk/sounds/en/unwelcomecall.gsm
 libdata/asterisk/sounds/en/up.gsm
 libdata/asterisk/sounds/en/uptime.gsm
 libdata/asterisk/sounds/en/user.gsm
@@ -2064,6 +2175,7 @@ libdata/asterisk/sounds/en/was.gsm
 libdata/asterisk/sounds/en/washington-dc.gsm
 libdata/asterisk/sounds/en/washington.gsm
 libdata/asterisk/sounds/en/watch.gsm
+libdata/asterisk/sounds/en/watson.gsm
 libdata/asterisk/sounds/en/we-apologize.gsm
 libdata/asterisk/sounds/en/we-dont-have-tech-support.gsm
 libdata/asterisk/sounds/en/weasels-eaten-phonesys.gsm
@@ -2081,6 +2193,7 @@ libdata/asterisk/sounds/en/what-time-it-is.gsm
 libdata/asterisk/sounds/en/what-time-it-is2.gsm
 libdata/asterisk/sounds/en/when-dialing-this-number.gsm
 libdata/asterisk/sounds/en/who-would-you-like-to-call.gsm
+libdata/asterisk/sounds/en/whoareyou.gsm
 libdata/asterisk/sounds/en/why-no-answer-mystery.gsm
 libdata/asterisk/sounds/en/wichita.gsm
 libdata/asterisk/sounds/en/will-apply.gsm
@@ -2092,8 +2205,10 @@ libdata/asterisk/sounds/en/windows.gsm
 libdata/asterisk/sounds/en/windy.gsm
 libdata/asterisk/sounds/en/wisconsin.gsm
 libdata/asterisk/sounds/en/wish-to-continue.gsm
+libdata/asterisk/sounds/en/wish_command_totally.gsm
 libdata/asterisk/sounds/en/with.gsm
 libdata/asterisk/sounds/en/within.gsm
+libdata/asterisk/sounds/en/woo_hoo_call_first.gsm
 libdata/asterisk/sounds/en/work.gsm
 libdata/asterisk/sounds/en/wrong-try-again-smarty.gsm
 libdata/asterisk/sounds/en/wtng-to-spk-w-rep.gsm
@@ -2146,6 +2261,7 @@ libdata/asterisk/sounds/en/you-must-first-dial.gsm
 libdata/asterisk/sounds/en/you-seem-impatient.gsm
 libdata/asterisk/sounds/en/you-sound-cute.gsm
 libdata/asterisk/sounds/en/you-wish-to-join.gsm
+libdata/asterisk/sounds/en/you_say_yes.gsm
 libdata/asterisk/sounds/en/your-account.gsm
 libdata/asterisk/sounds/en/your-msg-has-been-saved.gsm
 libdata/asterisk/sounds/en/your-msg-is-too-short.gsm
@@ -2153,7 +2269,10 @@ libdata/asterisk/sounds/en/your-notifications.gsm
 libdata/asterisk/sounds/en/your-req-notification.gsm
 libdata/asterisk/sounds/en/your-temp-greeting.gsm
 libdata/asterisk/sounds/en/your.gsm
+libdata/asterisk/sounds/en/yourcallisimportant.gsm
+libdata/asterisk/sounds/en/yourcallisimpotent.gsm
 libdata/asterisk/sounds/en/zip-code.gsm
+libdata/asterisk/sounds/en/zombies.gsm
 libdata/asterisk/static-http/ajamdemo.html
 libdata/asterisk/static-http/astman.css
 libdata/asterisk/static-http/astman.js
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index cbc95a0587f..614fd35889d 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.44 2013/04/10 05:24:38 jnemeth Exp $
+$NetBSD: distinfo,v 1.45 2013/04/18 16:55:22 jnemeth Exp $
 
-SHA1 (asterisk-1.8.20.2/asterisk-1.8.20.2.tar.gz) = 34da1378934fc7f36f7b5557dc13258f810e4671
-RMD160 (asterisk-1.8.20.2/asterisk-1.8.20.2.tar.gz) = 43de94899a3178e12f46326652edadf16bff9078
-Size (asterisk-1.8.20.2/asterisk-1.8.20.2.tar.gz) = 25180212 bytes
-SHA1 (asterisk-1.8.20.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.20.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.20.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (asterisk-1.8.21.0/asterisk-1.8.21.0.tar.gz) = aa1105e6c44ea2174b939da9e1ec942de2d1821a
+RMD160 (asterisk-1.8.21.0/asterisk-1.8.21.0.tar.gz) = b72fac9ddce36e96b204556a396699d5985cb885
+Size (asterisk-1.8.21.0/asterisk-1.8.21.0.tar.gz) = 25334905 bytes
+SHA1 (asterisk-1.8.21.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
+RMD160 (asterisk-1.8.21.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
+Size (asterisk-1.8.21.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
 SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
@@ -15,14 +15,14 @@ SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = aa95464a8bd4a417f313541b465142d2e4c3ee47
 SHA1 (patch-ap) = 94a986e6e24c04ee8e95ea6809f826cb99c90c8a
-SHA1 (patch-aq) = 682891a6c77d809bebc3085dcb88be9b1ab8589f
+SHA1 (patch-aq) = 8da5ef9a64f6e18849f58826252f41fe876e89dc
 SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
 SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
 SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
 SHA1 (patch-au) = 773398e719dca34640dcdc190857872da1ad7b4f
 SHA1 (patch-av) = 3424013b5bf22624aa664e972e2b495ab3296cbe
 SHA1 (patch-aw) = 0534acd67ea5da1eee8cf282035ebf4c559278ab
-SHA1 (patch-ax) = a4f4b0a46e74d74b780d8b96cdecb7e44d9b99f7
+SHA1 (patch-ax) = aae5b9954f9ae672aa948f1daa88494f1b407e81
 SHA1 (patch-ay) = 746a609e4d01903ebdf525a7cf5c3925729e74b0
 SHA1 (patch-az) = 64365b12cb47ec0fba358e4326eda172f96068cf
 SHA1 (patch-ba) = ffb20f4788f2f253e822fb48c68fec04c31b0619
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index c92910b5fd7..e410c30c33d 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,17 +1,17 @@
-$NetBSD: patch-aq,v 1.12 2012/10/08 23:56:48 jnemeth Exp $
+$NetBSD: patch-aq,v 1.13 2013/04/18 16:55:22 jnemeth Exp $
 
---- configure.orig	2012-08-09 18:58:44.000000000 +0000
+--- configure.orig	2013-01-30 17:44:11.000000000 +0000
 +++ configure
-@@ -24270,7 +24270,7 @@ $as_echo "user CFLAGS present" >&6; }
+@@ -16688,7 +16688,7 @@ $as_echo "user CFLAGS present" >&6; }
  else
- 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
 -	AST_NATIVE_ARCH=
 +	AST_NATIVE_ARCH=0
  fi
  
  
-@@ -25159,6 +25159,146 @@ fi
+@@ -17148,6 +17148,146 @@ fi
  
  
  
@@ -158,18 +158,18 @@ $NetBSD: patch-aq,v 1.12 2012/10/08 23:56: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]];'.
-@@ -29734,6 +29874,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -18262,6 +18402,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 ()
-@@ -55685,10 +55827,10 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_SBIN_LAUNCHD 1
- _ACEOF
+@@ -29253,10 +29395,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
+ 
+ $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
  
 -fi
  
diff --git a/comms/asterisk18/patches/patch-ax b/comms/asterisk18/patches/patch-ax
index f400e793f2c..735ab8141c1 100644
--- a/comms/asterisk18/patches/patch-ax
+++ b/comms/asterisk18/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
+$NetBSD: patch-ax,v 1.4 2013/04/18 16:55:22 jnemeth Exp $
 
---- apps/app_queue.c.orig	2012-06-22 22:07:35.000000000 +0000
+--- apps/app_queue.c.orig	2013-01-08 20:22:16.000000000 +0000
 +++ apps/app_queue.c
-@@ -3357,8 +3357,8 @@ static void record_abandoned(struct queu
+@@ -3533,8 +3533,8 @@ static void record_abandoned(struct queu
  		"Uniqueid: %s\r\n"
  		"Position: %d\r\n"
  		"OriginalPosition: %d\r\n"
@@ -13,7 +13,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  
  	qe->parent->callsabandoned++;
  	ao2_unlock(qe->parent);
-@@ -4003,7 +4003,7 @@ static int wait_our_turn(struct queue_en
+@@ -4210,7 +4210,7 @@ static int wait_our_turn(struct queue_en
  
  			if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty))) {
  				*reason = QUEUE_LEAVEEMPTY;
@@ -22,7 +22,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  				leave_queue(qe);
  				break;
  			}
-@@ -4209,12 +4209,12 @@ static void send_agent_complete(const st
+@@ -4417,12 +4417,12 @@ static void send_agent_complete(const st
  		"Channel: %s\r\n"
  		"Member: %s\r\n"
  		"MemberName: %s\r\n"
@@ -38,7 +38,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  		qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
  }
  
-@@ -4257,9 +4257,9 @@ static void queue_transfer_fixup(void *d
+@@ -4465,9 +4465,9 @@ static void queue_transfer_fixup(void *d
  	int callcompletedinsl = qtds->callcompletedinsl;
  	struct ast_datastore *datastore;
  
@@ -51,7 +51,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  
  	update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
  	
-@@ -4748,7 +4748,7 @@ static int try_calling(struct queue_ent 
+@@ -4956,7 +4956,7 @@ static int try_calling(struct queue_ent 
  			} else if (ast_check_hangup(qe->chan)) {
  				/* Caller must have hung up just before being connected */
  				ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", peer->name);
@@ -60,7 +60,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  				record_abandoned(qe);
  				ast_hangup(peer);
  				ao2_ref(member, -1);
-@@ -4794,8 +4794,8 @@ static int try_calling(struct queue_ent 
+@@ -5002,8 +5002,8 @@ static int try_calling(struct queue_ent 
  		/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
  		/* use  pbx_builtin_setvar to set a load of variables with one call */
  		if (qe->parent->setqueueentryvar) {
@@ -71,7 +71,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  			pbx_builtin_setvar_multiple(qe->chan, interfacevar);
  			pbx_builtin_setvar_multiple(peer, interfacevar);
  		}
-@@ -5051,8 +5051,8 @@ static int try_calling(struct queue_ent 
+@@ -5257,8 +5257,8 @@ static int try_calling(struct queue_ent 
  				ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
  		}
  		qe->handled++;
@@ -82,7 +82,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  
  		if (qe->chan->cdr) {
  			struct ast_cdr *cdr;
-@@ -5088,12 +5088,12 @@ static int try_calling(struct queue_ent 
+@@ -5294,12 +5294,12 @@ static int try_calling(struct queue_ent 
  					"Channel: %s\r\n"
  					"Member: %s\r\n"
  					"MemberName: %s\r\n"
@@ -98,7 +98,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  					qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
  		ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
  		ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
-@@ -5125,17 +5125,17 @@ static int try_calling(struct queue_ent 
+@@ -5331,17 +5331,17 @@ static int try_calling(struct queue_ent 
  
  			/* detect a blind transfer */
  			if (!(qe->chan->_softhangup | peer->_softhangup) && (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten))) {
@@ -109,7 +109,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
 +					qe->chan->exten, qe->chan->context, (intmax_t) (callstart - qe->start),
 +					(intmax_t) (time(NULL) - callstart), qe->opos);
  				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
- 			} else if (ast_check_hangup(qe->chan)) {
+ 			} else if (ast_check_hangup(qe->chan) && !ast_check_hangup(peer)) {
 -				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%ld|%ld|%d",
 -					(long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
 +				ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%jd|%jd|%d",
@@ -123,7 +123,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  				send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
  			}
  			if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {	
-@@ -6026,8 +6026,8 @@ check_turns:
+@@ -6237,8 +6237,8 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -134,7 +134,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  			break;
  		}
  
-@@ -6069,7 +6069,7 @@ check_turns:
+@@ -6280,7 +6280,7 @@ check_turns:
  			if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
  				record_abandoned(&qe);
  				reason = QUEUE_LEAVEEMPTY;
@@ -143,7 +143,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  				res = 0;
  				break;
  			}
-@@ -6091,7 +6091,7 @@ check_turns:
+@@ -6302,7 +6302,7 @@ check_turns:
  			record_abandoned(&qe);
  			reason = QUEUE_TIMEOUT;
  			res = 0;
@@ -152,7 +152,7 @@ $NetBSD: patch-ax,v 1.3 2012/08/03 08:22:53 jnemeth Exp $
  			break;
  		}
  
-@@ -6118,8 +6118,8 @@ stop:
+@@ -6329,8 +6329,8 @@ stop:
  			if (!qe.handled) {
  				record_abandoned(&qe);
  				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",