Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/asterisk: update to 20.8.1
@ 2024-07-11  9:52 Waldemar Brodkorb
  2024-07-11 19:00 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Waldemar Brodkorb @ 2024-07-11  9:52 UTC (permalink / raw)
  To: buildroot

See here for a ChangeLog:
https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md

Patch 0005 is applied upstream.

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 ...es-stasis-control.c-include-signal.h.patch | 43 -------------------
 package/asterisk/asterisk.hash                |  2 +-
 package/asterisk/asterisk.mk                  |  2 +-
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 package/asterisk/0005-res-stasis-control.c-include-signal.h.patch

diff --git a/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch b/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch
deleted file mode 100644
index fc615c4a19..0000000000
--- a/package/asterisk/0005-res-stasis-control.c-include-signal.h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8391dc3891337ecff8becefe1927a30d3922b848 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Wed, 1 May 2024 16:50:50 +0200
-Subject: [PATCH] res/stasis/control.c: include signal.h
-
-Include signal.h to avoid the following build failure with uclibc-ng
-raised since
-https://github.com/asterisk/asterisk/commit/2694792e13c7f3ab1911c4a69fba0df32c544177:
-
-stasis/control.c: In function 'exec_command_on_condition':
-stasis/control.c:313:3: warning: implicit declaration of function 'pthread_kill'; did you mean 'pthread_yield'? [-Wimplicit-function-declaration]
-  313 |   pthread_kill(control->control_thread, SIGURG);
-      |   ^~~~~~~~~~~~
-      |   pthread_yield
-stasis/control.c:313:41: error: 'SIGURG' undeclared (first use in this function)
-  313 |   pthread_kill(control->control_thread, SIGURG);
-      |                                         ^~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/d16e4ca4bd26234f84d17da24c04a8c19faba6c5
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Upstream: https://github.com/asterisk/asterisk/pull/728
----
- res/stasis/control.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/res/stasis/control.c b/res/stasis/control.c
-index 360f20790..4ed0e2af1 100644
---- a/res/stasis/control.c
-+++ b/res/stasis/control.c
-@@ -41,6 +41,8 @@
- #include "asterisk/musiconhold.h"
- #include "asterisk/app.h"
- 
-+#include <signal.h>
-+
- AST_LIST_HEAD(app_control_rules, stasis_app_control_rule);
- 
- /*!
--- 
-2.43.0
-
diff --git a/package/asterisk/asterisk.hash b/package/asterisk/asterisk.hash
index 8cb5468249..bff34b37bb 100644
--- a/package/asterisk/asterisk.hash
+++ b/package/asterisk/asterisk.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256  62adff44f5bc415627e16957e6bd528e1782a892e116ff261c46f96ca87c342b  asterisk-20.7.0.tar.gz
+sha256  bea2978c41d0f69f7197536c35c2d80cbfdf7db826f48c0741b6f66462981d2f  asterisk-20.8.1.tar.gz
 
 # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
 # sha256 locally computed
diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
index be27509441..3d41285c78 100644
--- a/package/asterisk/asterisk.mk
+++ b/package/asterisk/asterisk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ASTERISK_VERSION = 20.7.0
+ASTERISK_VERSION = 20.8.1
 # Use the github mirror: it's an official mirror maintained by Digium, and
 # provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
 ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH] package/asterisk: update to 20.8.1
  2024-07-11  9:52 [Buildroot] [PATCH] package/asterisk: update to 20.8.1 Waldemar Brodkorb
@ 2024-07-11 19:00 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2024-07-11 19:00 UTC (permalink / raw)
  To: Waldemar Brodkorb; +Cc: buildroot

On Thu, 11 Jul 2024 11:52:17 +0200
Waldemar Brodkorb <wbx@openadk.org> wrote:

> See here for a ChangeLog:
> https://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-20-current.md
> 
> Patch 0005 is applied upstream.
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  ...es-stasis-control.c-include-signal.h.patch | 43 -------------------
>  package/asterisk/asterisk.hash                |  2 +-
>  package/asterisk/asterisk.mk                  |  2 +-
>  3 files changed, 2 insertions(+), 45 deletions(-)
>  delete mode 100644 package/asterisk/0005-res-stasis-control.c-include-signal.h.patch

Looking at the Changelog... this version update contains a security
vulnerability fix. However, deeper investigation revealed that the
vulnerability was introduced between 20.7.0 and 20.8.0... and we were
still using the 20.7.0, which did not include the vulnerability. So I
added the following text in the commit log:

    20.8.1 contains a fix for CVE-2024-35190. However, the vulnerability
    was introduced in commit 68a49128253f677f9e1b235c70d2316342372f7d
    between 20.7.0 and 20.8.0, and Buildroot was using 20.7.0, so we were
    not affected by this vulnerability.
    
Applied with this addition. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-07-11 19:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-11  9:52 [Buildroot] [PATCH] package/asterisk: update to 20.8.1 Waldemar Brodkorb
2024-07-11 19:00 ` Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox