Pullup ticket #4566 - requested by jnemeth

comms/asterisk:: security update
comms/asterisk18: security update

Revisions pulled up:
- comms/asterisk/Makefile                                       1.113-1.115
- comms/asterisk/PLIST                                          1.9
- comms/asterisk/distinfo                                       1.67-1.69
- comms/asterisk/patches/patch-contrib_scripts_autosupport      deleted
- comms/asterisk18/Makefile                                     1.88-1.90
- comms/asterisk18/PLIST                                        1.25
- comms/asterisk18/distinfo                                     1.56-1.58

---
   Module Name:	pkgsrc
   Committed By:	jnemeth
   Date:		Tue Oct 14 03:35:05 UTC 2014

   Modified Files:
   	pkgsrc/comms/asterisk18: Makefile PLIST distinfo

   Log Message:
   Update Asterisk to 1.8.31.0.  This is mostly a bugfix release:

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

   The release of Asterisk 1.8.31.0 resolves several issues reported by the
   community and would have not been possible without your participation.
   Thank you!

   The following are the issues resolved in this release:

   Bugs fixed in this release:
   -----------------------------------
    * ASTERISK-24032 - Gentoo compilation emits warning:
         "_FORTIFY_SOURCE" redefined (Reported by Kilburn)
    * ASTERISK-24225 - Dial option z is broken (Reported by
         dimitripietro)
    * ASTERISK-24178 - [patch]fromdomainport used even if not set
         (Reported by Elazar Broad)
    * ASTERISK-24019 - When a Music On Hold stream starts it restarts
         at beginning of file. (Reported by Jason Richards)
    * ASTERISK-24211 - testsuite: Fix the dial_LS_options test
         (Reported by Matt Jordan)
    * ASTERISK-24249 - SIP debugs do not stop (Reported by Avinash
         Mohod)

   Improvements made in this release:
   -----------------------------------
    * ASTERISK-24171 - [patch] Provide a manpage for the aelparse
         utility (Reported by Jeremy Lainé)

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

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

   Thank you for your continued support of Asterisk!

---
   Module Name:	pkgsrc
   Committed By:	jnemeth
   Date:		Tue Oct 14 03:36:40 UTC 2014

   Modified Files:
   	pkgsrc/comms/asterisk: Makefile PLIST distinfo

   Log Message:
   Update Asterisk to 11.13.0.  This is mostly a bugfix release:

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

   The release of Asterisk 11.13.0 resolves several issues reported by the
   community and would have not been possible without your participation.
   Thank you!

   The following are the issues resolved in this release:

   Bugs fixed in this release:
   -----------------------------------
    * ASTERISK-24032 - Gentoo compilation emits warning:
         "_FORTIFY_SOURCE" redefined (Reported by Kilburn)
    * ASTERISK-24225 - Dial option z is broken (Reported by
         dimitripietro)
    * ASTERISK-24178 - [patch]fromdomainport used even if not set
         (Reported by Elazar Broad)
    * ASTERISK-22252 - res_musiconhold cleanup - REF_DEBUG reload
         warnings and ref leaks (Reported by Walter Doekes)
    * ASTERISK-23997 - chan_sip: port incorrectly incremented for RTCP
         ICE candidates in SDP answer (Reported by Badalian Vyacheslav)
    * ASTERISK-24019 - When a Music On Hold stream starts it restarts
         at beginning of file. (Reported by Jason Richards)
    * ASTERISK-23767 - [patch] Dynamic IAX2 registration stops trying
         if ever not able to resolve (Reported by David Herselman)
    * ASTERISK-24211 - testsuite: Fix the dial_LS_options test
         (Reported by Matt Jordan)
    * ASTERISK-24249 - SIP debugs do not stop (Reported by Avinash
         Mohod)
    * ASTERISK-23577 - res_rtp_asterisk: Crash in
         ast_rtp_on_turn_rtp_state when RTP instance is NULL (Reported by
         Jay Jideliov)
    * ASTERISK-23634 - With TURN Asterisk crashes on multiple (7-10)
         concurrent WebRTC (avpg/encryption/icesupport) calls (Reported
         by Roman Skvirsky)
    * ASTERISK-24301 - Security: Out of call MESSAGE requests
         processed via Message channel driver can crash Asterisk
         (Reported by Matt Jordan)

   Improvements made in this release:
   -----------------------------------
    * ASTERISK-24171 - [patch] Provide a manpage for the aelparse
         utility (Reported by Jeremy Lainé)

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

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

   Thank you for your continued support of Asterisk!

