From deca918110ea4a857c369b58ec966e372f86f263 Mon Sep 17 00:00:00 2001
From: Mazi Lo <openwrt.mazilo@recursor.net>
Date: Sat, 11 Oct 2014 09:58:41 -0400
Subject: [PATCH] FreeSWITCH: Git HASH e4e9b1b9f93f3b1c6e344519d52d3854520ba29a

1. Add an option to enable/disable STUN.
2. Set STUN default setting to disable for now.

Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
---
 net/freeswitch/Config.in | 6 ++++++
 net/freeswitch/Makefile  | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index ecc0c8c..a102e65 100644
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -173,6 +173,12 @@ menu "Configuration"
     help
 	Compile with SSL support.
 
+  config FS_WITH_STUN
+    bool "Enable stun module"
+    default n
+    help
+	Enable stun module
+
   config FS_WITH_OPT
     bool "Enable optimization"
     default y
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index dd3e072..db1c880 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -18,7 +18,7 @@ PKG_VERSION:=1.5.15b
 # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from
 # http://fisheye.freeswitch.org
 #
-FS_WITH_DEFAULT_HEAD:=66dafbde8ca0484141f044bcdf8132310742b443
+FS_WITH_DEFAULT_HEAD:=e4e9b1b9f93f3b1c6e344519d52d3854520ba29a
 PKG_SOURCE_URL:=https://stash.$(PKG_NAME).org/scm/fs/$(PKG_NAME).git
 PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_LATEST_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD|cut -f1),$(FS_WITH_DEFAULT_HEAD))
 FS_WITH_DEFAULT_HEAD_SHORT:=$(shell echo $(FS_WITH_DEFAULT_HEAD)|cut -b -7)
@@ -219,6 +219,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_FS_WITH_SRTP_GENERIC_AESICM \
 	CONFIG_FS_WITH_SRTP_KERNEL_LINUX \
 	CONFIG_FS_WITH_SRTP_OPENSSL \
+	CONFIG_FS_WITH_STUN \
 	CONFIG_FS_WITH_VISIBILITY \
 	$(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \
 
@@ -592,6 +593,7 @@ CONFIGURE_ARGS+= \
 	$(call autoconf_bool,CONFIG_FS_WITH_SRTP_GENERIC_AESICM,generic-aesicm) \
 	$(call autoconf_bool,CONFIG_FS_WITH_SRTP_KERNEL_LINUX,kernel-linux) \
 	$(call autoconf_bool,CONFIG_FS_WITH_SRTP_OPENSSL,openssl) \
+	$(call autoconf_bool,CONFIG_FS_WITH_STUN,stun) \
 	$(call autoconf_bool,CONFIG_FS_WITH_APR_THREADS,threads) \
 	$(call autoconf_bool,CONFIG_FS_WITH_VISIBILITY,visibility) \
 	$(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp && CONFIG_FS_WITH_FIXED_POINT,fixed-point) \
-- 
2.11.0