[packages] asterisk-1.8.x: update to 1.8.7.0, add requested modules #10230, patch...

SVN-Revision: 28462

diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile
index 1fdaa20d89fde9db511de4e1ca3584073ffafaf3..0ecc850c7d468be50c31e6cb4d4c92ee6d6af7f8 100644 (file)
--- 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.4.4
+PKG_VERSION:=1.8.7.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_MD5SUM:=bc2a1168603815c23f204927d1e73239
+PKG_MD5SUM:=5c6616a53fa3f300420ea17fd23abae9
 
 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 
@@ -266,7 +266,6 @@ EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
 EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
 
 define Build/Configure
-       -rm $(PKG_BUILD_DIR)/menuselect.makeopts
        $(call Build/Configure/Default,,$(SITE_VARS))
 endef
 
@@ -557,3 +556,7 @@ $(eval $(call Buildasterisk18ModuleTemplate,func_channel,Channel info,Channel in
 $(eval $(call Buildasterisk18ModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted))
 $(eval $(call Buildasterisk18ModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application))
 $(eval $(call Buildasterisk18ModuleTemplate,func_uri,URI encoding and decoding,Encodes and decodes URI-safe strings))
+$(eval $(call Buildasterisk18ModuleTemplate,app_disa,Direct Inward System Access,Direct Inward System Access))
+$(eval $(call Buildasterisk18ModuleTemplate,app_senddtmf,Send DTMF digits,Sends arbitrary DTMF digits))
+$(eval $(call Buildasterisk18ModuleTemplate,func_cut,CUT function,CUT function))
+$(eval $(call Buildasterisk18ModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI))

diff --git a/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch b/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch
new file mode 100644 (file)
index 0000000..bae44fe
--- /dev/null
+++ b/net/asterisk-1.8.x/patches/200-addons-defaultenable.patch
@@ -0,0 +1,66 @@
+--- a/addons/app_mysql.c
++++ b/addons/app_mysql.c
+@@ -25,7 +25,7 @@
+ 
+ /*** MODULEINFO
+       <depend>mysqlclient</depend>
+-      <defaultenabled>no</defaultenabled>
++      <defaultenabled>yes</defaultenabled>
+       <support_level>deprecated</support_level>
+       <replacement>func_odbc</replacement>
+  ***/
+--- a/addons/app_saycountpl.c
++++ b/addons/app_saycountpl.c
+@@ -21,7 +21,7 @@
+  */
+ 
+ /*** MODULEINFO
+-      <defaultenabled>no</defaultenabled>
++      <defaultenabled>yes</defaultenabled>
+       <support_level>deprecated</support_level>
+       <replacement>say.conf</replacement>
+  ***/
+--- a/addons/cdr_mysql.c
++++ b/addons/cdr_mysql.c
+@@ -35,7 +35,7 @@
+ 
+ /*** MODULEINFO
+       <depend>mysqlclient</depend>
+-      <defaultenabled>no</defaultenabled>
++      <defaultenabled>yes</defaultenabled>
+       <support_level>deprecated</support_level>
+       <replacement>cdr_adaptive_odbc</replacement>
+  ***/
+--- a/addons/chan_mobile.c
++++ b/addons/chan_mobile.c
+@@ -27,7 +27,7 @@
+ 
+ /*** MODULEINFO
+       <depend>bluetooth</depend>
+-      <defaultenabled>no</defaultenabled>
++      <defaultenabled>yes</defaultenabled>
+       <support_level>extended</support_level>
+  ***/
+ 
+--- a/addons/chan_ooh323.c
++++ b/addons/chan_ooh323.c
+@@ -18,7 +18,7 @@
+ 
+ 
+ /*** MODULEINFO
+-      <defaultenabled>no</defaultenabled>
++      <defaultenabled>yes</defaultenabled>
+       <support_level>extended</support_level>
+  ***/
+ 
+--- a/addons/res_config_mysql.c
++++ b/addons/res_config_mysql.c
+@@ -24,7 +24,7 @@
+ 
+ /*** MODULEINFO
+       <depend>mysqlclient</depend>
+-      <defaultenabled>no</defaultenabled>
++      <defaultenabled>yes</defaultenabled>
+       <support_level>extended</support_level>
+  ***/
+ 

diff --git a/net/asterisk-1.8.x/patches/200-menuselect_tree_addons.patch b/net/asterisk-1.8.x/patches/200-menuselect_tree_addons.patch
deleted file mode 100644 (file)
index d5ec2db..0000000
--- a/net/asterisk-1.8.x/patches/200-menuselect_tree_addons.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/menuselect-tree
-+++ b/menuselect-tree
-@@ -4,28 +4,28 @@
- <category name="MENUSELECT_ADDONS" displayname="Add-ons (See README-addons.txt)" remove_on_change="addons/modules.link">
- <member name="app_mysql" displayname="Simple Mysql Interface" remove_on_change="addons/app_mysql.o addons/app_mysql.so">
-       <depend>mysqlclient</depend>
--      <defaultenabled>no</defaultenabled>
-+      <defaultenabled>yes</defaultenabled>
- </member>
- <member name="app_saycountpl" displayname="Say polish counting words" remove_on_change="addons/app_saycountpl.o addons/app_saycountpl.so">
--      <defaultenabled>no</defaultenabled>
-+      <defaultenabled>yes</defaultenabled>
- </member>
- <member name="cdr_mysql" displayname="MySQL CDR Backend" remove_on_change="addons/cdr_mysql.o addons/cdr_mysql.so">
-       <depend>mysqlclient</depend>
--      <defaultenabled>no</defaultenabled>
-+      <defaultenabled>yes</defaultenabled>
- </member>
- <member name="chan_mobile" displayname="Bluetooth Mobile Device Channel Driver" remove_on_change="addons/chan_mobile.o addons/chan_mobile.so">
-       <depend>bluetooth</depend>
--      <defaultenabled>no</defaultenabled>
-+      <defaultenabled>yes</defaultenabled>
- </member>
- <member name="chan_ooh323" displayname="Objective Systems H323 Channel" remove_on_change="addons/chan_ooh323.o addons/chan_ooh323.so">
--      <defaultenabled>no</defaultenabled>
-+      <defaultenabled>yes</defaultenabled>
- </member>
- <member name="format_mp3" displayname="MP3 format [Any rate but 8000hz mono is optimal]" remove_on_change="addons/format_mp3.o addons/format_mp3.so">
-       <defaultenabled>no</defaultenabled>
- </member>
- <member name="res_config_mysql" displayname="MySQL RealTime Configuration Driver" remove_on_change="addons/res_config_mysql.o addons/res_config_mysql.so">
-       <depend>mysqlclient</depend>
--      <defaultenabled>no</defaultenabled>
-+      <defaultenabled>yes</defaultenabled>
- </member>
- </category>
- <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">

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
index 0f865f916c56ccfbc970d2942d6fc4ec3de5c620..8bdfe3fd01dd7edf6188cce93613e29d8f0b8c3f 100644 (file)
--- a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
+++ b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
@@ -1,6 +1,6 @@
 --- a/main/utils.c
 +++ b/main/utils.c
-@@ -1635,7 +1635,7 @@ ast_string_field __ast_string_field_allo
+@@ -1666,7 +1666,7 @@ ast_string_field __ast_string_field_allo
        }
  
        result = (*pool_head)->base + (*pool_head)->used;
@@ -9,7 +9,7 @@
        /* SPARC requires that the allocation field be aligned. */
        if ((long) result % sizeof(ast_string_field_allocation)) {
                result++;
-@@ -1716,7 +1716,7 @@ void __ast_string_field_ptr_build_va(str
+@@ -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);

diff --git a/net/asterisk-1.8.x/patches/400-gtalk.patch b/net/asterisk-1.8.x/patches/400-gtalk.patch
index 2e133a157b0b83b68c7ec7ab69be890e9ff089b0..d5dbfc90070b1325f50c7fa57020ff1676387281 100644 (file)
--- a/net/asterisk-1.8.x/patches/400-gtalk.patch
+++ b/net/asterisk-1.8.x/patches/400-gtalk.patch
@@ -1,11 +1,12 @@
 --- a/channels/chan_gtalk.c
 +++ b/channels/chan_gtalk.c
-@@ -480,7 +480,7 @@ static int gtalk_ringing_ack(void *data,
+@@ -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, "sta: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);