---
   Module Name:	pkgsrc
   Committed By:	jnemeth
   Date:		Wed Nov 19 08:30:57 UTC 2014

   Modified Files:
   	pkgsrc/comms/asterisk18: Makefile distinfo

   Log Message:
   Update to Asterisk 1.8.32.0: this is mostly a bug fix release.

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

   The release of Asterisk 1.8.32.0 resolves several issues reported by the
   community and would have not been possible without your participation.
   Thank you!

   The following are the issues resolved in this release:

   Bugs fixed in this release:
   -----------------------------------
    * ASTERISK-24348 - Built-in editline tab complete segfault with
         MALLOC_DEBUG (Reported by Walter Doekes)
    * ASTERISK-24335 - [PATCH] Asterisk incorrectly responds 503 to
         INVITE retransmissions of rejected calls (Reported by Torrey
         Searle)
    * ASTERISK-23768 - [patch] Asterisk man page contains a (new)
         unquoted minus sign (Reported by Jeremy Lainé)
    * ASTERISK-24357 - [fax] Out of bounds error in update_modem_bits
         (Reported by Jeremy Lainé)
    * ASTERISK-22945 - [patch] Memory leaks in chan_sip.c with
         realtime peers (Reported by ibercom)
    * ASTERISK-24390 - astobj2: REF_DEBUG reports false leaks with
         ao2_callback with OBJ_MULTIPLE (Reported by Corey Farrell)
    * ASTERISK-24011 - [patch]safe_asterisk tries to set ulimit -n too
         high on linux systems with lots of RAM (Reported by Michael
         Myles)
    * ASTERISK-20784 - Failure to receive an ACK to a SIP Re-INVITE
         results in a SIP channel leak (Reported by NITESH BANSAL)
    * ASTERISK-15879 - [patch] Failure to receive an ACK to a SIP
         Re-INVITE results in a SIP channel leak (Reported by Torrey
         Searle)
    * ASTERISK-24406 - Some caller ID strings are parsed differently
         since 11.13.0 (Reported by Etienne Lessard)
    * ASTERISK-24325 - res_calendar_ews: cannot be used with neon 0.30
         (Reported by Tzafrir Cohen)
    * ASTERISK-13797 - [patch] relax badshell tilde test (Reported by
         Tzafrir Cohen)
    * ASTERISK-22791 - asterisk sends Re-INVITE after receiving a BYE
         (Reported by Paolo Compagnini)
    * ASTERISK-18923 - res_fax_spandsp usage counter is wrong
         (Reported by Grigoriy Puzankin)
    * ASTERISK-24393 - rtptimeout=0 doesn't disable rtptimeout
         (Reported by Dmitry Melekhov)
    * ASTERISK-24063 - [patch]Asterisk does not respect outbound proxy
         when sending qualify requests (Reported by Damian Ivereigh)
    * ASTERISK-24425 - [patch] jabber/xmpp to use TLS instead of
         SSLv3, security fix POODLE (CVE-2014-3566) (Reported by
         abelbeck)
    * ASTERISK-24436 - Missing header in res/res_srtp.c when compiling
         against libsrtp-1.5.0 (Reported by Patrick Laimbock)
    * ASTERISK-21721 - SIP Failed to parse multiple Supported: headers
         (Reported by Olle Johansson)
    * ASTERISK-24190 - IMAP voicemail causes segfault (Reported by
         Nick Adams)
    * ASTERISK-24432 - Install refcounter.py when REF_DEBUG is enabled
         (Reported by Corey Farrell)
    * ASTERISK-24476 - main/app.c / app_voicemail: ast_writestream
         leaks (Reported by Corey Farrell)
    * ASTERISK-24307 - Unintentional memory retention in stringfields
         (Reported by Etienne Lessard)

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

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

   Thank you for your continued support of Asterisk!

