net/asterisk18: Update to 18.10.0

(cherry picked from commit c09fd977bf96f613acf47c8e15a8ffff2a5f5402)

4 files changed, 15 insertions, 75 deletions

diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile
index a88c35fc59c0..6994a0ba002a 100644
--- a/net/asterisk18/Makefile
+++ b/net/asterisk18/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	asterisk
-PORTVERSION=	18.9.0
+PORTVERSION=	18.10.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo
index 5e7d94947c62..fa0eb793ec9c 100644
--- a/net/asterisk18/distinfo
+++ b/net/asterisk18/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1639080727
-SHA256 (asterisk/asterisk-18.9.0.tar.gz) = 6db6d295d5b99318a68a6c36e797c3a784e921670945acc7202542317ebffaef
-SIZE (asterisk/asterisk-18.9.0.tar.gz) = 28045278
+TIMESTAMP = 1644500200
+SHA256 (asterisk/asterisk-18.10.0.tar.gz) = 6bf59b8ef05c3c245c36d3e1916e843891d6af716e951a1c32453fc16e70eb12
+SIZE (asterisk/asterisk-18.10.0.tar.gz) = 28071071
 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk18/files/patch-res_res__fax__spandsp.c b/net/asterisk18/files/patch-res_res__fax__spandsp.c
deleted file mode 100644
index 5ad7b22a40ad..000000000000
--- a/net/asterisk18/files/patch-res_res__fax__spandsp.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- res/res_fax_spandsp.c.orig	2021-11-02 08:42:19 UTC
-+++ res/res_fax_spandsp.c
-@@ -167,8 +167,8 @@ struct spandsp_pvt {
- static int spandsp_v21_new(struct spandsp_pvt *p);
- static void session_destroy(struct spandsp_pvt *p);
- static int t38_tx_packet_handler(t38_core_state_t *t38_core_state, void *data, const uint8_t *buf, int len, int count);
--static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code);
--static void spandsp_log(int level, const char *msg);
-+static void t30_phase_e_handler(void *data, int completion_code);
-+static void spandsp_log(void *user_data, int level, const char *msg);
- static int update_stats(struct spandsp_pvt *p, int completion_code);
- static int spandsp_modems(struct ast_fax_session_details *details);
- 
-@@ -375,10 +375,11 @@ static int update_stats(struct spandsp_pvt *p, int com
-  * This function pulls stats from the spandsp stack and stores them for res_fax
-  * to use later.
-  */
--static void t30_phase_e_handler(t30_state_t *t30_state, void *data, int completion_code)
-+static void t30_phase_e_handler(void *data, int completion_code)
- {
- 	struct ast_fax_session *s = data;
- 	struct spandsp_pvt *p = s->tech_pvt;
-+	t30_state_t *t30_state = p->t30_state;
- 	char headerinfo[T30_MAX_PAGE_HEADER_INFO + 1];
- 	const char *c;
- 	t30_stats_t stats;
-@@ -430,7 +431,7 @@ static void t30_phase_e_handler(t30_state_t *t30_state
-  *
-  * \note This function is a callback function called by spandsp.
-  */
--static void spandsp_log(int level, const char *msg)
-+static void spandsp_log(void *user_data, int level, const char *msg)
- {
- 	if (level == SPAN_LOG_ERROR) {
- 		ast_log(LOG_ERROR, "%s", msg);
-@@ -449,7 +450,7 @@ static void set_logging(logging_state_t *state, struct
- 		level = SPAN_LOG_DEBUG_3;
- 	}
- 
--	span_log_set_message_handler(state, spandsp_log);
-+	span_log_set_message_handler(state, spandsp_log, NULL);
- 	span_log_set_level(state, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | level);
- }
- 
-@@ -479,7 +480,7 @@ static void set_file(t30_state_t *t30_state, struct as
- static void set_ecm(t30_state_t *t30_state, struct ast_fax_session_details *details)
- {
- 	t30_set_ecm_capability(t30_state, details->option.ecm);
--	t30_set_supported_compressions(t30_state, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
-+	t30_set_supported_compressions(t30_state, T4_COMPRESSION_T4_1D | T4_COMPRESSION_T4_2D | T4_COMPRESSION_T6);
- }
- 
- static int spandsp_v21_new(struct spandsp_pvt *p)
-@@ -1256,7 +1257,7 @@ static int load_module(void)
- 	}
- 
- 	/* prevent logging to stderr */
--	span_set_message_handler(NULL);
-+	span_set_message_handler(NULL, NULL);
- 
- 	return AST_MODULE_LOAD_SUCCESS;
- }
diff --git a/net/asterisk18/files/patch-third-party_pjproject_Makefile b/net/asterisk18/files/patch-third-party_pjproject_Makefile
index 84f44591cb0e..dcfd4d618e80 100644
--- a/net/asterisk18/files/patch-third-party_pjproject_Makefile
+++ b/net/asterisk18/files/patch-third-party_pjproject_Makefile
@@ -1,8 +1,8 @@
---- third-party/pjproject/Makefile.orig	2020-09-09 15:43:27 UTC
+--- third-party/pjproject/Makefile.orig	2022-02-03 12:25:09 UTC
 +++ third-party/pjproject/Makefile
-@@ -98,14 +98,10 @@ _all: $(TARGETS)
+@@ -98,15 +98,11 @@ SHELL_ECHO_PREFIX := echo '[pjproject] '
  
- .DELETE_ON_ERROR:
+ _all: $(TARGETS)
  
 -$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak
 -	$(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\
@@ -12,12 +12,14 @@
 +	@true
  
  source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
--	$(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\
--	$(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
- 	$(ECHO_PREFIX) Unpacking $<
- 	-@rm -rf source pjproject-*/ >/dev/null 2>&1
- 	$(CMD_PREFIX) $(TAR) -xjf $<
-@@ -165,7 +161,7 @@ $(PJSIP_LIB_FILES): $(PJLIB_UTIL_LIB_FILES)
+-	$(CMD_PREFIX) \
+-		$(TARBALL_VERIFY) || (rm -rf $@ ; $(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD)) ;\
+-		$(SHELL_ECHO_PREFIX) Unpacking $< ;\
++	$(SHELL_ECHO_PREFIX) Unpacking $< ;\
+ 		rm -rf source pjproject-*/ $(REALLY_QUIET) || : ;\
+ 		$(TAR) -xjf $< ;\
+ 		mv pjproject-$(PJPROJECT_VERSION) source
+@@ -212,7 +208,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ
  
  pjproject.symbols: $(ALL_LIB_FILES)
  	$(ECHO_PREFIX) Generating symbols