Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk: bump to 20.5.2

Browse source 
- 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] https://github.com/asterisk/asterisk/pull/516

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper 2023-12-29 09:03:00 +01:00
parent 6643627656
commit 4e4b281794
6 changed files with 22 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/asterisk/Makefile
View file

@ -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

2
net/asterisk/patches/130-eventfd.patch
View file

@ -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])

2
net/asterisk/patches/140-use-default-lua.patch
View file

@ -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])

17
net/asterisk/patches/180-app_queue_time_t.patch Normal file
View file

@ -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;
}

33
net/asterisk/patches/180-res_crypto.c-Avoid-using-the-non-portable-ALLPERMS-m.patch
View file

@ -1,33 +0,0 @@
From 94c884d5b8afca96164852cfb29fc496bc5b9e0a Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@seanbright.com>
Date: Mon, 5 Jun 2023 18:17:47 -0400
Subject: [PATCH] res_crypto.c: Avoid using the non-portable ALLPERMS macro.
ALLPERMS is not POSIX and it's trivial enough to not jump through
autoconf hoops to check for it.
Fixes #149.
---
res/res_crypto.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -217,10 +217,15 @@ static struct ast_key *try_load_key(cons
return NULL;
}
+ /* PERM_MASK is a bitwise OR of all possible file mode bits encoded in the
+ * `st_mode` member of `struct stat`. For POSIX compatible systems this
+ * will be 07777. */
+#define PERM_MASK (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)
+
/* only user read or read/write modes allowed */
if (ktype == AST_KEY_PRIVATE &&
- ((st.st_mode & ALLPERMS) & ~(S_IRUSR | S_IWUSR)) != 0) {
- ast_log(LOG_ERROR, "Private key file has bad permissions: %s: %#4o\n", ffname, st.st_mode & ALLPERMS);
+ ((st.st_mode & PERM_MASK) & ~(S_IRUSR | S_IWUSR)) != 0) {
+ ast_log(LOG_ERROR, "Private key file has bad permissions: %s: %#4o\n", ffname, st.st_mode & PERM_MASK);
fclose(f);
return NULL;
}

25
net/asterisk/patches/190-chan_iax2.c-Avoid-crash-with-IAX2-switch-support.patch
View file

@ -1,25 +0,0 @@
From d26a00ef3484f7fa602044e73e31bcefc8ca1917 Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@seanbright.com>
Date: Fri, 7 Jul 2023 15:57:39 -0400
Subject: [PATCH] chan_iax2.c: Avoid crash with IAX2 switch support.
A change made in 82cebaa0 did not properly handle the case when a
channel was not provided, triggering a crash. ast_check_hangup(...)
does not protect against NULL pointers.
Fixes #180
---
channels/chan_iax2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -14323,7 +14323,7 @@ static struct iax2_dpcache *find_cache(s
ast_log(LOG_WARNING, "Timeout waiting for %s exten %s\n", data, exten);
}
- if (ast_check_hangup(chan)) {
+ if (chan && ast_check_hangup(chan)) {
doabort = 1;
}