---
   Module Name:	pkgsrc
   Committed By:	jnemeth
   Date:		Wed Nov 19 08:32:48 UTC 2014

   Modified Files:
   	pkgsrc/comms/asterisk: Makefile distinfo
   Removed Files:
   	pkgsrc/comms/asterisk/patches: patch-contrib_scripts_autosupport

   Log Message:
   Update to Asterisk 11.14.0: this is mostly a bugfix release.

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

   The release of Asterisk 11.14.0 resolves several issues reported by the
   community and would have not been possible without your participation.
   Thank you!

   The following are the issues resolved in this release:

   Bugs fixed in this release:
   -----------------------------------
    * ASTERISK-24348 - Built-in editline tab complete segfault with
         MALLOC_DEBUG (Reported by Walter Doekes)
    * ASTERISK-24335 - [PATCH] Asterisk incorrectly responds 503 to
         INVITE retransmissions of rejected calls (Reported by Torrey
         Searle)
    * ASTERISK-23768 - [patch] Asterisk man page contains a (new)
         unquoted minus sign (Reported by Jeremy Lainé)
    * ASTERISK-24357 - [fax] Out of bounds error in update_modem_bits
         (Reported by Jeremy Lainé)
    * ASTERISK-20567 - bashism in autosupport (Reported by Tzafrir
         Cohen)
    * ASTERISK-22945 - [patch] Memory leaks in chan_sip.c with
         realtime peers (Reported by ibercom)
    * ASTERISK-24384 - chan_motif: format capabilities leak on module
         load error (Reported by Corey Farrell)
    * ASTERISK-24385 - chan_sip: process_sdp leaks on an error path
         (Reported by Corey Farrell)
    * ASTERISK-24378 - Release AMI connections on shutdown (Reported
         by Corey Farrell)
    * ASTERISK-24354 - AMI sendMessage closes AMI connection on error
         (Reported by Peter Katzmann)
    * ASTERISK-24390 - astobj2: REF_DEBUG reports false leaks with
         ao2_callback with OBJ_MULTIPLE (Reported by Corey Farrell)
    * ASTERISK-24326 - res_rtp_asterisk: ICE-TCP candidates are
         incorrectly attempted (Reported by Joshua Colp)
    * ASTERISK-24011 - [patch]safe_asterisk tries to set ulimit -n too
         high on linux systems with lots of RAM (Reported by Michael
         Myles)
    * ASTERISK-24383 - res_rtp_asterisk: Crash if no candidates
         received for component (Reported by Kevin Harwell)
    * ASTERISK-20784 - Failure to receive an ACK to a SIP Re-INVITE
         results in a SIP channel leak (Reported by NITESH BANSAL)
    * ASTERISK-15879 - [patch] Failure to receive an ACK to a SIP
         Re-INVITE results in a SIP channel leak (Reported by Torrey
         Searle)
    * ASTERISK-24406 - Some caller ID strings are parsed differently
         since 11.13.0 (Reported by Etienne Lessard)
    * ASTERISK-24325 - res_calendar_ews: cannot be used with neon 0.30
         (Reported by Tzafrir Cohen)
    * ASTERISK-13797 - [patch] relax badshell tilde test (Reported by
         Tzafrir Cohen)
    * ASTERISK-22791 - asterisk sends Re-INVITE after receiving a BYE
         (Reported by Paolo Compagnini)
    * ASTERISK-18923 - res_fax_spandsp usage counter is wrong
         (Reported by Grigoriy Puzankin)
    * ASTERISK-24392 - res_fax: fax gateway sessions leak (Reported by
         Corey Farrell)
    * ASTERISK-24393 - rtptimeout=0 doesn't disable rtptimeout
         (Reported by Dmitry Melekhov)
    * ASTERISK-23846 - Unistim multilines. Loss of voice after second
         call drops (on a second line). (Reported by Rustam Khankishyiev)
    * ASTERISK-24063 - [patch]Asterisk does not respect outbound proxy
         when sending qualify requests (Reported by Damian Ivereigh)
    * ASTERISK-24425 - [patch] jabber/xmpp to use TLS instead of
         SSLv3, security fix POODLE (CVE-2014-3566) (Reported by
         abelbeck)
    * ASTERISK-24436 - Missing header in res/res_srtp.c when compiling
         against libsrtp-1.5.0 (Reported by Patrick Laimbock)
    * ASTERISK-24454 - app_queue: ao2_iterator not destroyed, causing
         leak (Reported by Corey Farrell)
    * ASTERISK-24430 - missing letter "p" in word response in
         OriginateResponse event documentation (Reported by Dafi Ni)
    * ASTERISK-24457 - res_fax: fax gateway frames leak (Reported by
         Corey Farrell)
    * ASTERISK-21721 - SIP Failed to parse multiple Supported: headers
         (Reported by Olle Johansson)
    * ASTERISK-24304 - asterisk crashing randomly because of unistim
         channel (Reported by dhanapathy sathya)
    * ASTERISK-24190 - IMAP voicemail causes segfault (Reported by
         Nick Adams)
    * ASTERISK-24466 - app_queue: fix a couple leaks to struct
         call_queue (Reported by Corey Farrell)
    * ASTERISK-24432 - Install refcounter.py when REF_DEBUG is enabled
         (Reported by Corey Farrell)
    * ASTERISK-24476 - main/app.c / app_voicemail: ast_writestream
         leaks (Reported by Corey Farrell)
    * ASTERISK-24307 - Unintentional memory retention in stringfields
         (Reported by Etienne Lessard)

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

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

   Thank you for your continued support of Asterisk!

