[packages_10.03.2] asterisk-1.8.x: merge r29504, r29601, r29665, r29761

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30193 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile
index 8da1ac6..be8aab5 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.7.1
+PKG_VERSION:=1.8.8.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/
-PKG_MD5SUM:=a732a608ce60fd523646be618e9da616
+PKG_MD5SUM:=7a32b35e1da0019c781b4ae10b599f61
 
 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION)
 
@@ -117,6 +117,18 @@ $(call Package/asterisk18/Default/description)
  Asterisk.
 endef
 
+define Package/asterisk18-res-srtp
+$(call Package/asterisk18/Default)
+  TITLE:=SRTP support
+  DEPENDS:= asterisk18 libsrtp +asterisk18-res-crypto
+endef
+
+define Package/asterisk18-res-srtp/description
+$(call Package/asterisk18/Default/description)
+ This package provides SRTP support to
+ Asterisk.
+endef
+
 define Package/asterisk18-chan-gtalk
 $(call Package/asterisk18/Default)
   TITLE:=GTalk support
@@ -231,6 +243,14 @@ else
        --without-bluetooth
 endif
 
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-res-srtp),)
+  CONFIGURE_ARGS+= \
+       --with-srtp="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+       --without-srtp
+endif
+
 CONFIGURE_ARGS+= \
        --without-curses \
        --with-gsm=internal \
@@ -480,6 +500,11 @@ define Package/asterisk18-mysql/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/
 endef
 
+define Package/asterisk18-res-srtp/install
+       $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/
+endef
+
 define Buildasterisk18ModuleTemplate
 
   define Package/asterisk18-$(subst _,-,$(1))
@@ -514,6 +539,7 @@ $(eval $(call BuildPackage,asterisk18-chan-mgcp))
 $(eval $(call BuildPackage,asterisk18-chan-skinny))
 $(eval $(call BuildPackage,asterisk18-curl))
 $(eval $(call BuildPackage,asterisk18-mysql))
+$(eval $(call BuildPackage,asterisk18-res-srtp))
 $(eval $(call Buildasterisk18ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands))
 $(eval $(call Buildasterisk18ModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available))
 $(eval $(call Buildasterisk18ModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel))
@@ -562,3 +588,5 @@ $(eval $(call Buildasterisk18ModuleTemplate,app_senddtmf,Send DTMF digits,Sends
 $(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))
+$(eval $(call Buildasterisk18ModuleTemplate,app_playtones,Playtones application,play a tone list))
+$(eval $(call Buildasterisk18ModuleTemplate,app_record,Record sound file,to record a sound file))