From nobody Sat Mar 5 12:08:48 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B33C819F0A77; Sat, 5 Mar 2022 12:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K9k5s22qDz4Stn; Sat, 5 Mar 2022 12:08:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646482129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JwdHtFVES9/snU9y9+x8TvjAbcbUsJx7Z9/2aNk6ZuY=; b=FKHycHyBU/xyfoTKsz6VZFxCEfjU7Lpnp3CGjd6ptChrwvKoyoU9OHphLTs/QERdAkKMdy u2iuzEf7p7c0itbPayo570HrKK9G4D4fVUFOGn8lwlrRQK+e/vm4ooLngYdUwZBUytNe2p uShB5WoLpdULrKaCW0n9fl/yeuuPhxiBOAJvEmu9fLOHjAcaKTkT6kpv79TcQvFXWLsRA8 Wtzu42e0uEenQ7PUhZX2MpuxbUrPU66w1qXoDEa+99VXDTvmrbPQYY/PNg06TLFXP7hLxv kH4PBzwmqlCLVL/dSo+k7BZX93WSpV+eq2S+3ZCN0zejQstsl3B8WpgZhtLb2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E75F51FFB4; Sat, 5 Mar 2022 12:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 225C8mIb088425; Sat, 5 Mar 2022 12:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225C8m0m088424; Sat, 5 Mar 2022 12:08:48 GMT (envelope-from git) Date: Sat, 5 Mar 2022 12:08:48 GMT Message-Id: <202203051208.225C8m0m088424@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 9a666fba3ab0 - 2022Q1 - net/asterisk18: Update to 18.10.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 9a666fba3ab0104ff55b0d2eefc4de16d0c877b7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646482129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JwdHtFVES9/snU9y9+x8TvjAbcbUsJx7Z9/2aNk6ZuY=; b=LFOhEoLWeJb7BwcsQz73IBxhuERIiHXIhUmAZRy/dRzD9qfH54KqGowAn3afbyAyS4KKj9 akrwEvSU9itob5QldhQhxOhZvo2Rlc0/3llIabG2q1EmZQ2eJymart84MxVoqfg72ojbws G+C1z5Or2sK101ipWzZNvkKKL+5+C3lVp5C4KygxId0MbgnESbGLuEAyDdf2Rt4kDCdB13 b2a6LYr3PaYe5nM82vGq97l7AY7r3vDm9qSKn5YjHSRd1p3idjkFbrD2+FaltKgnOhydxr 6KHTlwyo3dkpPfjilEkJaqMDjV/hh5p0BQwCRGEkQVWSFrq0ovLQTDFMPECNdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646482129; a=rsa-sha256; cv=none; b=iifMFQQYPsoq8LRuzN4HW4RsQDu+31ZRS36wdWIXNUZWbNJ/vB4tY/MGjdKxIDj1QKORX/ SJM+euIlXtGamwRzxPLjaz0RN7IYFdV/7gELCPCnFTm0/yRfi3k0R3Lr+NweYFMqP60PDy y7dHw869T0PIZsbmO+zeybweZGFoxrMiARxhf4SyBBEUxEkz6CpX64FkDZ1Kpr1L72G13r HaMIsmXSN2k48lJAXUk3WMscUPNQJSYOMSqH1y8R1fNXjibTUvQneqEMGtSfAwMI6KHOPK aVovi+aNqtvu0WsOI6XLBEu8dXI+WwGP6fB0JUNMeLZZ8Hcnr7mpmwaQkA7/eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a666fba3ab0104ff55b0d2eefc4de16d0c877b7 commit 9a666fba3ab0104ff55b0d2eefc4de16d0c877b7 Author: Guido Falsi AuthorDate: 2022-02-10 22:17:25 +0000 Commit: Guido Falsi CommitDate: 2022-03-05 12:08:01 +0000 net/asterisk18: Update to 18.10.0 (cherry picked from commit c09fd977bf96f613acf47c8e15a8ffff2a5f5402) --- net/asterisk18/Makefile | 2 +- net/asterisk18/distinfo | 6 +-- net/asterisk18/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/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