---
   Module Name:	pkgsrc
   Committed By:	jnemeth
   Date:		Wed Dec  3 01:00:23 UTC 2014

   Modified Files:
   	pkgsrc/comms/asterisk18: Makefile distinfo

   Log Message:
   Update to Asterisk 1.8.32.1: this is a security fix release.

   The Asterisk Development Team has announced security releases for Certified
   Asterisk 1.8.28 and 11.6 and Asterisk 1.8, 11, 12, and 13. The available
   security releases are released as versions 1.8.28-cert3, 11.6-cert8, 1.8.32.1,
   11.14.1, 12.7.1, and 13.0.1.

   The release of these versions resolves the following security vulnerabilities:

   * AST-2014-012: Unauthorized access in the presence of ACLs with mixed IP
     address families

     Many modules in Asterisk that service incoming IP traffic have ACL options
     ("permit" and "deny") that can be used to whitelist or blacklist address
     ranges. A bug has been discovered where the address family of incoming
     packets is only compared to the IP address family of the first entry in the
     list of access control rules. If the source IP address for an incoming
     packet is not of the same address as the first ACL entry, that packet
     bypasses all ACL rules.

   * AST-2014-018: Permission Escalation through DB dialplan function

     The DB dialplan function when executed from an external protocol, such as AMI,
     could result in a privilege escalation. Users with a lower class authorization
     in AMI can access the internal Asterisk database without the required SYSTEM
     class authorization.

   For more information about the details of these vulnerabilities, please read
   security advisories AST-2014-012, AST-2014-013, AST-2014-014, AST-2014-015,
   AST-2014-016, AST-2014-017, and AST-2014-018, 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.32.1

   The security advisories are available at:

    * http://downloads.asterisk.org/pub/security/AST-2014-012.pdf
    * http://downloads.asterisk.org/pub/security/AST-2014-018.pdf

   Thank you for your continued support of Asterisk!

