From 361ed0fc3e9fedd0c28fd7911c7406b7826f52c0 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 22 Jun 2024 15:40:52 +0100 Subject: [PATCH] asterisk: update to version 20.8.1 Update to most recent LTS release addressing multiple security and stability issues. Complete changelog: https://github.com/asterisk/asterisk/compare/20.5.2...20.8.1 Note that res-stir-shaken switched to use libjwt instead of providing a built-in JWT implementation. Signed-off-by: Daniel Golle (cherry picked from commit 11353e1a17761ee1b29488da008e05fe81d3e174) --- net/asterisk/Makefile | 7 ++++--- net/asterisk/patches/100-build-reproducibly.patch | 4 ++-- net/asterisk/patches/130-eventfd.patch | 2 +- net/asterisk/patches/140-use-default-lua.patch | 2 +- net/asterisk/patches/180-app_queue_time_t.patch | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index e5075ca..f38c4ff 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk -PKG_VERSION:=20.5.2 +PKG_VERSION:=20.8.1 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:=8f68e1789dfb8aa04b0eba87ea1d599a62e088ddd20926afc997f36b455e1859 +PKG_HASH:=fa498b6224e8c262de6840a67e00e3747e178fcefd9fb2595885d402ca3248f5 PKG_BUILD_DEPENDS:=libxml2/host @@ -583,6 +583,7 @@ CONFIGURE_ARGS+= \ --with-ilbc=internal \ --without-pjproject-bundled \ --with-libedit="$(STAGING_DIR)/usr" \ + $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-stir-shaken),--with-libjwt-bundled=yes,--with-libjwt-bundled=no) \ --with-libxml2 \ $(if $(CONFIG_ASTERISK_LIBXSLT_SUPPORT),--with-libxslt,--without-libxslt) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-snmp),--with-netsnmp="$(STAGING_DIR)/usr",--without-netsnmp) \ @@ -1057,7 +1058,7 @@ $(eval $(call BuildAsteriskModule,res-stasis-playback,Stasis application playbac $(eval $(call BuildAsteriskModule,res-stasis-recording,Stasis application recording,Stasis application recording support.,+$(PKG_NAME)-res-stasis,,res_stasis_recording,,)) $(eval $(call BuildAsteriskModule,res-stasis-snoop,Stasis application snoop,Stasis application snoop support.,+$(PKG_NAME)-res-stasis-recording,,res_stasis_snoop,,)) $(eval $(call BuildAsteriskModule,res-statsd,statsd client,Statsd client support.,,statsd.conf,res_statsd,,)) -$(eval $(call BuildAsteriskModule,res-stir-shaken,STIR/SHAKEN resource module,STIR/SHAKEN resource module.,+$(PKG_NAME)-curl,stir_shaken.conf,res_stir_shaken,,)) +$(eval $(call BuildAsteriskModule,res-stir-shaken,STIR/SHAKEN resource module,STIR/SHAKEN resource module.,+$(PKG_NAME)-curl +libjwt,stir_shaken.conf,res_stir_shaken,,)) $(eval $(call BuildAsteriskModule,res-stun-monitor,STUN monitoring,STUN network monitor.,,res_stun_monitor.conf,res_stun_monitor,,)) $(eval $(call BuildAsteriskModule,res-timing-dahdi,DAHDI Timing Interface,DAHDI timing interface.,+$(PKG_NAME)-chan-dahdi,,res_timing_dahdi,,)) $(eval $(call BuildAsteriskModule,res-timing-pthread,pthread Timing Interface,pthread timing interface.,,,res_timing_pthread,,)) diff --git a/net/asterisk/patches/100-build-reproducibly.patch b/net/asterisk/patches/100-build-reproducibly.patch index f16421b..d667f36 100644 --- a/net/asterisk/patches/100-build-reproducibly.patch +++ b/net/asterisk/patches/100-build-reproducibly.patch @@ -17,10 +17,10 @@ * build.h --- a/build_tools/make_xml_documentation +++ b/build_tools/make_xml_documentation -@@ -187,7 +187,7 @@ printf "Building Documentation For: " +@@ -193,7 +193,7 @@ printf "Building Documentation For: " for subdir in ${mod_subdirs} ; do printf "%s " "${subdir}" - subdir_path="${source_tree}/${subdir}" + subdir_path=$(make_absolute "$subdir") - for i in $(${FIND} "${subdir_path}" -name '*.c' -or -name '*.cc'); do + for i in $(${FIND} "${subdir_path}" -name '*.c' -or -name '*.cc' | LC_ALL=C sort); do if [ "${with_moduleinfo}" -eq "1" ] ; then diff --git a/net/asterisk/patches/130-eventfd.patch b/net/asterisk/patches/130-eventfd.patch index 60e7d26..81bd332 100644 --- a/net/asterisk/patches/130-eventfd.patch +++ b/net/asterisk/patches/130-eventfd.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -1257,7 +1257,7 @@ if test "${ac_cv_have_variable_fdset}x" +@@ -1272,7 +1272,7 @@ if test "${ac_cv_have_variable_fdset}x" fi AC_MSG_CHECKING([if we have usable eventfd support]) diff --git a/net/asterisk/patches/140-use-default-lua.patch b/net/asterisk/patches/140-use-default-lua.patch index 006a07f..3857d13 100644 --- a/net/asterisk/patches/140-use-default-lua.patch +++ b/net/asterisk/patches/140-use-default-lua.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2608,7 +2608,7 @@ if test -z "$__opus_include" -o x"$__opu +@@ -2623,7 +2623,7 @@ if test -z "$__opus_include" -o x"$__opu fi AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) diff --git a/net/asterisk/patches/180-app_queue_time_t.patch b/net/asterisk/patches/180-app_queue_time_t.patch index d582a39..3e47c0f 100644 --- a/net/asterisk/patches/180-app_queue_time_t.patch +++ b/net/asterisk/patches/180-app_queue_time_t.patch @@ -1,6 +1,6 @@ --- a/apps/app_queue.c +++ b/apps/app_queue.c -@@ -4614,8 +4614,12 @@ static int is_longest_waiting_caller(str +@@ -4625,8 +4625,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) { -- 2.30.2