CVS commit: pkgsrc/comms/asterisk18

["John Nemeth" <jnemeth%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jnemeth
Date:           Sun Jun 27 21:39:27 UTC 2021

Modified Files:
        pkgsrc/comms/asterisk18: Makefile distinfo
        pkgsrc/comms/asterisk18/patches: patch-res_res__xmpp.c
Added Files:
        pkgsrc/comms/asterisk18/patches: patch-main_bridge__channel.c
            patch-main_taskprocessor.c

Log Message:
comms/asterisk18: update to Asterisk 18.5.0.

pkgsrc change: Fix segfault under aarch64 from ryoon for comms/asterisk16.

-----

The Asterisk Development Team would like to announce the release
of Asterisk 18.5.0.

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

New Features made in this release:
-----------------------------------
 * ASTERISK-29446 - app_confbridge: New ConfKick application
      (Reported by N A)
 * ASTERISK-29440 - app_confbridge: Allow ConfBridge answer to
      be suppressed
      (Reported by N A)
 * ASTERISK-29431 - Minimum and maximum dialplan functions
      (Reported by N A)
 * ASTERISK-29439 - func_volume: Volume function can't be read
      (Reported by N A)

Bugs fixed in this release:
-----------------------------------
 * ASTERISK-29475 - SayNumber triggers WARNING if caller hangs
      up during application execution
      (Reported by N A)
 * ASTERISK-29404 - Consolidate res_pjsip_messaging fixes for
      domain name
      (Reported by George Joseph)
 * ASTERISK-29441 - Core reload making TCP endpoints go offline
      (Reported by Luke Escude)
 * ASTERISK-28237 - "FRACK!, Failed assertion bad magic number"
      happens when unsubscribe an application from an event source
      (Reported by Lucas Tardioli Silveira)
 * ASTERISK-28393 - Multidomain support issue
      (Reported by Andrea Sannucci)
 * ASTERISK-29433 - res_rtp_asterisk: Server reflexive
      candidates use incorrect raddr for RTCP
      (Reported by Chris)
 * ASTERISK-29397 - pjsip: Asterisk isn't tolerant of RFC8760 UASs
      (Reported by George Joseph)
 * ASTERISK-24601 - [patch]Missing RFC4235 tags and attributes
      in PJSIP NOTIFY event: dialog  XML body
      (Reported by Marco Paland)
 * ASTERISK-29370 - chan_sip does not recognize
      application/hook-flash
      (Reported by N A)
 * ASTERISK-29377 - cpool_release_pool "double free or
      corruption (out)"
      (Reported by Robert Sutton)
 * ASTERISK-29372 - file.c switch does not account for flash
      events
      (Reported by N A)
 * ASTERISK-29358 - chan_pjsip: Trace message for progress is
      output even if frame is not queued
      (Reported by Michael Maier)
 * ASTERISK-29407 - chan_local: Filtering audio formats should
      not occur on removed streams
      (Reported by Joshua C. Colp)
 * ASTERISK-29030 - res_rtp_asterisk: Additional RTP-frame (with
      wrong SSRC) gets inserted when switching from progress to
      established
      (Reported by Matthias Hensler)

Improvements made in this release:
-----------------------------------
 * ASTERISK-29450 - Allow setting channel variables using
      Originate application
      (Reported by N A)
 * ASTERISK-29459 - Missing configuration from PJSIP to SIP
      conversion script
      (Reported by N A)
 * ASTERISK-29460 - Recognize application/hook-flash in PJSIP
      (Reported by N A)
 * ASTERISK-29434 - Asterisk reveals pjproject version in STUN packets
      (Reported by Jeremy Lain??)
 * ASTERISK-29349 - Silent voicemail option is not completely silent
      (Reported by N A)
 * ASTERISK-29380 - Add Flash AMI event to handle flash events
      (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-18.5.0

Thank you for your continued support of Asterisk!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-announce/attachments/20210624/fe9defa9/attachment.html>

    Previous message (by thread): [asterisk-announce] Asterisk 16.19.0 Now Available
    Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the asterisk-announce mailing list


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 pkgsrc/comms/asterisk18/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/comms/asterisk18/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/comms/asterisk18/patches/patch-main_bridge__channel.c \
    pkgsrc/comms/asterisk18/patches/patch-main_taskprocessor.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/asterisk18/Makefile
diff -u pkgsrc/comms/asterisk18/Makefile:1.126 pkgsrc/comms/asterisk18/Makefile:1.127
--- pkgsrc/comms/asterisk18/Makefile:1.126      Sun Jun 13 07:57:52 2021
+++ pkgsrc/comms/asterisk18/Makefile    Sun Jun 27 21:39:27 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.126 2021/06/13 07:57:52 jnemeth Exp $
+# $NetBSD: Makefile,v 1.127 2021/06/27 21:39:27 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-18.4.0
+DISTNAME=      asterisk-18.5.0
 #PKGREVISION=  24
 CATEGORIES=    comms net audio
 MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/

Index: pkgsrc/comms/asterisk18/distinfo
diff -u pkgsrc/comms/asterisk18/distinfo:1.64 pkgsrc/comms/asterisk18/distinfo:1.65
--- pkgsrc/comms/asterisk18/distinfo:1.64       Sun Jun 13 07:57:52 2021
+++ pkgsrc/comms/asterisk18/distinfo    Sun Jun 27 21:39:27 2021
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.64 2021/06/13 07:57:52 jnemeth Exp $
+$NetBSD: distinfo,v 1.65 2021/06/27 21:39:27 jnemeth Exp $
 
-SHA1 (asterisk-18.4.0/asterisk-18.4.0.tar.gz) = 8a02af858044c449fe7b741e7d456bb2948f678e
-RMD160 (asterisk-18.4.0/asterisk-18.4.0.tar.gz) = 590f81c151e8f1cbe24a03db91deb6db9fc699a7
-SHA512 (asterisk-18.4.0/asterisk-18.4.0.tar.gz) = 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
-Size (asterisk-18.4.0/asterisk-18.4.0.tar.gz) = 27926601 bytes
-SHA1 (asterisk-18.4.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9
-RMD160 (asterisk-18.4.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106
-SHA512 (asterisk-18.4.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
-Size (asterisk-18.4.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
-SHA1 (asterisk-18.4.0/pjproject-2.10.md5) = 1f91cf11ef1df14344817905e165cc1908668d18
-RMD160 (asterisk-18.4.0/pjproject-2.10.md5) = c33bbef404923860a41e34520871c0fa7533a01d
-SHA512 (asterisk-18.4.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054
-Size (asterisk-18.4.0/pjproject-2.10.md5) = 110 bytes
-SHA1 (asterisk-18.4.0/pjproject-2.10.tar.bz2) = 0c691fa3562d4daad4b4374df61e8325ac15cc55
-RMD160 (asterisk-18.4.0/pjproject-2.10.tar.bz2) = 9ffe871976a67e4d29d45fdb2c1fc26b2925ef86
-SHA512 (asterisk-18.4.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e
-Size (asterisk-18.4.0/pjproject-2.10.tar.bz2) = 7339188 bytes
+SHA1 (asterisk-18.5.0/asterisk-18.5.0.tar.gz) = 408ebb5ac2417bc91449645e9c3caa51814951d6
+RMD160 (asterisk-18.5.0/asterisk-18.5.0.tar.gz) = 8b18ae8dc8f013d92d161d6598a628881f88c87d
+SHA512 (asterisk-18.5.0/asterisk-18.5.0.tar.gz) = f31ac2ccd4b9af3ee4ad1c1368519e889d2e3e5b6b22e6f1b6dc020ffbdc8caccf0c03ba620f4a8b6346403abffde23d93fa8c06a6d7d993074edfaa0cf256df
+Size (asterisk-18.5.0/asterisk-18.5.0.tar.gz) = 27956264 bytes
+SHA1 (asterisk-18.5.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 0207e289404704c42941759db9660269599044f9
+RMD160 (asterisk-18.5.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 5d660e7664a56086bd60ad49196e1b622a60f106
+SHA512 (asterisk-18.5.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 3f2f7bf3d5bce3544bc013f913c352f0204a3ce96239987403eb9dce8bc87e64a61d437762323a422a87b2fad1f3bf3e7a5f3d0d340f912a1b1dbfea9479d41d
+Size (asterisk-18.5.0/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz) = 4253587 bytes
+SHA1 (asterisk-18.5.0/pjproject-2.10.md5) = 1f91cf11ef1df14344817905e165cc1908668d18
+RMD160 (asterisk-18.5.0/pjproject-2.10.md5) = c33bbef404923860a41e34520871c0fa7533a01d
+SHA512 (asterisk-18.5.0/pjproject-2.10.md5) = bd24048c9c2fdaf06468e44bceca92bd02848d759ef98285d20b50174f865b1aec2928f1ce6c092862397ba83dd1a74da4a7e479eca881df1e9f9d1c211a7054
+Size (asterisk-18.5.0/pjproject-2.10.md5) = 110 bytes
+SHA1 (asterisk-18.5.0/pjproject-2.10.tar.bz2) = 0c691fa3562d4daad4b4374df61e8325ac15cc55
+RMD160 (asterisk-18.5.0/pjproject-2.10.tar.bz2) = 9ffe871976a67e4d29d45fdb2c1fc26b2925ef86
+SHA512 (asterisk-18.5.0/pjproject-2.10.tar.bz2) = fe29edccc63a8e72323e1b6f955a8c3475e26aba9cb8f5125546da4409fecc19a09a7950eee6b8e4a3c908943bc043d95130f878ad52958c5eccc617e3bcfb4e
+Size (asterisk-18.5.0/pjproject-2.10.tar.bz2) = 7339188 bytes
 SHA1 (patch-Makefile) = 73471d36b475fa8990e8acb69839dca32d866d25
 SHA1 (patch-addons_chan__ooh323.c) = 1775da7ca2129a962ed460bd1e78ba3ce6afa62c
 SHA1 (patch-apps_app__adsiprog.c) = 031139e5cd1ef6bb2afb0a74fee3d752eded0a2c
@@ -56,6 +56,7 @@ SHA1 (patch-main_ast__expr2.y) = 56ac74b
 SHA1 (patch-main_asterisk.c) = 1262d792f330fe8a1bb1d1f7ba51bc502d65be42
 SHA1 (patch-main_astmm.c) = 26a98d6fbb567ae619041ebd01a31349a847deab
 SHA1 (patch-main_bridge__basic.c) = b48627e563e20544017fdfcfb4559e868badf41d
+SHA1 (patch-main_bridge__channel.c) = 1ea5f8d0d1ad353c63904a80a67d8e53c8672b46
 SHA1 (patch-main_callerid.c) = 0ea1b3df8aaf3969fcd9e06055c8e6184d50d3d3
 SHA1 (patch-main_cdr.c) = 540fbdb354aba100fa37392b879b92a85d1d8620
 SHA1 (patch-main_cel.c) = 22fa21db8e0afa0958d34014f52e2c4fe9c73ba2
@@ -73,6 +74,7 @@ SHA1 (patch-main_pbx__builtins.c) = f53a
 SHA1 (patch-main_pbx__timing.c) = a4657330086c5b0e8fd271d5676fb897badea452
 SHA1 (patch-main_sched.c) = 4219ac1561e8c4fbc5b1facdf38b3e8b764d5def
 SHA1 (patch-main_stdtime_localtime.c) = 1e3c62d70eab62c46ac29e03e842229cf7587d2b
+SHA1 (patch-main_taskprocessor.c) = f90805bd78fd4096beb9ee1cf9c794c50b87481a
 SHA1 (patch-main_tdd.c) = 9f525971938dd4f222622cb3e78a35822bd08389
 SHA1 (patch-main_test.c) = f38b370cdb5788304e02c71ef05d2130ead9de98
 SHA1 (patch-main_utils.c) = 2762f982f7a66979e363e984b0948364e1b03b7e
@@ -87,7 +89,7 @@ SHA1 (patch-res_res__hep__pjsip.c) = b0c
 SHA1 (patch-res_res__limit.c) = e80f370fe5b84dcdc2f38e2137d5ed6f75ba35a4
 SHA1 (patch-res_res__musiconhold.c) = 401999cefa3805f63df33424c635ad18a7d00748
 SHA1 (patch-res_res__pjproject.c) = 0326bf12d9f798c8eae2eff4fad8b86d4bbc0589
-SHA1 (patch-res_res__xmpp.c) = eca0915ac537e4a5a0bdded8e2c10cf23538ff71
+SHA1 (patch-res_res__xmpp.c) = 390376180d1fb11a41c16f59dd44f506006a8e5d
 SHA1 (patch-sounds_Makefile) = acc15088ae2545f2822246466bfe783b5215fc54
 SHA1 (patch-tests_test__locale.c) = f3f1edc86356f2a7b4d3493433c772e164c77f66
 SHA1 (patch-tests_test__voicemail__api.c) = c600f726136581e47cf34da2c0bb485b8a5912eb

Index: pkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c
diff -u pkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c:1.2 pkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c:1.3
--- pkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c:1.2   Sun Jun 13 07:57:53 2021
+++ pkgsrc/comms/asterisk18/patches/patch-res_res__xmpp.c       Sun Jun 27 21:39:27 2021
@@ -1,8 +1,31 @@
-$NetBSD: patch-res_res__xmpp.c,v 1.2 2021/06/13 07:57:53 jnemeth Exp $
+$NetBSD: patch-res_res__xmpp.c,v 1.3 2021/06/27 21:39:27 jnemeth Exp $
 
---- res/res_xmpp.c.orig        2018-06-19 21:29:29.310245367 +0000
+--- res/res_xmpp.c.orig        2021-06-24 12:50:57.000000000 +0000
 +++ res/res_xmpp.c
-@@ -3746,7 +3746,7 @@ static int xmpp_client_receive(struct as
+@@ -62,6 +62,13 @@
+ #include "asterisk/config_options.h"
+ #include "asterisk/json.h"
+ 
++/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
++static int
++pt_pthread_equal(pthread_t t1, pthread_t t2)
++{
++      return t1 == t2;
++}
++
+ /*** DOCUMENTATION
+       <application name="JabberSend" language="en_US" module="res_xmpp">
+               <synopsis>
+@@ -3527,7 +3534,7 @@ static int xmpp_action_hook(void *data, 
+ 
+ int ast_xmpp_client_disconnect(struct ast_xmpp_client *client)
+ {
+-      if ((client->thread != AST_PTHREADT_NULL) && !pthread_equal(pthread_self(), client->thread)) {
++      if ((client->thread != AST_PTHREADT_NULL) && !pt_pthread_equal(pthread_self(), client->thread)) {
+               xmpp_client_change_state(client, XMPP_STATE_DISCONNECTING);
+               pthread_cancel(client->thread);
+               pthread_join(client->thread, NULL);
+@@ -3669,7 +3676,7 @@ static int xmpp_client_receive(struct as
                        /* if we stumble on the ending tag character,
                           we skip any whitespace that follows it*/
                        if (c == '>') {

Added files:

Index: pkgsrc/comms/asterisk18/patches/patch-main_bridge__channel.c
diff -u /dev/null pkgsrc/comms/asterisk18/patches/patch-main_bridge__channel.c:1.1
--- /dev/null   Sun Jun 27 21:39:27 2021
+++ pkgsrc/comms/asterisk18/patches/patch-main_bridge__channel.c        Sun Jun 27 21:39:27 2021
@@ -0,0 +1,38 @@
+$NetBSD: patch-main_bridge__channel.c,v 1.1 2021/06/27 21:39:27 jnemeth 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
+@@ -58,6 +58,13 @@
+ #include "asterisk/stream.h"
+ #include "asterisk/message.h"
+ 
++/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
++static int
++pt_pthread_equal(pthread_t t1, pthread_t t2)
++{
++      return t1 == t2;
++}
++
+ /*!
+  * \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
+  */
+ static void bridge_channel_poke(struct ast_bridge_channel *bridge_channel)
+ {
+-      if (!pthread_equal(pthread_self(), bridge_channel->thread)) {
++      if (!pt_pthread_equal(pthread_self(), bridge_channel->thread)) {
+               /* 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
+       };
+ 
+       /* Make sure we don't end up trying to wait on ourself to deliver the frame */
+-      ast_assert(!pthread_equal(pthread_self(), bridge_channel->thread));
++      ast_assert(!pt_pthread_equal(pthread_self(), bridge_channel->thread));
+ 
+       sync_payload = ast_alloca(sync_payload_len);
+       sync_payload->id = ast_atomic_fetchadd_int(&sync_ids, +1);
Index: pkgsrc/comms/asterisk18/patches/patch-main_taskprocessor.c
diff -u /dev/null pkgsrc/comms/asterisk18/patches/patch-main_taskprocessor.c:1.1
--- /dev/null   Sun Jun 27 21:39:27 2021
+++ pkgsrc/comms/asterisk18/patches/patch-main_taskprocessor.c  Sun Jun 27 21:39:27 2021
@@ -0,0 +1,38 @@
+$NetBSD: patch-main_taskprocessor.c,v 1.1 2021/06/27 21:39:27 jnemeth Exp $
+
+* Fix segfault under NetBSD/aarch64 9.99.80.
+
+--- main/taskprocessor.c.orig  2021-01-21 16:28:04.000000000 +0000
++++ main/taskprocessor.c
+@@ -37,6 +37,13 @@
+ #include "asterisk/taskprocessor.h"
+ #include "asterisk/sem.h"
+ 
++/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
++static int
++pt_pthread_equal(pthread_t t1, pthread_t t2)
++{
++      return t1 == t2;
++}
++
+ /*!
+  * \brief tps_task structure is queued to a taskprocessor
+  *
+@@ -263,7 +270,7 @@ static void default_listener_shutdown(st
+ 
+       ast_assert(pvt->poll_thread != AST_PTHREADT_NULL);
+ 
+-      if (pthread_equal(pthread_self(), pvt->poll_thread)) {
++      if (pt_pthread_equal(pthread_self(), pvt->poll_thread)) {
+               res = pthread_detach(pvt->poll_thread);
+               if (res != 0) {
+                       ast_log(LOG_ERROR, "pthread_detach(): %s\n", strerror(errno));
+@@ -1268,7 +1275,7 @@ int ast_taskprocessor_is_task(struct ast
+       int is_task;
+ 
+       ao2_lock(tps);
+-      is_task = pthread_equal(tps->thread, pthread_self());
++      is_task = pt_pthread_equal(tps->thread, pthread_self());
+       ao2_unlock(tps);
+       return is_task;
+ }