From 958401fa8f98e50df02917eded1eb4815997985d Mon Sep 17 00:00:00 2001 From: Sebastian Kemper Date: Fri, 15 Apr 2022 16:25:50 +0200 Subject: [PATCH] asterisk: bump to version 18.11.2 - add two new modules (app_sf and func_json) - update 100-build-reproducibly.patch as upstream refactored some of the code - refresh patches This bump includes fixes for the following security issues: https://downloads.asterisk.org/pub/security/AST-2022-001.html https://downloads.asterisk.org/pub/security/AST-2022-002.html https://downloads.asterisk.org/pub/security/AST-2022-003.html Signed-off-by: Sebastian Kemper --- net/asterisk/Makefile | 8 +++++-- .../patches/100-build-reproducibly.patch | 22 +++++++++---------- net/asterisk/patches/130-eventfd.patch | 2 +- .../patches/140-use-default-lua.patch | 2 +- ...170-time-add-support-for-time64-libc.patch | 12 +++++----- ...tall-launchd-issue-on-cross-platfrom.patch | 4 ++-- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index afa5c24..196a7e1 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk -PKG_VERSION:=18.7.1 +PKG_VERSION:=18.11.2 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases -PKG_HASH:=11c8728718b59af74440276ba888484bc9201217719d56436e1e0e85bf533c17 +PKG_HASH:=b456d19610e53789446e097bb9773a82a04088922de0cfaff2b818326b67296b PKG_BUILD_DEPENDS:=libxml2/host @@ -88,6 +88,7 @@ MODULES_AVAILABLE:= \ app-sayunixtime \ app-senddtmf \ app-sendtext \ + app-sf \ app-skel \ app-sms \ app-softhangup \ @@ -192,6 +193,7 @@ MODULES_AVAILABLE:= \ func-holdintercept \ func-iconv \ func-jitterbuffer \ + func-json \ func-lock \ func-math \ func-md5 \ @@ -818,6 +820,7 @@ $(eval $(call BuildAsteriskModule,app-saycounted,Decline words,Decline words acc $(eval $(call BuildAsteriskModule,app-sayunixtime,Say Unix time,Say time.,,,app_sayunixtime,,)) $(eval $(call BuildAsteriskModule,app-senddtmf,Send DTMF digits,Send DTMF digits application.,,,app_senddtmf,,)) $(eval $(call BuildAsteriskModule,app-sendtext,Send text,Send text applications.,,,app_sendtext,,)) +$(eval $(call BuildAsteriskModule,app-sf,SF Sender and Receiver Applications,SF Sender and Receiver Applications.,,,app_sf,,)) $(eval $(call BuildAsteriskModule,app-skel,Skeleton [sample],Skeleton application.,,app_skel.conf,app_skel,,)) $(eval $(call BuildAsteriskModule,app-sms,SMS,SMS/PSTN handler.,,,app_sms,,)) $(eval $(call BuildAsteriskModule,app-softhangup,Hang up requested channel,Hangs up the requested channel.,,,app_softhangup,,)) @@ -922,6 +925,7 @@ $(eval $(call BuildAsteriskModule,func-hangupcause,HANGUPCAUSE related functions $(eval $(call BuildAsteriskModule,func-holdintercept,Hold interception dialplan function,Hold interception dialplan function.,,,func_holdintercept,,)) $(eval $(call BuildAsteriskModule,func-iconv,Charset conversion,Charset conversions.,,,func_iconv,,,$(ICONV_DEPENDS))) $(eval $(call BuildAsteriskModule,func-jitterbuffer,Jitter buffer for read side of channel,Jitter buffer for read side of channel.,,,func_jitterbuffer,,)) +$(eval $(call BuildAsteriskModule,func-json,JSON decoding function,JSON decoding function.,,,func_json,,)) $(eval $(call BuildAsteriskModule,func-lock,Dialplan mutexes,Dialplan mutexes.,,,func_lock,,)) $(eval $(call BuildAsteriskModule,func-math,Math functions,Mathematical dialplan function.,,,func_math,,)) $(eval $(call BuildAsteriskModule,func-md5,MD5 digest dialplan functions,MD5 digest dialplan functions.,,,func_md5,,)) diff --git a/net/asterisk/patches/100-build-reproducibly.patch b/net/asterisk/patches/100-build-reproducibly.patch index b4f017c..f16421b 100644 --- a/net/asterisk/patches/100-build-reproducibly.patch +++ b/net/asterisk/patches/100-build-reproducibly.patch @@ -15,14 +15,14 @@ cat << END /* * build.h ---- a/Makefile -+++ b/Makefile -@@ -489,7 +489,7 @@ doc/core-en_US.xml: makeopts .lastclean - @echo "" >> $@ - @for x in $(MOD_SUBDIRS); do \ - printf "$$x " ; \ -- for i in `find $$x -name '*.c'`; do \ -+ for i in `find $$x -name '*.c' | LC_ALL=C sort`; do \ - MODULEINFO=$$($(AWK) -f build_tools/get_moduleinfo $$i) ; \ - if [ -n "$$MODULEINFO" ] ; \ - then \ +--- a/build_tools/make_xml_documentation ++++ b/build_tools/make_xml_documentation +@@ -187,7 +187,7 @@ printf "Building Documentation For: " + for subdir in ${mod_subdirs} ; do + printf "%s " "${subdir}" + subdir_path="${source_tree}/${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 + MODULEINFO=$(${AWK} -f "${source_tree}/build_tools/get_moduleinfo" "${i}") + if [ "${MODULEINFO}" != "" ] ; then diff --git a/net/asterisk/patches/130-eventfd.patch b/net/asterisk/patches/130-eventfd.patch index c783a52..af6fa99 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 -@@ -1205,7 +1205,7 @@ if test "${ac_cv_have_variable_fdset}x" +@@ -1260,7 +1260,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 c71aa8a..5f723cc 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 -@@ -2556,7 +2556,7 @@ if test -z "$__opus_include" -o x"$__opu +@@ -2612,7 +2612,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/170-time-add-support-for-time64-libc.patch b/net/asterisk/patches/170-time-add-support-for-time64-libc.patch index ff4c8b7..fbfdee4 100644 --- a/net/asterisk/patches/170-time-add-support-for-time64-libc.patch +++ b/net/asterisk/patches/170-time-add-support-for-time64-libc.patch @@ -108,7 +108,7 @@ Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e } --- a/res/res_http_media_cache.c +++ b/res/res_http_media_cache.c -@@ -152,7 +152,7 @@ static void bucket_file_set_expiration(s +@@ -150,7 +150,7 @@ static void bucket_file_set_expiration(s } /* Use 'now' if we didn't get an expiration time */ @@ -117,7 +117,7 @@ Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e ast_bucket_file_metadata_set(bucket_file, "__actual_expires", time_buf); } -@@ -302,7 +302,7 @@ static int bucket_file_expired(struct as +@@ -314,7 +314,7 @@ static int bucket_file_expired(struct as return 1; } @@ -128,7 +128,7 @@ Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e --- a/res/res_odbc.c +++ b/res/res_odbc.c -@@ -1038,7 +1038,7 @@ static odbc_status odbc_obj_connect(stru +@@ -1029,7 +1029,7 @@ static odbc_status odbc_obj_connect(stru /* Dont connect while server is marked as unreachable via negative_connection_cache */ negative_cache_expiration = obj->parent->last_negative_connect.tv_sec + obj->parent->negative_connection_cache.tv_sec; if (time(NULL) < negative_cache_expiration) { @@ -217,7 +217,7 @@ Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e addr, --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c -@@ -4744,7 +4744,7 @@ static int persistence_expires_str2struc +@@ -4872,7 +4872,7 @@ static int persistence_expires_str2struc static int persistence_expires_struct2str(const void *obj, const intptr_t *args, char **buf) { const struct subscription_persistence *persistence = obj; @@ -228,7 +228,7 @@ Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e #define RESOURCE_LIST_INIT_SIZE 4 --- a/res/res_pjsip_registrar.c +++ b/res/res_pjsip_registrar.c -@@ -1272,7 +1272,7 @@ static void *check_expiration_thread(voi +@@ -1370,7 +1370,7 @@ static void *check_expiration_thread(voi while (check_interval) { sleep(check_interval); @@ -239,7 +239,7 @@ Change-Id: Ic8d61b26033f5c486b917e738c9608b0923a844e ast_debug(4, "Woke up at %s Interval: %d\n", time, check_interval); --- a/res/res_stir_shaken.c +++ b/res/res_stir_shaken.c -@@ -389,7 +389,7 @@ static void set_public_key_expiration(co +@@ -441,7 +441,7 @@ static void set_public_key_expiration(co actual_expires.tv_sec += EXPIRATION_BUFFER; } diff --git a/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch b/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch index 98d2595..cebaee6 100644 --- a/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch +++ b/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch @@ -32,7 +32,7 @@ Signed-off-by: Sergey V. Lobanov --- a/Makefile +++ b/Makefile -@@ -589,9 +589,9 @@ bininstall: _all installdirs $(SUBDIRS_I +@@ -558,9 +558,9 @@ bininstall: _all installdirs $(SUBDIRS_I $(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/" $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/" @@ -47,7 +47,7 @@ Signed-off-by: Sergey V. Lobanov $(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation" --- a/makeopts.in +++ b/makeopts.in -@@ -369,3 +369,5 @@ SNDFILE_LIB=@SNDFILE_LIB@ +@@ -373,3 +373,5 @@ SNDFILE_LIB=@SNDFILE_LIB@ BEANSTALK_INCLUDE=@BEANSTALK_INCLUDE@ BEANSTALK_LIB=@BEANSTALK_LIB@ -- 2.30.2