update to asterisk-18.10.0

telephony/asterisk/18/Makefile

@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2022/01/07 20:06:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2022/02/10 22:06:59 sthen Exp $
 
-VER=		18.9.0
+VER=		18.10.0
 PJ_V=		2.10
 SHLIB_V=	0.0
 VERSION_SPEC=	>=18.0,<19.0
 PORTROACH=	limit:^18\.
-REVISION=	0
-REVISION-main=	1
 
 .include <bsd.port.mk>

telephony/asterisk/18/distinfo

@@ -1,4 +1,4 @@
-SHA256 (asterisk-18.9.0.tar.gz) = bbbSldW5kximimw255fDp4TpIWcJRazHICVCMX6/+u8=
+SHA256 (asterisk-18.10.0.tar.gz) = a/WbjvBcPCRcNtPhkW6EOJHWr3FulRocMkU/wW5w6xI=
 SHA256 (pjproject-2.10.tar.bz2) = LooaSgBWLKiO6IvbaNoqnZg8RiiPc0BzKHuRamNrFZM=
-SIZE (asterisk-18.9.0.tar.gz) = 28045278
+SIZE (asterisk-18.10.0.tar.gz) = 28071071
 SIZE (pjproject-2.10.tar.bz2) = 7339188

telephony/asterisk/18/patches/patch-configure_ac

@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure_ac,v 1.2 2021/12/10 11:19:56 sthen Exp $
+$OpenBSD: patch-configure_ac,v 1.3 2022/02/10 22:06:59 sthen Exp $
 
 test for alpine-2.22's c-client and cope with API change.
 parts borrowed from slackware patch for PHP with alpine-2.22.
@@ -8,7 +8,7 @@ last hunk: adapt to openbsd's lua directory naming
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -2163,6 +2163,67 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -2175,6 +2175,67 @@ if test "${USE_IMAP_TK}" != "no"; then
  				[ac_cv_imap_tk="no"]
  	   		)
  			if test "${ac_cv_imap_tk}" = "no"; then
@@ -76,7 +76,7 @@ Index: configure.ac
  				imap_libs="-lcrypto -lssl -lc-client4"
  				LIBS="${saved_libs} ${imap_libs} "`echo ${imap_ldflags}`
  				AC_LINK_IFELSE(
-@@ -2291,6 +2352,9 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -2303,6 +2364,9 @@ if test "${USE_IMAP_TK}" != "no"; then
  		if test "${ac_cv_imap_tk2006}" = "yes"; then
  			AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
  		fi
@@ -86,7 +86,7 @@ Index: configure.ac
  	else
  		AC_MSG_RESULT(no)
  	fi
-@@ -2601,10 +2665,10 @@ fi
+@@ -2613,10 +2677,10 @@ fi
  AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
  
  for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do

telephony/asterisk/18/patches/patch-contrib_scripts_ast_coredumper

@@ -1,4 +1,4 @@
-$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.2 2021/12/10 11:19:56 sthen Exp $
+$OpenBSD: patch-contrib_scripts_ast_coredumper,v 1.3 2022/02/10 22:06:59 sthen Exp $
 
 Index: contrib/scripts/ast_coredumper
 --- contrib/scripts/ast_coredumper.orig
@@ -22,7 +22,7 @@ Index: contrib/scripts/ast_coredumper
  : ${HELP:=false}
  : ${LATEST:=false}
  : ${OUTPUTDIR:=/tmp}
-@@ -562,11 +563,8 @@ DESCRIPTION
+@@ -566,11 +567,8 @@ DESCRIPTION
  		A list of coredumps or coredump search patterns.  These
  		will override the default and those specified in the config files.
  

telephony/asterisk/18/patches/patch-main_utils_c

@@ -1,14 +1,14 @@
-$OpenBSD: patch-main_utils_c,v 1.2 2021/12/10 11:19:56 sthen Exp $
+$OpenBSD: patch-main_utils_c,v 1.3 2022/02/10 22:06:59 sthen Exp $
 
 Index: main/utils.c
 --- main/utils.c.orig
 +++ main/utils.c
-@@ -2659,6 +2659,8 @@ int ast_get_tid(void)
+@@ -2661,6 +2661,8 @@ int ast_get_tid(void)
  	long lwpid;
  	thr_self(&lwpid); /* available since sys/thr.h creation 2003 */
  	ret = lwpid;
 +#elif defined(__OpenBSD__)
 +	ret = getthrid();
+ #elif defined(__NetBSD__)
+ 	ret = _lwp_self();
  #endif
- 	return ret;
- }

