From 89f65361634de6d9b95de6f02ddb2fbb758bca36 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 7 Dec 2011 22:44:34 +0000 Subject: [PATCH] merge asterisk-1.8.x updates SVN-Revision: 29476 --- net/asterisk-1.8.x/Makefile | 38 +++++++++-- .../patches/100-build_tools-iconv.patch | 2 +- .../patches/200-addons-defaultenable.patch | 66 +++++++++++++++++++ .../patches/200-menuselect_tree_addons.patch | 37 ----------- .../patches/300-word_alignment_arm.patch | 8 +-- net/asterisk-1.8.x/patches/400-gtalk.patch | 12 ++++ 6 files changed, 116 insertions(+), 47 deletions(-) create mode 100644 net/asterisk-1.8.x/patches/200-addons-defaultenable.patch delete mode 100644 net/asterisk-1.8.x/patches/200-menuselect_tree_addons.patch create 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 22deddb6b..8da1ac6c3 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.4.4 +PKG_VERSION:=1.8.7.1 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:=a732a608ce60fd523646be618e9da616 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) @@ -151,6 +151,17 @@ $(call Package/asterisk18/Default/description) This package provides the channel chan_mgcp support to Asterisk. endef +define Package/asterisk18-chan-skinny +$(call Package/asterisk18/Default) + TITLE:=Skinny channel support + DEPENDS:= asterisk18 +endef + +define Package/asterisk18-chan-skinny/description +$(call Package/asterisk18/Default/description) + This package provides the channel chan_skinny support to Asterisk. +endef + define Package/asterisk18-curl $(call Package/asterisk18/Default) TITLE:=CURL support @@ -166,7 +177,7 @@ endef define Package/asterisk18-mysql $(call Package/asterisk18/Default) TITLE:=MySQL support - DEPENDS:= asterisk18 +libmysqlclient + DEPENDS:= asterisk18 +PACKAGE_asterisk18-mysql:libmysqlclient endef define Package/asterisk18-mysql/description @@ -255,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 @@ -270,6 +280,7 @@ define Build/Compile ASTVARLIBDIR="/usr/lib/asterisk" \ ASTDATADIR="/usr/lib/asterisk" \ ASTKEYDIR="/usr/lib/asterisk" \ + ASTDBDIR="/usr/lib/asterisk" \ NOISY_BUILD="1" \ DEBUG="" \ OPTIMIZE="" \ @@ -340,6 +351,7 @@ define Package/asterisk18-voicemail/install $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/ $(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/ endef @@ -434,6 +446,17 @@ define Package/asterisk18-chan-mgcp/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mgcp.so $(1)/usr/lib/asterisk/modules/ endef +define Package/asterisk18-chan-skinny/conffiles +/etc/asterisk/skinny.conf +endef + +define Package/asterisk18-chan-skinny/install + $(INSTALL_DIR) $(1)/etc/asterisk + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/skinny.conf $(1)/etc/asterisk/ + $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/ +endef + define Package/asterisk18-curl/install $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/ @@ -488,6 +511,7 @@ $(eval $(call BuildPackage,asterisk18-res-musiconhold)) $(eval $(call BuildPackage,asterisk18-chan-gtalk)) $(eval $(call BuildPackage,asterisk18-chan-mobile)) $(eval $(call BuildPackage,asterisk18-chan-mgcp)) +$(eval $(call BuildPackage,asterisk18-chan-skinny)) $(eval $(call BuildPackage,asterisk18-curl)) $(eval $(call BuildPackage,asterisk18-mysql)) $(eval $(call Buildasterisk18ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands)) @@ -508,7 +532,6 @@ $(eval $(call Buildasterisk18ModuleTemplate,app_while,While loop,a while loop im $(eval $(call Buildasterisk18ModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel)) $(eval $(call Buildasterisk18ModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel)) $(eval $(call Buildasterisk18ModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs)) -$(eval $(call Buildasterisk18ModuleTemplate,codec_ulaw,Signed linear to ulaw translation,translation between signed linear and ulaw codecs)) $(eval $(call Buildasterisk18ModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs)) $(eval $(call Buildasterisk18ModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec)) $(eval $(call Buildasterisk18ModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs)) @@ -534,3 +557,8 @@ $(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)) +$(eval $(call Buildasterisk18ModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording)) diff --git a/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch b/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch index 1073bda9e..d3cad8252 100644 --- a/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch +++ b/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch @@ -1,6 +1,6 @@ --- a/build_tools/menuselect-deps.in +++ b/build_tools/menuselect-deps.in -@@ -14,7 +14,7 @@ GTK2=@PBX_GTK2@ +@@ -16,7 +16,7 @@ GTK2=@PBX_GTK2@ H323=@PBX_H323@ HOARD=@PBX_HOARD@ ICAL=@PBX_ICAL@ 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 index 000000000..bae44fe32 --- /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 + mysqlclient +- no ++ yes + deprecated + func_odbc + ***/ +--- a/addons/app_saycountpl.c ++++ b/addons/app_saycountpl.c +@@ -21,7 +21,7 @@ + */ + + /*** MODULEINFO +- no ++ yes + deprecated + say.conf + ***/ +--- a/addons/cdr_mysql.c ++++ b/addons/cdr_mysql.c +@@ -35,7 +35,7 @@ + + /*** MODULEINFO + mysqlclient +- no ++ yes + deprecated + cdr_adaptive_odbc + ***/ +--- a/addons/chan_mobile.c ++++ b/addons/chan_mobile.c +@@ -27,7 +27,7 @@ + + /*** MODULEINFO + bluetooth +- no ++ yes + extended + ***/ + +--- a/addons/chan_ooh323.c ++++ b/addons/chan_ooh323.c +@@ -18,7 +18,7 @@ + + + /*** MODULEINFO +- no ++ yes + extended + ***/ + +--- a/addons/res_config_mysql.c ++++ b/addons/res_config_mysql.c +@@ -24,7 +24,7 @@ + + /*** MODULEINFO + mysqlclient +- no ++ yes + extended + ***/ + 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 index d5ec2db44..000000000 --- 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 @@ - - - mysqlclient -- no -+ yes - - -- no -+ yes - - - mysqlclient -- no -+ yes - - - bluetooth -- no -+ yes - - -- no -+ yes - - - no - - - mysqlclient -- no -+ yes - - - 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 12d5551c1..cc638b3f7 100644 --- 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,20 +1,20 @@ --- a/main/utils.c +++ b/main/utils.c -@@ -1632,7 +1632,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; -#ifdef __sparc__ -+#if defined(__sparc__) || defined(__mips__) || defined(__arm__) ++#if defined(__sparc__) || defined(__arm__) /* SPARC requires that the allocation field be aligned. */ if ((long) result % sizeof(ast_string_field_allocation)) { result++; -@@ -1713,7 +1713,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); -#ifdef __sparc__ -+#if defined(__sparc__) || defined(__mips__) || defined(__arm__) ++#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 new file mode 100644 index 000000000..d5dbfc900 --- /dev/null +++ b/net/asterisk-1.8.x/patches/400-gtalk.patch @@ -0,0 +1,12 @@ +--- 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); -- 2.30.2