From: Jiri Slachta <jiri@slachta.eu>
Date: Wed, 12 May 2021 16:42:06 +0000 (+0200)
Subject: asterisk: update to 18.4.0
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec3a124bfc698d15bbc3c377a8bbe1bdd27260d0;p=feed%2Ftelephony.git

asterisk: update to 18.4.0

Patches updated/refreshed:

100-build-reproducibly.patch
130-eventfd.patch
140-use-default-lua.patch

Signed-off-by: Jiri Slachta <jiri@slachta.eu>
---

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 5bb21b5..269cd25 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
-PKG_VERSION:=18.2.2
+PKG_VERSION:=18.4.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=c7a3da64e30d1ac428ae2cf4723d3a2b799ae88768341084ce8a2e3e424ae163
+PKG_HASH:=91c0c35a0c53097647ab3e7b29d34dd0861fed0a8d52e3617408e9eced404db1
 
 PKG_BUILD_DEPENDS:=libxml2/host
 
diff --git a/net/asterisk/patches/100-build-reproducibly.patch b/net/asterisk/patches/100-build-reproducibly.patch
index 7ffa74a..b4f017c 100644
--- a/net/asterisk/patches/100-build-reproducibly.patch
+++ b/net/asterisk/patches/100-build-reproducibly.patch
@@ -23,6 +23,6 @@
  		printf "$$x " ; \
 -		for i in `find $$x -name '*.c'`; do \
 +		for i in `find $$x -name '*.c' | LC_ALL=C sort`; do \
- 			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
- 		done ; \
- 	done
+ 			MODULEINFO=$$($(AWK) -f build_tools/get_moduleinfo $$i) ; \
+ 			if [ -n "$$MODULEINFO" ] ; \
+ 			then \
diff --git a/net/asterisk/patches/130-eventfd.patch b/net/asterisk/patches/130-eventfd.patch
index ca57021..c783a52 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
-@@ -1210,7 +1210,7 @@ if test "${ac_cv_have_variable_fdset}x"
+@@ -1205,7 +1205,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 78ba140..bd7041f 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
-@@ -2560,7 +2560,7 @@ if test -z "$__opus_include" -o x"$__opu
+@@ -2555,7 +2555,7 @@ if test -z "$__opus_include" -o x"$__opu
  fi
  AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])