Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 604871A9217 for ; Sun, 17 Jan 2021 08:32:46 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 8599684DCA; Sun, 17 Jan 2021 08:32:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BE86384DB5 for ; Sun, 17 Jan 2021 08:32:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XfSsK55AXNWr for ; Sun, 17 Jan 2021 08:32:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DD93484D67 for ; Sun, 17 Jan 2021 08:32:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D4D1CFA9D; Sun, 17 Jan 2021 08:32:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1610872360168530" MIME-Version: 1.0 Date: Sun, 17 Jan 2021 08:32:40 +0000 From: "John Nemeth" Subject: CVS commit: pkgsrc/comms/asterisk15 To: pkgsrc-changes@NetBSD.org Reply-To: jnemeth@netbsd.org X-Mailer: log_accum Message-Id: <20210117083240.D4D1CFA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1610872360168530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jnemeth Date: Sun Jan 17 08:32:40 UTC 2021 Modified Files: pkgsrc/comms/asterisk15: Makefile PLIST distinfo options.mk pkgsrc/comms/asterisk15/patches: patch-Makefile patch-apps_app__queue.c patch-channels_chan__pjsip.c patch-configure patch-funcs_func__env.c patch-main_asterisk.c patch-res_res__pjproject.c patch-res_res__pjsip_config__domain__aliases.c patch-res_res__pjsip_config__global.c patch-res_res__pjsip_pjsip__options.c patch-res_res__rtp__asterisk.c Removed Files: pkgsrc/comms/asterisk15/patches: patch-channels_chan__oss.c patch-include_asterisk_endian.h patch-utils_streamplayer.c Log Message: asterisk15: Update to asterisk 15.7.4. ----- The Asterisk Development Team would like to announce security releases for Asterisk 13, 15 and 16. The available releases are released as versions 13.28.1, 15.7.4 and 16.5.1. These releases are available for immediate download at https://downloads.asterisk.org/pub/telephony/asterisk/releases The following security vulnerabilities were resolved in these versions: * AST-2019-004: Crash when negotiating for T.38 with a declined stream When Asterisk sends a re-invite initiating T.38 faxing, and the endpoint responds with a declined media stream a crash will then occur in Asterisk. * AST-2019-005: Remote Crash Vulnerability in audio transcoding When audio frames are given to the audio transcoding support in Asterisk the number of samples are examined and as part of this a message is output to indicate that no samples are present. A change was done to suppress this message for a particular scenario in which the message was not relevant. This change assumed that information about the origin of a frame will always exist when in reality it may not. For a full list of changes in the current releases, please see the ChangeLogs: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-15.7.4 The security advisories are available at: https://downloads.asterisk.org/pub/security/AST-2019-004.pdf https://downloads.asterisk.org/pub/security/AST-2019-005.pdf ----- The Asterisk Development Team would like to announce security releases for Asterisk 13, 15 and 16, and Certified Asterisk 13.21. The available releases are released as versions 13.27.1, 15.7.3, 16.4.1 and 13.21-cert4. These releases are available for immediate download at https://downloads.asterisk.org/pub/telephony/asterisk/releases The following security vulnerabilities were resolved in these versions: * AST-2019-002: Remote crash vulnerability with MESSAGE messages A specially crafted SIP in-dialog MESSAGE message can cause Asterisk to crash. * AST-2019-003: Remote Crash Vulnerability in chan_sip channel driver When T.38 faxing is done in Asterisk a T.38 reinvite may be sent to an endpoint to switch it to T.38. If the endpoint responds with an improperly formatted SDP answer including both a T.38 UDPTL stream and an audio or video stream containing only codecs not allowed on the SIP peer or user a crash will occur. The code incorrectly assumes that there will be at least one common codec when T.38 is also in the SDP answer. For a full list of changes in the current releases, please see the ChangeLogs: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-15.7.3 The security advisories are available at: https://downloads.asterisk.org/pub/security/AST-2019-002.pdf https://downloads.asterisk.org/pub/security/AST-2019-003.pdf ----- The Asterisk Development Team would like to announce security releases for Asterisk 15 and 16. The available releases are released as versions 15.7.2 and 16.2.1. These releases are available for immediate download at https://downloads.asterisk.org/pub/telephony/asterisk/releases The following security vulnerabilities were resolved in these versions: * AST-2019-001: Remote crash vulnerability with SDP protocol violation When Asterisk makes an outgoing call, a very specific SDP protocol violation by the remote party can cause Asterisk to crash. For a full list of changes in the current releases, please see the ChangeLogs: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-15.7.2 The security advisory is available at: https://downloads.asterisk.org/pub/security/AST-2019-001.pdf ----- The Asterisk Development Team would like to announce the release of Asterisk 15.7.1. This release is available for immediate download at http://downloads.asterisk.org/pub/telephony/asterisk The release of Asterisk 15.7.1 resolves an issue reported by the community and would have not been possible without your participation. Thank you! The following issue is resolved in this release: Bugs fixed in this release: ----------------------------------- * ASTERISK-28222 - Regression: MWI polling no longer works (Reported by abelbeck) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-15.7.1 ----- The Asterisk Development Team would like to announce the release of Asterisk 15.7.0. This release is available for immediate download at http://downloads.asterisk.org/pub/telephony/asterisk The release of Asterisk 15.7.0 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following issues are resolved in this release: Security bugs fixed in this release: ----------------------------------- * ASTERISK-28127 - Buffer overflow for DNS SRV/NAPTR records (Reported by Jan Hoffmann) * ASTERISK-28013 - res_http_websocket: Crash when reading HTTP Upgrade requests (Reported by Sean Bright) Bugs fixed in this release: ----------------------------------- * ASTERISK-28076 - bridging: Asterisk crashes when receiving an empty realtime text frame (Reported by Emmanuel BUU) * ASTERISK-28084 - app_queue: QueueMemberStatus Event flooding AMI (Reported by Andrej) * ASTERISK-28077 - res_pjsip: improve realtime performance on CLI 'pjsip show contacts' (Reported by Alexei Gradinari) * ASTERISK-27920 - app_queue: Queue member considered inuse after immediately hanging up during dialing. (Reported by Cao Minh Hiep) * ASTERISK-26094 - stasis: Playing MOH to bridge with ARI does not work (Reported by Cameron) * ASTERISK-28065 - res_odbc: missing SQL error diagnostic (Reported by Alexei Gradinari) * ASTERISK-28057 - chan_sip: SipNotify via AMI behaves differently to CLI (Reported by Peter Katzmann) * ASTERISK-28045 - configure script does not enforce libunbound2 version (Reported by Samuel Galarneau) * ASTERISK-28070 - testsuite: Sniffer assumes pjmedia will use ports below 10000 (Reported by Joshua C. Colp) * ASTERISK-27854 - rtp: Crash in off-nominal case where RTP instance can't be set up (Reported by Lei Fu) * ASTERISK-28059 - PJSIP: Update bundled PJPROJECT to version 2.8 (Reported by Joshua C. Colp) * ASTERISK-27121 - res_pjsip_mwi: Memory leak on reload (Reported by Sergej Kasumovic) * ASTERISK-28047 - chan_pjsip: Declined video stream is added when no video codecs configured and session refresh with removed video stream occurs (Reported by Will) * ASTERISK-28049 - res_pjproject build failure (Reported by Jaco Kroon) * ASTERISK-28034 - chan_sip unstable with TLS after asterisk start or reloads (Reported by David Hajek) * ASTERISK-28029 - [patch] res_musiconhold : music on hold will not start if previous hold just reached end of file (Reported by Frederic LE FOLL) * ASTERISK-28005 - channel.c: ARI ring only once (Reported by Hajek Michal) * ASTERISK-28032 - Realtime queuemembers are not updated during retry phase (Reported by lvl) * ASTERISK-27988 - alembic: PJSIP "mwi_subscribe_replaces_unsolicited" field is integer not boolean (Reported by Joshua C. Colp) * ASTERISK-28020 - res_pjsip_transport_websocket: Properly set 'received' for IPv6 (Reported by Sean Bright) * ASTERISK-28022 - res_pjsip realtime: uri column in ps_contacts table can be too short (Reported by Florian Floimair) Improvements made in this release: ----------------------------------- * ASTERISK-28046 - Remove stale nonoptreq references (Reported by Walter Doekes) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-15.7.0 ----- The Asterisk Development Team would like to announce security releases for Asterisk 15 and 16. The available releases are released as versions 15.6.2 and 16.0.1. These releases are available for immediate download at https://downloads.asterisk.org/pub/telephony/asterisk/releases The following security vulnerabilities were resolved in these versions: There is a buffer overflow vulnerability in dns_srv and dns_naptr functions of Asterisk that allows an attacker to crash Asterisk via a specially crafted DNS SRV or NAPTR response. The attacker???s request causes Asterisk to segfault and crash. For a full list of changes in the current releases, please see the ChangeLogs: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-15.6.2 The security advisory is available at: https://downloads.asterisk.org/pub/security/AST-2018-010.pdf ----- The Asterisk Development Team would like to announce security releases for Asterisk 13, 14 and 15, and Certified Asterisk 13.21. The available releases are released as versions 13.23.1, 14.7.8, 15.6.1 and 13.21-cert3. These releases are available for immediate download at https://downloads.asterisk.org/pub/telephony/asterisk/releases The following security vulnerabilities were resolved in these versions: * AST-2018-009: Remote crash vulnerability in HTTP websocket upgrade There is a stack overflow vulnerability in the res_http_websocket.so module of Asterisk that allows an attacker to crash Asterisk via a specially crafted HTTP request to upgrade the connection to a websocket. The attacker???s request causes Asterisk to run out of stack space and crash. For a full list of changes in the current releases, please see the ChangeLogs: https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-15.6.1 The security advisory is available at: https://downloads.asterisk.org/pub/security/AST-2018-009.pdf ----- The Asterisk Development Team would like to announce the release of Asterisk 15.6.0. This release is available for immediate download at http://downloads.asterisk.org/pub/telephony/asterisk The release of Asterisk 15.6.0 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following issues are resolved in this release: Bugs fixed in this release: ----------------------------------- * ASTERISK-28002 - When T.140 realtime text is negociated, a lot of debug traces are generated (Reported by Emmanuel BUU) * ASTERISK-27881 - PBX calls via chan_sip TCP trunk now get authentification error (Reported by Ian Gilmour) * ASTERISK-28011 - chan_sip: get_refer_info() attempted unlock mutex 'peer' without owning it! (Reported by Alec Davis) * ASTERISK-27944 - res_pjsip_t38: Crash receiving 1xx responses other than 100 before 200 for T.38 reINVITE (Reported by Joshua Elson) * ASTERISK-28007 - rtcp-mux is put in SDP answer regardless of offer (Reported by Torrey Searle) * ASTERISK-27398 - No joint capabilities with video and audio-only streams (Reported by Benjamin Keith Ford) * ASTERISK-27973 - app_queue: QUEUESTATUS = CONTINUE instead LEAVEEMPTY (Reported by Valentin Safonov) * ASTERISK-27997 - pjproject_bundled: Fix for Solaris builds. Do not undef s_addr. (Reported by Alexander Traud) * ASTERISK-27999 - Wrong SRTP use status report (Reported by Salah Ahmed) * ASTERISK-28001 - res_pjsip_registrar: Improve performance of inbound handling (Reported by Joshua Colp) * ASTERISK-27966 - pjsip: Race condition in 183 re transmission can result in a deadlock (Reported by Torrey Searle) * ASTERISK-15331 - make menuselect fails due to undefined symbols (initscr32, w32addch) in menuselect_curses.o (Reported by Majdi Bsoul) * ASTERISK-14935 - [regression] menuselect compilation failure on Solaris 10 (Reported by Samuel Owens) * ASTERISK-12382 - menuselect compilation failure on Solaris 10 / gcc 3.4.3 (Reported by rleasure) * ASTERISK-9107 - menuselect compilation failure on Solaris 10/gcc-4.1.1 (Reported by Bob Atkins) * ASTERISK-27991 - BuildSystem: Enable Jansson in Solaris 11. (Reported by Alexander Traud) * ASTERISK-27548 - res_pjsip_endpoint_identifier_ip only matches against "generic string" headers (Reported by George Joseph) * ASTERISK-27990 - res_rtp_asterisk: Requires OpenSSL in Developer Mode. (Reported by Alexander Traud) * ASTERISK-27591 - Frack errors in stasis.c and memory leakage (Reported by Siruja Maharjan) * ASTERISK-27978 - res_pjsip: Change default transport keepalive to preserve behavior (Reported by Joshua Colp) * ASTERISK-27968 - systemd: asterisk.service (Reported by seanchann.zhou) * ASTERISK-27880 - [patch] pjproject_bundled: Repair ./configure --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27810 - BASIC-RETRANS: Implement receive (Reported by Benjamin Keith Ford) * ASTERISK-27972 - res_sorcery_config: Allow object name based matching (Reported by Joshua Colp) * ASTERISK-25548 - stasis: Improve message type "Use of before init/after destruction" error (Reported by Joshua Colp) * ASTERISK-27967 - srtp: rejecting short sdes lifetimes incompatible with obihai ATAs (Reported by Nick French) * ASTERISK-27961 - res_pjsip: Spurious ERROR logging when printing headers in sip_msg (Reported by Nick French) * ASTERISK-27563 - pjsip modules always get -O2 even when DONT_OPTIMIZE is set (Reported by George Joseph) * ASTERISK-27957 - PJSIP proposes ICE candidates on answer even if not in offer (Reported by Torrey Searle) * ASTERISK-27347 - [patch] pjproject_bundled: Disable TCP/TLS keep-alives. (Reported by Alexander Traud) * ASTERISK-27938 - [patch] Compile fails with `IPTOS_MINCOST' undeclared. (Reported by Alexander Traud) * ASTERISK-27955 - res_pjsip_session: sdp group:BUNDLE attribute truncated (Reported by Kevin Harwell) * ASTERISK-27956 - res_pjsip_pubsub: segfault in function publish_expire (Reported by Alexei Gradinari) * ASTERISK-27949 - res_pjsip_rfc3326: A lot of endpoints do not correctly handle two Reason headers (Reported by Ross Beer) * ASTERISK-27763 - res_pjsip_session: Initial INVITE with audio+fax results in 488 instead of declining stream (Reported by Thiago Coutinho) * ASTERISK-27657 - res_pjsip_t38: ATA fails with hangupcause 58(Bearer capability not available) (Reported by Jared Hull) * ASTERISK-27080 - res_pjsip_t38: Slow T.38 re-invite rejection if remote leg has T.38 disabled (Reported by Torrey Searle) * ASTERISK-26686 - res_pjsip: Lock inversion in transport management (Reported by Ross Beer) * ASTERISK-27939 - [patch] bridge_softmix_binaural: Enable FFTW3 in Solaris 11. (Reported by Alexander Traud) Improvements made in this release: ----------------------------------- * ASTERISK-28006 - PJSIP: Missing "party=calling"/"party=called" in Remote-Party-ID (Reported by Eric Dantie) * ASTERISK-27995 - pjproject_bundled: Find shared libraries in root --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27993 - pjsip_wizard example gives wrong info about unsupported SRV records (Reported by Jonathan Harris) * ASTERISK-27970 - res_rtp_asterisk: T.140 packets containing backspace or end of line are merged with regular text and it causes some UA to break (Reported by Emmanuel BUU) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-15.6.0 ----- The Asterisk Development Team would like to announce the release of Asterisk 15.5.0. This release is available for immediate download at http://downloads.asterisk.org/pub/telephony/asterisk The release of Asterisk 15.5.0 resolves several issues reported by the community and would have not been possible without your participation. Thank you! The following issues are resolved in this release: Security bugs fixed in this release: ----------------------------------- * ASTERISK-27818 - Username bruteforce is possible when using ACL with PJSIP (Reported by John) * ASTERISK-27807 - iostreams: Potential DoS when client connection closed prematurely (Reported by Sean Bright) Bugs fixed in this release: ----------------------------------- * ASTERISK-27783 - res_pjsip_pubsub: apparent crash on shutdown (Reported by Kevin Harwell) * ASTERISK-27870 - app_confbridge: Conference bridge and announcer channels are not removed if conference is ended as soon as it starts (Reported by Robert Mordec) * ASTERISK-27943 - AMI: Action SendText needs to use the correct thread. (Reported by Richard Mudgett) * ASTERISK-27942 - res_pjsip_messaging doesn't accept application/* content-types. (Reported by George Joseph) * ASTERISK-27909 - cdr: Deadlock with submit_scheduled_batch and submit_unscheduled_batch (Reported by Denis Lebedev) * ASTERISK-27936 - res_pjsip_session doesn't update media when a 200 comes in with a different port than a 183 (Reported by George Joseph) * ASTERISK-26987 - pbx_dundi: Asterisk crashes when unloading module pbx_dundi.so with dundi peers (Reported by Kirsty Tyerman) * ASTERISK-27933 - [patch] uuid: Enable UUID in Solaris 11. (Reported by Alexander Traud) * ASTERISK-27625 - channels: CHECK_BLOCKING is ineffective (Reported by Corey Farrell) * ASTERISK-27931 - [patch] BuildSystem: Enable ./configure in Solaris 11. (Reported by Alexander Traud) * ASTERISK-27926 - [patch] bootstrap.sh: find -maxdepth is not POSIX compatible. (Reported by Alexander Traud) * ASTERISK-27903 - menuselect: GCC 8: restrict-qualified parameter passed and aliased. (Reported by Alexander Traud) * ASTERISK-27914 - [patch] tests/test_utils: Repair ./configure --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27705 - chan_iax2: Stops listening for traffic (Reported by Kirsty Tyerman) * ASTERISK-27908 - [patch] crypto.h: Repair ./configure --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27905 - [patch] res_srtp: Repair ./configure --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27888 - SQL fetch error on query which return 0 columns (Reported by Alexei Gradinari) * ASTERISK-27902 - chan_pjsip isn't updating hangupcause on 4XX responses (Reported by George Joseph) * ASTERISK-27901 - [patch] ooh323c: GCC 8: output truncated before terminating nul. (Reported by Alexander Traud) * ASTERISK-27872 - res_pjsip: Modified qualify_frequency doesn't effect until pjsip reload (Reported by Alexei Gradinari) * ASTERISK-27094 - res_fax: Deadlock when using Local channels and fax gateway (Reported by David Brillert) * ASTERISK-27848 - rtp: DTMF Breaks With telephony-event/16000 (Reported by Dominic) * ASTERISK-25261 - Manager events for MeetMe have incorrectly documented key name 'Usernum' - should be 'User' (Reported by Francois Blackburn) * ASTERISK-27878 - [patch] tcptls.h: Repair ./configure --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27876 - [patch] tcptls: Allow OpenSSL configured with no-dh. (Reported by Alexander Traud) * ASTERISK-27874 - [patch] tcptls: Allow OpenSSL 1.1.x configured with enable-ssl3-method no-deprecated. (Reported by Alexander Traud) * ASTERISK-27845 - Codec-Change Re-INVITE during DTMF can cause marker bit error (Reported by Torrey Searle) * ASTERISK-27831 - res_rtp_asterisk: Add support for abs-send-time RTP extension (Reported by Joshua Colp) * ASTERISK-27863 - config/ast_destroy_realtime_fields: successful DELETE is treated as failed (Reported by Alexei Gradinari) * ASTERISK-27865 - [patch]: tcptls: Repair ./configure --with-ssl=PATH. (Reported by Alexander Traud) * ASTERISK-27760 - Asterisk ODBC Voicemail Prompt storage fails with recent MariaDB version. (Reported by Nic Colledge) * ASTERISK-27853 - Incorrect error reported when leaving/retrieving a ODBC voicemail (Reported by Nic Colledge) * ASTERISK-27726 - chan_mobile: presents incorrect inbound Caller-ID names (Reported by Brian) * ASTERISK-27861 - [patch] res_pjsip_endpoint_identifier_ip: Unregister the module for headers. (Reported by Alexander Traud) * ASTERISK-27860 - [patch] res_pjsip: Register pjsip_transport_management not externally but internally. (Reported by Alexander Traud) * ASTERISK-27852 - cli: "manager show settings" mislabels HTTP timeout as being minutes. (Reported by Corey Farrell) * ASTERISK-27824 - Fix issues exposed by GCC 8 (Reported by George Joseph) * ASTERISK-27850 - [patch] rtp_engine: Allow Media Formats with add_static_payload(-1) on egress again. (Reported by Alexander Traud) * ASTERISK-27811 - [patch] sip_to_pjsip: Enable python3 compatibility. (Reported by Alexander Traud) * ASTERISK-27841 - digest over for manager (ami) over http fails on too long uris (Reported by Jaco Kroon) * ASTERISK-26570 - Macro allows an infinite loop of dialplan inclusion resulting in a crash (Reported by Tzafrir Cohen) * ASTERISK-27801 - Asterisk got stuck while enabling "ari set debug all on" (Reported by shaurya jain) * ASTERISK-27795 - chan_sip: one way / no audio with srtp (Reported by Florian Kaiser) * ASTERISK-27800 - One way audio when calling from Asterisk(sip trunk) to another number where both are connected to a SBC using TLS+SRTP (Reported by Artur Pires) * ASTERISK-26806 - pjsip_options: rework to make more efficient (Reported by Kevin Harwell) * ASTERISK-27814 - translate: interpolated frames are not passed through (Reported by Kevin Harwell) * ASTERISK-27812 - When the ooh323 debug is on there is no ringing signal to incoming calls via H323 trunk. (Reported by Dimos) * ASTERISK-26893 - No "alert" or "progress" in chan_ooh323 if debug is enabled only on the module (Reported by Marco Giordani) * ASTERISK-27639 - [patch] BuildSystem: Enable IMAP storage on FreeBSD and DragonFly BSD. (Reported by Alexander Traud) * ASTERISK-27804 - bridge_softmix / app_confbridge: Add support for combining REMB reports (Reported by Joshua Colp) * ASTERISK-27418 - app_confbridge: "core show profile bridge" does not output "sfu" when video_mode is sfu (Reported by Carlos Chavez) * ASTERISK-27808 - [patch] chan_vpb: Avoid GNU old-style field designator extension. (Reported by Alexander Traud) Improvements made in this release: ----------------------------------- * ASTERISK-27929 - [patch] BuildSystem: Enable autotools in Solaris 11. (Reported by Alexander Traud) * ASTERISK-27752 - Ten seconds of silence after mp3 playback (Reported by Sam Wierema) * ASTERISK-27910 - [patch] res_rtp_asterisk: Allow OpenSSL configured with no-deprecated. (Reported by Alexander Traud) * ASTERISK-27906 - [patch] res_crypto: Allow OpenSSL configured with no-deprecated. (Reported by Alexander Traud) * ASTERISK-27877 - app_confbridge: Add talking indicator for ConfBridgeList AMI response (Reported by William McCall) * ASTERISK-27873 - documentation: Error on wiki description of Asterisk 13 "MeetmeMute" event (Reported by Alessandro Polidori) * ASTERISK-27846 - ast_coredumper: Fix OUTPUT directory (Reported by Ted G) * ASTERISK-27867 - [patch] libasteriskssl: Allow OpenSSL 1.0.2 configured with no-deprecated. (Reported by Alexander Traud) * ASTERISK-27796 - res_hep: Allow create_address to resolve a provided hostname (Reported by Sebastian Gutierrez) * ASTERISK-27820 - [patch] Add DragonFly BSD. (Reported by Alexander Traud) * ASTERISK-27793 - cppcheck identifies redundant "if" (Reported by Ilya Shipitsin) For a full list of changes in this release, please see the ChangeLog: http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-15.5.0 To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/comms/asterisk15/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/asterisk15/PLIST \ pkgsrc/comms/asterisk15/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/asterisk15/options.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/asterisk15/patches/patch-Makefile \ pkgsrc/comms/asterisk15/patches/patch-apps_app__queue.c \ pkgsrc/comms/asterisk15/patches/patch-channels_chan__pjsip.c \ pkgsrc/comms/asterisk15/patches/patch-configure \ pkgsrc/comms/asterisk15/patches/patch-funcs_func__env.c \ pkgsrc/comms/asterisk15/patches/patch-main_asterisk.c \ pkgsrc/comms/asterisk15/patches/patch-res_res__pjproject.c \ pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__domain__aliases.c \ pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__global.c \ pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_pjsip__options.c \ pkgsrc/comms/asterisk15/patches/patch-res_res__rtp__asterisk.c cvs rdiff -u -r1.1 -r0 \ pkgsrc/comms/asterisk15/patches/patch-channels_chan__oss.c \ pkgsrc/comms/asterisk15/patches/patch-include_asterisk_endian.h \ pkgsrc/comms/asterisk15/patches/patch-utils_streamplayer.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1610872360168530 Content-Disposition: inline Content-Length: 38816 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/comms/asterisk15/Makefile diff -u pkgsrc/comms/asterisk15/Makefile:1.29 pkgsrc/comms/asterisk15/Makefile:1.30 --- pkgsrc/comms/asterisk15/Makefile:1.29 Thu Nov 5 09:07:38 2020 +++ pkgsrc/comms/asterisk15/Makefile Sun Jan 17 08:32:40 2021 @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.29 2020/11/05 09:07:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2021/01/17 08:32:40 jnemeth 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 +# Also look in ${WRKSRC}/third-party/versions.mak for pjproject -DISTNAME= asterisk-15.4.1 -PKGREVISION= 24 +DISTNAME= asterisk-15.7.4 +#PKGREVISION= 24 CATEGORIES= comms net audio MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ MASTER_SITES+= http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -148,7 +149,7 @@ PLIST.unbound= yes DISTFILES+= asterisk-extra-sounds-en-gsm-1.5.2.tar.gz # pjproject -PJPROJ_VERSION= 2.7.2 +PJPROJ_VERSION= 2.8 SITES.pjproject-${PJPROJ_VERSION}.tar.bz2= \ -https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/${PJPROJ_VERSION}/pjproject-${PJPROJ_VERSION}.tar.bz2 SITES.pjproject-${PJPROJ_VERSION}.md5= \ @@ -290,7 +291,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} -.if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER} == "clang" +.if ${OPSYS} != "Darwin" && ${PKGSRC_COMPILER:Mclang} .include "../../lang/libBlocksRuntime/buildlink3.mk" LDFLAGS+= -L${PREFIX}/lib .endif Index: pkgsrc/comms/asterisk15/PLIST diff -u pkgsrc/comms/asterisk15/PLIST:1.1 pkgsrc/comms/asterisk15/PLIST:1.2 --- pkgsrc/comms/asterisk15/PLIST:1.1 Mon Jul 16 21:53:04 2018 +++ pkgsrc/comms/asterisk15/PLIST Sun Jan 17 08:32:40 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2018/07/16 21:53:04 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -339,11 +339,11 @@ lib/asterisk/modules/format_h263.so lib/asterisk/modules/format_h264.so lib/asterisk/modules/format_ilbc.so lib/asterisk/modules/format_jpeg.so +${PLIST.speex}lib/asterisk/modules/format_ogg_speex.so lib/asterisk/modules/format_pcm.so lib/asterisk/modules/format_siren14.so lib/asterisk/modules/format_siren7.so lib/asterisk/modules/format_sln.so -${PLIST.speex}lib/asterisk/modules/format_ogg_speex.so lib/asterisk/modules/format_vox.so lib/asterisk/modules/format_wav.so lib/asterisk/modules/format_wav_gsm.so Index: pkgsrc/comms/asterisk15/distinfo diff -u pkgsrc/comms/asterisk15/distinfo:1.1 pkgsrc/comms/asterisk15/distinfo:1.2 --- pkgsrc/comms/asterisk15/distinfo:1.1 Mon Jul 16 21:53:04 2018 +++ pkgsrc/comms/asterisk15/distinfo Sun Jan 17 08:32:40 2021 @@ -1,22 +1,22 @@ -$NetBSD: distinfo,v 1.1 2018/07/16 21:53:04 joerg Exp $ +$NetBSD: distinfo,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ -SHA1 (asterisk-15.4.1/asterisk-15.4.1.tar.gz) = 54fbda90840e5a25228fafae67872bdd642c084d -RMD160 (asterisk-15.4.1/asterisk-15.4.1.tar.gz) = cbf26cf02e670ed49416eabf2acd168980fb1804 -SHA512 (asterisk-15.4.1/asterisk-15.4.1.tar.gz) = e4bad97c1804e65a5940a399fe9aaa8fa1c3327be0f5043272c28cb04a9bbd8382b1a4ed8c28a66b1fcb57a756ac4bc97ed3454f1ecc2437f8292e90f3376dc0 -Size (asterisk-15.4.1/asterisk-15.4.1.tar.gz) = 27587819 bytes -SHA1 (asterisk-15.4.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9 -RMD160 (asterisk-15.4.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106 -SHA512 (asterisk-15.4.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d -Size (asterisk-15.4.1/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes -SHA1 (asterisk-15.4.1/pjproject-2.7.2.md5) = c0d375b5372cfbd9d3ef2819c57f2999cd44fb22 -RMD160 (asterisk-15.4.1/pjproject-2.7.2.md5) = f0d33ce6457026506a6d12d90fb753542f9c27c9 -SHA512 (asterisk-15.4.1/pjproject-2.7.2.md5) = 7546b2f76ab27e1465b09b34da71a0c585a08aaf6dc27905b23ec5237763e13d45a5ea21176d4c275bd5de21c36e05dbf6204b0435f8a4d29235027dd7ed5173 -Size (asterisk-15.4.1/pjproject-2.7.2.md5) = 112 bytes -SHA1 (asterisk-15.4.1/pjproject-2.7.2.tar.bz2) = b45a4764a46c4f19ca28110a9db033691d9a5309 -RMD160 (asterisk-15.4.1/pjproject-2.7.2.tar.bz2) = 02eab8b6b688f91f049469e42e5de81b886294ea -SHA512 (asterisk-15.4.1/pjproject-2.7.2.tar.bz2) = 3d355ffcbbeed62cfc711e574a987dc06043ccf4f2625820adffa89167022b8306fcee3fada71d3d45e7b902fc9c65ac8221de101cbafed25362a3921f702afd -Size (asterisk-15.4.1/pjproject-2.7.2.tar.bz2) = 4994233 bytes -SHA1 (patch-Makefile) = 74e65482ee36afedd4b7723be8fbe2c82bc0e797 +SHA1 (asterisk-15.7.4/asterisk-15.7.4.tar.gz) = e2978dffcd8d82de2597ac39d20dd2f5fcee3528 +RMD160 (asterisk-15.7.4/asterisk-15.7.4.tar.gz) = f4d5601871353822d79f195c0b75407ceb5fcff9 +SHA512 (asterisk-15.7.4/asterisk-15.7.4.tar.gz) = fe6fe24daad5b09f2eea1ba8b69a28cdf2149c334038387491fef2215aa2c8051190648f14f3db09b024d80fdfa27b0693289d4e5bdc1fbe4733eed94893f79b +Size (asterisk-15.7.4/asterisk-15.7.4.tar.gz) = 27592178 bytes +SHA1 (asterisk-15.7.4/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9 +RMD160 (asterisk-15.7.4/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106 +SHA512 (asterisk-15.7.4/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d +Size (asterisk-15.7.4/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes +SHA1 (asterisk-15.7.4/pjproject-2.8.md5) = 17d1316b036742ece5f7f7a2393d5580e8b5e454 +RMD160 (asterisk-15.7.4/pjproject-2.8.md5) = 251b49688d3d8b83b97880abbdcf7f4978336bb5 +SHA512 (asterisk-15.7.4/pjproject-2.8.md5) = ac3ceac0c279a00de6098476346dcbdfd3b24f7be9f93746162ed5ead265ac20e58731d3fd6c23348fa92d2e635ddf932ddfaecf98a79e0a26a6eb717d122a36 +Size (asterisk-15.7.4/pjproject-2.8.md5) = 107 bytes +SHA1 (asterisk-15.7.4/pjproject-2.8.tar.bz2) = 7366fb16b082f449dec34dbe1fd3ee82ffd81290 +RMD160 (asterisk-15.7.4/pjproject-2.8.tar.bz2) = 515f2cf7fd48ea9a541aff49c815ef004b085c07 +SHA512 (asterisk-15.7.4/pjproject-2.8.tar.bz2) = 0a0ee66932959710f806cb1d88a3b946b214d2caecd54ecc9eabdbdb17f7f4fa0b7d27567dc3796d845a25b850c974536e7c7538d51f93771d13dd2fd309eaf5 +Size (asterisk-15.7.4/pjproject-2.8.tar.bz2) = 4976501 bytes +SHA1 (patch-Makefile) = 57220de5746364db229e5f7b54af8794cbf4a166 SHA1 (patch-addons_chan__ooh323.c) = 1775da7ca2129a962ed460bd1e78ba3ce6afa62c SHA1 (patch-apps_app__adsiprog.c) = 031139e5cd1ef6bb2afb0a74fee3d752eded0a2c SHA1 (patch-apps_app__chanspy.c) = 29a807909645c1ad0c8f81b6513a284b978e7c47 @@ -24,29 +24,27 @@ SHA1 (patch-apps_app__directory.c) = 889 SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10 SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695 SHA1 (patch-apps_app__minivm.c) = 22ee6ebfbe205baf0acf46ab16c94fea1750f2fb -SHA1 (patch-apps_app__queue.c) = 89a14825792f8ee6bc4c235fc9732ecb342449c9 +SHA1 (patch-apps_app__queue.c) = 03051f924b52cdb7ab69959740ff3efee15b78b1 SHA1 (patch-apps_app__sms.c) = ad65b3cb2a30489551101f7534c691cd1155d18f SHA1 (patch-apps_app__voicemail.c) = bee10453a86039a99db9df644585800f347aaace SHA1 (patch-build__tools_mkpkgconfig) = 7fab8fcf46d9f8a3b98455674fec6307ec472b23 SHA1 (patch-cdr_cdr__pgsql.c) = 82b002a1f5ed3b7361a98e2bffb5cea8833949b8 SHA1 (patch-cel_cel__pgsql.c) = b280efab2b035ce60be268bac9bc8824910b2b8f -SHA1 (patch-channels_chan__oss.c) = 64e45a57e99046597cdadd31c30db45032657df1 -SHA1 (patch-channels_chan__pjsip.c) = 8450fe50b7b7ea2c41737930fef4c4480c8efb66 +SHA1 (patch-channels_chan__pjsip.c) = efd4cbb82133fc5ddf7de70d01c99e185c585211 SHA1 (patch-channels_chan__sip.c) = ed285612eae6cbfde19ded87db9360c0bca153c7 SHA1 (patch-channels_pjsip_cli__commands.c) = 01baa9d242e3af02a1f3540cfb3064ad68c71d67 SHA1 (patch-channels_pjsip_dialplan__functions.c) = 2cf8199c4ec9d4894eb922c2703d49ecc06188ef -SHA1 (patch-configure) = ea2daa50074d12bf0a0edef07a61e1ac7c85efde +SHA1 (patch-configure) = 9af6b9735e2be12cb7caa03ada623d2b6e971c22 SHA1 (patch-configure.ac) = 411ba9ca8242e28ef5d35ad77a0f5fa9d6dba564 SHA1 (patch-contrib_scripts_vmail.cgi) = 7935ce96ea319eb19cc2ce999813eb837d5357c0 SHA1 (patch-funcs_func__cdr.c) = 79c743df264948e5ea9e1c292012a1f6362d0c1e SHA1 (patch-funcs_func__channel.c) = 9d6ed8a2431fbde6879782d8228030467aabe7eb -SHA1 (patch-funcs_func__env.c) = d9cf08d606c7d5b748f6ae12fd66455a3d30cbf8 +SHA1 (patch-funcs_func__env.c) = 9305d4dde2509f689e676295d3eb06bf5a74b3cb SHA1 (patch-funcs_func__pjsip__aor.c) = 9874f8d66a8afd26ae1669aa727cb5fa2a788334 SHA1 (patch-funcs_func__pjsip__contact.c) = 9b1fa54ee31a549be40d487c650cc79d625c8092 SHA1 (patch-funcs_func__pjsip__endpoint.c) = 263a4bdb6365bcc9f6392d25a5aef5c607e59d04 SHA1 (patch-funcs_func__strings.c) = 08d313add57c5be822a19311fc70a7555bd63877 SHA1 (patch-include_asterisk_autoconfig.h.in) = 23807b08b94f5cf9c2de76c2928f7ae38997d006 -SHA1 (patch-include_asterisk_endian.h) = 1fc20d750da7d0a0407c1e1694b8bb21753acdcd SHA1 (patch-include_asterisk_lock.h) = ce636ef6102a2a95600cfc8215305507e08fe8f9 SHA1 (patch-include_asterisk_sha1.h) = 9b233ef82b50b8d94177616e1382991656ce1ebf SHA1 (patch-include_asterisk_strings.h) = 9ace78a13131bcb411eda79a98264b5cfcc7789c @@ -55,7 +53,7 @@ SHA1 (patch-main_acl.c) = 06a9d247b19d64 SHA1 (patch-main_app.c) = 1c12bb207dcb0060017d63ba4f11fcf63d60a45e SHA1 (patch-main_ast__expr2.c) = bad644eb956645e889344810ec315afd430853be SHA1 (patch-main_ast__expr2.y) = 56ac74b5a3ae47bd5bec798e549ec43bd085e0e8 -SHA1 (patch-main_asterisk.c) = e0b89d10d0a4815ad9d608fd785b62acf189be42 +SHA1 (patch-main_asterisk.c) = 1262d792f330fe8a1bb1d1f7ba51bc502d65be42 SHA1 (patch-main_astmm.c) = 26a98d6fbb567ae619041ebd01a31349a847deab SHA1 (patch-main_bridge__basic.c) = b48627e563e20544017fdfcfb4559e868badf41d SHA1 (patch-main_callerid.c) = 0ea1b3df8aaf3969fcd9e06055c8e6184d50d3d3 @@ -89,7 +87,7 @@ SHA1 (patch-res_res__calendar__icalendar SHA1 (patch-res_res__hep__pjsip.c) = b0c8fed52451ec31a2c77d4abd28640631bb708c SHA1 (patch-res_res__limit.c) = e80f370fe5b84dcdc2f38e2137d5ed6f75ba35a4 SHA1 (patch-res_res__musiconhold.c) = 2396c344aa0383e694631eedcca7655147bca8ab -SHA1 (patch-res_res__pjproject.c) = d72c6fd3696872e5cae55b9b32dc2d813079a620 +SHA1 (patch-res_res__pjproject.c) = 0326bf12d9f798c8eae2eff4fad8b86d4bbc0589 SHA1 (patch-res_res__pjsip.c) = d287cdb4823e81d41ea3fb28eea433db76e66bec SHA1 (patch-res_res__pjsip__acl.c) = 8a83ce62fa07f48d2437c27fed41eb57aa827809 SHA1 (patch-res_res__pjsip__authenticator__digest.c) = e8591364ef3489f6200e66091be7d45c5aa228d5 @@ -134,8 +132,8 @@ SHA1 (patch-res_res__pjsip__t38.c) = e30 SHA1 (patch-res_res__pjsip__transport__websocket.c) = f74adcd9c193acfe9744d49ae4248b806499c07e SHA1 (patch-res_res__pjsip__xpidf__body__generator.c) = 27eb80e19aafefd2966baff800a21ffaca0e250d SHA1 (patch-res_res__pjsip_config__auth.c) = bf56ad74af5525544a3f77268c9e0884f8e8a574 -SHA1 (patch-res_res__pjsip_config__domain__aliases.c) = 45ddbb599e4e0afd45eb3994e6b623f64da60399 -SHA1 (patch-res_res__pjsip_config__global.c) = aca854cc1a84be76308885e47e11f2e8dcde3e5d +SHA1 (patch-res_res__pjsip_config__domain__aliases.c) = 65eea0261c9e769b428a8925415e38f061099620 +SHA1 (patch-res_res__pjsip_config__global.c) = 28e088302ce4cbe46a9b321d3e089d3a99b08f50 SHA1 (patch-res_res__pjsip_config__system.c) = b7e57c35ec71931c75cbf3300e4bbc18f1a8e32e SHA1 (patch-res_res__pjsip_config__transport.c) = c269cda08565abd0df0df43400b5bc293cb53514 SHA1 (patch-res_res__pjsip_location.c) = 4d34085251f168147709994acd625da90d5e1fc4 @@ -144,7 +142,7 @@ SHA1 (patch-res_res__pjsip_pjsip__config SHA1 (patch-res_res__pjsip_pjsip__distributor.c) = ee53596e5b83432900bca92eade9c4b46c4ea4e9 SHA1 (patch-res_res__pjsip_pjsip__global__headers.c) = 2d6ce3c4fdec88c6408e46fd117069dba2b2e209 SHA1 (patch-res_res__pjsip_pjsip__message__filter.c) = cb3942bf6cd642b1ac491eefc356ad912719290c -SHA1 (patch-res_res__pjsip_pjsip__options.c) = a585f4ad6ad8b547239c5a3666b9fb9643c5e02f +SHA1 (patch-res_res__pjsip_pjsip__options.c) = a016064904b4e663b713f5555778e327baeabb42 SHA1 (patch-res_res__pjsip_pjsip__resolver.c) = a237411f2cdfe264b25e99db72182c80f741fb09 SHA1 (patch-res_res__pjsip_pjsip__scheduler.c) = 1993e266411217b702da4365d50c2cb80bfd6045 SHA1 (patch-res_res__pjsip_pjsip__session.c) = 58092107a59b3c7a9078759e468a9d548005fe4a @@ -152,7 +150,7 @@ SHA1 (patch-res_res__pjsip_pjsip__transp SHA1 (patch-res_res__pjsip_pjsip__transport__management.c) = 43949821170fd2c10826a4121e98b96fedb9eb85 SHA1 (patch-res_res__pjsip_presence__xml.c) = bf1870287d0940d77a94c06ca8ef5f499453439c SHA1 (patch-res_res__pjsip_security__events.c) = 423c2820dc190b2f7476433cd6abc9daf0980dac -SHA1 (patch-res_res__rtp__asterisk.c) = 10cd3c4c8d82d51c074d4d1433d3d0d8ff9ddd9f +SHA1 (patch-res_res__rtp__asterisk.c) = 874c2f6d388beaa0d84ec76c65173bfd83ab04d7 SHA1 (patch-res_res__xmpp.c) = eca0915ac537e4a5a0bdded8e2c10cf23538ff71 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54 SHA1 (patch-tests_test__locale.c) = f3f1edc86356f2a7b4d3493433c772e164c77f66 @@ -161,4 +159,3 @@ SHA1 (patch-utils_Makefile) = 4b4be483c2 SHA1 (patch-utils_db1-ast_include_db.h) = 03b43353b7967f999ace3eb160828c530e2e8fae SHA1 (patch-utils_extconf.c) = f35d079c4801fe20132ff52d63d951d9e1658902 SHA1 (patch-utils_smsq.c) = 5c4cd729f1c9cb68291c514a2e54418e9b5a47cb -SHA1 (patch-utils_streamplayer.c) = a5bbff91d87f017143c57ae39d4fac5cda20f584 Index: pkgsrc/comms/asterisk15/options.mk diff -u pkgsrc/comms/asterisk15/options.mk:1.3 pkgsrc/comms/asterisk15/options.mk:1.4 --- pkgsrc/comms/asterisk15/options.mk:1.3 Thu May 21 14:25:59 2020 +++ pkgsrc/comms/asterisk15/options.mk Sun Jan 17 08:32:40 2021 @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.3 2020/05/21 14:25:59 rillig Exp $ +# $NetBSD: options.mk,v 1.4 2021/01/17 08:32:40 jnemeth Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= x11 unixodbc ilbc webvmail ldap spandsp PKG_SUPPORTED_OPTIONS+= jabber speex snmp pgsql asterisk-config PKG_OPTIONS_LEGACY_OPTS+= gtk:x11 -PKG_SUGGESTED_OPTIONS= ldap jabber speex asterisk-config unixodbc ilbc webvmail spandsp snmp pgsql +PKG_SUGGESTED_OPTIONS= ldap jabber speex asterisk-config .include "../../mk/bsd.options.mk" @@ -70,6 +70,7 @@ post-configure: ${ECHO} "MENUSELECT_CHANNELS=-chan_mgcp" >> ${WRKSRC}/pkgsrc.makeopts .endif ${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts + ${ECHO} "MENUSELECT_CFLAGS=-BUILD_NATIVE" >> ${WRKSRC}/pkgsrc.makeopts # this is a hack to work around a bug in menuselect cd ${WRKSRC} && make menuselect.makeopts Index: pkgsrc/comms/asterisk15/patches/patch-Makefile diff -u pkgsrc/comms/asterisk15/patches/patch-Makefile:1.1 pkgsrc/comms/asterisk15/patches/patch-Makefile:1.2 --- pkgsrc/comms/asterisk15/patches/patch-Makefile:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-Makefile Sun Jan 17 08:32:40 2021 @@ -1,6 +1,6 @@ -$NetBSD: patch-Makefile,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-Makefile,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- Makefile.orig 2018-05-01 20:12:26.000000000 +0000 +--- Makefile.orig 2019-09-05 13:09:20.000000000 +0000 +++ Makefile @@ -145,7 +145,7 @@ DEBUG=-g3 @@ -44,13 +44,13 @@ $NetBSD: patch-Makefile,v 1.1 2018/07/16 @@ -767,7 +760,7 @@ upgrade: bininstall # (2) the extension to strip off define INSTALL_CONFIGS - @for x in configs/$(1)/*$(2); do \ + @for x in $(1)/*$(2); do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \ + dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x $(2)`"; \ if [ -f "$${dst}" ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s "$${dst}" "$$x" ; then \ -@@ -796,24 +789,24 @@ define INSTALL_CONFIGS +@@ -796,9 +789,9 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -63,6 +63,7 @@ $NetBSD: patch-Makefile,v 1.1 2018/07/16 fi endef +@@ -813,15 +806,15 @@ install-configs: # XXX why *.adsi is installed first ? adsi: @echo Installing adsi config files... @@ -81,7 +82,7 @@ $NetBSD: patch-Makefile,v 1.1 2018/07/16 done samples: adsi -@@ -846,7 +839,7 @@ basic-pbx: +@@ -854,7 +847,7 @@ basic-pbx: webvmail: @[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) @[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) @@ -90,7 +91,7 @@ $NetBSD: patch-Makefile,v 1.1 2018/07/16 $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk" for x in images/*.gif; do \ $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \ -@@ -896,11 +889,11 @@ endif +@@ -904,11 +897,11 @@ endif endif install-logrotate: @@ -105,7 +106,7 @@ $NetBSD: patch-Makefile,v 1.1 2018/07/16 rm -f contrib/scripts/asterisk.logrotate.tmp config: -@@ -1024,7 +1017,7 @@ uninstall-all: _uninstall +@@ -1032,7 +1025,7 @@ uninstall-all: _uninstall rm -rf "$(DESTDIR)$(ASTVARLIBDIR)" rm -rf "$(DESTDIR)$(ASTDATADIR)" rm -rf "$(DESTDIR)$(ASTSPOOLDIR)" @@ -114,9 +115,9 @@ $NetBSD: patch-Makefile,v 1.1 2018/07/16 rm -rf "$(DESTDIR)$(ASTLOGDIR)" menuconfig: menuselect -@@ -1112,6 +1105,7 @@ check-alembic: makeopts - @ALEMBIC=$(ALEMBIC) build_tools/make_check_alembic config cdr voicemail >&2 +@@ -1121,6 +1114,7 @@ check-alembic: makeopts + .PHONY: install-configs .PHONY: menuselect +.PHONY: menuselect.makeopts .PHONY: main Index: pkgsrc/comms/asterisk15/patches/patch-apps_app__queue.c diff -u pkgsrc/comms/asterisk15/patches/patch-apps_app__queue.c:1.1 pkgsrc/comms/asterisk15/patches/patch-apps_app__queue.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-apps_app__queue.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-apps_app__queue.c Sun Jan 17 08:32:40 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-apps_app__queue.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-apps_app__queue.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- apps/app_queue.c.orig 2018-05-01 20:12:26.000000000 +0000 +--- apps/app_queue.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ apps/app_queue.c -@@ -2307,7 +2307,7 @@ static int get_member_status(struct call +@@ -2308,7 +2308,7 @@ static int get_member_status(struct call ast_debug(4, "%s is unavailable because he is paused'\n", member->membername); break; } else if ((conditions & QUEUE_EMPTY_WRAPUP) && member->lastcall && q->wrapuptime && (time(NULL) - q->wrapuptime < member->lastcall)) { @@ -11,7 +11,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 break; } else { ao2_ref(member, -1); -@@ -5549,7 +5549,7 @@ static int wait_our_turn(struct queue_en +@@ -5550,7 +5550,7 @@ static int wait_our_turn(struct queue_en if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->raise_penalty, qe->parent->leavewhenempty, 0))) { *reason = QUEUE_LEAVEEMPTY; @@ -20,7 +20,18 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 res = -1; qe->handled = -1; break; -@@ -6934,8 +6934,8 @@ static int try_calling(struct queue_ent +@@ -5810,8 +5810,8 @@ static void queue_agent_cb(void *userdat + } else if (ast_channel_agent_logoff_type() == stasis_message_type(msg)) { + ast_queue_log("NONE", agent_blob->snapshot->uniqueid, + ast_json_string_get(ast_json_object_get(agent_blob->blob, "agent")), +- "AGENTLOGOFF", "%s|%ld", agent_blob->snapshot->name, +- (long) ast_json_integer_get(ast_json_object_get(agent_blob->blob, "logintime"))); ++ "AGENTLOGOFF", "%s|%jd", agent_blob->snapshot->name, ++ (intmax_t) ast_json_integer_get(ast_json_object_get(agent_blob->blob, "logintime"))); + } + } + +@@ -6938,8 +6938,8 @@ static int try_calling(struct queue_ent /* if setinterfacevar is defined, make member variables available to the channel */ /* use pbx_builtin_setvar to set a load of variables with one call */ if (qe->parent->setinterfacevar && interfacevar) { @@ -31,7 +42,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 pbx_builtin_setvar_multiple(qe->chan, ast_str_buffer(interfacevar)); pbx_builtin_setvar_multiple(peer, ast_str_buffer(interfacevar)); } -@@ -6943,8 +6943,8 @@ static int try_calling(struct queue_ent +@@ -6947,8 +6947,8 @@ static int try_calling(struct queue_ent /* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */ /* use pbx_builtin_setvar to set a load of variables with one call */ if (qe->parent->setqueueentryvar && interfacevar) { @@ -42,7 +53,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 pbx_builtin_setvar_multiple(qe->chan, ast_str_buffer(interfacevar)); pbx_builtin_setvar_multiple(peer, ast_str_buffer(interfacevar)); } -@@ -8205,8 +8205,8 @@ static int queue_exec(struct ast_channel +@@ -8209,8 +8209,8 @@ static int queue_exec(struct ast_channel } } @@ -53,7 +64,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 qe.chan = chan; qe.prio = prio; -@@ -8257,8 +8257,8 @@ check_turns: +@@ -8261,8 +8261,8 @@ check_turns: record_abandoned(&qe); reason = QUEUE_TIMEOUT; res = 0; @@ -64,7 +75,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 break; } -@@ -8328,7 +8328,7 @@ check_turns: +@@ -8332,7 +8332,7 @@ check_turns: record_abandoned(&qe); reason = QUEUE_TIMEOUT; res = 0; @@ -73,18 +84,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 break; } -@@ -8356,8 +8356,8 @@ stop: - if (!qe.handled) { - record_abandoned(&qe); - ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON", -- "%d|%d|%ld", qe.pos, qe.opos, -- (long) (time(NULL) - qe.start)); -+ "%d|%d|%jd", qe.pos, qe.opos, -+ (intmax_t) (time(NULL) - qe.start)); - res = -1; - } else if (qcontinue) { - reason = QUEUE_CONTINUE; -@@ -8368,7 +8368,7 @@ stop: +@@ -8373,7 +8373,7 @@ stop: } } else if (qe.valid_digits) { ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "EXITWITHKEY", @@ -93,7 +93,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 } } -@@ -9631,9 +9631,9 @@ static char *__queues_show(struct manses +@@ -9636,9 +9636,9 @@ static char *__queues_show(struct manses do_print(s, fd, " Callers: "); for (qe = q->head; qe; qe = qe->next) { @@ -106,7 +106,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 do_print(s, fd, ast_str_buffer(out)); } } -@@ -9672,7 +9672,7 @@ static int word_in_list(const char *list +@@ -9677,7 +9677,7 @@ static int word_in_list(const char *list const char *find, *end_find, *end_list; /* strip whitespace from front */ @@ -115,7 +115,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 list++; } -@@ -9681,11 +9681,11 @@ static int word_in_list(const char *list +@@ -9686,11 +9686,11 @@ static int word_in_list(const char *list if (find != list && *(find - 1) != ' ') { list = find; /* strip word from front */ @@ -129,7 +129,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 list++; } continue; -@@ -9698,11 +9698,11 @@ static int word_in_list(const char *list +@@ -9703,11 +9703,11 @@ static int word_in_list(const char *list if (end_find == end_list || *end_find != ' ') { list = find; /* strip word from front */ @@ -143,7 +143,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 list++; } continue; -@@ -9994,7 +9994,7 @@ static int manager_queues_status(struct +@@ -9999,7 +9999,7 @@ static int manager_queues_status(struct "CallerIDName: %s\r\n" "ConnectedLineNum: %s\r\n" "ConnectedLineName: %s\r\n" @@ -152,7 +152,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.1 2 "Priority: %d\r\n" "%s" "\r\n", -@@ -10003,7 +10003,7 @@ static int manager_queues_status(struct +@@ -10008,7 +10008,7 @@ static int manager_queues_status(struct S_COR(ast_channel_caller(qe->chan)->id.name.valid, ast_channel_caller(qe->chan)->id.name.str, "unknown"), S_COR(ast_channel_connected(qe->chan)->id.number.valid, ast_channel_connected(qe->chan)->id.number.str, "unknown"), S_COR(ast_channel_connected(qe->chan)->id.name.valid, ast_channel_connected(qe->chan)->id.name.str, "unknown"), Index: pkgsrc/comms/asterisk15/patches/patch-channels_chan__pjsip.c diff -u pkgsrc/comms/asterisk15/patches/patch-channels_chan__pjsip.c:1.1 pkgsrc/comms/asterisk15/patches/patch-channels_chan__pjsip.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-channels_chan__pjsip.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-channels_chan__pjsip.c Sun Jan 17 08:32:40 2021 @@ -1,6 +1,6 @@ -$NetBSD: patch-channels_chan__pjsip.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-channels_chan__pjsip.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- channels/chan_pjsip.c.orig 2018-06-20 14:36:49.919764716 +0000 +--- channels/chan_pjsip.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ channels/chan_pjsip.c @@ -34,10 +34,6 @@ @@ -13,9 +13,9 @@ $NetBSD: patch-channels_chan__pjsip.c,v #include "asterisk/lock.h" #include "asterisk/channel.h" #include "asterisk/module.h" -@@ -62,10 +58,14 @@ - #include "asterisk/pickup.h" +@@ -63,10 +59,14 @@ #include "asterisk/test.h" + #include "asterisk/message.h" -#include "asterisk/res_pjsip.h" -#include "asterisk/res_pjsip_session.h" Index: pkgsrc/comms/asterisk15/patches/patch-configure diff -u pkgsrc/comms/asterisk15/patches/patch-configure:1.1 pkgsrc/comms/asterisk15/patches/patch-configure:1.2 --- pkgsrc/comms/asterisk15/patches/patch-configure:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-configure Sun Jan 17 08:32:40 2021 @@ -1,36 +1,23 @@ -$NetBSD: patch-configure,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-configure,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- configure.orig 2018-05-01 20:12:26.000000000 +0000 +--- configure.orig 2019-09-05 13:09:20.000000000 +0000 +++ configure -@@ -9089,12 +9089,12 @@ else +@@ -9127,12 +9127,12 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang -fblocks" >&5 $as_echo_n "checking for clang -fblocks... " >&6; } -- if test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then -+ if test "`echo "int main(){return ^{return 42;}();}" | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c - 2>&1`" = ""; then +- if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c - 2>&1`" = ""; then ++ if test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c - 2>&1`" = ""; then AST_CLANG_BLOCKS_LIBS="" AST_CLANG_BLOCKS="-Wno-unknown-warning-option -fblocks" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -- elif test "`echo "int main(){return ^{return 42;}();}" | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then -+ elif test "`echo "int main(){return ^{return 42;}();}" | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then +- elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then ++ elif test "`echo 'int main(){return ^{return 42;}();}' | ${CC} ${LDFLAGS} -o /dev/null -fblocks -x c -lBlocksRuntime - 2>&1`" = ""; then AST_CLANG_BLOCKS_LIBS="-lBlocksRuntime" AST_CLANG_BLOCKS="-fblocks" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -9230,10 +9230,10 @@ $as_echo "configuring" >&6; } - - this_host=$(./config.sub $(./config.guess)) - if test "$build" != "$this_host" ; then -- PJPROJECT_CONFIGURE_OPTS+=" --build=$build" -+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --build=$build" - fi - if test "$host" != "$this_host" ; then -- PJPROJECT_CONFIGURE_OPTS+=" --host=$host" -+ PJPROJECT_CONFIGURE_OPTS="${PJPROJECT_CONFIGURE_OPTS} --host=$host" - fi - - export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP -@@ -15006,7 +15006,7 @@ fi +@@ -15352,7 +15352,7 @@ fi done @@ -39,7 +26,7 @@ $NetBSD: patch-configure,v 1.1 2018/07/1 if test "x$ac_cv_header_sys_poll_h" = xyes; then : else -@@ -17021,7 +17021,7 @@ fi +@@ -17367,7 +17367,7 @@ fi done @@ -48,7 +35,7 @@ $NetBSD: patch-configure,v 1.1 2018/07/1 do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -17256,7 +17256,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -17602,7 +17602,7 @@ rm -f core conftest.err conftest.$ac_obj LDFLAGS=${old_LDFLAGS} rm -f conftest.dynamics @@ -57,7 +44,7 @@ $NetBSD: patch-configure,v 1.1 2018/07/1 if test "x$ac_cv_header_sys_poll_h" = xyes; then : HAS_POLL=1 -@@ -19454,6 +19454,148 @@ fi +@@ -19813,6 +19813,148 @@ fi @@ -206,7 +193,7 @@ $NetBSD: patch-configure,v 1.1 2018/07/1 # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -@@ -20680,6 +20822,8 @@ $as_echo_n "checking for getifaddrs() su +@@ -20917,6 +21059,8 @@ $as_echo_n "checking for getifaddrs() su cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Index: pkgsrc/comms/asterisk15/patches/patch-funcs_func__env.c diff -u pkgsrc/comms/asterisk15/patches/patch-funcs_func__env.c:1.1 pkgsrc/comms/asterisk15/patches/patch-funcs_func__env.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-funcs_func__env.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-funcs_func__env.c Sun Jan 17 08:32:40 2021 @@ -1,16 +1,7 @@ -$NetBSD: patch-funcs_func__env.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-funcs_func__env.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- funcs/func_env.c.orig 2018-05-01 20:12:26.000000000 +0000 +--- funcs/func_env.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ funcs/func_env.c -@@ -307,7 +307,7 @@ static int stat_read(struct ast_channel - snprintf(buf, len, "%d", (int) s.st_ctime); - break; - case 'm': -- snprintf(buf, len, "%o", s.st_mode); -+ snprintf(buf, len, "%o", (unsigned int) s.st_mode); - break; - } - } @@ -408,11 +408,11 @@ static int file_count_line(struct ast_ch AST_STANDARD_APP_ARGS(args, data); Index: pkgsrc/comms/asterisk15/patches/patch-main_asterisk.c diff -u pkgsrc/comms/asterisk15/patches/patch-main_asterisk.c:1.1 pkgsrc/comms/asterisk15/patches/patch-main_asterisk.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-main_asterisk.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-main_asterisk.c Sun Jan 17 08:32:40 2021 @@ -1,16 +1,7 @@ -$NetBSD: patch-main_asterisk.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-main_asterisk.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- main/asterisk.c.orig 2018-05-01 20:12:26.000000000 +0000 +--- main/asterisk.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ main/asterisk.c -@@ -170,7 +170,7 @@ - #include - #include - #include --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__DragonFly__) - #include - #endif - #if defined(HAVE_SWAPCTL) @@ -852,7 +852,7 @@ int64_t ast_mark(int i, int startstop) #define DEFINE_PROFILE_MIN_MAX_VALUES min = 0; \ max = prof_data->entries;\ Index: pkgsrc/comms/asterisk15/patches/patch-res_res__pjproject.c diff -u pkgsrc/comms/asterisk15/patches/patch-res_res__pjproject.c:1.1 pkgsrc/comms/asterisk15/patches/patch-res_res__pjproject.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-res_res__pjproject.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-res_res__pjproject.c Sun Jan 17 08:32:40 2021 @@ -1,15 +1,15 @@ -$NetBSD: patch-res_res__pjproject.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-res_res__pjproject.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- res/res_pjproject.c.orig 2018-06-20 14:49:55.032949063 +0000 +--- res/res_pjproject.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ res/res_pjproject.c -@@ -99,18 +99,19 @@ +@@ -99,20 +99,22 @@ #include "asterisk.h" #include -#include -#include -#include -- + #include "asterisk/options.h" #include "asterisk/logger.h" #include "asterisk/module.h" @@ -17,6 +17,8 @@ $NetBSD: patch-res_res__pjproject.c,v 1. -#include "asterisk/res_pjproject.h" #include "asterisk/vector.h" #include "asterisk/sorcery.h" + #include "asterisk/test.h" + #include "asterisk/netsock2.h" +#include +#include Index: pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__domain__aliases.c diff -u pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__domain__aliases.c:1.1 pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__domain__aliases.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__domain__aliases.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__domain__aliases.c Sun Jan 17 08:32:40 2021 @@ -1,16 +1,17 @@ -$NetBSD: patch-res_res__pjsip_config__domain__aliases.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-res_res__pjsip_config__domain__aliases.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- res/res_pjsip/config_domain_aliases.c.orig 2018-06-20 15:08:56.215815643 +0000 +--- res/res_pjsip/config_domain_aliases.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ res/res_pjsip/config_domain_aliases.c -@@ -18,12 +18,13 @@ +@@ -17,14 +17,14 @@ + */ #include "asterisk.h" - +#include "asterisk/logger.h" +#include "asterisk/sorcery.h" -+ - #include "pjsip.h" - #include "pjlib.h" + + #include + #include + #include "asterisk/res_pjsip.h" #include "include/res_pjsip_private.h" -#include "asterisk/logger.h" Index: pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__global.c diff -u pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__global.c:1.1 pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__global.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__global.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_config__global.c Sun Jan 17 08:32:40 2021 @@ -1,6 +1,6 @@ -$NetBSD: patch-res_res__pjsip_config__global.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-res_res__pjsip_config__global.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- res/res_pjsip/config_global.c.orig 2018-06-20 15:12:19.176643964 +0000 +--- res/res_pjsip/config_global.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ res/res_pjsip/config_global.c @@ -17,16 +17,16 @@ */ @@ -22,4 +22,4 @@ $NetBSD: patch-res_res__pjsip_config__gl +#include "include/res_pjsip_private.h" #define DEFAULT_MAX_FORWARDS 70 - #define DEFAULT_KEEPALIVE_INTERVAL 0 + #define DEFAULT_KEEPALIVE_INTERVAL 90 Index: pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_pjsip__options.c diff -u pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_pjsip__options.c:1.1 pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_pjsip__options.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_pjsip__options.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-res_res__pjsip_pjsip__options.c Sun Jan 17 08:32:40 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-res_res__pjsip_pjsip__options.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-res_res__pjsip_pjsip__options.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- res/res_pjsip/pjsip_options.c.orig 2018-06-20 15:12:53.179204973 +0000 +--- res/res_pjsip/pjsip_options.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ res/res_pjsip/pjsip_options.c -@@ -18,11 +18,6 @@ +@@ -19,11 +19,6 @@ #include "asterisk.h" @@ -14,12 +14,13 @@ $NetBSD: patch-res_res__pjsip_pjsip__opt #include "asterisk/channel.h" #include "asterisk/pbx.h" #include "asterisk/astobj2.h" -@@ -30,9 +25,15 @@ +@@ -31,10 +26,16 @@ #include "asterisk/time.h" #include "asterisk/test.h" #include "asterisk/statsd.h" -#include "include/res_pjsip_private.h" #include "asterisk/taskprocessor.h" + #include "asterisk/threadpool.h" +#include +#include @@ -28,6 +29,6 @@ $NetBSD: patch-res_res__pjsip_pjsip__opt +#include "asterisk/res_pjsip.h" +#include "include/res_pjsip_private.h" + - #define DEFAULT_LANGUAGE "en" - #define DEFAULT_ENCODING "text/plain" - #define QUALIFIED_BUCKETS 211 + /* + * This implementation for OPTIONS support is based around the idea + * that realistically an AOR generally has very few contacts and is Index: pkgsrc/comms/asterisk15/patches/patch-res_res__rtp__asterisk.c diff -u pkgsrc/comms/asterisk15/patches/patch-res_res__rtp__asterisk.c:1.1 pkgsrc/comms/asterisk15/patches/patch-res_res__rtp__asterisk.c:1.2 --- pkgsrc/comms/asterisk15/patches/patch-res_res__rtp__asterisk.c:1.1 Mon Jul 16 21:53:05 2018 +++ pkgsrc/comms/asterisk15/patches/patch-res_res__rtp__asterisk.c Sun Jan 17 08:32:40 2021 @@ -1,9 +1,9 @@ -$NetBSD: patch-res_res__rtp__asterisk.c,v 1.1 2018/07/16 21:53:05 joerg Exp $ +$NetBSD: patch-res_res__rtp__asterisk.c,v 1.2 2021/01/17 08:32:40 jnemeth Exp $ ---- res/res_rtp_asterisk.c.orig 2018-06-20 15:19:48.478113854 +0000 +--- res/res_rtp_asterisk.c.orig 2019-09-05 13:09:20.000000000 +0000 +++ res/res_rtp_asterisk.c -@@ -46,13 +46,6 @@ - #include +@@ -56,13 +56,6 @@ + #endif #endif -#ifdef HAVE_PJPROJECT @@ -16,7 +16,7 @@ $NetBSD: patch-res_res__rtp__asterisk.c, #include "asterisk/options.h" #include "asterisk/stun.h" #include "asterisk/pbx.h" -@@ -72,7 +65,16 @@ +@@ -82,7 +75,16 @@ #include "asterisk/uuid.h" #include "asterisk/test.h" #include "asterisk/data_buffer.h" @@ -33,7 +33,7 @@ $NetBSD: patch-res_res__rtp__asterisk.c, #include "asterisk/res_pjproject.h" #endif -@@ -3254,7 +3256,7 @@ static void rtp_add_candidates_to_ice(st +@@ -3297,7 +3299,7 @@ static void rtp_add_candidates_to_ice(st } /* If configured to use a STUN server to get our external mapped address do so */ --_----------=_1610872360168530--