---
   Module Name:	pkgsrc
   Committed By:	jnemeth
   Date:		Wed Dec  3 01:57:37 UTC 2014

   Modified Files:
   	pkgsrc/comms/asterisk: Makefile distinfo

   Log Message:
   Update to Asterisk 11.14.1:  this is a security fix release.

   The Asterisk Development Team has announced security releases for Certified
   Asterisk 1.8.28 and 11.6 and Asterisk 1.8, 11, 12, and 13. The available
   security releases are released as versions 1.8.28-cert3, 11.6-cert8, 1.8.32.1,
   11.14.1, 12.7.1, and 13.0.1.

   The release of these versions resolves the following security vulnerabilities:

   * AST-2014-012: Unauthorized access in the presence of ACLs with mixed IP
     address families

     Many modules in Asterisk that service incoming IP traffic have ACL options
     ("permit" and "deny") that can be used to whitelist or blacklist address
     ranges. A bug has been discovered where the address family of incoming
     packets is only compared to the IP address family of the first entry in the
     list of access control rules. If the source IP address for an incoming
     packet is not of the same address as the first ACL entry, that packet
     bypasses all ACL rules.

   * AST-2014-018: Permission Escalation through DB dialplan function

     The DB dialplan function when executed from an external protocol, such as AMI,
     could result in a privilege escalation. Users with a lower class authorization
     in AMI can access the internal Asterisk database without the required SYSTEM
     class authorization.

   In addition, the release of 11.6-cert8 and 11.14.1 resolves the following
   security vulnerability:

   * AST-2014-014: High call load with ConfBridge can result in resource exhaustion

     The ConfBridge application uses an internal bridging API to implement
     conference bridges. This internal API uses a state model for channels within
     the conference bridge and transitions between states as different things
     occur. Unload load it is possible for some state transitions to be delayed
     causing the channel to transition from being hung up to waiting for media. As
     the channel has been hung up remotely no further media will arrive and the
     channel will stay within ConfBridge indefinitely.

   In addition, the release of 11.6-cert8, 11.14.1, 12.7.1, and 13.0.1 resolves
   the following security vulnerability:

   * AST-2014-017: Permission Escalation via ConfBridge dialplan function and
                   AMI ConfbridgeStartRecord Action

     The CONFBRIDGE dialplan function when executed from an external protocol (such
     as AMI) can result in a privilege escalation as certain options within that
     function can affect the underlying system. Additionally, the AMI
     ConfbridgeStartRecord action has options that would allow modification of the
     underlying system, and does not require SYSTEM class authorization in AMI.

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

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

   The security advisories are available at:

    * http://downloads.asterisk.org/pub/security/AST-2014-012.pdf
    * http://downloads.asterisk.org/pub/security/AST-2014-014.pdf
    * http://downloads.asterisk.org/pub/security/AST-2014-017.pdf
    * http://downloads.asterisk.org/pub/security/AST-2014-018.pdf

   Thank you for your continued support of Asterisk!

7 files changed, 40 insertions, 63 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 168ed7726c9..75a83c26a93 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.111 2014/09/20 19:12:16 jnemeth Exp $
+# $NetBSD: Makefile,v 1.111.2.1 2014/12/06 16:57:53 tron Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-11.12.1
+DISTNAME=	asterisk-11.14.1
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -115,7 +115,7 @@ PLIST.mgcp= yes
 .include "options.mk"
 
 # check sounds/Makefile for current version when upgrading package
-DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.14.tar.gz
+DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.15.tar.gz
 
 # Override default paths in config files
 SUBST_CLASSES+=		configs
@@ -214,9 +214,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.25.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.26.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.14.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.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/asterisk/PLIST b/comms/asterisk/PLIST
index b13f4cda8d7..cdfba531c9c 100644
--- a/comms/asterisk/PLIST
+++ b/comms/asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2014/07/02 03:06:24 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.8.2.1 2014/12/06 16:57:53 tron Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -377,15 +377,15 @@ 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.25
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
 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.25
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.14
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.25
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.14
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.25
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.14
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
 libdata/asterisk/sounds/en/OfficeSpace.gsm
 libdata/asterisk/sounds/en/Randulo-allison.gsm
 libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index a5010e2c227..5b2f5f8043e 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.66 2014/09/20 19:12:16 jnemeth Exp $
+$NetBSD: distinfo,v 1.66.2.1 2014/12/06 16:57:53 tron Exp $
 
