diff options
Diffstat (limited to 'net/asterisk/patches')
6 files changed, 21 insertions, 59 deletions
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 e8917e9..81d3c31 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 -@@ -1090,15 +1090,18 @@ AC_LINK_IFELSE( +@@ -1092,15 +1092,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 fad4417..44b60a7 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 -@@ -1484,7 +1484,11 @@ AC_LINK_IFELSE( +@@ -1496,7 +1496,11 @@ AC_LINK_IFELSE( #include <arpa/nameser.h> #endif #include <resolv.h>], diff --git a/net/asterisk/patches/130-eventfd.patch b/net/asterisk/patches/130-eventfd.patch index 39ed7d3..46b9701 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 -@@ -1263,7 +1263,7 @@ if test "${ac_cv_have_variable_fdset}x" +@@ -1265,7 +1265,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 9247664..bfe03a1 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 -@@ -2619,7 +2619,7 @@ if test -z "$__opus_include" -o x"$__opu +@@ -2632,7 +2632,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-menuselect-force-use-of-xml2-config.patch b/net/asterisk/patches/170-menuselect-force-use-of-xml2-config.patch new file mode 100644 index 0000000..486a1a5 --- /dev/null +++ b/net/asterisk/patches/170-menuselect-force-use-of-xml2-config.patch @@ -0,0 +1,17 @@ +Since commit dc701d6 in the OpenWrt packages repo the host libxml2 package +provides a static lib only. But Asterisk does not check that and calls +pkg-config without "--static". The result is that menuselect doesn't build. + +So don't use pkg-config for the libxml2 detection. Asterisk will resort to +use xml2-config, which outputs all the flags needed. + +--- a/menuselect/configure.ac ++++ b/menuselect/configure.ac +@@ -91,7 +91,6 @@ else + AST_EXT_LIB_CHECK([TINFO], [tinfo], [keypad], [curses.h]) + fi + +-AST_PKG_CONFIG_CHECK([LIBXML2], [libxml-2.0]) + AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , , + [#include <libxml/tree.h> + #include <libxml/parser.h>], 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 deleted file mode 100644 index cebaee6..0000000 --- a/net/asterisk/patches/180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: https://issues.asterisk.org/jira/browse/ASTERISK-29905 - -From d27d75ad8058f6ed35197737b949bac57202dd54 Mon Sep 17 00:00:00 2001 -From: "Sergey V. Lobanov" <sergey@lobanov.in> -Date: Wed, 9 Feb 2022 01:29:46 +0300 -Subject: [PATCH] build: fix bininstall launchd issue on cross-platfrom build - -configure script detects /sbin/launchd, but the result of this -check is not used in Makefile (bininstall). Makefile also detects -/sbin/launchd file to decide if it is required to install -safe_asterisk. - -configure script correctly detects cross compile build and sets -PBX_LAUNCHD=0 - -In case of building asterisk on MacOS host for Linux target using -external toolchain (e.g. OpenWrt toolchain), bininstall does not -install safe_asterisk (due to /sbin/launchd detection in Makefile), -but it is required on target (Linux). - -This patch adds HAVE_SBIN_LAUNCHD=@PBX_LAUNCHD@ to makeopts.in to -use the result of /sbin/launchd detection from configure script in -Makefile. -Also this patch uses HAVE_SBIN_LAUNCHD in Makefile (bininstall) to -decide if it is required to install safe_asterisk. - -Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in> ---- - Makefile | 6 +++--- - makeopts.in | 2 ++ - 2 files changed, 5 insertions(+), 3 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -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)/" -- if [ ! -f /sbin/launchd ]; then \ -- ./build_tools/install_subst contrib/scripts/safe_asterisk "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk"; \ -- fi -+ifneq ($(HAVE_SBIN_LAUNCHD),1) -+ ./build_tools/install_subst contrib/scripts/safe_asterisk "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk"; -+endif - - ifneq ($(DISABLE_XMLDOC),yes) - $(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation" ---- a/makeopts.in -+++ b/makeopts.in -@@ -373,3 +373,5 @@ SNDFILE_LIB=@SNDFILE_LIB@ - - BEANSTALK_INCLUDE=@BEANSTALK_INCLUDE@ - BEANSTALK_LIB=@BEANSTALK_LIB@ -+ -+HAVE_SBIN_LAUNCHD=@PBX_LAUNCHD@ |