mirror of
https://github.com/openwrt/telephony.git
synced 2025-12-21 21:24:35 +04:00
3181481463
asterisk: update AST_EXT_TOOL_CHECK for OpenWrt Issue #672 shows that the current macro has some pitfalls, at least when running within OpenWrt's buildroot. The macro is used to detect these tools: 1. xml2-config 2. mysql_config 3. neon-config 4. net-snmp-config 5. sdl-config (we're not using SDL) The macro also adds configure arguments that allow to specify a path like so: --with-mysqlclient=PATH Macro problems: 1. If no PATH is specified, it adds "/bin" to the search path. Obviously this is a bad thing when cross-compiling. 2. If a PATH is specified, it adds it to the start of every include and library path it encounters. These paths are then broken. This commit makes problem 1 go away by making the addition of "${$1_DIR}/bin" to the PATH dependent on there being a PATH handed to the macro. An alternative would be to remove the PATH addition altogether, but then the macro wouldn't behave as expected. It also removes the path filtering of the include and lib dirs to address problem 2. Closes #672 Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> (cherry picked from commit79a0acfe56) asterisk: bump to 18.7.1 The removed patch has been applied upstream and is part of this release. Signed-off-by: Andre Heider <a.heider@gmail.com> (cherry picked from commit0399a3dc73) asterisk: add missing modules + dependency Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> (cherry picked from commit04b6b267f1) asterisk: fix build on macos This commit adds a patch to fix /sbin/launchd detection on macos Signed-off-by: Sergey V. Lobanov <sergey@lobanov.in> (cherry picked from commit4209a36afe) 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 <sebastian_ml@gmx.net> (cherry picked from commit958401fa8f) asterisk: add --without-libxslt to configure Since upstream commit b40c4d59b1dd803cad79060fb5b5a48d249ba578 "--disable-xmldoc" does no longer prevent the linking to libxslt, if available. If that's the case one is greeted with the following error: Package asterisk is missing dependencies for the following libraries: libxslt.so.1 This commit explicitly disables the use of libxslt, to avoid the dependency. Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> (cherry picked from commit64a1d2faef)
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
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@
|