Date: Sat, 5 Mar 2022 12:08:45 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 350280ad4be6 - 2022Q1 - net/asterisk16: Update to 16.24.0 Message-ID: <202203051208.225C8j0r088345@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q1 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=350280ad4be6d85413049f1d86b7505f351c3903 commit 350280ad4be6d85413049f1d86b7505f351c3903 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2022-02-10 22:16:59 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2022-03-05 12:06:50 +0000 net/asterisk16: Update to 16.24.0 (cherry picked from commit 385f451f32a5d71b13fcddbae211f8c068d69c9b) --- net/asterisk16/Makefile | 2 +- net/asterisk16/distinfo | 6 +-- net/asterisk16/files/patch-res_res__fax__spandsp.c | 62 ---------------------- .../files/patch-third-party_pjproject_Makefile | 20 +++---- 4 files changed, 15 insertions(+), 75 deletions(-) diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 618c2ca48415..13cfd4632e91 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -1,5 +1,5 @@ PORTNAME= asterisk -PORTVERSION= 16.23.0 +PORTVERSION= 16.24.0 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo index 8b9bfb05ed8e..f29e40300c66 100644 --- a/net/asterisk16/distinfo +++ b/net/asterisk16/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1639080465 -SHA256 (asterisk/asterisk-16.23.0.tar.gz) = c2ad32bdf45bfc297a4f172cd9a6a98e53c30c75f5f916cbd1ba2e24e0df8054 -SIZE (asterisk/asterisk-16.23.0.tar.gz) = 27960909 +TIMESTAMP = 1644500161 +SHA256 (asterisk/asterisk-16.24.0.tar.gz) = c866d15ce15bd8c12b6d69a6092900472d066a440b352275cbce1e507e60fc58 +SIZE (asterisk/asterisk-16.24.0.tar.gz) = 27987904 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/asterisk16/files/patch-res_res__fax__spandsp.c b/net/asterisk16/files/patch-res_res__fax__spandsp.c deleted file mode 100644 index 7efe45d3e616..000000000000 --- a/net/asterisk16/files/patch-res_res__fax__spandsp.c +++ /dev/null @@ -1,62 +0,0 @@ ---- res/res_fax_spandsp.c.orig 2021-11-02 08:40:01 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/asterisk16/files/patch-third-party_pjproject_Makefile b/net/asterisk16/files/patch-third-party_pjproject_Makefile index fc1b47d6e802..45ae5db97c97 100644 --- a/net/asterisk16/files/patch-third-party_pjproject_Makefile +++ b/net/asterisk16/files/patch-third-party_pjproject_Makefile @@ -1,8 +1,8 @@ ---- third-party/pjproject/Makefile.orig 2020-07-09 15:39:17 UTC +--- third-party/pjproject/Makefile.orig 2022-02-03 12:19:37 UTC +++ third-party/pjproject/Makefile -@@ -88,14 +88,10 @@ _all: $(TARGETS) +@@ -88,15 +88,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 $< -@@ -155,7 +151,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 +@@ -202,7 +198,7 @@ $(ALL_LIB_FILES): source/build.mak source/pjlib/includ pjproject.symbols: $(ALL_LIB_FILES) $(ECHO_PREFIX) Generating symbols
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203051208.225C8j0r088345>