Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

asterisk: update to 18.2.2

Browse source 
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>
This commit is contained in:
Sebastian Kemper 2021-03-19 18:24:43 +01:00
parent 9452a933ad
commit fad04b6d2e
6 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/asterisk/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk PKG_NAME:=asterisk
PKG_VERSION:=18.1.1 PKG_VERSION:=18.2.2
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
PKG_HASH:=d0c0e90379c680a2803b9ba99d35918f5b9522c51998109bcc1937ee53ebdaa3 PKG_HASH:=c7a3da64e30d1ac428ae2cf4723d3a2b799ae88768341084ce8a2e3e424ae163
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host

2
net/asterisk/patches/001-disable-semaphores-on-uclibc-otherwise-allow.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/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. # Some platforms define sem_init(), but only support sem_open(). joyous.
AC_MSG_CHECKING(for working unnamed semaphores) AC_MSG_CHECKING(for working unnamed semaphores)

2
net/asterisk/patches/002-configure-fix-detection-of-re-entrant-resolver-funct.patch
View file

@ -18,7 +18,7 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1429,7 +1429,11 @@ AC_LINK_IFELSE( @@ -1434,7 +1434,11 @@ AC_LINK_IFELSE(
#include <arpa/nameser.h> #include <arpa/nameser.h>
#endif #endif
#include <resolv.h>], #include <resolv.h>],

2
net/asterisk/patches/100-build-reproducibly.patch
View file

@ -17,7 +17,7 @@
* build.h * build.h
--- a/Makefile --- a/Makefile
+++ b/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\">" >> $@ @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
@for x in $(MOD_SUBDIRS); do \ @for x in $(MOD_SUBDIRS); do \
printf "$$x " ; \ printf "$$x " ; \

2
net/asterisk/patches/130-eventfd.patch
View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/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 fi
AC_MSG_CHECKING([if we have usable eventfd support]) AC_MSG_CHECKING([if we have usable eventfd support])

10
net/asterisk/patches/140-use-default-lua.patch
View file

@ -1,15 +1,11 @@
--- a/configure.ac --- a/configure.ac
+++ b/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 fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include]) 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 -for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
+# This does not work for us. We have both liblua and liblua5.3 in +for ver in ${LUA_VERSIONS}; do
+# $(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
AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm]) AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
if test "x${PBX_LUA}" = "x1" ; then if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then if test x"${LUA_DIR}" = x; then