From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Fri, 19 Mar 2021 17:24:43 +0000 (+0100)
Subject: asterisk: update to 18.2.2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fad04b6d2e57afacee6c94f4f6776619fcf0606c;p=feed%2Ftelephony.git

asterisk: update to 18.2.2

Updated 140-use-default-lua.patch.

Patches refreshed:
  001-disable-semaphores-on-uclibc-otherwise-allow.patch
  002-configure-fix-detection-of-re-entrant-resolver-funct.patch
  100-build-reproducibly.patch
  130-eventfd.patch

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 8c21ce2..38e2082 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk
-PKG_VERSION:=18.1.1
-PKG_RELEASE:=3
+PKG_VERSION:=18.2.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
-PKG_HASH:=d0c0e90379c680a2803b9ba99d35918f5b9522c51998109bcc1937ee53ebdaa3
+PKG_HASH:=c7a3da64e30d1ac428ae2cf4723d3a2b799ae88768341084ce8a2e3e424ae163
 
 PKG_BUILD_DEPENDS:=libxml2/host
 
diff --git a/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch b/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch
index ad8bc59..b7d3f53 100644
--- a/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch
+++ b/net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1035,15 +1035,18 @@ AC_LINK_IFELSE(
+@@ -1040,15 +1040,18 @@ AC_LINK_IFELSE(
  
  # Some platforms define sem_init(), but only support sem_open(). joyous.
  AC_MSG_CHECKING(for working unnamed semaphores)
diff --git a/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch b/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch
index 74ae605..9dad5bb 100644
--- a/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch
+++ b/net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch
@@ -18,7 +18,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1429,7 +1429,11 @@ AC_LINK_IFELSE(
+@@ -1434,7 +1434,11 @@ AC_LINK_IFELSE(
  			#include <arpa/nameser.h>
  			#endif
  			#include <resolv.h>],
diff --git a/net/asterisk/patches/100-build-reproducibly.patch b/net/asterisk/patches/100-build-reproducibly.patch
index 736fd5d..7ffa74a 100644
--- a/net/asterisk/patches/100-build-reproducibly.patch
+++ b/net/asterisk/patches/100-build-reproducibly.patch
@@ -17,7 +17,7 @@
   * build.h
 --- a/Makefile
 +++ b/Makefile
-@@ -488,7 +488,7 @@ doc/core-en_US.xml: makeopts .lastclean
+@@ -489,7 +489,7 @@ doc/core-en_US.xml: makeopts .lastclean
  	@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
  	@for x in $(MOD_SUBDIRS); do \
  		printf "$$x " ; \
diff --git a/net/asterisk/patches/130-eventfd.patch b/net/asterisk/patches/130-eventfd.patch
index 75a0e70..1fb986e 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
-@@ -1208,7 +1208,7 @@ if test "${ac_cv_have_variable_fdset}x"
+@@ -1213,7 +1213,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 1dcbd05..f50af3e 100644
--- a/net/asterisk/patches/140-use-default-lua.patch
+++ b/net/asterisk/patches/140-use-default-lua.patch
@@ -1,15 +1,11 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2560,7 +2560,11 @@ if test -z "$__opus_include" -o x"$__opu
+@@ -2567,7 +2567,7 @@ if test -z "$__opus_include" -o x"$__opu
  fi
  AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
  
--for ver in 5.4 5.3 5.2 5.1; do
-+# This does not work for us. We have both liblua and liblua5.3 in
-+# $(STAGING_DIR)/usr. But the headers for liblua5.3 are in
-+# (STAGING_DIR)/usr/include/lua5.3. Using the below, Asterisk would
-+# use the headers from liblua and link against liblua5.3 :/
-+for ver in ; do
+-for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
++for ver in ${LUA_VERSIONS}; do
  	AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
  	if test "x${PBX_LUA}" = "x1" ; then
  		if test x"${LUA_DIR}" = x; then