telephony/asterisk/18/patches/patch-res_res_rtp_asterisk_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-res_res_rtp_asterisk_c,v 1.2 2021/11/02 12:40:57 sthen Exp $
+$OpenBSD: patch-res_res_rtp_asterisk_c,v 1.3 2022/02/10 22:06:59 sthen Exp $
 
 libressl *does* have this now
 
@@ -14,7 +14,7 @@ Index: res/res_rtp_asterisk.c
  	return DTLSv1_method();
  #else
  	return DTLS_method();
-@@ -9071,7 +9071,7 @@ static int store_stunaddr_resolved(const struct ast_dn
+@@ -9073,7 +9073,7 @@ static int store_stunaddr_resolved(const struct ast_dn
  		const unsigned char *data = (unsigned char *)ast_dns_record_get_data(record);
  		const int rr_type = ast_dns_record_get_rr_type(record);
  

telephony/asterisk/18/patches/patch-third-party_apply_patches

@@ -1,11 +1,11 @@
-$OpenBSD: patch-third-party_apply_patches,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $
+$OpenBSD: patch-third-party_apply_patches,v 1.2 2022/02/10 22:06:59 sthen Exp $
 
 Index: third-party/apply_patches
 --- third-party/apply_patches.orig
 +++ third-party/apply_patches
-@@ -27,7 +27,7 @@ fi
+@@ -29,7 +29,7 @@ fi
  
- for patchfile in "$patchdir"/*.patch ; do
+ for patchfile in ${patches} ; do
  	[ -z $quiet ] && echo "Applying patch $(basename $patchfile)"
 -	${PATCH} -d "$sourcedir" -p1 -s -i "$patchfile" || exit 1
 +	${PATCH} -d "$sourcedir" -z.orig.ast -p1 -s -i "$patchfile" || exit 1

telephony/asterisk/18/patches/patch-third-party_pjproject_Makefile

@@ -1,11 +1,11 @@
-$OpenBSD: patch-third-party_pjproject_Makefile,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $
+$OpenBSD: patch-third-party_pjproject_Makefile,v 1.2 2022/02/10 22:06:59 sthen Exp $
 
 Index: third-party/pjproject/Makefile
 --- third-party/pjproject/Makefile.orig
 +++ third-party/pjproject/Makefile
-@@ -98,7 +98,7 @@ _all: $(TARGETS)
+@@ -98,7 +98,7 @@ SHELL_ECHO_PREFIX := echo '[pjproject] '
  
- .DELETE_ON_ERROR:
+ _all: $(TARGETS)
  
 -$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak
 +$(DOWNLOAD_DIR)/$(TARBALL_FILE): 

telephony/asterisk/18/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1.1.1 2021/10/16 10:55:00 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2022/02/10 22:06:59 sthen Exp $
 @option is-branch
 @conflict asterisk-sounds-<=1.2.1p2
 @conflict asterisk-curl-*
@@ -302,6 +302,7 @@ lib/asterisk/modules/
 @so lib/asterisk/modules/app_sayunixtime.so
 @so lib/asterisk/modules/app_senddtmf.so
 @so lib/asterisk/modules/app_sendtext.so
+@so lib/asterisk/modules/app_sf.so
 @so lib/asterisk/modules/app_sms.so
 @so lib/asterisk/modules/app_softhangup.so
 @so lib/asterisk/modules/app_speech_utils.so
@@ -399,6 +400,7 @@ lib/asterisk/modules/
 @so lib/asterisk/modules/func_holdintercept.so
 @so lib/asterisk/modules/func_iconv.so
 @so lib/asterisk/modules/func_jitterbuffer.so
+@so lib/asterisk/modules/func_json.so
 @so lib/asterisk/modules/func_lock.so
 @so lib/asterisk/modules/func_logic.so
 @so lib/asterisk/modules/func_math.so