Skip to content

Commit

Permalink
asterisk: bump to 20.5.2
Browse files Browse the repository at this point in the history
- Resolves GHSA-98rc-4j27-74hh, GHSA-hxj9-xwr8-w8pq, GHSA-5743-x3p5-3rg7
  and GHSA-8857-hfmw-vg8f
- patches refreshed
- patch 180-app_queue_time_t.patch added to fix new warnings, sent
  upstream (see [1])
- 180-res_crypto.c-Avoid-using-the-non-portable-ALLPERMS-m.patch and
  190-chan_iax2.c-Avoid-crash-with-IAX2-switch-support.patch removed as
  they're included in upstream release tar ball.

[1] asterisk/asterisk#516

Signed-off-by: Sebastian Kemper <[email protected]>
(cherry picked from commit 4e4b281)
  • Loading branch information
micmac1 committed Jan 5, 2024
1 parent 3f2f4b2 commit 23aada1
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 63 deletions.
6 changes: 3 additions & 3 deletions net/asterisk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=asterisk
PKG_VERSION:=20.3.0
PKG_RELEASE:=2
PKG_VERSION:=20.5.2
PKG_RELEASE:=1
PKG_CPE_ID:=cpe:/a:digium:asterisk

PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
PKG_HASH:=2e70b4bb40114966c6572eae38b5106b588a7a759d41f1c90a6032407dd60463
PKG_HASH:=8f68e1789dfb8aa04b0eba87ea1d599a62e088ddd20926afc997f36b455e1859

PKG_BUILD_DEPENDS:=libxml2/host

Expand Down
2 changes: 1 addition & 1 deletion net/asterisk/patches/130-eventfd.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -1256,7 +1256,7 @@ if test "${ac_cv_have_variable_fdset}x"
@@ -1257,7 +1257,7 @@ if test "${ac_cv_have_variable_fdset}x"
fi

AC_MSG_CHECKING([if we have usable eventfd support])
Expand Down
2 changes: 1 addition & 1 deletion net/asterisk/patches/140-use-default-lua.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -2616,7 +2616,7 @@ if test -z "$__opus_include" -o x"$__opu
@@ -2608,7 +2608,7 @@ if test -z "$__opus_include" -o x"$__opu
fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])

Expand Down
17 changes: 17 additions & 0 deletions net/asterisk/patches/180-app_queue_time_t.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4614,8 +4614,12 @@ static int is_longest_waiting_caller(str
* will be unused until the first caller is picked up.
*/
if (ch->start < caller->start && !ch->pending) {
- ast_debug(1, "Queue %s has a call at position %i that's been waiting longer (%li vs %li)\n",
- q->name, ch->pos, ch->start, caller->start);
+ char time1[AST_TIME_T_LEN];
+ char time2[AST_TIME_T_LEN];
+ ast_time_t_to_string(ch->start, time1, sizeof(time1));
+ ast_time_t_to_string(caller->start, time2, sizeof(time2));
+ ast_debug(1, "Queue %s has a call at position %i that's been waiting longer (%s vs %s)\n",
+ q->name, ch->pos, time1, time2);
is_longest_waiting = 0;
break;
}

This file was deleted.

This file was deleted.

0 comments on commit 23aada1

Please sign in to comment.