main/freeswitch: upgrade to 1.2.5.3

2 files changed, 85 insertions, 73 deletions

diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 320ab39358..0d86afbc45 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.2.0
-pkgrel=3
+pkgver=1.2.5.3
+pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -55,6 +55,7 @@ build() {
 	
 	# remove -Werror since gcc-4.5 is more strict
 	sed -i -e 's/-Werror//g' configure || return 1
+	export LDFLAGS="$LDFLAGS -liconv"
 	CFLAGS="-Wno-unused-but-set-variable" ./configure --prefix=/usr \
 		--sysconfdir=/etc/freeswitch \
 		--with-modinstdir=/usr/lib/freeswitch \
@@ -155,9 +156,9 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="81a6ba0cda70f78f8c36eb47cc564ba3  freeswitch-1.2.0.tar.bz2
+md5sums="29540dc974a8597dbc64001ada38f3f6  freeswitch-1.2.5.3.tar.bz2
 e3912aa52a4d8f8cb3b4e38c2668116d  freeswitch-mod_shout-textrels.patch
 769eaa127d4dbae687dc4aa961a8cc70  0002-mod_lua-alpine-module-search-path.patch
-bd16f291e09195bdfc45c1da9aeb407b  modules.conf
+d173becb6ae97acf9dde55d246e980b1  modules.conf
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 54a929d16731df730de0cd5355ea3031  freeswitch.initd"
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index 792260c3ec..57284bae81 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -1,126 +1,137 @@
+#applications/mod_abstraction
+#applications/mod_avmd
+#applications/mod_blacklist
+applications/mod_callcenter
 #applications/mod_cidlookup
+applications/mod_cluechoo
 applications/mod_commands
 applications/mod_conference
+applications/mod_curl
+applications/mod_db
+applications/mod_directory
+applications/mod_distributor
 applications/mod_dptools
+#applications/mod_easyroute
 applications/mod_enum
-#applications/mod_osp
+applications/mod_esf
+#applications/mod_esl
+applications/mod_expr
 applications/mod_fifo
-applications/mod_curl
-applications/mod_db
+#applications/mod_fsk
+applications/mod_fsv
 applications/mod_hash
 applications/mod_httapi
-#applications/mod_redis
-applications/mod_voicemail
-applications/mod_directory
+#applications/mod_http_cache
+#applications/mod_ladspa
 #applications/mod_lcr
-applications/mod_expr
-applications/mod_esf
-#applications/mod_easyroute
-applications/mod_fsv
+#applications/mod_memcache
+#applications/mod_mongo
 #applications/mod_nibblebill
-#applications/mod_soundtouch
+#applications/mod_osp
+#applications/mod_redis
 #applications/mod_rss
 applications/mod_sms
-applications/mod_spandsp
+#applications/mod_snapshot
+#applications/mod_snipe_hunt
 #applications/mod_snom
-#applications/mod_vmd
-#applications/mod_avmd
-#applications/mod_memcache
+#applications/mod_soundtouch
+applications/mod_spandsp
 #applications/mod_spy
-applications/mod_cluechoo
-applications/mod_valet_parking
-applications/mod_distributor
 #applications/mod_stress
-#applications/mod_snapshot
-#applications/mod_snipe_hunt
-applications/mod_callcenter
-#applications/mod_fsk
-#applications/mod_ladspa
-#applications/mod_mongo
-codecs/mod_g723_1
+applications/mod_valet_parking
+#applications/mod_vmd
+applications/mod_voicemail
+#applications/mod_voicemail_ivr
+#applications/mod_random
+#asr_tts/mod_cepstral
+asr_tts/mod_flite
+#asr_tts/mod_pocketsphinx
+#asr_tts/mod_tts_commandline
+#asr_tts/mod_unimrcp
 codecs/mod_amr
 #codecs/mod_amrwb
-#codecs/mod_silk
+codecs/mod_bv
+#codecs/mod_celt
 #codecs/mod_codec2
-codecs/mod_g729
 #codecs/mod_com_g729
+#codecs/mod_dahdi_codec
+codecs/mod_g723_1
+codecs/mod_g729
 codecs/mod_h26x
-codecs/mod_bv
+codecs/mod_vp8
 codecs/mod_ilbc
-codecs/mod_speex
-codecs/mod_siren
-#codecs/mod_celt
+#codecs/mod_isac
 #codecs/mod_opus
 codecs/mod_sangoma_codec
-#codecs/mod_dahdi_codec
-codecs/mod_vp8
+#codecs/mod_silk
+codecs/mod_siren
+codecs/mod_speex
+dialplans/mod_dialplan_asterisk
 #dialplans/mod_dialplan_directory
 dialplans/mod_dialplan_xml
-dialplans/mod_dialplan_asterisk
 #directories/mod_ldap
+#endpoints/mod_alsa
 endpoints/mod_dingaling
-endpoints/mod_portaudio
-endpoints/mod_sofia
+#endpoints/mod_h323
+#endpoints/mod_html5
+#endpoints/mod_khomp
 endpoints/mod_loopback
-endpoints/mod_rtmp
-#endpoints/mod_alsa
 #endpoints/mod_opal
+endpoints/mod_portaudio
+endpoints/mod_rtmp
 #endpoints/mod_skinny
 #endpoints/mod_skypopen
-#endpoints/mod_h323
-#endpoints/mod_khomp
-#endpoints/mod_gsmopen
-#../../libs/openzap/mod_openzap
-../../libs/freetdm/mod_freetdm
-#asr_tts/mod_unimrcp
-asr_tts/mod_flite
-#asr_tts/mod_pocketsphinx
-#asr_tts/mod_cepstral
-#asr_tts/mod_tts_commandline
+endpoints/mod_sofia
+event_handlers/mod_cdr_csv
+#event_handlers/mod_cdr_mongodb
+event_handlers/mod_cdr_pg_csv
+event_handlers/mod_cdr_sqlite
+#event_handlers/mod_erlang_event
 #event_handlers/mod_event_multicast
 event_handlers/mod_event_socket
 event_handlers/mod_event_zmq
-event_handlers/mod_cdr_csv
-event_handlers/mod_cdr_sqlite
-event_handlers/mod_cdr_pg_csv
 #event_handlers/mod_radius_cdr
-#event_handlers/mod_erlang_event
 event_handlers/mod_snmp
-formats/mod_native_file
-formats/mod_sndfile
-formats/mod_shout
 formats/mod_local_stream
-formats/mod_tone_stream
+formats/mod_native_file
 #formats/mod_portaudio_stream
 formats/mod_shell_stream
-#languages/mod_python
-#languages/mod_spidermonkey
+formats/mod_shout
+formats/mod_sndfile
+formats/mod_tone_stream
+#formats/mod_vlc
+#languages/mod_java
 languages/mod_lua
+#languages/mod_managed
 #languages/mod_perl
+#languages/mod_python
+languages/mod_spidermonkey
 #languages/mod_yaml
-#languages/mod_java
-#languages/mod_managed
 loggers/mod_console
 loggers/mod_logfile
 loggers/mod_syslog
-xml_int/mod_xml_rpc
-xml_int/mod_xml_curl
-xml_int/mod_xml_cdr
-#xml_int/mod_xml_ldap
+#say/mod_say_de
 say/mod_say_en
-say/mod_say_de
 say/mod_say_es
 say/mod_say_fr
+say/mod_say_he
+say/mod_say_hu
 say/mod_say_it
 say/mod_say_nl
 say/mod_say_pt
 say/mod_say_ru
-say/mod_say_zh
-say/mod_say_hu
 say/mod_say_th
-say/mod_say_he
+say/mod_say_zh
+#timers/mod_posix_timer
 timers/mod_timerfd
+xml_int/mod_xml_cdr
+xml_int/mod_xml_curl
+#xml_int/mod_xml_ldap
+xml_int/mod_xml_rpc
+xml_int/mod_xml_scgi
+
+../../libs/freetdm/mod_freetdm
+#../../libs/openzap/mod_openzap
 
 ## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/xml_int/mod_xml_odbc
-