Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Jun 2020 14:18:22 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r539613 - in branches/2020Q2/net/asterisk16: . files
Message-ID:  <202006191418.05JEIM7T002641@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Fri Jun 19 14:18:21 2020
New Revision: 539613
URL: https://svnweb.freebsd.org/changeset/ports/539613

Log:
  MFH: r539600
  
  Apply patch from upstream to fix regression in chan_dahdi channel
  variables.
  
  Obtainer from:	https://issues.asterisk.org/jira/browse/ASTERISK-28955
  
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2020Q2/net/asterisk16/Makefile
  branches/2020Q2/net/asterisk16/files/patch-channels-chan_dahdi.c
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/net/asterisk16/Makefile
==============================================================================
--- branches/2020Q2/net/asterisk16/Makefile	Fri Jun 19 14:17:15 2020	(r539612)
+++ branches/2020Q2/net/asterisk16/Makefile	Fri Jun 19 14:18:21 2020	(r539613)
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	16.9.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \

Modified: branches/2020Q2/net/asterisk16/files/patch-channels-chan_dahdi.c
==============================================================================
--- branches/2020Q2/net/asterisk16/files/patch-channels-chan_dahdi.c	Fri Jun 19 14:17:15 2020	(r539612)
+++ branches/2020Q2/net/asterisk16/files/patch-channels-chan_dahdi.c	Fri Jun 19 14:18:21 2020	(r539613)
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig	2018-08-08 16:02:31 UTC
+--- channels/chan_dahdi.c.orig	2020-06-16 14:39:16 UTC
 +++ channels/chan_dahdi.c
-@@ -4599,6 +4599,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
  		return;
  	}
  	if (p->echocancel.head.tap_length) {
@@ -9,7 +9,7 @@
  #if defined(HAVE_PRI) || defined(HAVE_SS7)
  		switch (p->sig) {
  #if defined(HAVE_PRI)
-@@ -4629,7 +4631,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
  			break;
  		}
  #endif	/* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -20,7 +20,7 @@
  		if (res) {
  			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
  		} else {
-@@ -4663,8 +4667,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
  
  	if (p->echocanon) {
  		struct dahdi_echocanparams ecp = { .tap_length = 0 };
@@ -31,3 +31,16 @@
  
  		if (res)
  			ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
+@@ -18147,8 +18152,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp
+ 				if ((varval = strchr(varname, '='))) {
+ 					*varval++ = '\0';
+ 					if ((tmpvar = ast_variable_new(varname, varval, ""))) {
+-						tmpvar->next = confp->chan.vars;
+-						confp->chan.vars = tmpvar;
++						if (ast_variable_list_replace(&confp->chan.vars, tmpvar)) {
++							tmpvar->next = confp->chan.vars;
++							confp->chan.vars = tmpvar;
++						}
+ 					}
+ 				}
+ 			}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006191418.05JEIM7T002641>