summaryrefslogtreecommitdiff
path: root/comms/asterisk
diff options
context:
space:
mode:
authorjnemeth <jnemeth>2014-07-02 03:06:24 +0000
committerjnemeth <jnemeth>2014-07-02 03:06:24 +0000
commit5e1eabacec344d45a9784ebd46e99ae3040dc920 (patch)
tree7cf3c678c73378a772d18e2fd6a03de335762116 /comms/asterisk
parent07b87b8c0570bffaf8521f25e441c911faac4ff4 (diff)
downloadpkgsrc-5e1eabacec344d45a9784ebd46e99ae3040dc920.tar.gz
Update to Asterisk 11.10.2: this fixes multiple security issues along
with general bug fixes. The security issues fixed are: AST-2014-001, AST-2014-002, AST-2014-006, and AST-2014-007. ----- The Asterisk Development Team has announced security releases for Certified Asterisk 1.8.15, 11.6, and Asterisk 1.8, 11, and 12. The available security releases are released as versions 1.8.15-cert7, 11.6-cert4, 1.8.28.2, 11.10.2, and 12.3.2. These releases resolve security vulnerabilities that were previously fixed in 1.8.15-cert6, 11.6-cert3, 1.8.28.1, 11.10.1, and 12.3.1. Unfortunately, the fix for AST-2014-007 inadvertently introduced a regression in Asterisk's TCP and TLS handling that prevented Asterisk from sending data over these transports. This regression and the security vulnerabilities have been fixed in the versions specified in this release announcement. Please note that the release of these versions resolves the following security vulnerabilities: * AST-2014-006: Permission Escalation via Asterisk Manager User Unauthorized Shell Access * AST-2014-007: Denial of Service via Exhaustion of Allowed Concurrent HTTP Connections For more information about the details of these vulnerabilities, please read security advisories AST-2014-005, AST-2014-006, AST-2014-007, and AST-2014-008, which were released with the previous versions that addressed these vulnerabilities. For a full list of changes in the current releases, please see the ChangeLogs: http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-11.10.2 The security advisories are available at: * http://downloads.asterisk.org/pub/security/AST-2014-006.pdf * http://downloads.asterisk.org/pub/security/AST-2014-007.pdf Thank you for your continued support of Asterisk! ----- The Asterisk Development Team has announced security releases for Certified Asterisk 1.8.15, 11.6, and Asterisk 1.8, 11, and 12. The available security releases are released as versions 1.8.15-cert6, 11.6-cert3, 1.8.28.1, 11.10.1, and 12.3.1. The release of these versions resolves the following issue: * AST-2014-007: Denial of Service via Exhaustion of Allowed Concurrent HTTP Connections Establishing a TCP or TLS connection to the configured HTTP or HTTPS port respectively in http.conf and then not sending or completing a HTTP request will tie up a HTTP session. By doing this repeatedly until the maximum number of open HTTP sessions is reached, legitimate requests are blocked. Additionally, the release of 11.6-cert3, 11.10.1, and 12.3.1 resolves the following issue: * AST-2014-006: Permission Escalation via Asterisk Manager User Unauthorized Shell Access Manager users can execute arbitrary shell commands with the MixMonitor manager action. Asterisk does not require system class authorization for a manager user to use the MixMonitor action, so any manager user who is permitted to use manager commands can potentially execute shell commands as the user executing the Asterisk process. These issues and their resolutions are described in the security advisories. For more information about the details of these vulnerabilities, please read security advisories AST-2014-005, AST-2014-006, AST-2014-007, and AST-2014-008, 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-11.10.1 The security advisories are available at: * http://downloads.asterisk.org/pub/security/AST-2014-006.pdf * http://downloads.asterisk.org/pub/security/AST-2014-007.pdf Thank you for your continued support of Asterisk! ----- The Asterisk Development Team has announced the release of Asterisk 11.10.0. The release of Asterisk 11.10.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-23547 - [patch] app_queue removing callers from queue when reloading (Reported by Italo Rossi) * ASTERISK-23559 - app_voicemail fails to load after fix to dialplan functions (Reported by Corey Farrell) * ASTERISK-22846 - testsuite: masquerade super test fails on all branches (still) (Reported by Matt Jordan) * ASTERISK-23545 - Confbridge talker detection settings configuration load bug (Reported by John Knott) * ASTERISK-23546 - CB_ADD_LEN does not do what you'd think (Reported by Walter Doekes) * ASTERISK-23620 - Code path in app_stack fails to unlock list (Reported by Bradley Watkins) * ASTERISK-23616 - Big memory leak in logger.c (Reported by ibercom) * ASTERISK-23576 - Build failure on SmartOS / Illumos / SunOS (Reported by Sebastian Wiedenroth) * ASTERISK-23550 - Newer sound sets don't show up in menuselect (Reported by Rusty Newton) * ASTERISK-18331 - app_sms failure (Reported by David Woodhouse) * ASTERISK-19465 - P-Asserted-Identity Privacy (Reported by Krzysztof Chmielewski) * ASTERISK-23605 - res_http_websocket: Race condition in shutting down websocket causes crash (Reported by Matt Jordan) * ASTERISK-23707 - Realtime Contacts: Apparent mismatch between PGSQL database state and Asterisk state (Reported by Mark Michelson) * ASTERISK-23381 - [patch]ChanSpy- Barge only works on the initial 'spy', if the spied-on channel makes a new call, unable to barge. (Reported by Robert Moss) * ASTERISK-23665 - Wrong mime type for codec H263-1998 (h263+) (Reported by Guillaume Maudoux) * ASTERISK-23664 - Incorrect H264 specification in SDP. (Reported by Guillaume Maudoux) * ASTERISK-22977 - chan_sip+CEL: missing ANSWER and PICKUP event for INVITE/w/replaces pickup (Reported by Walter Doekes) * ASTERISK-23709 - Regression in Dahdi/Analog/waitfordialtone (Reported by Steve Davies) Improvements made in this release: ----------------------------------- * ASTERISK-23649 - [patch]Support for DTLS retransmission (Reported by NITESH BANSAL) * ASTERISK-23564 - [patch]TLS/SRTP status of channel not currently available in a CLI command (Reported by Patrick Laimbock) * ASTERISK-23754 - [patch] Use var/lib directory for log file configured in asterisk.conf (Reported by Igor Goncharovsky) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11.10.0 Thank you for your continued support of Asterisk! ----- The Asterisk Development Team has announced the release of Asterisk 11.9.0. The release of Asterisk 11.9.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-22790 - check_modem_rate() may return incorrect rate for V.27 (Reported by Paolo Compagnini) * ASTERISK-23034 - [patch] manager Originate doesn't abort on failed format_cap allocation (Reported by Corey Farrell) * ASTERISK-23061 - [Patch] 'textsupport' setting not mentioned in sip.conf.sample (Reported by Eugene) * ASTERISK-23028 - [patch] Asterisk man pages contains unquoted minus signs (Reported by Jeremy Lainé) * ASTERISK-23046 - Custom CDR fields set during a GoSUB called from app_queue are not inserted (Reported by Denis Pantsyrev) * ASTERISK-23027 - [patch] Spelling typo "transfered" instead of "transferred" (Reported by Jeremy Lainé) * ASTERISK-23008 - Local channels loose CALLERID name when DAHDI channel connects (Reported by Michael Cargile) * ASTERISK-23100 - [patch] In chan_mgcp the ident in transmitted request and request queue may differ - fix for locking (Reported by adomjan) * ASTERISK-22988 - [patch]T38 , SIP 488 after Rejecting image media offer due to invalid or unsupported syntax (Reported by adomjan) * ASTERISK-22861 - [patch]Specifying a null time as parameter to GotoIfTime or ExecIfTime causes segmentation fault (Reported by Sebastian Murray-Roberts) * ASTERISK-17837 - extconfig.conf - Maximum Include level (1) exceeded (Reported by pz) * ASTERISK-22662 - Documentation fix? - queues.conf says persistentmembers defaults to yes, it appears to lie (Reported by Rusty Newton) * ASTERISK-23134 - [patch] res_rtp_asterisk port selection cannot handle selinux port restrictions (Reported by Corey Farrell) * ASTERISK-23220 - STACK_PEEK function with no arguments causes crash/core dump (Reported by James Sharp) * ASTERISK-19773 - Asterisk crash on issuing Asterisk-CLI 'reload' command multiple times on cli_aliases (Reported by Joel Vandal) * ASTERISK-22757 - segfault in res_clialiases.so on reload when mapping "module reload" command (Reported by Gareth Blades) * ASTERISK-17727 - [patch] TLS doesn't get all certificate chain (Reported by LN) * ASTERISK-23178 - devicestate.h: device state setting functions are documented with the wrong return values (Reported by Jonathan Rose) * ASTERISK-23232 - LocalBridge AMI Event LocalOptimization value is opposite to what's expected (Reported by Leon Roy) * ASTERISK-23098 - [patch]possible null pointer dereference in format.c (Reported by Marcello Ceschia) * ASTERISK-23297 - Asterisk 12, pbx_config.so segfaults if res_parking.so is not loaded, or if res_parking.conf has no configuration (Reported by CJ Oster) * ASTERISK-23069 - Custom CDR variable not recorded when set in macro called from app_queue (Reported by Bryan Anderson) * ASTERISK-19499 - ConfBridge MOH is not working for transferee after attended transfer (Reported by Timo Teräs) * ASTERISK-23261 - [patch]Output mixup in ${CHANNEL(rtpqos,audio,all)} (Reported by rsw686) * ASTERISK-23279 - [patch]Asterisk doesn't support the dynamic payload change in rtp mapping in the 200 OK response (Reported by NITESH BANSAL) * ASTERISK-23255 - UUID included for Redhat, but missing for Debian distros in install_prereq script (Reported by Rusty Newton) * ASTERISK-23260 - [patch]ForkCDR v option does not keep CDR variables for subsequent records (Reported by zvision) * ASTERISK-23141 - Asterisk crashes on Dial(), in pbx_find_extension at pbx.c (Reported by Maxim) * ASTERISK-23336 - Asterisk warning "Don't know how to indicate condition 33 on ooh323c" on outgoing calls from H323 to SIP peer (Reported by Alexander Semych) * ASTERISK-23231 - Since 405693 If we have res_fax.conf file set to minrate=2400, then res_fax refuse to load (Reported by David Brillert) * ASTERISK-23135 - Crash - segfault in ast_channel_hangupcause_set - probably introduced in 11.7.0 (Reported by OK) * ASTERISK-23323 - [patch]chan_sip: missing p->owner checks in handle_response_invite (Reported by Walter Doekes) * ASTERISK-23406 - [patch]Fix typo in "sip show peer" (Reported by ibercom) * ASTERISK-23310 - bridged channel crashes in bridge_p2p_rtp_write (Reported by Jeremy Lainé) * ASTERISK-22911 - [patch]Asterisk fails to resume WebRTC call from hold (Reported by Vytis Valentinavičius) * ASTERISK-23104 - Specifying the SetVar AMI without a Channel cause Asterisk to crash (Reported by Joel Vandal) * ASTERISK-21930 - [patch]WebRTC over WSS is not working. (Reported by John) * ASTERISK-23383 - Wrong sense test on stat return code causes unchanged config check to break with include files. (Reported by David Woolley) * ASTERISK-20149 - Crash when faxing SIP to SIP with strictrtp set to yes (Reported by Alexandr Gordeev) * ASTERISK-17523 - Qualify for static realtime peers does not work (Reported by Maciej Krajewski) * ASTERISK-21406 - [patch] chan_sip deadlock on monlock between unload_module and do_monitor (Reported by Corey Farrell) * ASTERISK-23373 - [patch]Security: Open FD exhaustion with chan_sip Session-Timers (Reported by Corey Farrell) * ASTERISK-23340 - Security Vulnerability: stack allocation of cookie headers in loop allows for unauthenticated remote denial of service attack (Reported by Matt Jordan) * ASTERISK-23311 - Manager - MoH Stop Event fails to show up when leaving Conference (Reported by Benjamin Keith Ford) * ASTERISK-23420 - [patch]Memory leak in manager_add_filter function in manager.c (Reported by Etienne Lessard) * ASTERISK-23488 - Logic error in callerid checksum processing (Reported by Russ Meyerriecks) * ASTERISK-23461 - Only first user is muted when joining confbridge with 'startmuted=yes' (Reported by Chico Manobela) * ASTERISK-20841 - fromdomain not honored on outbound INVITE request (Reported by Kelly Goedert) * ASTERISK-22079 - Segfault: INTERNAL_OBJ (user_data=0x6374652f) at astobj2.c:120 (Reported by Jamuel Starkey) * ASTERISK-23509 - [patch]SayNumber for Polish language tries to play empty files for numbers divisible by 100 (Reported by zvision) * ASTERISK-23103 - [patch]Crash in ast_format_cmp, in ao2_find (Reported by JoshE) * ASTERISK-23391 - Audit dialplan function usage of channel variable (Reported by Corey Farrell) * ASTERISK-23548 - POST to ARI sometimes returns no body on success (Reported by Scott Griepentrog) * ASTERISK-23460 - ooh323 channel stuck if call is placed directly and gatekeeper is not available (Reported by Dmitry Melekhov) Improvements made in this release: ----------------------------------- * ASTERISK-22980 - [patch]Allow building cdr_radius and cel_radius against libfreeradius-client (Reported by Jeremy Lainé) * ASTERISK-22661 - Unable to exit ChanSpy if spied channel does not have a call in progress (Reported by Chris Hillman) * ASTERISK-23099 - [patch] WSS: enable ast_websocket_read() function to read the whole available data at first and then wait for any fragmented packets (Reported by Thava Iyer) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11.9.0 Thank you for your continued support of Asterisk! ----- The Asterisk Development Team has announced security releases for Certified Asterisk 1.8.15, 11.6, and Asterisk 1.8, 11, and 12. The available security releases are released as versions 1.8.15-cert5, 11.6-cert2, 1.8.26.1, 11.8.1, and 12.1.1. The release of these versions resolve the following issues: * AST-2014-001: Stack overflow in HTTP processing of Cookie headers. Sending a HTTP request that is handled by Asterisk with a large number of Cookie headers could overflow the stack. Another vulnerability along similar lines is any HTTP request with a ridiculous number of headers in the request could exhaust system memory. * AST-2014-002: chan_sip: Exit early on bad session timers request This change allows chan_sip to avoid creation of the channel and consumption of associated file descriptors altogether if the inbound request is going to be rejected anyway. These issues and their resolutions are described in the security advisories. For more information about the details of these vulnerabilities, please read security advisories AST-2014-001, AST-2014-002, AST-2014-003, and AST-2014-004, 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-11.8.1 The security advisories are available at: * http://downloads.asterisk.org/pub/security/AST-2014-001.pdf * http://downloads.asterisk.org/pub/security/AST-2014-002.pdf Thank you for your continued support of Asterisk! ----- The Asterisk Development Team has announced the release of Asterisk 11.8.0. The release of Asterisk 11.8.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-22544 - Italian prompt vm-options has advertisement in it (Reported by Rusty Newton) * ASTERISK-21383 - STUN Binding Requests Not Being Sent Back from Asterisk to Chrome (Reported by Shaun Clark) * ASTERISK-22478 - [patch]Can't use pound(hash) symbol for custom DTMF menus in ConfBridge (processed as directive) (Reported by Nicolas Tanski) * ASTERISK-12117 - chan_sip creates a new local tag (from-tag) for every register message (Reported by Pawel Pierscionek) * ASTERISK-20862 - Asterisk min and max member penalties not honored when set with 0 (Reported by Schmooze Com) * ASTERISK-22746 - [patch]Crash in chan_dahdi during caller id read (Reported by Michael Walton) * ASTERISK-22788 - [patch] main/translate.c: access to variable f after free in ast_translate() (Reported by Corey Farrell) * ASTERISK-21242 - Segfault when T.38 re-invite retransmission receives 200 OK (Reported by Ashley Winters) * ASTERISK-22590 - BufferOverflow in unpacksms16() when receiving 16 bit multipart SMS with app_sms (Reported by Jan Juergens) * ASTERISK-22905 - Prevent Asterisk functions that are 'dangerous' from being executed from external interfaces (Reported by Matt Jordan) * ASTERISK-23021 - Typos in code : "avaliable" instead of "available" (Reported by Jeremy Lainé) * ASTERISK-22970 - [patch]Documentation fix for QUOTE() (Reported by Gareth Palmer) * ASTERISK-21960 - ooh323 channels stuck (Reported by Dmitry Melekhov) * ASTERISK-22350 - DUNDI - core dump on shutdown - segfault in sqlite3_reset from /usr/lib/libsqlite3.so.0 (Reported by Birger "WIMPy" Harzenetter) * ASTERISK-22942 - [patch] - Asterisk crashed after Set(FAXOPT(faxdetect)=t38) (Reported by adomjan) * ASTERISK-22856 - [patch]SayUnixTime in polish reads minutes instead of seconds (Reported by Robert Mordec) * ASTERISK-22854 - [patch] - Deadlock between cel_pgsql unload and core_event_dispatcher taskprocessor thread (Reported by Etienne Lessard) * ASTERISK-22910 - [patch] - REPLACE() calls strcpy on overlapping memory when <replace-char> is empty (Reported by Gareth Palmer) * ASTERISK-22871 - cel_pgsql module not loading after "reload" or "reload cel_pgsql.so" command (Reported by Matteo) * ASTERISK-23084 - [patch]rasterisk needlessly prints the AST-2013-007 warning (Reported by Tzafrir Cohen) * ASTERISK-17138 - [patch] Asterisk not re-registering after it receives "Forbidden - wrong password on authentication" (Reported by Rudi) * ASTERISK-23011 - [patch]configure.ac and pbx_lua don't support lua 5.2 (Reported by George Joseph) * ASTERISK-22834 - Parking by blind transfer when lot full orphans channels (Reported by rsw686) * ASTERISK-23047 - Orphaned (stuck) channel occurs during a failed SIP transfer to parking space (Reported by Tommy Thompson) * ASTERISK-22946 - Local From tag regression with sipgate.de (Reported by Stephan Eisvogel) * ASTERISK-23010 - No BYE message sent when sip INVITE is received (Reported by Ryan Tilton) * ASTERISK-23135 - Crash - segfault in ast_channel_hangupcause_set - probably introduced in 11.7.0 (Reported by OK) Improvements made in this release: ----------------------------------- * ASTERISK-22728 - [patch] Improve Understanding Of 'Forcerport' When Running "sip show peers" (Reported by Michael L. Young) * ASTERISK-22659 - Make a new core and extra sounds release (Reported by Rusty Newton) * ASTERISK-22919 - core show channeltypes slicing (Reported by outtolunc) * ASTERISK-22918 - dahdi show channels slices PRI channel dnid on output (Reported by outtolunc) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-11.8.0 Thank you for your continued support of Asterisk!
Diffstat (limited to 'comms/asterisk')
-rw-r--r--comms/asterisk/Makefile11
-rw-r--r--comms/asterisk/PLIST20
-rw-r--r--comms/asterisk/distinfo21
-rw-r--r--comms/asterisk/patches/patch-channels_chan__oss.c8
-rw-r--r--comms/asterisk/patches/patch-funcs_func__strings.c22
-rw-r--r--comms/asterisk/patches/patch-main_manager.c43
-rw-r--r--comms/asterisk/patches/patch-res_res__config__pgsql.c83
-rw-r--r--comms/asterisk/patches/patch-tests_test__linkedlists.c26
8 files changed, 193 insertions, 41 deletions
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 16c4d44f1ba..3b47be5a1f1 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.107 2014/05/29 23:35:20 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2014/07/02 03:06:24 jnemeth Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
-DISTNAME= asterisk-11.7.0
+DISTNAME= asterisk-11.10.2
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
-PKGREVISION= 4
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -115,7 +114,7 @@ PLIST.mgcp= yes
.include "options.mk"
# check sounds/Makefile for current version when upgrading package
-DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.13.tar.gz
+DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.14.tar.gz
# Override default paths in config files
SUBST_CLASSES+= configs
@@ -214,9 +213,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.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.25.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.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+ ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.14.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 5e679de06e1..b13f4cda8d7 100644
--- a/comms/asterisk/PLIST
+++ b/comms/asterisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:59 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/07/02 03:06:24 jnemeth 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.24
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.25
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.24
-libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
-libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
+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/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
libdata/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -443,7 +443,6 @@ libdata/asterisk/sounds/en/all-reps-busy.gsm
libdata/asterisk/sounds/en/all-your-base.gsm
libdata/asterisk/sounds/en/altitude.gsm
libdata/asterisk/sounds/en/ampersand.gsm
-libdata/asterisk/sounds/en/an-error-has-occured.gsm
libdata/asterisk/sounds/en/an-error-has-occurred.gsm
libdata/asterisk/sounds/en/and-area-code.gsm
libdata/asterisk/sounds/en/and-or.gsm
@@ -1362,6 +1361,7 @@ libdata/asterisk/sounds/en/loss.gsm
libdata/asterisk/sounds/en/lots-o-monkeys.gsm
libdata/asterisk/sounds/en/louisiana.gsm
libdata/asterisk/sounds/en/low.gsm
+libdata/asterisk/sounds/en/lowercase.gsm
libdata/asterisk/sounds/en/lunch.gsm
libdata/asterisk/sounds/en/lyrics-louie-louie.gsm
libdata/asterisk/sounds/en/machine.gsm
@@ -2057,6 +2057,7 @@ 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/uppercase.gsm
libdata/asterisk/sounds/en/uptime.gsm
libdata/asterisk/sounds/en/user.gsm
libdata/asterisk/sounds/en/users.gsm
@@ -2116,6 +2117,7 @@ libdata/asterisk/sounds/en/vm-message.gsm
libdata/asterisk/sounds/en/vm-messages.gsm
libdata/asterisk/sounds/en/vm-minutes.gsm
libdata/asterisk/sounds/en/vm-mismatch.gsm
+libdata/asterisk/sounds/en/vm-msgforwarded.gsm
libdata/asterisk/sounds/en/vm-msginstruct.gsm
libdata/asterisk/sounds/en/vm-msgsaved.gsm
libdata/asterisk/sounds/en/vm-newpassword.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 30ca673a2e0..929736dec34 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.62 2014/01/07 11:07:03 jnemeth Exp $
+$NetBSD: distinfo,v 1.63 2014/07/02 03:06:24 jnemeth Exp $
-SHA1 (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = 25182857b97478fd44783e41eb28e08a87c19ac8
-RMD160 (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = f2d96f9bfa648216038f8de66f91179a09b490f1
-Size (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = 34779538 bytes
-SHA1 (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
-RMD160 (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
-Size (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
+SHA1 (asterisk-11.10.2/asterisk-11.10.2.tar.gz) = 14a67a52d84931015c06390212a84aabeeb4d8b5
+RMD160 (asterisk-11.10.2/asterisk-11.10.2.tar.gz) = 69ed569eb5bdb6b78b012302ab1f11cc154c9ba7
+Size (asterisk-11.10.2/asterisk-11.10.2.tar.gz) = 34846584 bytes
+SHA1 (asterisk-11.10.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 14403cd023e812565085c8232210b8b439274ecf
+RMD160 (asterisk-11.10.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 675fc1f3cedd0e17b62a8285f9f0527783cfb1d3
+Size (asterisk-11.10.2/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz) = 4386590 bytes
SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
@@ -17,11 +17,12 @@ SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
SHA1 (patch-apps_confbridge_conf__config__parser.c) = 42d5a6e2ce837111d06fa9154c7f66403cb83553
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__motif.c) = db6c97ba02a441633338d492032d78cd86f094f5
-SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
+SHA1 (patch-channels_chan__oss.c) = 0be259a83c4425d08b693a54c43896da039df721
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
SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
@@ -35,7 +36,7 @@ SHA1 (patch-main_config__options.c) = e49a946da99546684e8988ca4301bcacbb415987
SHA1 (patch-main_features.c) = 1c11207c60ce53c1101141e07ae04d0ddb838450
SHA1 (patch-main_format.c) = a6d446c3de883cf3ef768d03d39e8d8db068b750
SHA1 (patch-main_http.c) = 1d3d6b47d1ced22faf79fb17c56e7a3067b7c892
-SHA1 (patch-main_manager.c) = 754c77f373bff93cbd33e907823effc12824dd45
+SHA1 (patch-main_manager.c) = 8affce24e74e923dac612c072a60444971fab42c
SHA1 (patch-main_named__acl.c) = 48c23ed0e558299679bbfc9e564383f9f7dd181f
SHA1 (patch-main_netsock.c) = 015796266b9806425180c9bb05a1907116ef086d
SHA1 (patch-main_sched.c) = 73759369470b575e73ca78f9cff096ebb477c9b1
@@ -46,10 +47,12 @@ SHA1 (patch-pbx_pbx__dundi.c) = 2823c48d64d2b96abb5cf627045d17282629521b
SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a
SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9
SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299
+SHA1 (patch-res_res__config__pgsql.c) = 719fa8939ca0e6cae256dd1b19a11405f475a620
SHA1 (patch-res_res__xmpp.c) = 5296a4f7454e432592a058939c7b0f2e328d53e2
SHA1 (patch-sounds_Makefile) = 792c2e25e1c8334fe8c9038b8b630376a5894c31
SHA1 (patch-tests_test__abstract__jb.c) = 42cfa303fc2e399aa9fe3bebf51464d0776e171c
SHA1 (patch-tests_test__config.c) = fa049dc1fedb8a0c898afa6848406d191acb54d3
+SHA1 (patch-tests_test__linkedlists.c) = 73356c76cc48b07737de8a091fa8ad6a49ee9e5c
SHA1 (patch-tests_test__locale.c) = e8419bed77d4787356adf8bc81893bea2adb48f4
SHA1 (patch-utils_Makefile) = e776da1fe1233a1f6933256f530f3bfff026de25
SHA1 (patch-utils_db1-ast_include_db.h) = 94ec413fe6a6154d65c43bdde2b26644d8bb5dac
diff --git a/comms/asterisk/patches/patch-channels_chan__oss.c b/comms/asterisk/patches/patch-channels_chan__oss.c
index 0891b4ea8be..2a397cd0acd 100644
--- a/comms/asterisk/patches/patch-channels_chan__oss.c
+++ b/comms/asterisk/patches/patch-channels_chan__oss.c
@@ -1,13 +1,13 @@
-$NetBSD: patch-channels_chan__oss.c,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
+$NetBSD: patch-channels_chan__oss.c,v 1.2 2014/07/02 03:06:24 jnemeth Exp $
---- channels/chan_oss.c.orig 2012-08-21 20:40:18.000000000 +0000
+--- channels/chan_oss.c.orig 2014-04-17 20:06:11.000000000 +0000
+++ channels/chan_oss.c
@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef __linux
#include <linux/soundcard.h>
--#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__)
-+#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) || defined(__GLIBC__)
+-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
++#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun) || defined(__DragonFly__)
#include <sys/soundcard.h>
#else
#include <soundcard.h>
diff --git a/comms/asterisk/patches/patch-funcs_func__strings.c b/comms/asterisk/patches/patch-funcs_func__strings.c
new file mode 100644
index 00000000000..bea2e3d64bc
--- /dev/null
+++ b/comms/asterisk/patches/patch-funcs_func__strings.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-funcs_func__strings.c,v 1.1 2014/07/02 03:06:24 jnemeth Exp $
+
+--- funcs/func_strings.c.orig 2014-05-21 19:05:32.000000000 +0000
++++ funcs/func_strings.c
+@@ -790,6 +790,8 @@ static struct ast_custom_function filter
+ .read = filter,
+ };
+
++RAII_DECL(struct ast_str *, str, ast_free);
++
+ static int replace(struct ast_channel *chan, const char *cmd, char *data, struct ast_str **buf, ssize_t len)
+ {
+ AST_DECLARE_APP_ARGS(args,
+@@ -798,7 +800,7 @@ static int replace(struct ast_channel *c
+ AST_APP_ARG(replace);
+ );
+ char *strptr, *varsubst;
+- RAII_VAR(struct ast_str *, str, ast_str_create(16), ast_free);
++ RAII_VAR(struct ast_str *, str, ast_str_create(16));
+ char find[256]; /* Only 256 characters possible */
+ char replace[2] = "";
+ size_t unused;
diff --git a/comms/asterisk/patches/patch-main_manager.c b/comms/asterisk/patches/patch-main_manager.c
index 4a4bcf345e6..8e47c06d382 100644
--- a/comms/asterisk/patches/patch-main_manager.c
+++ b/comms/asterisk/patches/patch-main_manager.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-main_manager.c,v 1.2 2013/08/08 00:45:10 jnemeth Exp $
+$NetBSD: patch-main_manager.c,v 1.3 2014/07/02 03:06:24 jnemeth Exp $
---- main/manager.c.orig 2013-05-13 14:26:57.000000000 +0000
+--- main/manager.c.orig 2014-06-12 16:54:15.000000000 +0000
+++ main/manager.c
-@@ -1850,7 +1850,7 @@ static char *handle_showmanconn(struct a
+@@ -1871,7 +1871,7 @@ static char *handle_showmanconn(struct a
struct mansession_session *session;
time_t now = time(NULL);
#define HSMCONN_FORMAT1 " %-15.15s %-55.55s %-10.10s %-10.10s %-8.8s %-8.8s %-5.5s %-5.5s\n"
@@ -11,16 +11,33 @@ $NetBSD: patch-main_manager.c,v 1.2 2013/08/08 00:45:10 jnemeth Exp $
int count = 0;
struct ao2_iterator i;
-@@ -1871,7 +1871,7 @@ static char *handle_showmanconn(struct a
- i = ao2_iterator_init(sessions, 0);
- while ((session = ao2_iterator_next(&i))) {
- ao2_lock(session);
-- ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_sockaddr_stringify_addr(&session->addr), (int)(session->sessionstart), (int)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
-+ ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_sockaddr_stringify_addr(&session->addr), (intmax_t)(session->sessionstart), (intmax_t)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
- count++;
- ao2_unlock(session);
- unref_mansession(session);
-@@ -7203,9 +7203,11 @@ static char *handle_manager_show_events(
+@@ -1897,8 +1897,8 @@ static char *handle_showmanconn(struct a
+ ao2_lock(session);
+ ast_cli(a->fd, HSMCONN_FORMAT2, session->username,
+ ast_sockaddr_stringify_addr(&session->addr),
+- (int) (session->sessionstart),
+- (int) (now - session->sessionstart),
++ (intmax_t) (session->sessionstart),
++ (intmax_t) (now - session->sessionstart),
+ session->fd,
+ session->inuse,
+ session->readperm,
+@@ -5692,11 +5692,13 @@ static void append_channel_vars(struct a
+ AST_THREADSTORAGE(manager_event_buf);
+ #define MANAGER_EVENT_BUF_INITSIZE 256
+
++RAII_DECL(struct ao2_container *, sessions, ao2_cleanup);
++
+ int __ast_manager_event_multichan(int category, const char *event, int chancount,
+ struct ast_channel **chans, const char *file, int line, const char *func,
+ const char *fmt, ...)
+ {
+- RAII_VAR(struct ao2_container *, sessions, ao2_global_obj_ref(mgr_sessions), ao2_cleanup);
++ RAII_VAR(struct ao2_container *, sessions, ao2_global_obj_ref(mgr_sessions));
+ struct mansession_session *session;
+ struct manager_custom_hook *hook;
+ struct ast_str *auth = ast_str_alloca(80);
+@@ -7313,9 +7315,11 @@ static char *handle_manager_show_events(
return CLI_SUCCESS;
}
diff --git a/comms/asterisk/patches/patch-res_res__config__pgsql.c b/comms/asterisk/patches/patch-res_res__config__pgsql.c
new file mode 100644
index 00000000000..df08bfdddc0
--- /dev/null
+++ b/comms/asterisk/patches/patch-res_res__config__pgsql.c
@@ -0,0 +1,83 @@
+$NetBSD: patch-res_res__config__pgsql.c,v 1.1 2014/07/02 03:06:24 jnemeth Exp $
+
+--- res/res_config_pgsql.c.orig 2014-05-02 19:50:07.000000000 +0000
++++ res/res_config_pgsql.c
+@@ -247,12 +247,14 @@ static int pgsql_exec(const char *databa
+ return -1;
+ }
+
++RAII_DECL(PGresult *, result, PQclear);
++
+ static struct tables *find_table(const char *database, const char *orig_tablename)
+ {
+ struct columns *column;
+ struct tables *table;
+ struct ast_str *sql = ast_str_thread_get(&findtable_buf, 330);
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int exec_result;
+ char *fname, *ftype, *flen, *fnotnull, *fdef;
+ int i, rows;
+@@ -416,7 +418,7 @@ static struct columns *find_column(struc
+
+ static struct ast_variable *realtime_pgsql(const char *database, const char *tablename, va_list ap)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int num_rows = 0, pgresult;
+ struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+ struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 100);
+@@ -531,7 +533,7 @@ static struct ast_variable *realtime_pgs
+
+ static struct ast_config *realtime_multi_pgsql(const char *database, const char *table, va_list ap)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int num_rows = 0, pgresult;
+ struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+ struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 100);
+@@ -688,7 +690,7 @@ static struct ast_config *realtime_multi
+ static int update_pgsql(const char *database, const char *tablename, const char *keyfield,
+ const char *lookup, va_list ap)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int numrows = 0, pgresult;
+ const char *newparam, *newval;
+ struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+@@ -819,7 +821,7 @@ static int update_pgsql(const char *data
+
+ static int update2_pgsql(const char *database, const char *tablename, va_list ap)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int numrows = 0, pgresult, first = 1;
+ struct ast_str *escapebuf = ast_str_thread_get(&escapebuf_buf, 16);
+ const char *newparam, *newval;
+@@ -933,7 +935,7 @@ static int update2_pgsql(const char *dat
+
+ static int store_pgsql(const char *database, const char *table, va_list ap)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int numrows;
+ struct ast_str *buf = ast_str_thread_get(&escapebuf_buf, 256);
+ struct ast_str *sql1 = ast_str_thread_get(&sql_buf, 256);
+@@ -1014,7 +1016,7 @@ static int store_pgsql(const char *datab
+
+ static int destroy_pgsql(const char *database, const char *table, const char *keyfield, const char *lookup, va_list ap)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ int numrows = 0;
+ int pgresult;
+ struct ast_str *sql = ast_str_thread_get(&sql_buf, 256);
+@@ -1096,7 +1098,7 @@ static struct ast_config *config_pgsql(c
+ const char *file, struct ast_config *cfg,
+ struct ast_flags flags, const char *suggested_incl, const char *who_asked)
+ {
+- RAII_VAR(PGresult *, result, NULL, PQclear);
++ RAII_VAR(PGresult *, result, NULL);
+ long num_rows;
+ struct ast_variable *new_v;
+ struct ast_category *cur_cat = NULL;
diff --git a/comms/asterisk/patches/patch-tests_test__linkedlists.c b/comms/asterisk/patches/patch-tests_test__linkedlists.c
new file mode 100644
index 00000000000..c57aa34ae43
--- /dev/null
+++ b/comms/asterisk/patches/patch-tests_test__linkedlists.c
@@ -0,0 +1,26 @@
+$NetBSD: patch-tests_test__linkedlists.c,v 1.1 2014/07/02 03:06:24 jnemeth Exp $
+
+--- tests/test_linkedlists.c.orig 2013-10-24 19:55:23.000000000 +0000
++++ tests/test_linkedlists.c
+@@ -124,9 +124,11 @@ static int dbl_list_expect_reverse(struc
+ return AST_TEST_FAIL; \
+ }
+
++RAII_VAR(struct ast_str *, buf, ast_free);
++
+ AST_TEST_DEFINE(single_ll_tests)
+ {
+- RAII_VAR(struct ast_str *, buf, NULL, ast_free);
++ RAII_VAR(struct ast_str *, buf, NULL);
+ struct test_llist test_list = { 0, };
+ struct test_llist other_list = { 0, };
+ struct test_val *bogus;
+@@ -337,7 +339,7 @@ AST_TEST_DEFINE(single_ll_tests)
+
+ AST_TEST_DEFINE(double_ll_tests)
+ {
+- RAII_VAR(struct ast_str *, buf, NULL, ast_free);
++ RAII_VAR(struct ast_str *, buf, NULL);
+ struct test_dbl_llist test_list = { 0, };
+ struct test_dbl_llist other_list = { 0, };
+ struct test_val *bogus;