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

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

Revision: 6313
          http://sourceforge.net/p/astlinux/code/6313
Author:   abelbeck
Date:     2013-12-19 16:04:49 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
asterisk, version bump to 1.8.25.0 and 11.7.0

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

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch
    branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch

Deleted: branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch	2013-12-13 18:44:42 UTC (rev 6312)
+++ branches/1.0/package/asterisk/asterisk-1.8-res_jabber-log-nonpubsub-error-to-debug.patch	2013-12-19 16:04:49 UTC (rev 6313)
@@ -1,11 +0,0 @@
---- asterisk-1.8.23.0/res/res_jabber.c.orig	2013-08-26 21:01:37.000000000 -0500
-+++ asterisk-1.8.23.0/res/res_jabber.c	2013-08-26 21:10:23.000000000 -0500
-@@ -3507,7 +3507,7 @@
- 	iks *orig_pubsub = iks_find(pak->x, "pubsub");
- 	struct aji_client *client;
- 	if (!orig_pubsub) {
--		ast_log(LOG_ERROR, "Error isn't a PubSub error, why are we here?\n");
-+		ast_debug(1, "Error isn't a PubSub error, why are we here?\n");
- 		return IKS_FILTER_EAT;
- 	}
- 	orig_request = iks_child(orig_pubsub);

Deleted: branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch	2013-12-13 18:44:42 UTC (rev 6312)
+++ branches/1.0/package/asterisk/asterisk-11-res_xmpp-log-nonpubsub-error-to-debug.patch	2013-12-19 16:04:49 UTC (rev 6313)
@@ -1,11 +0,0 @@
---- asterisk-11.5.0/res/res_xmpp.c.orig	2013-08-26 21:37:44.000000000 -0500
-+++ asterisk-11.5.0/res/res_xmpp.c	2013-08-26 21:39:26.000000000 -0500
-@@ -1381,7 +1381,7 @@
- 	}
- 
- 	if (!orig_pubsub) {
--		ast_log(LOG_ERROR, "Error isn't a PubSub error, why are we here?\n");
-+		ast_debug(1, "Error isn't a PubSub error, why are we here?\n");
- 		return IKS_FILTER_EAT;
- 	}
- 

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-12-13 18:44:42 UTC (rev 6312)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-12-19 16:04:49 UTC (rev 6313)
@@ -10,9 +10,9 @@
 ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.24.0
+ASTERISK_VERSION := 1.8.25.0
   else
-ASTERISK_VERSION := 11.6.0
+ASTERISK_VERSION := 11.7.0
   endif
  endif
 endif

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