[Astlinux-commits] SF.net SVN: astlinux:[7650] branches/1.0/package/asterisk

[<abe...@us...>]

Revision: 7650
          http://sourceforge.net/p/astlinux/code/7650
Author:   abelbeck
Date:     2016-04-20 15:58:26 +0000 (Wed, 20 Apr 2016)
Log Message:
-----------
asterisk, version bump to 13.8.2 and add app_queue-segfault-fix patch for 11.x and 13.x

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.mk

Added Paths:
-----------
    branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
    branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch

Added: branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch	2016-04-20 15:58:26 UTC (rev 7650)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=fa432cb76f5e41ad1168b73d3cd415daf3c851c3;hp=4a8029080d4b88a34a84f8d2b20491ba1dcbf6f0;hb=32b4320d620ffff5c55f111fc22f22fdb07f8c60;hpb=981ed6091e513bc81d4863d409762638495c2ed1
+
+diff --git a/apps/app_queue.c b/apps/app_queue.c
+index 4a80290..fa432cb 100644
+--- a/apps/app_queue.c
++++ b/apps/app_queue.c
+@@ -3641,7 +3641,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
+ 		return 0;
+ 	}
+ 
+-	if (call->member->in_call && call->lastqueue->wrapuptime) {
++	if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
+ 		ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
+ 			call->interface, call->lastqueue->wrapuptime);
+ 		return 0;

Added: branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch	                        (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-app_queue-segfault-fix.patch	2016-04-20 15:58:26 UTC (rev 7650)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=34fdfe7a3ea3296c27dfa814b368ef46d8b7dd4f;hp=939a0e2ad99e415037334bd7e0b377e377ef85e8;hb=3b9d8b60b211377f2023ebfbfdd157cfb668de6e;hpb=56c8182913b4df446e39ac76283dc7be355210f4
+
+diff --git a/apps/app_queue.c b/apps/app_queue.c
+index 939a0e2..34fdfe7 100644
+--- a/apps/app_queue.c
++++ b/apps/app_queue.c
+@@ -4164,7 +4164,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
+ 		return 0;
+ 	}
+ 
+-	if (call->member->in_call && call->lastqueue->wrapuptime) {
++	if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
+ 		ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
+ 			call->interface, call->lastqueue->wrapuptime);
+ 		return 0;

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2016-04-19 13:12:10 UTC (rev 7649)
+++ branches/1.0/package/asterisk/asterisk.mk	2016-04-20 15:58:26 UTC (rev 7650)
@@ -9,7 +9,7 @@
  ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
 ASTERISK_VERSION := 11.22.0
  else
-ASTERISK_VERSION := 13.8.1
+ASTERISK_VERSION := 13.8.2
  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.