-SHA1 (asterisk-11.12.1/asterisk-11.12.1.tar.gz) = b5df9ede712446fdc061b87ae7559a94456d45d0
-RMD160 (asterisk-11.12.1/asterisk-11.12.1.tar.gz) = fa7ddd678926c062716fab8931e741e4a7ae4d9b
-Size (asterisk-11.12.1/asterisk-11.12.1.tar.gz) = 34862194 bytes
-SHA1 (asterisk-11.12.1/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 14403cd023e812565085c8232210b8b439274ecf
-RMD160 (asterisk-11.12.1/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 675fc1f3cedd0e17b62a8285f9f0527783cfb1d3
-Size (asterisk-11.12.1/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 4386590 bytes
+SHA1 (asterisk-11.14.1/asterisk-11.14.1.tar.gz) = 10f1ac8c282bbb99c07eaa13c93f994294dd552f
+RMD160 (asterisk-11.14.1/asterisk-11.14.1.tar.gz) = 6f7bcde4be32a35bfc9b5c23c6f021fcfc52e205
+Size (asterisk-11.14.1/asterisk-11.14.1.tar.gz) = 34966823 bytes
+SHA1 (asterisk-11.14.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-11.14.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+Size (asterisk-11.14.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
 SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
 SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
 SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
@@ -21,7 +21,6 @@ SHA1 (patch-channels_chan__oss.c) = 0be259a83c4425d08b693a54c43896da039df721
 SHA1 (patch-channels_chan__sip.c) = 61c67e6d7e0a6e27e98614f6d4de15b64c73e7e1
 SHA1 (patch-configure) = 88619fe9072ff69ed8da0a1917ac3852d10998a4
 SHA1 (patch-configure.ac) = 2fdae524cfc95f152b86a32405b80f6edae6fa20
-SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
 SHA1 (patch-funcs_func__strings.c) = 4c1db693d845691492b77bbf489764d362de2087
 SHA1 (patch-include_asterisk_autoconfig.h.in) = 09a8f8d5398612fdadba25f221b16c19429f81e2
diff --git a/comms/asterisk/patches/patch-contrib_scripts_autosupport b/comms/asterisk/patches/patch-contrib_scripts_autosupport
deleted file mode 100644
index 8d59a078474..00000000000
--- a/comms/asterisk/patches/patch-contrib_scripts_autosupport
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-contrib_scripts_autosupport,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
-
---- contrib/scripts/autosupport.orig	2012-01-04 20:01:27.000000000 +0000
-+++ contrib/scripts/autosupport
-@@ -33,7 +33,7 @@ NONINTERACTIVE=0
- # 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."
-@@ -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
diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 02eb274acf9..4fbcc03737c 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.86 2014/08/28 01:26:25 jnemeth Exp $
+# $NetBSD: Makefile,v 1.86.2.1 2014/12/06 16:57:53 tron Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.30.0
+DISTNAME=	asterisk-1.8.32.1
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -113,7 +113,7 @@ PLIST.mgcp= yes
 .include "options.mk"
 
 # check sounds/Makefile for current version when upgrading package
-DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.14.tar.gz
+DISTFILES+=	asterisk-extra-sounds-en-gsm-1.4.15.tar.gz
 
 # Override default paths in config files
 SUBST_CLASSES+=		configs
@@ -204,9 +204,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.25.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.26.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.14.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.15.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 272475a148b..c302a101a23 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2014/07/02 03:20:43 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.24.2.1 2014/12/06 16:57:53 tron Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -356,15 +356,15 @@ 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.25
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
 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.25
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.14
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.25
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.14
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.25
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.14
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
 libdata/asterisk/sounds/en/OfficeSpace.gsm
 libdata/asterisk/sounds/en/Randulo-allison.gsm
 libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 81654dc4729..a535f34419f 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.55 2014/08/28 01:26:25 jnemeth Exp $
+$NetBSD: distinfo,v 1.55.2.1 2014/12/06 16:57:53 tron Exp $
 
-SHA1 (asterisk-1.8.30.0/asterisk-1.8.30.0.tar.gz) = 62677e22bbed77a4f98aa5a2f6ff1d7448f78021
-RMD160 (asterisk-1.8.30.0/asterisk-1.8.30.0.tar.gz) = 04265c70c55bea7c7dbfeaff6f8bed8a26a32dc1
-Size (asterisk-1.8.30.0/asterisk-1.8.30.0.tar.gz) = 29540685 bytes
-SHA1 (asterisk-1.8.30.0/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 14403cd023e812565085c8232210b8b439274ecf
-RMD160 (asterisk-1.8.30.0/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 675fc1f3cedd0e17b62a8285f9f0527783cfb1d3
-Size (asterisk-1.8.30.0/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 4386590 bytes
+SHA1 (asterisk-1.8.32.1/asterisk-1.8.32.1.tar.gz) = 0cdba970a970859a98289d2bad0a585ecc877fa2
+RMD160 (asterisk-1.8.32.1/asterisk-1.8.32.1.tar.gz) = 29401ac57b03a0d1ba4a3e7722d95e710a5033c5
+Size (asterisk-1.8.32.1/asterisk-1.8.32.1.tar.gz) = 29636238 bytes
+SHA1 (asterisk-1.8.32.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-1.8.32.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+Size (asterisk-1.8.32.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
 SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39