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

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

Revision: 6147
          http://sourceforge.net/p/astlinux/code/6147
Author:   abelbeck
Date:     2013-07-22 19:30:23 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
asterisk, version bump to 1.8.23.0 and 11.5.0

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

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch

Deleted: branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch	2013-07-22 18:20:23 UTC (rev 6146)
+++ branches/1.0/package/asterisk/asterisk-11-ASTERISK-21785-tmp-refs-astobj2.patch	2013-07-22 19:30:23 UTC (rev 6147)
@@ -1,144 +0,0 @@
-Index: include/asterisk/astobj2.h
-===================================================================
---- asterisk-11.3.0/include/asterisk/astobj2.h	(revision 388691)
-+++ asterisk-11.3.0/include/asterisk/astobj2.h	(working copy)
-@@ -625,11 +625,20 @@
-  *
-  * \return Nothing
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_release(holder, tag)	\
- 	__ao2_global_obj_release(&holder, (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_release(holder)	\
- 	__ao2_global_obj_release(&holder, "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- 
-+#else
-+
-+#define ao2_t_global_obj_release(holder, tag)	\
-+	__ao2_global_obj_release(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_release(holder)	\
-+	__ao2_global_obj_release(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- void __ao2_global_obj_release(struct ao2_global_obj *holder, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- /*!
-@@ -647,11 +656,20 @@
-  * \retval Reference to previous global ao2 object stored.
-  * \retval NULL if no object available.
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_replace(holder, obj, tag)	\
- 	__ao2_global_obj_replace(&holder, (obj), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_replace(holder, obj)	\
- 	__ao2_global_obj_replace(&holder, (obj), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- 
-+#else
-+
-+#define ao2_t_global_obj_replace(holder, obj, tag)	\
-+	__ao2_global_obj_replace(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_replace(holder, obj)	\
-+	__ao2_global_obj_replace(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- void *__ao2_global_obj_replace(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- /*!
-@@ -670,10 +688,20 @@
-  * \retval 0 The global object was previously empty
-  * \retval 1 The global object was not previously empty
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_replace_unref(holder, obj, tag)	\
- 	__ao2_global_obj_replace_unref(&holder, (obj), (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_replace_unref(holder, obj)	\
- 	__ao2_global_obj_replace_unref(&holder, (obj), "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+
-+#else
-+
-+#define ao2_t_global_obj_replace_unref(holder, obj, tag)	\
-+	__ao2_global_obj_replace_unref(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_replace_unref(holder, obj)	\
-+	__ao2_global_obj_replace_unref(&holder, (obj), NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- int __ao2_global_obj_replace_unref(struct ao2_global_obj *holder, void *obj, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- /*!
-@@ -686,11 +714,20 @@
-  * \retval Reference to current ao2 object stored in the holder.
-  * \retval NULL if no object available.
-  */
-+#ifdef REF_DEBUG
- #define ao2_t_global_obj_ref(holder, tag)	\
- 	__ao2_global_obj_ref(&holder, (tag), __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- #define ao2_global_obj_ref(holder)	\
- 	__ao2_global_obj_ref(&holder, "", __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
- 
-+#else
-+
-+#define ao2_t_global_obj_ref(holder, tag)	\
-+	__ao2_global_obj_ref(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#define ao2_global_obj_ref(holder)	\
-+	__ao2_global_obj_ref(&holder, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__, #holder)
-+#endif
-+
- void *__ao2_global_obj_ref(struct ao2_global_obj *holder, const char *tag, const char *file, int line, const char *func, const char *name);
- 
- 
-Index: main/astobj2.c
-===================================================================
---- asterisk-11.3.0/main/astobj2.c	(revision 388691)
-+++ asterisk-11.3.0/main/astobj2.c	(working copy)
-@@ -656,7 +656,11 @@
- 
- 	/* Release the held ao2 object. */
- 	if (holder->obj) {
--		__ao2_ref_debug(holder->obj, -1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(holder->obj, -1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(holder->obj, -1);
-+		}
- 		holder->obj = NULL;
- 	}
- 
-@@ -678,7 +682,11 @@
- 	}
- 
- 	if (obj) {
--		__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(obj, +1);
-+		}
- 	}
- 	obj_old = holder->obj;
- 	holder->obj = obj;
-@@ -694,7 +702,11 @@
- 
- 	obj_old = __ao2_global_obj_replace(holder, obj, tag, file, line, func, name);
- 	if (obj_old) {
--		__ao2_ref_debug(obj_old, -1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(obj_old, -1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(obj_old, -1);
-+		}
- 		return 1;
- 	}
- 	return 0;
-@@ -717,7 +729,11 @@
- 
- 	obj = holder->obj;
- 	if (obj) {
--		__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		if (tag) {
-+			__ao2_ref_debug(obj, +1, tag, file, line, func);
-+		} else {
-+			__ao2_ref(obj, +1);
-+		}
- 	}
- 
- 	__ast_rwlock_unlock(file, line, func, &holder->lock, name);

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2013-07-22 18:20:23 UTC (rev 6146)
+++ branches/1.0/package/asterisk/asterisk.mk	2013-07-22 19:30:23 UTC (rev 6147)
@@ -10,9 +10,9 @@
 ASTERISK_VERSION := 1.6.2.21
  else
   ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.22.0
+ASTERISK_VERSION := 1.8.23.0
   else
-ASTERISK_VERSION := 11.4.0
+ASTERISK_VERSION := 11.5.0
   endif
  endif
 endif

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