FreeSWITCH:

1. Bump to git HEAD dc671d9d82e5ccdc5617f53c68c272c44a56b535
  2. Fix mod-erlang-event
  3. Add mod-basic, mod-cdr-mongodb, mod-memcached, and mod-mongo

Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>

net/freeswitch/patches/0000002-build-config-erlang_m4.patch

@@ -0,0 +1,56 @@
+--- a/build/config/erlang.m4
++++ b/build/config/erlang.m4
+@@ -16,25 +16,26 @@ then
+ 
+ 	if test "$with_erlang" != "yes" -a "$with_erlang" != "try" ; then
+ 		AC_MSG_CHECKING([for erlang])
+-		if test ! -x "$with_erlang" ; then
++		if test ! -x "$with_erlang/../../host/lib/erlang/bin" ; then
+ 			AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
+ 		fi
+-		AC_MSG_RESULT([$with_erlang])
+-		AC_SUBST([ERLANG], ["$with_erlang"])
++		AC_MSG_RESULT(["$with_erlang/../../host/lib/erlang/bin/erl"])
++		AC_SUBST([ERL],["$with_erlang/../../host/lib/erlang/bin/erl"])
+ 	else
+-		AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
++		AC_ERLANG_NEED_ERL(["$with_erlang/../../host/lib/erlang/bin"])
+ 	fi
+ 
+-	if test "$ERLANG" != "no" ; then
++	if test "$ERL" != "no" ; then
+ 		AC_MSG_CHECKING([erlang version])
+-		ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`"
++		ERLANG_VER="`$ERL -version 2>&1 | cut -d' ' -f6`"
+ 
+ 		if test -z "$ERLANG_VER" ; then
+ 			AC_MSG_ERROR([Unable to detect erlang version])
++		else
++			AC_MSG_RESULT([$ERLANG_VER])
+ 		fi
+-		AC_MSG_RESULT([$ERLANG_VER])
+ 
+-		ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
++		ERLANG_LIBDIR="$with_erlang/lib"
+ 		AC_MSG_CHECKING([erlang libdir])
+ 		if test -z "`echo $ERLANG_LIBDIR`" ; then
+ 			AC_MSG_ERROR([failed])
+@@ -44,7 +45,7 @@ then
+ 		fi
+ 		AC_MSG_RESULT([$ERLANG_LIBDIR])
+ 
+-		ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
++		ERLANG_INCDIR="$with_erlang/include"
+ 		AC_MSG_CHECKING([erlang incdir])
+ 		if test -z "`echo $ERLANG_INCDIR`" ; then
+ 			AC_MSG_ERROR([failed])
+@@ -61,7 +62,8 @@ then
+ 		# check liei
+ 		AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
+ 		# maybe someday ei will actually expose this?
+-		AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
++		# until then, we comment it out
++		#AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
+ 
+ 		if test "$has_libei" = "no" ; then
+ 			AS_IF([test "$with_erlang" = "try"],

net/freeswitch/patches/0000010-configure_ac.patch

@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -803,7 +803,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
+ 
+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
+ 
+-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
+ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
+ 
+ AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[

net/freeswitch/patches/0000011-Makefile.am.patch

@@ -6,9 +6,9 @@
 +include $(BASE)/build/openwrt_rules.mk
 +
  EXTRA_DIST =
- SUBDIRS = . src
+ SUBDIRS = . src build
- AUTOMAKE_OPTIONS = foreign
+ AUTOMAKE_OPTIONS = foreign subdir-objects
-@@ -164,7 +168,6 @@ ZRTP_LIBS = -lbn -lzrtp
+@@ -171,7 +175,6 @@ ZRTP_LIBS = -lbn -lzrtp
  libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
  libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
  CORE_LIBS += libs/libzrtp/libzrtp.a
@@ -16,16 +16,7 @@
  endif
  
  library_includedir      = $(includedir)
-@@ -427,7 +430,7 @@ $(switch_builddir)/quiet_libtool: $(swit
+@@ -630,7 +633,9 @@ sndfile-reconf:
- 	@cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool
- 
- build/print_git_revision: build/print_git_revision.c
--	$(CC) -o $@ $<
-+	$(HOSTCC) -o $@ $<
- 
- src/include/switch_version.h: src/include/switch_version.h.in Makefile build/print_git_revision $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
- 	@cat $< > $@; \
-@@ -665,7 +668,9 @@ sndfile-reconf:
  
  tiff-reconf:
  	cd libs/tiff-4.0.2 && autoreconf -fi
@@ -36,7 +27,7 @@
  	cd libs/tiff-4.0.2 && make
  
  python-reconf:
-@@ -690,9 +695,6 @@ iks-reconf:
+@@ -653,9 +658,6 @@ iks-reconf:
  	$(MAKE) mod_dingaling-clean
  
  spandsp-reconf: tiff-reconf

net/freeswitch/patches/002-configure_in.patch

@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -162,7 +162,7 @@ if test "${enable_optimizer}" = "yes" ;
-         AX_CC_MAXOPT
- fi
- 
--AX_PATH_LIBGNUTLS()
-+#AX_PATH_LIBGNUTLS()
- 
- # set defaults for use on all platforms
- SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu"
-@@ -614,7 +614,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
- 
- AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
- 
--AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
-+# AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])])
- AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])])
- 
- AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[

net/freeswitch/patches/100-libs-esl-Makefile.patch

@@ -1,9 +0,0 @@
---- a/libs/esl/Makefile
-+++ b/libs/esl/Makefile
-@@ -1,3 +1,6 @@
-+BASE=../..
-+include $(BASE)/build/openwrt_rules.mk
-+
- include eslmake.rules
- PWD=$(shell pwd)
- INCS=-I$(PWD)/src/include

net/freeswitch/patches/1114000-libs-libcodec2-src-Makefile_am.patch

@@ -0,0 +1,15 @@
+--- a/libs/libcodec2/src/Makefile.am
++++ b/libs/libcodec2/src/Makefile.am
+@@ -88,6 +88,12 @@ codebookge.$(OBJEXT): codebookge.c
+ 
+ codebook.lo: codebook.c
+ 
++generate_codebook:
++	$(CC_FOR_BUILD) -o generate_codebook generate_codebook.c -lm
++
++genlspdtcb:
++	$(CC_FOR_BUILD) -o genlspdtcb genlspdtcb.c -lm
++
+ codebook.c: generate_codebook $(CODEBOOKS)
+ 	./generate_codebook lsp_cb $(CODEBOOKS) > codebook.c
+ 

net/freeswitch/patches/1304150-src-mod-codecs-mod_opus-Makefile_am.patch

@@ -0,0 +1,11 @@
+--- a/src/mod/codecs/mod_opus/Makefile.am
++++ b/src/mod/codecs/mod_opus/Makefile.am
+@@ -17,7 +17,7 @@ $(OPUS_DIR)/configure:
+ 
+ $(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure
+ 	mkdir -p $(OPUS_BUILDDIR)
+-	cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR)
++	cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(host) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
+ 	$(TOUCH_TARGET)
+ 
+ $(OPUS_LA): $(OPUS_BUILDDIR)/Makefile

net/freeswitch/patches/1306000-src-mod-directories-mod_ldap-Makefile_am.patch

@@ -0,0 +1,11 @@
+--- a/src/mod/directories/mod_ldap/Makefile.am
++++ b/src/mod/directories/mod_ldap/Makefile.am
+@@ -13,7 +13,7 @@ mod_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWI
+ mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
+ mod_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
+ 
+-MY_DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb
++MY_DEFAULT_ARGS=--host=$(host) --with-yielding_select=yes --disable-slapd --disable-bdb --disable-hdb
+ 
+ $(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)
+ 

net/freeswitch/patches/1307000-src-mod-endpoints-mod_gsmopen-Makefile_am.patch

@@ -0,0 +1,11 @@
+--- a/src/mod/endpoints/mod_gsmopen/Makefile.am
++++ b/src/mod/endpoints/mod_gsmopen/Makefile.am
+@@ -12,7 +12,7 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libsp
+ mod_LTLIBRARIES = mod_gsmopen.la
+ mod_gsmopen_la_SOURCES  = mod_gsmopen.cpp gsmopen_protocol.cpp 
+ mod_gsmopen_la_CXXFLAGS = $(SWITCH_AM_CXXFLAGS)
+-mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
++mod_gsmopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I. -fpermissive
+ mod_gsmopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
+ mod_gsmopen_la_LDFLAGS  = -avoid-version -module -no-undefined -lctb-0.16 -lgsmme
+ 

net/freeswitch/patches/1307010-src-mod-endpoints-mod_gsmopen-gsmlib-gsmlib-1.10-patched-13ubuntu-configure_in.patch

@@ -0,0 +1,24 @@
+--- a/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
++++ b/src/mod/endpoints/mod_gsmopen/gsmlib/gsmlib-1.10-patched-13ubuntu/configure.in
+@@ -56,21 +56,6 @@ dnl Checks for programs.
+ AC_PROG_CPP
+ AC_PROG_CXX
+ 
+-dnl check for gcc 2.95.x
+-AC_TRY_RUN([
+-#include <unistd.h>
+-main()
+-{
+-#if defined(__GNUC__) && \
+-    ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+-    return 1;
+-#endif
+-  return 0;
+-}
+-],,
+-[echo "need at least gcc 2.95 to compile correctly"
+-exit 1])
+-
+ dnl check for alloca
+ AC_FUNC_ALLOCA
+ 

net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch

@@ -1,17 +0,0 @@
---- a/src/mod/codecs/mod_opus/Makefile
-+++ b/src/mod/codecs/mod_opus/Makefile
-@@ -12,12 +12,13 @@ OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.l
- LOCAL_LIBADD=$(OPUS_LA)
- 
- include $(BASE)/build/modmake.rules
-+include $(BASE)/build/openwrt_rules.mk
- 
- $(OPUS_DIR):
- 	$(GETLIB) $(OPUS).tar.gz
- 
- $(OPUS_DIR)/Makefile: $(OPUS_DIR)
--	cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR)
-+	cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(GNU_TARGET_NAME) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
- 	$(TOUCH_TARGET)
- 
- $(OPUS_LA): $(OPUS_DIR)/Makefile

net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch

@@ -1,15 +0,0 @@
---- a/src/mod/codecs/mod_silk/Makefile
-+++ b/src/mod/codecs/mod_silk/Makefile
-@@ -1,4 +1,5 @@
- BASE=../../../..
-+include $(BASE)/build/openwrt_rules.mk
- SILK_DIR=$(switch_srcdir)/libs/silk
- SILK_BUILDDIR=$(switch_builddir)/libs/silk
- LOCAL_CFLAGS=-I$(SILK_DIR)/src  -I$(SILK_DIR)/interface
-@@ -8,5 +9,5 @@ LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o
- include $(BASE)/build/modmake.rules
- 
- $(SILK_LA): $(SILK_DIR)/.update	
--	cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE)
-+	cd $(SILK_BUILDDIR) && ./configure --host=$(GNU_TARGET_NAME) --disable-shared && make clean && $(MAKE)
- 	$(TOUCH_TARGET)

net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch

@@ -1,11 +0,0 @@
---- a/src/mod/directories/mod_ldap/Makefile
-+++ b/src/mod/directories/mod_ldap/Makefile
-@@ -21,7 +21,7 @@ $(LDAP_DIR):
- 
- $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR)
- 	mkdir -p $(LDAP_BUILDDIR)
--	cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
-+	cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) --with-yielding_select=yes
- 	$(TOUCH_TARGET)
- 
- $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile

net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch

@@ -1,20 +0,0 @@
---- a/src/mod/endpoints/mod_gsmopen/Makefile
-+++ b/src/mod/endpoints/mod_gsmopen/Makefile
-@@ -1,5 +1,15 @@
-+BASE=../../../..
- MODNAME=mod_gsmopen
--LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\"
--LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme
-+SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"'
-+
-+TIFF_DIR="$(shell ls -d $(switch_srcdir)/libs/tiff*)"
-+TIFF_BUILDDIR=$(TIFF_DIR)
-+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
-+
-+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
-+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
-+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
-+LOCAL_CFLAGS += $(SVNDEF) -I$(BASE)/libs/spandsp/src -I$(TIFF_DIR)/libtiff -I$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/include -fpermissive
-+LOCAL_LDFLAGS=-L$(BASE)/libs/spandsp/src -lspandsp -L$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib -lctb-0.16
- LOCAL_OBJS=gsmopen_protocol.o
- include ../../../../build/modmake.rules

net/freeswitch/patches/206-src-mod-event_handlers-mod_snmp-Makefile.patch

@@ -1,16 +0,0 @@
---- a/src/mod/event_handlers/mod_snmp/Makefile
-+++ b/src/mod/event_handlers/mod_snmp/Makefile
-@@ -1,7 +1,10 @@
--include ../../../../build/modmake.rules
-+BASE=../../../..
-+
-+include $(BASE)/build/modmake.rules
-+include $(BASE)/build/openwrt_rules.mk
-+
-+LOCAL_CFLAGS=$(shell $(STAGING_DIR)/host/bin/net-snmp-config --cflags --agent-libs) -DNETSNMP_NO_INLINE
- 
--LOCAL_CFLAGS=`net-snmp-config --cflags`
--LOCAL_LDFLAGS=`net-snmp-config --agent-libs`
- LOCAL_OBJS=subagent.o
- 
- local_depend: $(LOCAL_OBJS)

net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch

@@ -1,11 +0,0 @@
---- a/src/mod/xml_int/mod_xml_ldap/Makefile
-+++ b/src/mod/xml_int/mod_xml_ldap/Makefile
-@@ -14,7 +14,7 @@ LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LI
- 
- include $(BASE)/build/modmake.rules
- 
--DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
-+DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb --with-yielding_select=yes
- 
- $(LDAP_DIR):
- 	$(GETLIB) $(LDAP).tar.gz

net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch

@@ -1,10 +0,0 @@
---- a/src/mod/xml_int/mod_xml_rpc/Makefile
-+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
-@@ -14,7 +14,6 @@ $(XMLRPC_DIR)/lib/abyss/src/date.o\
- $(XMLRPC_DIR)/src/double.o\
- $(XMLRPC_DIR)/lib/libutil/error.o\
- $(XMLRPC_DIR)/lib/abyss/src/file.o\
--$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\
- $(XMLRPC_DIR)/lib/util/getoptx.o\
- $(XMLRPC_DIR)/lib/abyss/src/handler.o\
- $(XMLRPC_DIR)/lib/abyss/src/http.o\

net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch

@@ -1,10 +0,0 @@
---- a/src/mod/endpoints/mod_dingaling/Makefile
-+++ b/src/mod/endpoints/mod_dingaling/Makefile
-@@ -10,7 +10,6 @@ DING_DIR=$(BASE)/libs/libdingaling
- LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include
- LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA)
- LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h
--LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS)
- include $(BASE)/build/modmake.rules
- 
-