From c27e43f5b1a02c2e01aab97a1d6b831fabaa4524 Mon Sep 17 00:00:00 2001
From: Mazi Lo <OpenWRT@slickdeals.endjunk.com>
Date: Wed, 21 Sep 2011 17:04:50 +0000
Subject: [PATCH] update to the latest git commit to include fix for resources
 leak on mod_blacklist, blacklist.conf.xml file, and add the missing yaml
 configuration file.

SVN-Revision: 28281
---
 net/freeswitch/Makefile                              |  2 +-
 .../etc.minimal/autoload_configs/modules.conf.xml    | 12 +++++++-----
 .../blacklist/autoload_configs/blacklist.conf.xml    | 11 +++++++++++
 .../etc.packages/blacklist/blacklists/blocked.list   |  0
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml
 create mode 100644 net/freeswitch/files/etc.packages/blacklist/blacklists/blocked.list

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index a4dd797593..66e5647a02 100644
--- 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:=379c9fc41dd0196ccd7bf9640ae704b995cbc15e
+PKG_REV:=5fe3a22d83867d07f30ef7974329b2fa966747ea
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/modules.conf.xml b/net/freeswitch/files/etc.minimal/autoload_configs/modules.conf.xml
index e73a07cdf9..452d79f675 100644
--- a/net/freeswitch/files/etc.minimal/autoload_configs/modules.conf.xml
+++ b/net/freeswitch/files/etc.minimal/autoload_configs/modules.conf.xml
@@ -4,7 +4,7 @@
     <!-- Loggers (I'd load these first) -->
     <load module="mod_console"/>
     <load module="mod_logfile"/>
-    <load module="mod_syslog"/>
+    <!-- <load module="mod_syslog"/> -->
 
     <!--<load module="mod_yaml"/>-->
 
@@ -18,7 +18,7 @@
     <!-- <load module="mod_xml_cdr"/> -->
 
     <!-- Event Handlers -->
-    <!-- <load module="mod_cdr_csv"/> -->
+    <load module="mod_cdr_csv"/>
     <!-- <load module="mod_cdr_sqlite"/> -->
     <!-- <load module="mod_event_multicast"/> -->
     <load module="mod_event_socket"/>
@@ -31,7 +31,7 @@
     <!-- <load module="mod_ldap"/> -->
 
     <!-- Endpoints -->
-    <load module="mod_dingaling"/>
+    <!-- <load module="mod_dingaling"/> -->
     <!-- <load module="mod_portaudio"/> -->
     <!-- <load module="mod_alsa"/> -->
     <load module="mod_sofia"/>
@@ -42,10 +42,11 @@
     <!-- <load module="mod_unicall"/> -->
     <!-- <load module="mod_skinny"/> -->
     <!-- <load module="mod_khomp"/>   -->
+    <!-- <load module="mod_rtmp"/>   -->
 
     <!-- Applications -->
     <load module="mod_commands"/>
-    <!-- <load module="mod_conference"/> -->
+    <load module="mod_conference"/>
     <load module="mod_db"/>
     <load module="mod_dptools"/>
     <!-- <load module="mod_expr"/> -->
@@ -101,11 +102,11 @@
     <!-- <load module="mod_timerfd"/> -->
 
     <!-- Languages -->
-    <load module="mod_lua"/>
     <!-- <load module="mod_spidermonkey"/> -->
     <!-- <load module="mod_perl"/> -->
     <!-- <load module="mod_python"/> -->
     <!-- <load module="mod_java"/> -->
+    <load module="mod_lua"/>
 
     <!-- ASR /TTS -->
     <!-- <load module="mod_flite"/> -->
@@ -121,6 +122,7 @@
 
     <!-- Third party modules -->
     <!--<load module="mod_nibblebill"/>-->
+    <!--<load module="mod_callcenter"/>-->
 
   </modules>
 </configuration>
diff --git a/net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml b/net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml
new file mode 100644
index 0000000000..33be75d148
--- /dev/null
+++ b/net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml
@@ -0,0 +1,11 @@
+<configuration name="mod_blacklist.conf" description="Blacklist module">
+<lists>
+	<!--
+		Example blacklist, the referenced file contains blacklisted items, one entry per line
+
+		NOTE: make sure the file exists and is readable by FreeSWITCH.
+	-->
+
+	<list name="blocked" filename="/etc/freeswitch/blacklists/blocked.list"/>
+</lists>
+</configuration>
diff --git a/net/freeswitch/files/etc.packages/blacklist/blacklists/blocked.list b/net/freeswitch/files/etc.packages/blacklist/blacklists/blocked.list
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.30.2