Added new mod_sms and updated to latest mod_blacklist with a capability to dump back...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28286 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 66e5647..d040de5 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -16,7 +16,7 @@ PKG_RELEASE:=1
 #
 # The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org
 #
-PKG_REV:=5fe3a22d83867d07f30ef7974329b2fa966747ea
+PKG_REV:=decb286114a685ea7920030f60f733c3fe34358c
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
@@ -112,6 +112,7 @@ FS_MOD_AVAILABLE:= \
        siren \
        skinny \
        skypopen \
+       sms \
        snapshot \
        snmp \
        snipe-hunt \
@@ -762,6 +763,7 @@ $(eval $(call BuildPlugin,silk,codec mod_silk,mod_silk,,))
 $(eval $(call BuildPlugin,siren,G.722.1 codec,mod_siren,,))
 $(eval $(call BuildPlugin,skinny,endpoint mod_skinny,mod_skinny,,))
 $(eval $(call BuildPlugin,skypopen,Skype compatible endpoint,mod_skypopen,,@FEATURE_drawing-backend_libX11))
+$(eval $(call BuildPlugin,sms,SMS application,mod_sms,,))
 $(eval $(call BuildPlugin,snapshot,application mod_snapshot,mod_snapshot,,))
 $(eval $(call BuildPlugin,sndfile,Multi-Format file transcoder,mod_sndfile,,))
 $(eval $(call BuildPlugin,snipe-hunt,application mod_snipe_hunt,mod_snipe_hunt,,))

diff --git a/net/freeswitch/files/etc.minimal/freeswitch.xml b/net/freeswitch/files/etc.minimal/freeswitch.xml
index f520617..ca9224e 100644 (file)
--- a/net/freeswitch/files/etc.minimal/freeswitch.xml
+++ b/net/freeswitch/files/etc.minimal/freeswitch.xml
@@ -50,21 +50,22 @@
     <X-PRE-PROCESS cmd="include" data="dialplan/*.xml"/>
   </section>
 
+  <section name="chatplan" description="Regex/XML Chatplan">
+    <X-PRE-PROCESS cmd="include" data="chatplan/*.xml"/>
+  </section>
+
   <!-- mod_dingaling is reliant on the vcard data in the "directory" section. -->
   <!-- mod_sofia is reliant on the user data for authorization --> 
   <section name="directory" description="User Directory">
     <X-PRE-PROCESS cmd="include" data="directory/*.xml"/>
   </section>
 
-  <section name="phrases" description="Speech Phrase Management">
-       <macros>
-               <X-PRE-PROCESS cmd="include" data="lang/de/*.xml">
-               <X-PRE-PROCESS cmd="include" data="lang/en/*.xml">
-               <X-PRE-PROCESS cmd="include" data="lang/fr/*.xml">
-               <X-PRE-PROCESS cmd="include" data="lang/ru/*.xml">
-       </macros>
+  <!-- languages section (under development still) -->
+  <section name="languages" description="Language Management">
+    <X-PRE-PROCESS cmd="include" data="lang/de/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="lang/he/*.xml"/>
   </section>
-
 </document>
-
-

diff --git a/net/freeswitch/files/etc.packages/sms/chatplan/default.xml b/net/freeswitch/files/etc.packages/sms/chatplan/default.xml
new file mode 100644 (file)
index 0000000..b67bb63
--- /dev/null
+++ b/net/freeswitch/files/etc.packages/sms/chatplan/default.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<include>
+  <context name="default">
+
+    <extension name="demo">
+      <condition field="to" expression="^(.*)$">
+       <!--    <action application="lua" data="test.lua"/> -->
+
+       <action application="reply" data="Hello, you said: ${_body}"/>
+      </condition>
+    </extension>
+
+  </context>
+</include>

diff --git a/net/freeswitch/patches/001-build-modules_conf_in.patch b/net/freeswitch/patches/001-build-modules_conf_in.patch
index 1806603..a7b1956 100644 (file)
--- a/net/freeswitch/patches/001-build-modules_conf_in.patch
+++ b/net/freeswitch/patches/001-build-modules_conf_in.patch
@@ -1,9 +1,9 @@
 --- a/build/modules.conf.in
 +++ b/build/modules.conf.in
-@@ -38,10 +38,13 @@ applications/mod_valet_parking
- #applications/mod_fsk
+@@ -40,10 +40,13 @@ applications/mod_valet_parking
  #applications/mod_ladspa
  #applications/mod_mongo
+ applications/mod_sms
 +#applications/mod_mp4
 +#applications/mod_protovm
  codecs/mod_g723_1
@@ -14,7 +14,7 @@
  #codecs/mod_codec2
  codecs/mod_g729
  #codecs/mod_com_g729
-@@ -59,6 +62,7 @@ dialplans/mod_dialplan_xml
+@@ -61,6 +64,7 @@ dialplans/mod_dialplan_xml
  dialplans/mod_dialplan_asterisk
  #directories/mod_ldap
  #endpoints/mod_dingaling
@@ -22,11 +22,11 @@
  #endpoints/mod_portaudio
  endpoints/mod_sofia
  endpoints/mod_loopback
-@@ -79,6 +83,7 @@ endpoints/mod_loopback
+@@ -81,6 +85,7 @@ endpoints/mod_loopback
  #event_handlers/mod_event_multicast
  event_handlers/mod_event_socket
  #event_handlers/mod_event_zmq
 +#event_handlers/mod_json_cdr
  event_handlers/mod_cdr_csv
  event_handlers/mod_cdr_sqlite
- #event_handlers/mod_cdr_pg_csv
+ #event_handlers/mod_cdr_mongodb