Skip to content

Commit

Permalink
asterisk: bump to 18.20.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
- 180-chan_iax2.c-Avoid-crash-with-IAX2-switch-support.patch removed as
  it's included in upstream release tar ball.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
  • Loading branch information
micmac1 committed Jan 5, 2024
1 parent ab63996 commit 404a50b
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 32 deletions.
6 changes: 3 additions & 3 deletions net/asterisk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=asterisk
PKG_VERSION:=18.15.1
PKG_RELEASE:=3
PKG_VERSION:=18.20.2
PKG_RELEASE:=1

PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
PKG_HASH:=7594b045e1979a6e80f07ecfff634204830917fd2a7686b161cf4849454f4531
PKG_HASH:=7ee8499fc704e5fcae57c5f195f806f2ce4da7ae5f62faa43e73b3e6d218747f

PKG_BUILD_DEPENDS:=libxml2/host

Expand Down
4 changes: 2 additions & 2 deletions net/asterisk/patches/030-GNU-GLOB-exts-only-on-glibc.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -601,7 +601,7 @@ includes { STORE_POS; return KW_INCLUDES
@@ -598,7 +598,7 @@ includes { STORE_POS; return KW_INCLUDES
snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
}
Expand All @@ -11,7 +11,7 @@
glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -1982,7 +1982,7 @@ YY_RULE_SETUP
@@ -1966,7 +1966,7 @@ YY_RULE_SETUP
snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
}
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
@@ -1262,7 +1262,7 @@ if test "${ac_cv_have_variable_fdset}x"
@@ -1264,7 +1264,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
@@ -2625,7 +2625,7 @@ if test -z "$__opus_include" -o x"$__opu
@@ -2634,7 +2634,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.

0 comments on commit 404a50b

Please sign in to comment.