From a2105ef51a8321ce72de4152af7951e87d52fb73 Mon Sep 17 00:00:00 2001 From: zandbelt Date: Sun, 11 Mar 2012 19:25:48 +0000 Subject: [PATCH] [packages] asterisk-1.8.x: upgrade to 1.8.10.0 git-svn-id: svn://svn.openwrt.org/openwrt/packages@30891 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/asterisk-1.8.x/Makefile | 4 ++-- .../patches/200-addons-defaultenable.patch | 11 ++++++++++ .../patches/300-word_alignment_arm.patch | 20 ------------------- net/asterisk-1.8.x/patches/400-gtalk.patch | 12 ----------- net/asterisk-1.8.x/patches/500-nres.patch | 12 +++++------ 5 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 net/asterisk-1.8.x/patches/300-word_alignment_arm.patch delete mode 100644 net/asterisk-1.8.x/patches/400-gtalk.patch diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile index 25ee81d19..28ccd59ef 100644 --- a/net/asterisk-1.8.x/Makefile +++ b/net/asterisk-1.8.x/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18 -PKG_VERSION:=1.8.8.0 +PKG_VERSION:=1.8.10.0 PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=7a32b35e1da0019c781b4ae10b599f61 +PKG_MD5SUM:=7b0f4c40ff21ffab6d777e4fa16ec724 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) diff --git a/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch b/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch index bae44fe32..65b9e7994 100644 --- a/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch +++ b/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch @@ -64,3 +64,14 @@ extended ***/ +--- a/res/res_pktccops.c ++++ b/res/res_pktccops.c +@@ -31,7 +31,7 @@ + */ + + /*** MODULEINFO +- no ++ yes + extended + ***/ + diff --git a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch deleted file mode 100644 index cc638b3f7..000000000 --- a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/main/utils.c -+++ b/main/utils.c -@@ -1666,7 +1666,7 @@ ast_string_field __ast_string_field_allo - } - - result = (*pool_head)->base + (*pool_head)->used; --#ifdef __sparc__ -+#if defined(__sparc__) || defined(__arm__) - /* SPARC requires that the allocation field be aligned. */ - if ((long) result % sizeof(ast_string_field_allocation)) { - result++; -@@ -1747,7 +1747,7 @@ void __ast_string_field_ptr_build_va(str - } - } else { - target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation); --#ifdef __sparc__ -+#if defined(__sparc__) || defined(__arm__) - if ((long) target % sizeof(ast_string_field_allocation)) { - target++; - space--; diff --git a/net/asterisk-1.8.x/patches/400-gtalk.patch b/net/asterisk-1.8.x/patches/400-gtalk.patch deleted file mode 100644 index d5dbfc900..000000000 --- a/net/asterisk-1.8.x/patches/400-gtalk.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/channels/chan_gtalk.c -+++ b/channels/chan_gtalk.c -@@ -481,7 +481,8 @@ static int gtalk_ringing_ack(void *data, - break; - } - if (!strcasecmp(name, "error") && -- (redirect = iks_find_cdata(traversenodes, "redirect")) && -+ ( (redirect = iks_find_cdata(traversenodes, "redirect")) || -+ (redirect = iks_find_cdata(traversenodes, "sta:redirect")) ) && - (redirect = strstr(redirect, "xmpp:"))) { - redirect += 5; - ast_log(LOG_DEBUG, "redirect %s\n", redirect); diff --git a/net/asterisk-1.8.x/patches/500-nres.patch b/net/asterisk-1.8.x/patches/500-nres.patch index 96c0f2efe..1d030b59b 100644 --- a/net/asterisk-1.8.x/patches/500-nres.patch +++ b/net/asterisk-1.8.x/patches/500-nres.patch @@ -1,11 +1,11 @@ --- a/configure +++ b/configure -@@ -24234,7 +24234,7 @@ $as_echo "$ac_try_echo") >&5 +@@ -16784,7 +16784,7 @@ if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - cat >>confdefs.h <<\_ACEOF --#define HAVE_RES_NINIT 1 -+//#define HAVE_RES_NINIT 1 - _ACEOF +-$as_echo "#define HAVE_RES_NINIT 1" >>confdefs.h ++$as_echo "//#define HAVE_RES_NINIT 1" >>confdefs.h - { $as_echo "$as_me:$LINENO: checking for library containing res_9_ndestroy" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_ndestroy" >&5 + $as_echo_n "checking for library containing res_9_ndestroy... " >&6; }