asterisk-13.x: update to 13.24.0

Update to the current 13.x release, see [0].

[0] http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-13-current

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2018-12-14 17:13:17 +01:00
parent ef174dc928
commit 452b5d7d44
5 changed files with 10 additions and 10 deletions

View file

@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk13 PKG_NAME:=asterisk13
PKG_VERSION:=13.23.1 PKG_VERSION:=13.24.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
PKG_HASH:=c772acbfdddb9250bfe07f7e20a7efb6a79a6c123832727429486c78d44fc78c PKG_HASH:=0ad7761acec4deaf8f157a33f8636995b9179b8462022f42577978ae31383fd8
PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
PKG_BUILD_DEPENDS:=libxml2/host PKG_BUILD_DEPENDS:=libxml2/host

View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1016,19 +1016,6 @@ AC_LINK_IFELSE( @@ -1030,19 +1030,6 @@ AC_LINK_IFELSE(
] ]
) )

View file

@ -1,6 +1,6 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1363,7 +1363,6 @@ AC_LINK_IFELSE( @@ -1377,7 +1377,6 @@ AC_LINK_IFELSE(
#include <resolv.h>], #include <resolv.h>],
[int foo = res_ninit(NULL);])], [int foo = res_ninit(NULL);])],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

View file

@ -26,8 +26,8 @@
+#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE } +#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
+#endif +#endif
#define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, 1 } #define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, {1, 0} }
#define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, 0 } #define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, {0, 0} }
@@ -114,9 +120,11 @@ struct ast_lock_track { @@ -114,9 +120,11 @@ struct ast_lock_track {
int reentrancy; int reentrancy;
const char *func[AST_MAX_REENTRANCY]; const char *func[AST_MAX_REENTRANCY];
@ -40,7 +40,7 @@
pthread_mutex_t reentr_mutex; pthread_mutex_t reentr_mutex;
}; };
@@ -241,6 +249,7 @@ enum ast_lock_type { @@ -264,6 +272,7 @@ enum ast_lock_type {
* on the lock. ast_mark_lock_acquired() will mark it as held by this thread. * on the lock. ast_mark_lock_acquired() will mark it as held by this thread.
*/ */
#if !defined(LOW_MEMORY) #if !defined(LOW_MEMORY)
@ -48,7 +48,7 @@
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
void ast_store_lock_info(enum ast_lock_type type, const char *filename, void ast_store_lock_info(enum ast_lock_type type, const char *filename,
int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt); int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt);
@@ -248,14 +257,22 @@ void ast_store_lock_info(enum ast_lock_t @@ -271,14 +280,22 @@ void ast_store_lock_info(enum ast_lock_t
void ast_store_lock_info(enum ast_lock_type type, const char *filename, void ast_store_lock_info(enum ast_lock_type type, const char *filename,
int line_num, const char *func, const char *lock_name, void *lock_addr); int line_num, const char *func, const char *lock_name, void *lock_addr);
#endif /* HAVE_BKTR */ #endif /* HAVE_BKTR */
@ -71,7 +71,7 @@
#endif /* !defined(LOW_MEMORY) */ #endif /* !defined(LOW_MEMORY) */
/*! /*!
@@ -283,19 +300,27 @@ void ast_mark_lock_failed(void *lock_add @@ -306,19 +323,27 @@ void ast_mark_lock_failed(void *lock_add
* be removed from the current thread's lock info struct. * be removed from the current thread's lock info struct.
*/ */
#if !defined(LOW_MEMORY) #if !defined(LOW_MEMORY)

View file

@ -10,7 +10,7 @@
kfreebsd*-gnu) kfreebsd*-gnu)
OSARCH=kfreebsd-gnu OSARCH=kfreebsd-gnu
;; ;;
@@ -1495,9 +1498,11 @@ AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_ope @@ -1509,9 +1512,11 @@ AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_ope
# openSUSE requires -lz # openSUSE requires -lz
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty -lz]) AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty -lz])