package/asterisk: bump to 20.5.2
PATCH 1/1 package/asterisk: bump to 20.5.2
Tested on a Raspberry PI4 with a SNOM 360 and a SIP Trunk to Easybell.
Attention: chan_sip is deprecated, use chan_pjsip instead. For chan_pjsip you need to enable openssl otherwise the module will not load.
Patches 0005 and 0006 are applied upstream.
Remove unused configure options:
--without-curses
--without-isdnnet
--without-misdn
--without-nbs
--without-oss
--without-sqlite
--without-suppserv
--without-termcap
--without-tinfo
--without-vpb
--- .checkpackageignore | 2 - DEVELOPERS | 1 + ...tection-of-re-entrant-resolver-funct.patch | 38 ------------------- ...n-iostream.c-fix-build-with-libressl.patch | 38 ------------------- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 18 ++------- 6 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch delete mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch
.checkpackageignore +0 -2
@@ -159,8 +159,6 @@ package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch Upstream package/asterisk/0002-configure-fix-detection-of-libcrypt.patch Upstream package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch Upstream package/asterisk/0004-install-samples-need-the-data-files.patch Upstream -package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch Upstream -package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch Upstream package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch Upstream package/at/S99at Indent Variables package/attr/0001-build-with-older-GCCs.patch Upstream
DEVELOPERS +1 -0
@@ -3106,6 +3106,7 @@ N: Wade Berrier <[email protected]> F: package/ngrep/ N: Waldemar Brodkorb <[email protected]> +F: package/asterisk/ F: package/mksh/ F: package/ruby/ F: package/uclibc/
package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 9b4070944578336506cd0a76de6f733c72d0ca74 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" <[email protected]> -Date: Sat, 13 Oct 2018 11:11:15 +0200 -Subject: [PATCH] configure: fix detection of re-entrant resolver functions - -Fixes https://issues.asterisk.org/jira/browse/ASTERISK-21795 - -uClibc does not provide res_nsearch: -asterisk-16.0.0/main/dns.c:506: undefined reference to `res_nsearch' - -Patch coded by Yann E. MORIN: -http://lists.busybox.net/pipermail/buildroot/2018-October/232630.html - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd0c8edd13..ee1ca9ceb6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1388,7 +1388,11 @@ AC_LINK_IFELSE( - #include <arpa/nameser.h> - #endif - #include <resolv.h>], -- [int foo = res_ninit(NULL);])], -+ [ -+ int foo; -+ foo = res_ninit(NULL); -+ foo = res_nsearch(NULL, NULL, 0, 0, NULL, 0); -+ ])], - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]) - AC_SEARCH_LIBS(res_9_ndestroy, resolv) --- -2.19.1 -
package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 9569fa20fec49f530170a3042afb99556cf66a2e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Sun, 17 Apr 2022 10:52:42 +0200 -Subject: [PATCH] main/iostream.c: fix build with libressl - -Fix the following build failure with libressl by using SSL_is_server -which is available since version 2.7.0 and -https://github.com/libressl-portable/openbsd/commit/d7ec516916c5eaac29b02d7a8ac6570f63b458f7: - -iostream.c: In function 'ast_iostream_close': -iostream.c:559:41: error: invalid use of incomplete typedef 'SSL' {aka 'struct ssl_st'} - 559 | if (!stream->ssl->server) { - | ^~ - -Fixes: - - http://autobuild.buildroot.org/results/ce4d62d00bb77ba5b303cacf6be7e350581a62f9 - -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - main/iostream.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main/iostream.c b/main/iostream.c -index d060b6d6d4..b8ab80ec91 100644 ---- a/main/iostream.c -+++ b/main/iostream.c -@@ -553,7 +553,7 @@ int ast_iostream_close(struct ast_iostream *stream) - ERR_error_string(sslerr, err), ssl_error_to_string(sslerr, res)); - } - --#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) -+#if !(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER < 0x2070000L)) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) - if (!SSL_is_server(stream->ssl)) { - #else - if (!stream->ssl->server) { --- -2.35.1 -
package/asterisk/asterisk.hash +1 -1
@@ -1,5 +1,5 @@ # Locally computed -sha256 ef1ddc07dc02bb0c5f5ba58a5e42e42bcb63e55ac94199be8e3b5d3910f43736 asterisk-16.30.1.tar.gz +sha256 9def260ac8745a5eac7aceabe1c22f84a283b7812f0eccd760f87ce9eb991d22 asterisk-20.5.2.tar.gz # sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases # sha256 locally computed
package/asterisk/asterisk.mk +4 -14
@@ -4,7 +4,7 @@ # ################################################################################ -ASTERISK_VERSION = 16.30.1 +ASTERISK_VERSION = 20.5.2 # 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))
@@ -25,7 +25,7 @@ ASTERISK_CPE_ID_VENDOR = asterisk ASTERISK_CPE_ID_PRODUCT = open_source ASTERISK_SELINUX_MODULES = asterisk -# For patches 0002, 0003 and 0005 +# For patches 0002 and 0003 ASTERISK_AUTORECONF = YES ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject -Ithird-party/jansson
@@ -56,7 +56,6 @@ ASTERISK_CONF_OPTS = \ --without-bfd \ --without-cap \ --without-cpg \ - --without-curses \ --without-gtk2 \ --without-gmime \ --without-hoard \
@@ -65,37 +64,26 @@ ASTERISK_CONF_OPTS = \ --without-imap \ --without-inotify \ --without-iodbc \ - --without-isdnnet \ --without-jack \ --without-uriparser \ --without-kqueue \ --without-libedit \ --without-libxslt \ --without-lua \ - --without-misdn \ --without-mysqlclient \ - --without-nbs \ --without-neon29 \ --without-newt \ --without-openr2 \ --without-osptk \ - --without-oss \ --without-postgres \ - --without-pjproject \ - --without-pjproject-bundled \ --without-popt \ --without-resample \ --without-sdl \ --without-SDL_image \ - --without-sqlite \ - --without-suppserv \ --without-tds \ - --without-termcap \ --without-timerfd \ - --without-tinfo \ --without-unbound \ --without-unixodbc \ - --without-vpb \ --without-x11 \ --with-crypt \ --with-jansson \
@@ -103,6 +91,8 @@ ASTERISK_CONF_OPTS = \ --with-ilbc \ --with-libxml2 \ --with-libedit="$(STAGING_DIR)/usr" \ + --with-pjproject \ + --with-pjproject-bundled \ --with-sqlite3="$(STAGING_DIR)/usr" \ --with-sounds-cache=$(ASTERISK_DL_DIR)
Signature · 6 lines
2.30.2 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 50 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Waldemar" == Waldemar Brodkorb <[email protected]> writes:
Tested on a Raspberry PI4 with a SNOM 360 and a SIP Trunk to Easybell.
Attention:chan_sipis deprecated, usechan_pjsipinstead. Forchan_pjsipyou need to enable openssl otherwise the module will not load.Patches 0005 and 0006 are applied upstream.
Remove unused configure options:
--without-curses
--without-isdnnet
--without-misdn
--without-nbs
--without-oss
--without-sqlite
--without-suppserv
--without-termcap
--without-tinfo
--without-vpbSigned-off-by Waldemar Brodkorb <[email protected]>--- .checkpackageignore | 2 - DEVELOPERS | 1 + ...tection-of-re-entrant-resolver-funct.patch | 38 ------------------- ...n-iostream.c-fix-build-with-libressl.patch | 38 ------------------- package/asterisk/asterisk.hash | 2 +- package/asterisk/asterisk.mk | 18 ++------- 6 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch delete mode 100644 package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch.checkpackageignore +0
-2@@ -159,8 +159,6 @@ package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch Upstream package/asterisk/0002-configure-fix-detection-of-libcrypt.patch Upstream package/asterisk/0003-build-ensure-target-directory-for-modules-exists.patch Upstream package/asterisk/0004-install-samples-need-the-data-files.patch Upstream -package/asterisk/0005-configure-fix-detection-of-re-entrant-resolver-funct.patch Upstream -package/asterisk/0006-main-iostream.c-fix-build-with-libressl.patch Upstream package/at/0001-Makefile.in-fix-make-install-for-non-root-don-t-stri.patch Upstream package/at/S99at Indent Variables package/attr/0001-build-with-older-GCCs.patch UpstreamDEVELOPERS +0
-0
DEVELOPERS N: Wade Berrier <[email protected]> · line 3109
Quoted 4 lines
DEVELOPERS +1
-0@@ -3106,6 +3106,7 @@ N: Wade Berrier <[email protected]> F: package/ngrep/ N: Waldemar Brodkorb <[email protected]> +F: package/asterisk/
Thanks for stepping up to maintain asterisk!
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Waldemar" == Waldemar Brodkorb <[email protected]> writes:
Hi,
Quoted 4 lines
Tested on a Raspberry PI4 with a SNOM 360 and a SIP Trunk to Easybell.
Attention:chan_sipis deprecated, usechan_pjsipinstead. Forchan_pjsipyou need to enable openssl otherwise the module will not load.
For some reason I didn't receive the 20.6.0 bump in my mailbox (but it did make it to patchwork) - What is the reason for using a bundled libjwt? We normally prefer to not bundle if possible.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot