[Astlinux-commits] SF.net SVN: astlinux:[2583] branches/s2s/package/asterisk

[<kr...@us...>]

Revision: 2583
          http://astlinux.svn.sourceforge.net/astlinux/?rev=2583&view=rev
Author:   krisk84
Date:     2009-03-24 20:57:08 +0000 (Tue, 24 Mar 2009)

Log Message:
-----------
update to Asterisk 1.4.24 to fix CANCEL

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

Removed Paths:
-------------
    branches/s2s/package/asterisk/asterisk-app_page.patch

Deleted: branches/s2s/package/asterisk/asterisk-app_page.patch
===================================================================
--- branches/s2s/package/asterisk/asterisk-app_page.patch	2009-03-23 00:41:20 UTC (rev 2582)
+++ branches/s2s/package/asterisk/asterisk-app_page.patch	2009-03-24 20:57:08 UTC (rev 2583)
@@ -1,22 +0,0 @@
---- asterisk-1.4.23.orig/apps/app_page.c	2009/01/25 04:17:33	170978
-+++ asterisk-1.4.23/apps/app_page.c	2009/01/25 13:33:20	170979
-@@ -120,12 +120,15 @@
- 	/* Count number of extensions in list by number of ampersands + 1 */
- 	num_dials = 1;
- 	tmp2 = tmp;
--	while (*tmp2 && *tmp2++ == '&') {
--		num_dials++;
-+	while (*tmp2) {
-+		if (*tmp2 == '&') {
-+			num_dials++;
-+		}
-+		tmp2++;
- 	}
- 
--	if (!(dial_list = ast_calloc(num_dials, sizeof(void *)))) {
--		ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (long)(sizeof(void *) * num_dials));
-+	if (!(dial_list = ast_calloc(num_dials, sizeof(struct ast_dial *)))) {
-+		ast_log(LOG_ERROR, "Can't allocate %ld bytes for dial list\n", (long)(sizeof(struct ast_dial *) * num_dials));
- 		ast_module_user_remove(u);
- 		return -1;
- 	}

Modified: branches/s2s/package/asterisk/asterisk.mk
===================================================================
--- branches/s2s/package/asterisk/asterisk.mk	2009-03-23 00:41:20 UTC (rev 2582)
+++ branches/s2s/package/asterisk/asterisk.mk	2009-03-24 20:57:08 UTC (rev 2583)
@@ -3,7 +3,7 @@
 # asterisk
 #
 ##############################################################
-ASTERISK_VERSION := 1.4.23
+ASTERISK_VERSION := 1.4.24
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
 ASTERISK_SITE := http://downloads.digium.com/pub/asterisk/releases
 ASTERISK_DIR := $(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.