From 5130511792ed73af5504b51b66ba411f5d56f048 Mon Sep 17 00:00:00 2001 From: ryoon Date: Fri, 4 Mar 2022 12:22:31 +0000 Subject: asterisk16: Update to 16.24.0 Changelog: Asterisk 16.24.0 Now Available The following issues are resolved in this release: New Features made in this release: * [ASTERISK-29808] cdr: allow disabling CDR by default (Reported by N A) * [ASTERISK-29830] ami: Add AMI event for Wink (Reported by N A) * [ASTERISK-29802] app_sf: Add full tech-agnostic SF support (Reported by N A) * [ASTERISK-29759] app_sendtext: Add ReceiveText application (Reported by N A) * [ASTERISK-29706] func_json: Add JSON parsing function (Reported by N A) Bugs fixed in this release: * [ASTERISK-29888] res_pjsip_outbound_authenticator_digest: ABRT attempting to clean up auth_sess (Reported by George Joseph) * [ASTERISK-29854] func_frame_drop: fix buffer usage typo (Reported by N A) * [ASTERISK-29857] res_tonedetect: fix logic errors in code (Reported by N A) * [ASTERISK-29869] rtp sequence number can skip after DTMF under certain bridges (Reported by Torrey Searle) * [ASTERISK-29817] gethostbyname_r is misdetected on NetBSD and causes a build failure (Reported by Micha G rny) * [ASTERISK-29698] Segfault if sorcery object_lifetime_maximum and qualify_frequency the same value (Reported by Alexei Gradinari) * [ASTERISK-29851] rdtsc is not enabled (stubbed out) on NetBSD (Reported by Micha G rny) * [ASTERISK-29852] make_version uses GNU-ism that break git-svn-id parsing on NetBSD (Reported by Micha G rny) * [ASTERISK-29850] ast_get_tid() not implemented for NetBSD (Reported by Micha G rny) * [ASTERISK-29818] Build failure on NetBSD due to hmac function collision (Reported by Micha G rny) * [ASTERISK-29867] configure fails if libsrtp dev files are not installed (Reported by Sean Bright) * [ASTERISK-29856] res_rtp_asterisk: Invalid comparison creates unreachable code (Reported by N A) * [ASTERISK-29813] res_pjsip_session doesn t support multipart message bodies (Reported by George Joseph) * [ASTERISK-29858] Regression: Using external pjproject not working after hack commit (Reported by George Joseph) * [ASTERISK-29859] VoiceMailMain() fails when encountering non-numeric CALLERID(num) (Reported by Mark Murawski) * [ASTERISK-29847] pbx_variables: ASTSBINDIR is missing (Reported by N A) * [ASTERISK-29824] It s hard to make changes to bundled pjproject (Reported by George Joseph) * [ASTERISK-29695] SAY.CONF wrong logic when converting 24hour time to say 12 hour am/pm (Reported by Vincent Dubois) * [ASTERISK-29664] PJSIP processing token with % incorrectly (Reported by Dan Cropp) * [ASTERISK-29827] Support for Nordic language syntax in Queues (Reported by Mark Petersen) * [ASTERISK-29515] app_queue: QueueSummary and QueueStatus events don t exist in documentation (Reported by Luke Escude) * [ASTERISK-29746] tcptls.c: TCP client connect fails due to interrupt (Reported by Kevin Harwell) * [ASTERISK-29806] app_queue: extension state incorrect (Reported by Steve Davies) * [ASTERISK-29816] SAY_DTMF_INTERRUPT channel variable is not honored (Reported by Sean Bright) * [ASTERISK-29821] Deadlock in bridge_channel_internal_join() on local channels. (Reported by Krzysztof Trempala) * [ASTERISK-29722] test_timezone_watch breaks during DST to ST transition (Reported by Josh Soref) * [ASTERISK-29804] bundled_pjproject: sip_inv is missing multipart support in some cases (Reported by George Joseph) * [ASTERISK-29794] ast_coredumper does not delete results when requested and a specific output dir is set (Reported by Frederic Van Espen) * [ASTERISK-29803] pbx_variables: cp4 variables is used uninitialized (Reported by N A) * [ASTERISK-29766] pbx_variables: MSet truncates sets after 24 variables (Reported by N A) * [ASTERISK-29772] chan_sip: ${CHANNEL(ruri)} in Dial/Queue b (test,s,1) cause a coredump (Reported by Mark Petersen) * [ASTERISK-29790] xmldoc: Dump invalid to XML DTD: XSLT (Reported by Alexander Traud) * [ASTERISK-29791] xmldoc: Dump invalid to XML DTD: ACO Matchfield (Reported by Alexander Traud) * [ASTERISK-26991] documentation: Doxygen site is no longer being updated (Reported by Joshua C. Colp) * [ASTERISK-20259] Update Doxygen Configuration for make progdocs (Reported by Andrew Latham) * [ASTERISK-29785] res_pjsip_sdp_rtp: Warns on every offered crypto suite (Reported by Alexander Traud) * [ASTERISK-27406] Infinite loop when out of ports and rtpstart value is odd (Reported by Thomas Guebels) * [ASTERISK-28053] chan_pjsip: Wrong or missing Q.850 reason in CANCEL (Reported by Simone Lazzaris) * [ASTERISK-29761] res: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29763] main: Fix for Doxygen (Reported by Alexander Traud) Improvements made in this release: * [ASTERISK-29832] Enable pickup on channel after having received 183 Progress (Reported by Mark Petersen) * [ASTERISK-28890] res_pjsip_sdp_rtp: Keepalive not supported for video streams (Reported by Luke Escude) * [ASTERISK-29831] Queue don t play thank-you when here is no hold time announcements (Reported by Mark Petersen) * [ASTERISK-29855] frame.h: fix CNG documentation typo (Reported by N A) * [ASTERISK-29848] documentation: Document special system and channel variables (Reported by N A) * [ASTERISK-29819] utils.c: Remove all usages of ast_gethostbyname() (Reported by Sean Bright) * [ASTERISK-29815] dsp: Define magic number as macro (Reported by N A) * [ASTERISK-29807] cli: add module refresh command (Reported by N A) * [ASTERISK-29829] app_mp3: Throw warning if attempting to play a nonexistent stream (Reported by N A) * [ASTERISK-24427] Documentation is missing for a few AMI Events Including CDR and events triggered after the QueueStatus action (Reported by Dafi Ni) * [ASTERISK-29795] DIALEDPEERNUMBER not set on destination channel for Queue calls (Reported by Mark Petersen) * [ASTERISK-29801] app.c: Throw warnings for nonexistent options (Reported by N A) * [ASTERISK-29797] Support for Danish language syntax in VM (Reported by Mark Petersen) * [ASTERISK-29758] configs: Minor updates to sample configs (Reported by N A) * [ASTERISK-29800] strings: Fix misusage in comment examples (Reported by N A) * [ASTERISK-29745] pbx: Add public API for more elegant variable substitution with extensions (Reported by N A) * [ASTERISK-29729] Incompatibility with newer spandsp releases (3.0.0+) (Reported by Dustin Marquess) For a full list of changes in this release, please see the ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-16.24.0 Asterisk 16.23.0 Now Available The following issues are resolved in this release: New Features made in this release: * [ASTERISK-29720] res_tonedetect: Add call progress tone detection (Reported by N A) * [ASTERISK-18069] app_queue Add Login Time and Last Paused Times to Queue Members (Reported by Jamuel Starkey) Bugs fixed in this release: * [ASTERISK-29779] progdocs: Hidden code sections with syntax errors. (Reported by Alexander Traud) * [ASTERISK-29732] progdocs: Fix grouping for latest Doxygen (Reported by Alexander Traud) * [ASTERISK-29771] Crash occurs when 2 realtime sippeers mysql connections are configured and we have a schema warning (Reported by Mario Ban) * [ASTERISK-29776] stir/shaken: Requires GNU designator (Reported by Alexander Traud) * [ASTERISK-29773] progdocs: doxyref.h outdated (Reported by Alexander Traud) * [ASTERISK-29765] xmldoc: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29764] chan_misdn: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29762] channels: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29730] Segfault in __ao2_ref if refdebug = yes (Reported by Alexei Gradinari) * [ASTERISK-29748] bridging: Infinite loop when both Local channel halves in same bridge (Reported by Joshua C. Colp) * [ASTERISK-29753] parking: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29754] odbc: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29756] res_ari: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29755] frame: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29751] channel: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29750] stasis: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29752] app: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29749] res_xmpp: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29737] chan_iax2: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29747] res_pjsip: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29743] bridges: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29742] addons: Fix for Doxygen. (Reported by Alexander Traud) * [ASTERISK-29741] tests: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29740] apps: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29736] bridge_channel: Fix for Doxygen (Reported by Alexander Traud) * [ASTERISK-29733] progdocs: Avoid name with Doxygen \file (Reported by Alexander Traud) * [ASTERISK-29734] progdocs: Use Doxygen \example correctly (Reported by Alexander Traud) * [ASTERISK-29735] progdocs: Avoid multiple use of section labels (Reported by Alexander Traud) * [ASTERISK-29744] app_morsecode: Fix deadlock (Reported by N A) * [ASTERISK-29705] app_read: Fix custom terminator functionality regression (Reported by N A) * [ASTERISK-29703] res_pjsip_callerid: Fix OLI parsing (Reported by N A) * [ASTERISK-29702] sig_analog: Fix truncated buffer copy (Reported by N A) * [ASTERISK-29724] BuildSystem: In POSIX sh, == in place of = is undefined. (Reported by Alexander Traud) * [ASTERISK-28040] pbx: dialplan reload is removing minus symbol from dynamic hints (Reported by Daniel Zanutti) * [ASTERISK-29391] VoiceMail does not cancel recording on rerecord hangup (Reported by N A) * [ASTERISK-29709] res_snmp: Not build on recent Debian distributions. (Reported by Alexander Traud) * [ASTERISK-29710] stasis: Clang 13 warns about the unused but set variable dispatched. (Reported by Alexander Traud) * [ASTERISK-29711] aelparse: GCC 11.2 found two maybe uninitialized (Reported by Alexander Traud) * [ASTERISK-29713] GCC 11.2: two stringop-overread (Reported by Alexander Traud) * [ASTERISK-29682] Squash compiler issues generated by gcc 11 (Reported by George Joseph) * [ASTERISK-29693] Using with-crypto and with-ssl fails on a recompile (Reported by George Joseph) * [ASTERISK-27816] func_talkdetect s logic is completely broken (Reported by Moritz Fain) * [ASTERISK-29691] stun: Not all users provide a dst to ast_stun_request (Reported by Dennis Haney) * [ASTERISK-26497] make install downloads x86_32 variants of external modules on non Intel architectures (Reported by Corey Farrell) Improvements made in this release: * [ASTERISK-29777] documentation: Standardize example syntax (Reported by N A) * [ASTERISK-29715] app_voicemail: Refactor email generation functions (Reported by N A) * [ASTERISK-29727] Add type for JSON stasis message RTCP Report Received/Sent (Reported by Boris P. Korzun) * [ASTERISK-29714] Spelling errors (Reported by Josh Soref) * [ASTERISK-29707] chan_iax2: Allow both key and secret to be specified at dial time (Reported by N A) * [ASTERISK-29662] Add mix option to Playback application for say and filename (Reported by Shloime Rosenblum) For a full list of changes in this release, please see the ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-16.23.0 Asterisk 16.22.0 Now Available The following issues are resolved in this release: New Features made in this release: * [ASTERISK-29656] Add CHANNEL_EXISTS function (Reported by N A) Bugs fixed in this release: * [ASTERISK-20219] IAX2 Call Encryption Fails with RSA authentication (Reported by Michael Munger) * [ASTERISK-29402] res_pjsip_t38: Socket is bound to IPv4/IPv6 but platform does not support it (Reported by Matthew Kern) * [ASTERISK-29673] app_read: Fix null pointer crash regression (Reported by N A) * [ASTERISK-29671] res_rtp_asterisk: memory leak (Reported by Jean Aunis Prescom) * [ASTERISK-29663] messaging: AMI MessageSend does not support same parameters as dialplan application (Reported by Brian J. Murrell) * [ASTERISK-29578] app_queue: Custom device state using included hints do not update (Reported by N A) * [ASTERISK-29660] Build failure when disabling PJSIP support (Reported by Guido Falsi) Improvements made in this release: * [ASTERISK-29637] Add support for future dates in Say.c (Reported by Shloime Rosenblum) * [ASTERISK-29525] PJSIP remove_existing unavailable contacts (Reported by Joseph Nadiv) * [ASTERISK-29661] func_vmcount: Add support for multiple mailboxes (Reported by N A) * [ASTERISK-29275] Support of MIME-type for wav16 (Reported by Boris P. Korzun) * [ASTERISK-29529] Add custom logging level (Reported by N A) For a full list of changes in this release, please see the ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-16.22.0 Asterisk 16.21.1 Now Available The following issue is resolved in this release: Bugs fixed in this release: * [ASTERISK-29685] pbx_ael: Infinite loop on reload (Reported by Joshua C. Colp) For a full list of changes in this release, please see the ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-16.21.1 Asterisk 16.21.0 Now Available The following issues are resolved in this release: Deprecations made in this release: * [ASTERISK-29548] app_meetme: Deprecated in 19, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29549] app_osploop: Deprecated in 19, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29550] chan_alsa: Deprecated in 19, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29551] chan_mgcp: Deprecated in 19, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29552] chan_skinny: Deprecated in 19, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29553] res_pktccops: Deprecated in 19, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29554] cdr_mysql: Deprecated in 1.8, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29555] app_mysql: Deprecated in 1.8, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29557] app_ices: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29558] app_macro: Deprecated in 16, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29559] app_fax: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29560] app_url: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29561] app_image: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29562] app_nbscat: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29563] app_dahdiras: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29564] cdr_syslog: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29565] chan_oss: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29566] chan_phone: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29567] chan_sip: Deprecated in 17, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29568] chan_nbs: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29569] chan_misdn: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29570] chan_vpb: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29571] res_config_sqlite: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29572] res_monitor: Deprecated in 16, to be removed in 21 (Reported by Joshua C. Colp) * [ASTERISK-29573] conf2ael: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) * [ASTERISK-29574] muted: Deprecated in 16, to be removed in 19 (Reported by Joshua C. Colp) Improvements made in this release: * [ASTERISK-29472] res_pjsip: OLI/ANI2 support missing (Reported by N A) * [ASTERISK-29626] app_stack: Include calling location if attempting to branch to nonexistent location (Reported by N A) * [ASTERISK-29632] Add option to Application_VoiceMail to suppress instructions only when a custom greeting is present (Reported by Charlie Smurthwaite) * [ASTERISK-29605] chan_iax2: Add ANI2 (Reported by N A) * [ASTERISK-29508] STUN server address refresh (Reported by S bastien Duthil) * [ASTERISK-29612] bridge_basic: Don t throw warning if attended transfer is cancelled (Reported by N A) * [ASTERISK-29544] Media Cache Delayed remote sound file retrieve delays all playbacks (Reported by Andre Barbosa) * [ASTERISK-29541] app_morsecode: Add American Morse code (Reported by N A) * [ASTERISK-29495] Return integer instead of float if response is a whole number (Reported by N A) * [ASTERISK-29543] app_originate: Allow specifying codec(s) to use (Reported by N A) Bugs fixed in this release: * [ASTERISK-29673] app_read: Fix null pointer crash regression (Reported by N A) * [ASTERISK-29660] Build failure when disabling PJSIP support (Reported by Guido Falsi) * [ASTERISK-29654] pjproject includes trailing whitespace in sdp format attributes (Reported by George Joseph) * [ASTERISK-29635] MP3Player don t work with actual mpg123 versions (Reported by Carlos Oliva) * [ASTERISK-27176] test_abstract_jb: frames leak (Reported by Corey Farrell) * [ASTERISK-29634] res_snmp: gcc 11 needs -fPIC to compile correctly (Reported by George Joseph) * [ASTERISK-29630] Asterisk is unable to read extended number format terminfo files (Reported by Sean Bright) * [ASTERISK-28004] dns: Core ast_dns_get_nameservers does not support configured IPv6 servers (Reported by Isaac McDonald) * [ASTERISK-29618] ConfBridge errors on creation conference room (Reported by Alexander Zharov) * [ASTERISK-29622] ARI: external media create doesn t use body parameter (Reported by sungtae kim) * [ASTERISK-29614] app_agent_pool: XML Doc: unterminated entity reference (Reported by Alexander Traud) * [ASTERISK-29609] Subsequent ael reload will cause a lock up (Reported by Mark Murawski) * [ASTERISK-28701] app_queue: Core reload resets queue stats, even when keepstats=yes (Reported by Luke Escude) * [ASTERISK-29616] res_rtp_asterisk: sqrt(.) requires the header math.h. (Reported by Alexander Traud) * [ASTERISK-29518] sig_analog: FCG_CAMA fails to signal ANI spill when using MF signaling (Reported by Sarah Autumn) * [ASTERISK-29582] res_pjproject: Can t map pjproject log messages to Asterisk TRACE (Reported by George Joseph) * [ASTERISK-29575] app_milliwatt: Milliwatt application doesn t use the proper timings (Reported by N A) * [ASTERISK-20339] chan_mgcp, resp_pktccops ast_debug support (Reported by Tomas Maldonado) * [ASTERISK-29540] aelparse: include of context with timings fails (Reported by Alexander Traud) * [ASTERISK-29539] Segmentation fault at ast_writestream() when write handler not defined (happens with OGG/Speex) (Reported by Ernani Jos Camargo Azevedo) New Features made in this release: * [ASTERISK-29496] Add SendMF application (Reported by N A) * [ASTERISK-29627] Add STRBETWEEN function (Reported by N A) * [ASTERISK-29628] Add file and directory functions (Reported by N A) * [ASTERISK-29531] Add SAYFILES function (Reported by N A) * [ASTERISK-29546] Add tone detection module (Reported by N A) * [ASTERISK-18454] Option for Read to be able to accept # (Reported by Sta Retji) * [ASTERISK-29542] Add audio scrambler (Reported by N A) * [ASTERISK-29478] Function to drop frames in the TX or RX directions (Reported by N A) For a full list of changes in this release, please see the ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-16.21.0 Asterisk 16.20.0 Now Available The following issues are resolved in this release: Security bugs fixed in this release: * [ASTERISK-29415] Crash in PJSIP TLS transport (Reported by Andrew Yager) * [ASTERISK-29381] chan_pjsip: Remote denial of service by an authenticated user (Reported by Ivan Poddubny) New Features made in this release: * [ASTERISK-29389] Add PJSIP_HEADERS() and ability to read header by pattern (Reported by Igor Goncharovsky) * [ASTERISK-29477] Function to asynchronously store digits dialed (Reported by N A) * [ASTERISK-29454] New application to reload modules (Reported by N A) * [ASTERISK-29444] Add application to wait for condition (Reported by N A) * [ASTERISK-29442] app_dial: Expand A option to allow announcement playback to caller (Reported by N A) Bugs fixed in this release: * [ASTERISK-29494] cdr_adaptive_odbc: Prevent throwing warnings if CDR filtering is used (Reported by N A) * [ASTERISK-29513] statsd: Remove non-standard metric type Meter (Reported by Rijnhard Hessel) * [ASTERISK-29526] G729 audio gets corrupted by Asterisk due to smoother (Reported by under) * [ASTERISK-29392] chan_iax2: Asterisk crashes when queueing video with format (Reported by Michael Welk) * [ASTERISK-29507] STUN timeout is silently delaying calls (Reported by S bastien Duthil) * [ASTERISK-27871] Remote URL in playback must end with file extension (Reported by Caesar) * [ASTERISK-29503] Updated identify/match syntax not supported by config wizard (Reported by Sean Bright) * [ASTERISK-29480] fixedjitterbuffer contains an un-wrappered assert that triggers on a negative time slew (Reported by Dan Cropp) * [ASTERISK-29485] core: Inband generation of tones for Busy() and Congestion() may not occur (Reported by Joshua C. Colp) * [ASTERISK-29479] Channels are not put on hold for Session Progress with inactive audio (Reported by Bernd Zobl) Improvements made in this release: * [ASTERISK-29528] Add support for multiple files for agent announcements (Reported by N A) * [ASTERISK-29501] ARI Stasis Playback doesn t hangup call when processing a list of invalid files (Reported by Andre Barbosa) * [ASTERISK-29464] ARI PlaybackFinish skip error events (Reported by Andre Barbosa) For a full list of changes in this release, please see the ChangeLog: https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-16.20.0 --- comms/asterisk16/Makefile | 8 +-- comms/asterisk16/PLIST | 12 ++++- comms/asterisk16/distinfo | 36 ++++++------- comms/asterisk16/patches/patch-configure | 20 +------ comms/asterisk16/patches/patch-configure.ac | 20 +------ .../patches/patch-include_asterisk_sha1.h | 63 ++-------------------- .../patches/patch-main_bridge__channel.c | 12 ++--- .../patches/patch-res_res__rtp__asterisk.c | 14 ++--- 8 files changed, 52 insertions(+), 133 deletions(-) diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile index 773f3e95311..080fa7ddf59 100644 --- a/comms/asterisk16/Makefile +++ b/comms/asterisk16/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.85 2021/12/08 16:03:34 adam Exp $ +# $NetBSD: Makefile,v 1.86 2022/03/04 12:22:31 ryoon Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked; look in ${WRKSRC}/sounds/Makefile # to find out the current sound file versions -DISTNAME= asterisk-16.19.0 -PKGREVISION= 2 +DISTNAME= asterisk-16.24.0 CATEGORIES= comms net audio MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -192,12 +191,14 @@ SUBST_STAGE.autoconfig= post-configure SUBST_FILES.autoconfig= include/asterisk/autoconfig.h SUBST_SED.autoconfig= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|" SUBST_SED.autoconfig+= -e "s|^\#define HAVE_GETHOSTBYNAME_R_6 1|\#undef HAVE_GETHOSTBYNAME_R_6|" +SUBST_NOOP_OK.autoconfig= yes # XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else SUBST_CLASSES.NetBSD+= pktinfo SUBST_STAGE.pktinfo= post-configure SUBST_FILES.pktinfo= include/asterisk/autoconfig.h SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|" +SUBST_NOOP_OK.pktinfo= yes # XXX gross hack, gethostbyname_r on NETBSD is for internal use only SUBST_CLASSES.NetBSD+= gethostbyname_r @@ -205,6 +206,7 @@ SUBST_STAGE.gethostbyname_r= post-configure SUBST_FILES.gethostbyname_r= include/asterisk/autoconfig.h SUBST_SED.gethostbyname_r= -e "s|^\#define HAVE_GETHOSTBYNAME_R_5 1|\#undef HAVE_GETHOSTBYNAME_R_5|" SUBST_SED.gethostbyname_r+= -e "s|^\#define HAVE_GETHOSTBYNAME_R_6 1|\#undef HAVE_GETHOSTBYNAME_R_6|" +SUBST_NOOP_OK.gethostbyname_r= yes RCD_SCRIPTS= asterisk OWN_DIRS_PERMS+= ${ASTDBDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755 diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST index e6c0ec25440..6162de9c57e 100644 --- a/comms/asterisk16/PLIST +++ b/comms/asterisk16/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2020/12/10 13:52:30 gdt Exp $ +@comment $NetBSD: PLIST,v 1.27 2022/03/04 12:22:31 ryoon Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -247,6 +247,7 @@ lib/asterisk/modules/app_dictate.so lib/asterisk/modules/app_directed_pickup.so lib/asterisk/modules/app_directory.so lib/asterisk/modules/app_disa.so +lib/asterisk/modules/app_dtmfstore.so lib/asterisk/modules/app_dumpchan.so lib/asterisk/modules/app_echo.so lib/asterisk/modules/app_exec.so @@ -257,6 +258,7 @@ lib/asterisk/modules/app_forkcdr.so lib/asterisk/modules/app_getcpeid.so lib/asterisk/modules/app_ices.so lib/asterisk/modules/app_image.so +lib/asterisk/modules/app_mf.so lib/asterisk/modules/app_milliwatt.so lib/asterisk/modules/app_minivm.so lib/asterisk/modules/app_mixmonitor.so @@ -272,9 +274,11 @@ lib/asterisk/modules/app_queue.so lib/asterisk/modules/app_read.so lib/asterisk/modules/app_readexten.so lib/asterisk/modules/app_record.so +lib/asterisk/modules/app_reload.so lib/asterisk/modules/app_sayunixtime.so lib/asterisk/modules/app_senddtmf.so lib/asterisk/modules/app_sendtext.so +lib/asterisk/modules/app_sf.so lib/asterisk/modules/app_sms.so lib/asterisk/modules/app_softhangup.so lib/asterisk/modules/app_speech_utils.so @@ -289,6 +293,7 @@ lib/asterisk/modules/app_url.so lib/asterisk/modules/app_userevent.so lib/asterisk/modules/app_verbose.so lib/asterisk/modules/app_voicemail.so +lib/asterisk/modules/app_waitforcond.so lib/asterisk/modules/app_waitforring.so lib/asterisk/modules/app_waitforsilence.so lib/asterisk/modules/app_waituntil.so @@ -366,6 +371,7 @@ lib/asterisk/modules/func_dialplan.so lib/asterisk/modules/func_enum.so lib/asterisk/modules/func_env.so lib/asterisk/modules/func_extstate.so +lib/asterisk/modules/func_frame_drop.so lib/asterisk/modules/func_frame_trace.so lib/asterisk/modules/func_global.so lib/asterisk/modules/func_groupcount.so @@ -373,6 +379,7 @@ lib/asterisk/modules/func_hangupcause.so lib/asterisk/modules/func_holdintercept.so lib/asterisk/modules/func_iconv.so lib/asterisk/modules/func_jitterbuffer.so +lib/asterisk/modules/func_json.so lib/asterisk/modules/func_lock.so lib/asterisk/modules/func_logic.so lib/asterisk/modules/func_math.so @@ -387,6 +394,8 @@ lib/asterisk/modules/func_pjsip_endpoint.so lib/asterisk/modules/func_presencestate.so lib/asterisk/modules/func_rand.so lib/asterisk/modules/func_realtime.so +lib/asterisk/modules/func_sayfiles.so +lib/asterisk/modules/func_scramble.so lib/asterisk/modules/func_sha1.so lib/asterisk/modules/func_shell.so lib/asterisk/modules/func_sorcery.so @@ -532,6 +541,7 @@ lib/asterisk/modules/res_stir_shaken.so lib/asterisk/modules/res_stun_monitor.so ${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so lib/asterisk/modules/res_timing_pthread.so +lib/asterisk/modules/res_tonedetect.so ${PLIST.timerfd}lib/asterisk/modules/res_timing_timerfd.so ${PLIST.jabber}lib/asterisk/modules/res_xmpp.so lib/libasteriskssl.so diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo index 6f896561dc3..1a7750ed1e5 100644 --- a/comms/asterisk16/distinfo +++ b/comms/asterisk16/distinfo @@ -1,34 +1,34 @@ -$NetBSD: distinfo,v 1.44 2021/10/26 10:05:58 nia Exp $ +$NetBSD: distinfo,v 1.45 2022/03/04 12:22:31 ryoon Exp $ -BLAKE2s (asterisk-16.19.0/asterisk-16.19.0.tar.gz) = ebf05642620e42ea85df93e1b5ffdfde0de2f5ee3cb13244895f530c55970038 -SHA512 (asterisk-16.19.0/asterisk-16.19.0.tar.gz) = e50b7c42591ff7fedba3e591a4e696ace62731d81b4d054757a91d8997ee454e949c56a4cf19e37c160407b23ec8c654c1b8af18712d09078e6149b5b22c5040 -Size (asterisk-16.19.0/asterisk-16.19.0.tar.gz) = 27872364 bytes -BLAKE2s (asterisk-16.19.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde -SHA512 (asterisk-16.19.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d -Size (asterisk-16.19.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes -BLAKE2s (asterisk-16.19.0/pjproject-2.10.md5) = 6739f51daf24d0567304f773bd49648c1be3a7a4a33c0f3353279fb349168e7e -SHA512 (asterisk-16.19.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054 -Size (asterisk-16.19.0/pjproject-2.10.md5) = 110 bytes -BLAKE2s (asterisk-16.19.0/pjproject-2.10.tar.bz2) = fac6400fa94cde09a848314b754062364c021e8c13d3fe28493634d4415959f7 -SHA512 (asterisk-16.19.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e -Size (asterisk-16.19.0/pjproject-2.10.tar.bz2) = 7339188 bytes +BLAKE2s (asterisk-16.24.0/asterisk-16.24.0.tar.gz) = 5b794eb721b375f10d414fb5e8659504fa868f7472d1efca10751cf1a573221e +SHA512 (asterisk-16.24.0/asterisk-16.24.0.tar.gz) = 0c770264fad5a5f4c8cc6572b524349337635f0a8def26391897776d7ba4ec8f0cf595f588abc75f9f37ba941a56b7d3704b3ef3ddb4b67d3e4e341992e8f815 +Size (asterisk-16.24.0/asterisk-16.24.0.tar.gz) = 27987904 bytes +BLAKE2s (asterisk-16.24.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f7e5fe212d7e7cdca14c52527a2552311ab7762c3f1464b09ddedc7c66aebde +SHA512 (asterisk-16.24.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d +Size (asterisk-16.24.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes +BLAKE2s (asterisk-16.24.0/pjproject-2.10.md5) = 6739f51daf24d0567304f773bd49648c1be3a7a4a33c0f3353279fb349168e7e +SHA512 (asterisk-16.24.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054 +Size (asterisk-16.24.0/pjproject-2.10.md5) = 110 bytes +BLAKE2s (asterisk-16.24.0/pjproject-2.10.tar.bz2) = fac6400fa94cde09a848314b754062364c021e8c13d3fe28493634d4415959f7 +SHA512 (asterisk-16.24.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e +Size (asterisk-16.24.0/pjproject-2.10.tar.bz2) = 7339188 bytes SHA1 (patch-Makefile) = 9f093c599f6c6208721c20387f07865a9cf2fd8e SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23 SHA1 (patch-channels_Makefile) = b32bb8439ae07ed361ab7cb811b4766a27f09ec9 -SHA1 (patch-configure) = 65da4b46faae700c39b316cc88f6757f8b023657 -SHA1 (patch-configure.ac) = 91a080a5190eb397021676ba2f579990939b40e8 +SHA1 (patch-configure) = 36f740a5d55fc6683e91239aedbb671c5d7077ee +SHA1 (patch-configure.ac) = 98690ecc0e1cc99b6d7a0cd13412bd1b2b05397a SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0 SHA1 (patch-include_asterisk_autoconfig.h.in) = 2f8a986bd3b35ebb384280f0dbf81c32d689ddd2 -SHA1 (patch-include_asterisk_sha1.h) = 9b233ef82b50b8d94177616e1382991656ce1ebf +SHA1 (patch-include_asterisk_sha1.h) = c332c45a4e8e19926c59d222b1061a6c901b1064 SHA1 (patch-main_Makefile) = d8b2cdd76dbf4dfa3ae082ce39cc0f8396b368aa SHA1 (patch-main_acl.c) = 06a9d247b19d648e9ff54ac2a234dc8ac8c023bb -SHA1 (patch-main_bridge__channel.c) = 1ea5f8d0d1ad353c63904a80a67d8e53c8672b46 +SHA1 (patch-main_bridge__channel.c) = 2120e3d623843113066413a5980cef6ece81bd82 SHA1 (patch-main_pbx__builtins.c) = 7c1d518f05afc1523b247f50b0363e25832c8636 SHA1 (patch-main_stdtime_localtime.c) = d530bea8f93667a07b707e6fb01c6744aa264d40 SHA1 (patch-main_taskprocessor.c) = f90805bd78fd4096beb9ee1cf9c794c50b87481a SHA1 (patch-main_utils.c) = ab85be3687dd7f39b742bd5e4036f9e297f3e272 SHA1 (patch-pbx_pbx__dundi.c) = d2a50650a19463304c81fc19c460565b94f91b72 -SHA1 (patch-res_res__rtp__asterisk.c) = 0008322f3600ed95f404df00e503441f764d5492 +SHA1 (patch-res_res__rtp__asterisk.c) = a5952d7e25538cdf9786684a05fb05b8f9e1872c SHA1 (patch-res_res__xmpp.c) = 8e8951b8a57eac168e9bf4429392ddfe808ef590 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54 SHA1 (patch-tests_test__locale.c) = f3f1edc86356f2a7b4d3493433c772e164c77f66 diff --git a/comms/asterisk16/patches/patch-configure b/comms/asterisk16/patches/patch-configure index 3d12d91fddb..e384e6c234e 100644 --- a/comms/asterisk16/patches/patch-configure +++ b/comms/asterisk16/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.3 2020/08/13 09:24:25 ryoon Exp $ +$NetBSD: patch-configure,v 1.4 2022/03/04 12:22:31 ryoon Exp $ --- configure.orig 2020-07-16 16:00:28.000000000 +0000 +++ configure @@ -11,24 +11,6 @@ $NetBSD: patch-configure,v 1.3 2020/08/13 09:24:25 ryoon Exp $ AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime" AST_CLANG_BLOCKS="-fblocks" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -9057,7 +9057,7 @@ if test "${with_pjproject_bundled+set}" - fi - - --if test "${with_pjproject}" == "no" || test "${with_pjproject}" == "n" ; then -+if test "${with_pjproject}" = "no" || test "${with_pjproject}" = "n" ; then - PJPROJECT_BUNDLED=no - fi - -@@ -14689,7 +14689,7 @@ fi - - - --if test "${PERMANENT_DLOPEN}" == "yes"; then -+if test "${PERMANENT_DLOPEN}" = "yes"; then - - $as_echo "#define HAVE_PERMANENT_DLOPEN 1" >>confdefs.h - @@ -14723,7 +14723,7 @@ fi done diff --git a/comms/asterisk16/patches/patch-configure.ac b/comms/asterisk16/patches/patch-configure.ac index b6c8468d24d..f1e1810815e 100644 --- a/comms/asterisk16/patches/patch-configure.ac +++ b/comms/asterisk16/patches/patch-configure.ac @@ -1,25 +1,7 @@ -$NetBSD: patch-configure.ac,v 1.2 2020/08/13 09:24:25 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.3 2022/03/04 12:22:31 ryoon Exp $ --- configure.ac.orig 2020-07-16 16:00:28.000000000 +0000 +++ configure.ac -@@ -452,7 +452,7 @@ AC_ARG_WITH([pjproject-bundled], - *) PJPROJECT_BUNDLED=yes ;; - esac]) - --if test "${with_pjproject}" == "no" || test "${with_pjproject}" == "n" ; then -+if test "${with_pjproject}" = "no" || test "${with_pjproject}" = "n" ; then - PJPROJECT_BUNDLED=no - fi - -@@ -740,7 +740,7 @@ AC_ARG_ENABLE([permanent-dlopen], - esac], [PERMANENT_DLOPEN=no]) - - AC_SUBST([PERMANENT_DLOPEN]) --if test "${PERMANENT_DLOPEN}" == "yes"; then -+if test "${PERMANENT_DLOPEN}" = "yes"; then - AC_DEFINE([HAVE_PERMANENT_DLOPEN], 1, [Define to support libc with permanent dlopen.]) - fi - @@ -749,7 +749,7 @@ AC_CHECK_HEADERS([xlocale.h]) AC_CHECK_HEADERS([winsock.h winsock2.h]) diff --git a/comms/asterisk16/patches/patch-include_asterisk_sha1.h b/comms/asterisk16/patches/patch-include_asterisk_sha1.h index 4fd89a79101..7c1c793c6db 100644 --- a/comms/asterisk16/patches/patch-include_asterisk_sha1.h +++ b/comms/asterisk16/patches/patch-include_asterisk_sha1.h @@ -1,6 +1,6 @@ -$NetBSD: patch-include_asterisk_sha1.h,v 1.1 2019/08/20 13:47:42 ryoon Exp $ +$NetBSD: patch-include_asterisk_sha1.h,v 1.2 2022/03/04 12:22:31 ryoon Exp $ ---- include/asterisk/sha1.h.orig 2016-09-09 16:14:37.000000000 +0000 +--- include/asterisk/sha1.h.orig 2022-02-10 11:53:37.000000000 +0000 +++ include/asterisk/sha1.h @@ -191,49 +191,6 @@ typedef struct SHA256Context SHA224Conte typedef struct SHA512Context SHA384Context; @@ -52,7 +52,7 @@ $NetBSD: patch-include_asterisk_sha1.h,v 1.1 2019/08/20 13:47:42 ryoon Exp $ * Function Prototypes */ -@@ -281,76 +238,6 @@ extern int SHA512FinalBits(SHA512Context +@@ -281,19 +238,6 @@ extern int SHA512FinalBits(SHA512Context extern int SHA512Result(SHA512Context *, uint8_t Message_Digest[SHA512HashSize]); @@ -68,63 +68,6 @@ $NetBSD: patch-include_asterisk_sha1.h,v 1.1 2019/08/20 13:47:42 ryoon Exp $ -extern int USHAHashSize(enum SHAversion whichSha); -extern int USHAHashSizeBits(enum SHAversion whichSha); -extern const char *USHAHashName(enum SHAversion whichSha); -- --/* -- * HMAC Keyed-Hashing for Message Authentication, RFC 2104, -- * for all SHAs. -- * This interface allows a fixed-length text input to be used. -- */ --extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */ -- const unsigned char *text, /* pointer to data stream */ -- int text_len, /* length of data stream */ -- const unsigned char *key, /* pointer to authentication key */ -- int key_len, /* length of authentication key */ -- uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */ -- --/* -- * HMAC Keyed-Hashing for Message Authentication, RFC 2104, -- * for all SHAs. -- * This interface allows any length of text input to be used. -- */ --extern int hmacReset(HMACContext *context, enum SHAversion whichSha, -- const unsigned char *key, int key_len); --extern int hmacInput(HMACContext *context, const unsigned char *text, -- int text_len); --extern int hmacFinalBits(HMACContext *context, uint8_t bits, -- unsigned int bit_count); --extern int hmacResult(HMACContext *context, -- uint8_t digest[USHAMaxHashSize]); -- --/* -- * HKDF HMAC-based Extract-and-Expand Key Derivation Function, -- * RFC 5869, for all SHAs. -- */ --extern int hkdf(SHAversion whichSha, const unsigned char *salt, -- int salt_len, const unsigned char *ikm, int ikm_len, -- const unsigned char *info, int info_len, -- uint8_t okm[ ], int okm_len); --extern int hkdfExtract(SHAversion whichSha, const unsigned char *salt, -- int salt_len, const unsigned char *ikm, -- int ikm_len, uint8_t prk[USHAMaxHashSize]); --extern int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ], -- int prk_len, const unsigned char *info, -- int info_len, uint8_t okm[ ], int okm_len); -- --/* -- * HKDF HMAC-based Extract-and-Expand Key Derivation Function, -- * RFC 5869, for all SHAs. -- * This interface allows any length of text input to be used. -- */ --extern int hkdfReset(HKDFContext *context, enum SHAversion whichSha, -- const unsigned char *salt, int salt_len); --extern int hkdfInput(HKDFContext *context, const unsigned char *ikm, -- int ikm_len); --extern int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits, -- unsigned int ikm_bit_count); --extern int hkdfResult(HKDFContext *context, -- uint8_t prk[USHAMaxHashSize], -- const unsigned char *info, int info_len, -- uint8_t okm[USHAMaxHashSize], int okm_len); - /************************ sha-private.h ************************/ /***************** See RFC 6234 for details. *******************/ diff --git a/comms/asterisk16/patches/patch-main_bridge__channel.c b/comms/asterisk16/patches/patch-main_bridge__channel.c index 7dc7b1bf39e..8e814a59677 100644 --- a/comms/asterisk16/patches/patch-main_bridge__channel.c +++ b/comms/asterisk16/patches/patch-main_bridge__channel.c @@ -1,12 +1,12 @@ -$NetBSD: patch-main_bridge__channel.c,v 1.1 2021/02/11 11:54:13 ryoon Exp $ +$NetBSD: patch-main_bridge__channel.c,v 1.2 2022/03/04 12:22:31 ryoon Exp $ * Fix segfault under NetBSD/aarch64 9.99.80. ---- main/bridge_channel.c.orig 2021-01-21 16:28:04.000000000 +0000 +--- main/bridge_channel.c.orig 2022-02-10 11:53:37.000000000 +0000 +++ main/bridge_channel.c -@@ -58,6 +58,13 @@ - #include "asterisk/stream.h" +@@ -59,6 +59,13 @@ #include "asterisk/message.h" + #include "asterisk/core_local.h" +/* XXX, pthread_equal() is misused to compare non-valid thread pointers */ +static int @@ -18,7 +18,7 @@ $NetBSD: patch-main_bridge__channel.c,v 1.1 2021/02/11 11:54:13 ryoon Exp $ /*! * \brief Used to queue an action frame onto a bridge channel and write an action frame into a bridge. * \since 12.0.0 -@@ -258,7 +265,7 @@ int ast_bridge_channel_notify_talking(st +@@ -259,7 +266,7 @@ int ast_bridge_channel_notify_talking(st */ static void bridge_channel_poke(struct ast_bridge_channel *bridge_channel) { @@ -27,7 +27,7 @@ $NetBSD: patch-main_bridge__channel.c,v 1.1 2021/02/11 11:54:13 ryoon Exp $ /* Wake up the bridge channel thread. */ ast_queue_frame(bridge_channel->chan, &ast_null_frame); } -@@ -971,7 +978,7 @@ static int bridge_channel_queue_action_d +@@ -936,7 +943,7 @@ static int bridge_channel_queue_action_d }; /* Make sure we don't end up trying to wait on ourself to deliver the frame */ diff --git a/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c b/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c index bb39fd4f616..b61bbb5490b 100644 --- a/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c +++ b/comms/asterisk16/patches/patch-res_res__rtp__asterisk.c @@ -1,8 +1,8 @@ -$NetBSD: patch-res_res__rtp__asterisk.c,v 1.4 2021/08/09 13:13:14 ryoon Exp $ +$NetBSD: patch-res_res__rtp__asterisk.c,v 1.5 2022/03/04 12:22:31 ryoon Exp $ ---- res/res_rtp_asterisk.c.orig 2021-06-24 12:48:56.000000000 +0000 +--- res/res_rtp_asterisk.c.orig 2022-02-10 11:53:37.000000000 +0000 +++ res/res_rtp_asterisk.c -@@ -63,6 +63,10 @@ +@@ -69,6 +69,10 @@ #include #endif @@ -13,12 +13,12 @@ $NetBSD: patch-res_res__rtp__asterisk.c,v 1.4 2021/08/09 13:13:14 ryoon Exp $ #include "asterisk/conversions.h" #include "asterisk/options.h" #include "asterisk/logger_category.h" -@@ -3638,7 +3642,7 @@ static void rtp_add_candidates_to_ice(st - } +@@ -3654,7 +3658,7 @@ static void rtp_add_candidates_to_ice(st + ast_rwlock_unlock(&stunaddr_lock); /* If configured to use a STUN server to get our external mapped address do so */ -- if (stunaddr.sin_addr.s_addr && !stun_address_is_blacklisted(addr) && -+ if (!is_zero_address(&stunaddr.sin_addr) && !stun_address_is_blacklisted(addr) && +- if (stunaddr_copy.sin_addr.s_addr && !stun_address_is_blacklisted(addr) && ++ if (!is_zero_address(&stunaddr.sin_addr) && !stun_address_is_blacklisted(addr) && (ast_sockaddr_is_ipv4(addr) || ast_sockaddr_is_any(addr)) && count < PJ_ICE_MAX_CAND) { struct sockaddr_in answer; -- cgit v1.2.3