From 445b5e5ff1f5a0d4ec1ed7a5c51271beae1684d4 Mon Sep 17 00:00:00 2001
From: Sebastian Kemper <sebastian_ml@gmx.net>
Date: Wed, 20 Apr 2022 23:18:16 +0200
Subject: asterisk-16.x: bump to version 16.25.2

This bumps asterisk to version 16.25.2 to address the following security
concerns:

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

Other changes:

- add two new modules (app_sf and func_json)
- update 100-build-reproducibly.patch as upstream refactored some of the
  code
- refresh patches
- "--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.
- backport 160-AST_EXT_TOOL_CHECK.patch from master for issue #672
- backport 180_build-fix-bininstall-launchd-issue-on-cross-platfrom.patch
  from master to fix a build issue on MacOS (patch from Sergey V.
  Lobanov <sergey@lobanov.in>)

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
---
 .../patches/160-AST_EXT_TOOL_CHECK.patch           | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 net/asterisk-16.x/patches/160-AST_EXT_TOOL_CHECK.patch

(limited to 'net/asterisk-16.x/patches/160-AST_EXT_TOOL_CHECK.patch')

diff --git a/net/asterisk-16.x/patches/160-AST_EXT_TOOL_CHECK.patch b/net/asterisk-16.x/patches/160-AST_EXT_TOOL_CHECK.patch
new file mode 100644
index 0000000..97c9d35
--- /dev/null
+++ b/net/asterisk-16.x/patches/160-AST_EXT_TOOL_CHECK.patch
@@ -0,0 +1,22 @@
+--- a/autoconf/ast_ext_tool_check.m4
++++ b/autoconf/ast_ext_tool_check.m4
+@@ -8,13 +8,16 @@ AC_DEFUN([AST_EXT_TOOL_CHECK],
+ 	AC_REQUIRE([AST_PROG_SED])dnl
+ 	if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
+ 		PBX_$1=0
+-		AC_PATH_TOOL(CONFIG_$1, $2, No, [${$1_DIR}/bin:$PATH])
++		if test "x${$1_DIR}" != "x"; then
++			AC_PATH_TOOL(CONFIG_$1, $2, No, [${$1_DIR}/bin:$PATH])
++		else
++			AC_PATH_TOOL(CONFIG_$1, $2, No, [$PATH])
++		fi
+ 		if test ! "x${CONFIG_$1}" = xNo; then
+ 			$1_INCLUDE=$(${CONFIG_$1} m4_default([$3],[--cflags]))
+-			$1_INCLUDE=$(echo ${$1_INCLUDE} | $SED -e "s|-I|-I${$1_DIR}|g" -e "s|-std=c99||g")
++			$1_INCLUDE=$(echo ${$1_INCLUDE} | $SED -e "s|-std=c99||g")
+ 
+ 			$1_LIB=$(${CONFIG_$1} m4_default([$4],[--libs]))
+-			$1_LIB=$(echo ${$1_LIB} | $SED -e "s|-L|-L${$1_DIR}|g")
+ 
+ 			m4_ifval([$5], [
+ 				saved_cppflags="${CPPFLAGS}"
-- 
cgit