From: <abe...@us...> - 2015-11-07 15:02:36
|
Revision: 7320 http://sourceforge.net/p/astlinux/code/7320 Author: abelbeck Date: 2015-11-07 15:02:33 +0000 (Sat, 07 Nov 2015) Log Message: ----------- asterisk, revert back to 11.19.0 and 13.5.0, later versions have stability issues as doucmented in ASTERISK-25476 Ref: https://issues.asterisk.org/jira/browse/ASTERISK-25476 Modified Paths: -------------- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch branches/1.0/package/asterisk/asterisk.mk Removed Paths: ------------- branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-11-07 15:02:33 UTC (rev 7320) @@ -1,6 +1,6 @@ --- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600 +++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600 -@@ -2404,11 +2404,13 @@ +@@ -2398,11 +2398,13 @@ AC_OUTPUT ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2 Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-11-07 15:02:33 UTC (rev 7320) @@ -1,6 +1,6 @@ --- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500 +++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500 -@@ -16767,7 +16767,7 @@ +@@ -16743,7 +16743,7 @@ } if (!force) { Deleted: branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk-11-issue-ASTERISK-25476.patch 2015-11-07 15:02:33 UTC (rev 7320) @@ -1,20 +0,0 @@ ---- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500 -+++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500 -@@ -4635,7 +4635,7 @@ - return; - } else { - if (rtp->rtcp) { -- if (rtp->rtcp->schedid > 0) { -+ if (rtp->rtcp->schedid > -1) { - if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) { - /* Successfully cancelled scheduler entry. */ - ao2_ref(instance, -1); -@@ -4863,7 +4863,7 @@ - } - #endif - -- if (rtp->rtcp && rtp->rtcp->schedid > 0) { -+ if (rtp->rtcp && rtp->rtcp->schedid > -1) { - if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) { - /* successfully cancelled scheduler entry. */ - ao2_ref(instance, -1); Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-11-07 15:02:33 UTC (rev 7320) @@ -1,6 +1,6 @@ --- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600 +++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600 -@@ -2517,11 +2517,13 @@ +@@ -2511,11 +2511,13 @@ AC_OUTPUT ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2 Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2015-11-07 15:02:33 UTC (rev 7320) @@ -1,6 +1,6 @@ --- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500 +++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500 -@@ -16911,7 +16911,7 @@ +@@ -16894,7 +16894,7 @@ } if (!force) { Deleted: branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk-13-issue-ASTERISK-25476.patch 2015-11-07 15:02:33 UTC (rev 7320) @@ -1,20 +0,0 @@ ---- asterisk-11.20.0/res/res_rtp_asterisk.c.orig 2015-10-20 12:52:37.000000000 -0500 -+++ asterisk-11.20.0/res/res_rtp_asterisk.c 2015-10-20 12:53:38.000000000 -0500 -@@ -4780,7 +4780,7 @@ - return; - } else { - if (rtp->rtcp) { -- if (rtp->rtcp->schedid > 0) { -+ if (rtp->rtcp->schedid > -1) { - if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) { - /* Successfully cancelled scheduler entry. */ - ao2_ref(instance, -1); -@@ -4997,7 +4997,7 @@ - } - #endif - -- if (rtp->rtcp && rtp->rtcp->schedid > 0) { -+ if (rtp->rtcp && rtp->rtcp->schedid > -1) { - if (!ast_sched_del(rtp->sched, rtp->rtcp->schedid)) { - /* successfully cancelled scheduler entry. */ - ao2_ref(instance, -1); Modified: branches/1.0/package/asterisk/asterisk.mk =================================================================== --- branches/1.0/package/asterisk/asterisk.mk 2015-11-06 17:50:29 UTC (rev 7319) +++ branches/1.0/package/asterisk/asterisk.mk 2015-11-07 15:02:33 UTC (rev 7320) @@ -7,9 +7,9 @@ ASTERISK_VERSION := 1.8.32.3 else ifeq ($(BR2_PACKAGE_ASTERISK_v11),y) -ASTERISK_VERSION := 11.20.0 +ASTERISK_VERSION := 11.19.0 else -ASTERISK_VERSION := 13.6.0 +ASTERISK_VERSION := 13.5.0 endif endif ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |