svn commit: r539612 - in branches/2020Q2/net/asterisk13: . files
Guido Falsi
madpilot at FreeBSD.org
Fri Jun 19 14:17:16 UTC 2020
Author: madpilot
Date: Fri Jun 19 14:17:15 2020
New Revision: 539612
URL: https://svnweb.freebsd.org/changeset/ports/539612
Log:
MFH: r539599
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/asterisk13/Makefile
branches/2020Q2/net/asterisk13/files/patch-channels-chan_dahdi.c
Directory Properties:
branches/2020Q2/ (props changed)
Modified: branches/2020Q2/net/asterisk13/Makefile
==============================================================================
--- branches/2020Q2/net/asterisk13/Makefile Fri Jun 19 14:02:10 2020 (r539611)
+++ branches/2020Q2/net/asterisk13/Makefile Fri Jun 19 14:17:15 2020 (r539612)
@@ -2,6 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 13.32.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
Modified: branches/2020Q2/net/asterisk13/files/patch-channels-chan_dahdi.c
==============================================================================
--- branches/2020Q2/net/asterisk13/files/patch-channels-chan_dahdi.c Fri Jun 19 14:02:10 2020 (r539611)
+++ branches/2020Q2/net/asterisk13/files/patch-channels-chan_dahdi.c Fri Jun 19 14:17:15 2020 (r539612)
@@ -1,6 +1,6 @@
---- channels/chan_dahdi.c.orig 2017-12-20 19:05:45 UTC
+--- channels/chan_dahdi.c.orig 2020-06-11 08:42:48 UTC
+++ channels/chan_dahdi.c
-@@ -4666,6 +4666,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4716,6 +4716,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)
-@@ -4696,7 +4698,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
+@@ -4746,7 +4748,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
break;
}
#endif /* defined(HAVE_PRI) || defined(HAVE_SS7) */
@@ -19,7 +19,7 @@
if (res) {
ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
} else {
-@@ -4730,8 +4733,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
+@@ -4780,8 +4783,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
if (p->echocanon) {
struct dahdi_echocanparams ecp = { .tap_length = 0 };
@@ -30,3 +30,16 @@
if (res)
ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
+@@ -18271,8 +18275,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;
++ }
+ }
+ }
+ }
More information about the svn-ports-all
mailing list