Merge branch 'signalwire:master' into master

2021-11-04 16:34:31 +01:00 · 2021-11-04 16:34:31 +01:00 · 3ba4597b88
parent 49bac7e082 038cd82948
commit 3ba4597b88
2347 changed files with 61959 additions and 706250 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -5,16 +5,19 @@ name: unit-tests
 steps:
    - name: bootstrap
      image: signalwire/freeswitch-public-base
-      pull: true
+      pull: always
      commands:
      - cat /proc/sys/kernel/core_pattern
      - ./bootstrap.sh -j

    - name: configure
      image: signalwire/freeswitch-public-base
-      pull: true
+      pull: always
      commands:
-      - echo "applications/mod_test" >> modules.conf
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
+      - git clone https://github.com/freeswitch/sofia-sip.git
+      - cd sofia-sip && ./autogen.sh && ./configure.gnu && make -j`nproc` && make install && cd ..
      - echo 'codecs/mod_openh264' >> modules.conf
      - sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
      - sed -i '/event_handlers\\/mod_rayo/s/^#//g' modules.conf
@ -25,16 +28,22 @@ steps:

    - name: build
      image: signalwire/freeswitch-public-base
-      pull: true
+      pull: always
      commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
+      - cd sofia-sip && make install && cd ..
      - echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
      - chmod +x build.sh
      - ./build.sh

    - name: run-tests
      image: signalwire/freeswitch-public-base
-      pull: true
+      pull: always
      commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libsofia-sip-ua0 libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libspandsp3-dev
+      - cd sofia-sip && make install && cd ..
      - make install || true
      - cd tests/unit
      - ./run-tests.sh
@ -46,17 +55,15 @@ steps:
      - cd logs && ls -la

    - name: notify
-      image: signalwire/public-unit-tests-notify
-      pull: true
+      image: signalwire/drone-notify
+      pull: always
      environment:
-        GITHUB_CI_APP_PEM:
-          from_secret: github_ci_app_pem
-        SSH_KEY:
-          from_secret: public_artifacts_ssh_key
        SLACK_WEBHOOK_URL:
          from_secret: slack_webhook_url
+        ENV_FILE:
+          from_secret: notify_env
      commands:
-      - /root/notify.sh
+      - /root/unit-tests-notify.sh

 trigger:
  branch:
@ -71,15 +78,17 @@ name: scan-build

 steps:
    - name: bootstrap
-      image: signalwire/freeswitch-public-base:stretch
-      pull: true
+      image: signalwire/freeswitch-public-base
+      pull: always
      commands:
      - ./bootstrap.sh -j

    - name: configure
-      image: signalwire/freeswitch-public-base:stretch
-      pull: true
+      image: signalwire/freeswitch-public-base
+      pull: always
      commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
      - cp build/modules.conf.most modules.conf
      #Enable/Uncomment mods
      - echo 'codecs/mod_openh264' >> modules.conf
@ -106,29 +115,28 @@ steps:
      - ./configure

    - name: scan-build
-      image: signalwire/freeswitch-public-base:stretch
-      pull: true
+      image: signalwire/freeswitch-public-base
+      pull: always
      commands:
+      - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq remove libspandsp-dev
+      - DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp3-dev
      - mkdir -p scan-build
-      - echo '#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
+      - echo '#!/bin/bash\nscan-build-7 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
      - chmod +x scan.sh
      - ./scan.sh
      - exitstatus=`cat ./scan-build-status.txt`
      - echo "*** Exit status is $exitstatus"

    - name: notify
-      image: signalwire/public-scan-build-notify
-      pull: true
+      image: signalwire/drone-notify
+      pull: always
      environment:
-        GITHUB_CI_APP_PEM:
-          from_secret: github_ci_app_pem
-        SSH_KEY:
-          from_secret: public_artifacts_ssh_key
        SLACK_WEBHOOK_URL:
          from_secret: slack_webhook_url
+        ENV_FILE:
+          from_secret: notify_env
      commands:
-      - /root/notify.sh
-
+      - /root/scan-build-notify.sh

 trigger:
  branch:
@ -139,6 +147,6 @@ trigger:

 ---
 kind: signature
-hmac: 430f5a243e6029b985fa0219e9fb44c71a59931af44a3230751e238f8b64dd32
+hmac: a85b0db203d2c9a71c3e4a63a46b5513fbdb3b8f5135e21d0fe0992f33626824

 ...
--- a/.gitattributes
+++ b/.gitattributes
@ -6,7 +6,6 @@
 *.c text eol=lf
 *.cxx text eol=lf
 *.cpp text eol=lf
-/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask text eol=lf
 *.txt text eol=lf
 *.exe -diff binary executable windows dfsg-nonfree debian-ignore
 *.wav -diff binary sound
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -0,0 +1,44 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Using this example configuration...
+2. Dial into conference using verto
+3. Play my_problem_file.mp4 into conference
+4. FreeSWITCH crashes
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Package version or git hash**
+ - Version [e.g. 1.10.4]
+
+**Trace logs**
+Provide freeswitch logs w/ DEBUG and UUID logging enabled
+
+**backtrace from core file**
+If applicable, provide the full backtrace from the core file.
+```
+(gdb) set pagination off
+(gdb) set logging file /tmp/backtrace.log
+(gdb) set logging on
+Copying output to /tmp/backtrace.log.
+(gdb) bt
+(gdb) bt full
+(gdb) info threads
+(gdb) thread apply all bt
+(gdb) thread apply all bt full
+(gdb) set logging off
+Done logging to /tmp/backtrace.log.
+(gdb) quit
+```
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+<!--FreeSWITCH features are generally contributed by the community.  If you are a developer and want to add a feature to FreeSWITCH, this can also be a good starting point for discussing it with the FreeSWITCH team prior to submitting your pull request.-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+
+**Package version or git hash**
+- Version of FreeSWITCH [e.g. 1.10.4]
--- a/.gitignore
+++ b/.gitignore
@ -102,6 +102,7 @@ Release/
 /build/config/ltmain.sh
 /build/config/missing
 /build/freeswitch.pc
+/build/standalone_module/freeswitch.pc
 /build/getlib.sh
 /build/getg729.sh
 /build/getsounds.sh
@ -115,15 +116,6 @@ Release/
 /libs/esl/fs_ivrd
 /libs/esl/testclient
 /libs/esl/testserver
-/libs/freetdm/detect_dtmf
-/libs/freetdm/detect_tones
-/libs/freetdm/testanalog
-/libs/freetdm/testapp
-/libs/freetdm/testcid
-/libs/freetdm/testpri
-/libs/freetdm/testr2
-/libs/freetdm/testsangomaboost
-/libs/freetdm/testtones
 /libs/fsg729-*-installer
 /libs/g729/
 /libs/libcodec2/compile
@ -142,7 +134,6 @@ Release/
 /libs/libcodec2/unittest/Makefile
 /libs/libcodec2/unittest/Makefile.in
 /libs/mpg123-1.13.2/
-/libs/spandsp/src/cielab_luts.h
 /scripts/fsxs
 /scripts/gentls_cert

@ -166,6 +157,7 @@ Release/
 /src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
 /src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
 /src/mod/languages/mod_python/mod_python_wrap.cpp.orig
+/src/mod/languages/mod_python3/mod_python_wrap.cpp.orig
 /src/mod/say/mod_say_de/Makefile
 /src/mod/say/mod_say_es/Makefile
 /src/mod/say/mod_say_fr/Makefile
@ -231,8 +223,6 @@ libs/libsndfile/src/version-metadata.rc
 libs/libsndfile/tests/pedantic-header-test.sh
 yum/RPMS
 yum/temp
-html5/verto/verto_communicator/bower_components/
-html5/verto/verto_communicator/node_modules/
 .vs/

 Freeswitch.2015.VC.db
@ -260,8 +250,11 @@ libs/libsilk-*/
 libs/rabbitmq-c-*/
 libs/rabbitmq-c-*.zip
 libs/ffmpeg-*/
+libs/sofia-sip*/
+libs/sofia-sip*

 src/mod/applications/mod_test/test/test_asr
+src/mod/applications/mod_test/test/test_tts
 src/mod/event_handlers/mod_rayo/test/test_iks
 src/mod/event_handlers/mod_rayo/test/test_nlsml
 src/mod/event_handlers/mod_rayo/test/test_srgs
@ -273,9 +266,18 @@ src/mod/applications/mod_http_cache/test/test_aws.log
 src/mod/applications/mod_http_cache/test/test_aws.trs
 src/mod/formats/mod_sndfile/test/test_sndfile
 src/mod/formats/mod_sndfile/test/test_sndfile_conf
+src/mod/formats/mod_ssml/test/test_tts_format
 src/mod/*/*/test/*.log
 src/mod/*/*/test/*.trs
 src/mod/*/*/test/[0-9]*/*
 test-suite.log
 src/mod/applications/mod_av/test/test_BT7.mp4
 src/mod/applications/mod_av/test/test_RGB.mp4
+images/test-argb.png
+images/test-rgb.png
+images/test.png
+images/test_patched.png
+images/test_text.png
+
+src/mod/codecs/mod_amrwb/test/test_amrwb
+src/mod/endpoints/mod_sofia/test/sipp-based-tests
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@ -342,9 +342,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_easyroute", "src\mod\ap
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lcr", "src\mod\applications\mod_lcr\mod_lcr.2017.vcxproj", "{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\win32\libtiff\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\win32\spandsp\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.2017.vcxproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
 EndProject
@ -358,9 +358,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtmp", "src\mod\endpoints\mod_rtmp\mod_rtmp.2017.vcxproj", "{48414740-C693-4968-9846-EE058020C64F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\spandsp\src\msvc\make_at_dictionary.2017.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\win32\spandsp\make_at_dictionary.2017.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2017.vcxproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\win32\spandsp\make_modem_filter.2017.vcxproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2017.vcxproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}"
 EndProject
@ -484,11 +484,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\win32\xmlrpc
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup.2017", "w32\Setup\Setup.2017.wixproj", "{47213370-B933-487D-9F45-BCA26D7E2B6F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\spandsp\src\msvc\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\win32\spandsp\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2017.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\win32\spandsp\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"
 EndProject
@ -504,7 +504,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_float", "libs\win
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opus", "src\mod\codecs\mod_opus\mod_opus.2017.vcxproj", "{64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\spandsp\src\msvc\make_t43_gray_code_tables.2017.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\win32\spandsp\make_t43_gray_code_tables.2017.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winFailToBan", "src\mod\languages\mod_managed\managed\examples\winFailToBan\winFailToBan.csproj", "{5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}"
 EndProject
--- a/1807
+++ b/1807
--- a/Makefile.am
+++ b/Makefile.am
@ -30,8 +30,7 @@ endif
 AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) 
 AM_CPPFLAGS =
 AM_CPPFLAGS += -I$(switch_srcdir)/libs/libvpx
-AM_CPPFLAGS += $(SWITCH_AM_CXXFLAGS) -I$(switch_srcdir)/libs/sofia-sip/libsofia-sip-ua/sdp
-AM_CPPFLAGS += -I$(switch_srcdir)/libs/sofia-sip/libsofia-sip-ua/su -I$(switch_builddir)/libs/sofia-sip/libsofia-sip-ua/su
+AM_CPPFLAGS += $(SWITCH_AM_CXXFLAGS)
 AM_LDFLAGS  = $(SWITCH_AM_LDFLAGS) $(AM_LIBAPR_LDFLAGS) $(AM_LIBAPU_LDFLAGS)

 DEFAULT_SOUNDS=en-us-callie-8000
@ -131,7 +130,7 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/libyuv/include
 CORE_CFLAGS += -DSWITCH_HAVE_YUV
 endif
 CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
-CORE_CFLAGS += -I$(switch_builddir)/libs/spandsp/src -I$(switch_srcdir)/libs/spandsp/src 
+CORE_CFLAGS += $(SPANDSP_CFLAGS)
 if ENABLE_LIBVPX
 CORE_CFLAGS += -DSWITCH_HAVE_VPX
 endif
@ -185,13 +184,10 @@ endif
 ##
 ## libfreeswitch
 ##
-noinst_LTLIBRARIES        = libfreeswitch_spandsp.la
+noinst_LTLIBRARIES        =
 if ENABLE_LIBYUV
 noinst_LTLIBRARIES += libfreeswitch_libyuv.la
 endif
-libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc.c libs/spandsp/src/bit_operations.c
-libfreeswitch_spandsp_la_CFLAGS  = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS)
-CORE_LIBS+=libfreeswitch_spandsp.la

 if ENABLE_LIBYUV
 libfreeswitch_libyuv_la_SOURCES = \
@ -250,9 +246,9 @@ CORE_LIBS+=libfreeswitch_libyuv.la
 endif

 lib_LTLIBRARIES	         = libfreeswitch.la
-libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS)  $(AM_CFLAGS) $(TPL_CFLAGS)
+libfreeswitch_la_CFLAGS  = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(SOFIA_SIP_CFLAGS) $(AM_CFLAGS) $(TPL_CFLAGS)
 libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
-libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS)
+libfreeswitch_la_LIBADD  = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(SYSTEMD_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS) $(SOFIA_SIP_LIBS)
 libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)

 if HAVE_PNG
@ -304,6 +300,7 @@ library_include_HEADERS = \
 	src/include/switch_dso.h \
 	src/include/switch_loadable_module.h \
 	src/include/switch_module_interfaces.h \
+	src/include/switch_packetizer.h \
 	src/include/switch_platform.h \
 	src/include/switch_resample.h \
 	src/include/switch_regex.h \
@ -368,6 +365,7 @@ libfreeswitch_la_SOURCES = \
 	src/switch_version.c \
 	src/switch_core_media.c \
 	src/switch_core_video.c \
+	src/switch_packetizer.c \
 	src/switch_sdp.c \
 	src/switch_scheduler.c \
 	src/switch_core_db.c \
@ -593,14 +591,6 @@ libs/libvpx/Makefile: libs/libvpx/.update
 libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update
 	@cd libs/libvpx && $(MAKE)

-libs/sofia-sip/Makefile:
-	cd libs/sofia-sip && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-
-libs/sofia-sip/libsofia-sip-ua/sdp/.libs/libsdp.a libs/sofia-sip/libsofia-sip-ua/su/.libs/libsu.a: libs/sofia-sip/.update libs/sofia-sip/Makefile
-	@cd libs/sofia-sip && $(MAKE) noop
-	@cd libs/sofia-sip && $(MAKE) SOFIA_CFLAGS="$(SWITCH_AM_CFLAGS)"
-	@$(TOUCH_TARGET)
-
 libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr/.update
 	@cd libs/apr && ./config.status
 	@$(TOUCH_TARGET)
@ -611,14 +601,15 @@ libs/apr/libapr-1.la: libs/apr/Makefile libs/apr/.update
 libs/apr-util/libaprutil-1.la: libs/apr/libapr-1.la libs/apr-util libs/apr-util/.update
 	@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep  "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr-util && $(MAKE) $(MFLAGS) && touch libaprutil-1.la; fi

-SRTP_SRC =	libs/srtp/srtp/srtp.c libs/srtp/srtp/ekt.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
+SRTP_SRC =	libs/srtp/srtp/srtp.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
 		libs/srtp/crypto/cipher/aes.c libs/srtp/crypto/cipher/aes_icm.c \
 		libs/srtp/crypto/hash/null_auth.c libs/srtp/crypto/hash/sha1.c \
 		libs/srtp/crypto/hash/hmac.c libs/srtp/crypto/hash/auth.c \
-		libs/srtp/crypto/math/datatypes.c libs/srtp/crypto/math/stat.c \
+		libs/srtp/crypto/math/datatypes.c \
 		libs/srtp/crypto/kernel/crypto_kernel.c libs/srtp/crypto/kernel/alloc.c \
 		libs/srtp/crypto/kernel/key.c libs/srtp/crypto/kernel/err.c \
-		libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c libs/srtp/crypto/replay/ut_sim.c 
+		libs/srtp/crypto/replay/rdb.c libs/srtp/crypto/replay/rdbx.c \
+		libs/srtp/crypto/cipher/cipher_test_cases.c libs/srtp/crypto/hash/auth_test_cases.c

 libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update $(SRTP_SRC)
 	touch $(switch_srcdir)/src/include/switch.h
@ -722,9 +713,7 @@ core-install: core_install

 clean_core: clean-libLTLIBRARIES
 	rm -f $(libfreeswitch_la_OBJECTS)
-	rm -f $(libfreeswitch_spandsp_la_OBJECTS)
 	rm -f `echo $(libfreeswitch_la_OBJECTS) | sed -e's|.lo|.o|g'`
-	rm -f `echo $(libfreeswitch_spandsp_la_OBJECTS) | sed -e's|.lo|.o|g'`

 install_core: install-libLTLIBRARIES

@ -755,12 +744,11 @@ pristine:
 	git clean -fdx
 	git reset --hard

-update-clean: clean python-reconf
-	cd libs/sofia-sip && $(MAKE) clean
+update-clean: clean python-reconf python3-reconf
 	cd libs/esl && $(MAKE) clean
 	cd libs/srtp && $(MAKE) clean

-swigall:
+swigall: src/include/switch_swigable_cpp.h
 	@echo reswigging all
 	sh $(switch_srcdir)/build/swigall.sh

@ -773,6 +761,10 @@ python-reconf:
 	rm -f src/mod/languages/mod_python/Makefile
 	./config.status

+python3-reconf:
+	rm -f src/mod/languages/mod_python3/Makefile
+	./config.status
+
 reconf:
 	rm config.cache
 	sh ./config.status --recheck
@ -790,17 +782,6 @@ iks-reconf:
 	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
 	$(MAKE) mod_dingaling-clean

-spandsp-reconf:
-	cd libs/spandsp && $(MAKE) clean || echo
-	cd libs/spandsp && autoreconf -fi
-	cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-	cd libs/spandsp && $(MAKE)
-
-sofia-reconf:
-	cd libs/sofia-sip && sh ./autogen.sh
-	cd libs/sofia-sip && $(MAKE) clean
-	cd libs/sofia-sip && ./configure $(MY_DEFAULT_ARGS) --with-pic --with-glib=no --disable-shared
-
 cluecon:
 	@clear
 	@echo Thank you for updating. This is going to take a while so relax.
--- a/README.md
+++ b/README.md
@ -6,7 +6,7 @@ Visit  [https://signalwire.com](https://signalwire.com/)  or https://github.com/

 ## Getting Started

-FreeSWITCH is available on [Github](https://github.com/signalwire/freeswitch) in source code format.  You can checkout the development branch and build for many poplular platforms including Linux, Windows, MacOSX and BSD.  There is an issue tracker and pull request system available as part of the repo online.
+FreeSWITCH is available on [Github](https://github.com/signalwire/freeswitch) in source code format.  You can checkout the development branch and build for many popular platforms including Linux, Windows, MacOSX and BSD.  There is an issue tracker and pull request system available as part of the repo online.

 See [https://freeswitch.com/#getting-started](https://freeswitch.com/#getting-started) for more detailed instructions.

--- a/acinclude.m4
+++ b/acinclude.m4
@ -9,8 +9,8 @@ m4_include([build/config/ax_check_java.m4])
 m4_include([build/config/uuid.m4])
 m4_include([build/config/erlang.m4])
 m4_include([build/config/odbc.m4])
+m4_include([build/config/sac-pkg-config.m4])
+m4_include([build/config/sac-openssl.m4])
 m4_include([build/config/sched_setaffinity.m4])
 m4_include([libs/apr/build/apr_common.m4])
-m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
-m4_include([libs/sofia-sip/m4/sac-openssl.m4])
 m4_include([libs/iksemel/build/libgnutls.m4])
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -2,13 +2,15 @@
 ##### -*- mode:shell-script; indent-tabs-mode:nil; sh-basic-offset:2 -*-
 ##### bootstrap FreeSWITCH and FreeSWITCH libraries

+. $(dirname $0)/scripts/ci/build-requirements.sh
+
 echo "bootstrap: checking installation..."

 BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp fs";
+SUBDIRS="apr libzrtp iksemel libdingaling srtp unimrcp fs";

 while getopts 'jhd:v' o; do 
  case "$o" in
@ -45,176 +47,6 @@ setup_gnu() {
  touch README
 }

-check_ac_ver() {
-  # autoconf 2.59 or newer
-  ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
-  if test -z "$ac_version"; then
-    echo "bootstrap: autoconf not found."
-    echo "           You need autoconf version 2.59 or newer installed"
-    echo "           to build FreeSWITCH from source."
-    exit 1
-  fi
-  if test `uname -s` = "OpenBSD" && test "$ac_version" = "2.62"; then
-    echo "Autoconf 2.62 is broken on OpenBSD, please try another version"
-    exit 1
-  fi
-  IFS=_; set $ac_version; IFS=' '
-  ac_version=$1
-  IFS=.; set $ac_version; IFS=' '
-  if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
-    echo "bootstrap: autoconf version $ac_version found."
-    echo "           You need autoconf version 2.59 or newer installed"
-    echo "           to build FreeSWITCH from source."
-    exit 1
-  else
-    echo "bootstrap: autoconf version $ac_version (ok)"
-  fi
-}
-
-check_am_ver() {
-  # automake 1.7 or newer
-  am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
-  if test -z "$am_version"; then
-    echo "bootstrap: automake not found."
-    echo "           You need automake version 1.7 or newer installed"
-    echo "           to build FreeSWITCH from source."
-    exit 1
-  fi
-  IFS=_; set $am_version; IFS=' '
-  am_version=$1
-  IFS=.; set $am_version; IFS=' '
-  if test "$1" = "1" -a "$2" -lt "7"; then
-    echo "bootstrap: automake version $am_version found."
-    echo "           You need automake version 1.7 or newer installed"
-    echo "           to build FreeSWITCH from source."
-    exit 1
-  else
-    echo "bootstrap: automake version $am_version (ok)"
-  fi
-}
-
-check_acl_ver() {
-  # aclocal 1.7 or newer
-  acl_version=`${ACLOCAL:-aclocal} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
-  if test -z "$acl_version"; then
-    echo "bootstrap: aclocal not found."
-    echo "           You need aclocal version 1.7 or newer installed"
-    echo "           to build FreeSWITCH from source."
-    exit 1
-  fi
-  IFS=_; set $acl_version; IFS=' '
-  acl_version=$1
-  IFS=.; set $acl_version; IFS=' '
-  if test "$1" = "1" -a "$2" -lt "7"; then
-    echo "bootstrap: aclocal version $acl_version found."
-    echo "           You need aclocal version 1.7 or newer installed"
-    echo "           to build FreeSWITCH from source."
-    exit 1
-  else
-    echo "bootstrap: aclocal version $acl_version (ok)"
-  fi
-}
-
-check_lt_ver() {
-  # Sample libtool --version outputs:
-  # ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
-  # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
-  # output is multiline from 1.5 onwards
-
-  # Require libtool 1.4 or newer
-  libtool=${LIBTOOL:-`${LIBDIR}/apr/build/PrintPath glibtool libtool libtool22 libtool15 libtool14`}
-  lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-  if test -z "$lt_pversion"; then
-    echo "bootstrap: libtool not found."
-    echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from source."
-    exit 1
-  fi
-  lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-  IFS=.; set $lt_version; IFS=' '
-  lt_status="good"
-
-  if test -z "$1"; then a=0 ; else a=$1;fi
-  if test -z "$2"; then b=0 ; else b=$2;fi
-  if test -z "$3"; then c=0 ; else c=$3;fi
-  lt_major=$a
-
-  if test "$a" -eq "2"; then
-    lt_status="good"
-  elif test "$a" -lt "2"; then
-    if test "$b" -lt "5" -o "$b" =  "5" -a "$c" -lt "14" ; then
-      lt_status="bad"
-    fi
-  else
-    lt_status="bad"
-  fi
-  if test $lt_status = "good"; then
-    echo "bootstrap: libtool version $lt_pversion (ok)"
-  else
-    echo "bootstrap: libtool version $lt_pversion found."
-    echo "           You need libtool version 1.5.14 or newer to build FreeSWITCH from source."
-    exit 1
-  fi
-}
-
-check_libtoolize() {
-  # check libtoolize availability
-  if [ -n "${LIBTOOL}" ]; then
-    libtoolize=${LIBTOOLIZE:-`dirname "${LIBTOOL}"`/libtoolize}
-  else
-    libtoolize=${LIBTOOLIZE:-`${LIBDIR}/apr/build/PrintPath glibtoolize libtoolize libtoolize22 libtoolize15 libtoolize14`}
-  fi
-  if [ "x$libtoolize" = "x" ]; then
-    echo "libtoolize not found in path"
-    exit 1
-  fi
-  if [ ! -x "$libtoolize" ]; then
-    echo "$libtoolize does not exist or is not executable"
-    exit 1
-  fi
-
-  # compare libtool and libtoolize version
-  ltl_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-  ltl_version=`echo $ltl_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
-  IFS=.; set $ltl_version; IFS=' '
-
-  if [ "x${lt_version}" != "x${ltl_version}" ]; then
-    echo "$libtool and $libtoolize have different versions"
-    exit 1
-  fi
-}
-
-check_make() {
-  #
-  # Check to make sure we have GNU Make installed
-  #  
-  
-  make=`which make`
-  if [ -x "$make" ]; then
-     make_version=`$make --version || true | grep GNU`
-     if [ $? -ne 0 ]; then
-        make=`which gmake`
-        if [ -x "$make" ]; then
-          make_version=`$make --version | grep GNU`
-	  if [ $? -ne 0 ]; then 
-            echo "GNU Make does not exist or is not executable"
-            exit 1;
-          fi
-        fi
-      fi
-   fi
-}
-
-
-check_awk() {
-  # TODO: Building with mawk on at least Debian squeeze is know to
-  # work, but mawk is believed to fail on some systems.  If we can
-  # replicate this, we need a particular behavior that we can test
-  # here to verify whether we have an acceptable awk.
-  :
-}
-
-
-
 print_autotools_vers() {
  #
  # Info output
--- a/libs/sofia-sip/m4/sac-openssl.m4
+++ b/libs/sofia-sip/m4/sac-openssl.m4
--- a/libs/sofia-sip/m4/sac-pkg-config.m4
+++ b/libs/sofia-sip/m4/sac-pkg-config.m4
--- a/build/freeswitch.service
+++ b/build/freeswitch.service
@ -4,6 +4,10 @@ After=syslog.target network.target
 After=postgresql.service postgresql-9.3.service postgresql-9.4.service mysqld.service httpd.service

 [Service]
+# You can use Type=notify only if you compile FreeSWITCH with --enable-systemd configure option
+# In this case you have to run FreeSWITCH in foreground mode (-nf option)!
+#Type=notify
+#NotifyAccess=main
 User=freeswitch
 EnvironmentFile=-/etc/sysconfig/freeswitch
 # RuntimeDirectory is not yet supported in CentOS 7. A workaround is to use /etc/tmpfiles.d/freeswitch.conf
--- a/build/modcheck.sh
+++ b/build/modcheck.sh
@ -21,8 +21,8 @@ cd $here
 for i in $files ; do
    mod=${i%%.*}

-    infile=`grep ^.*$mod\$ ../modules.conf | grep -v ftmod_`
-    commented=`grep ^\#.*$mod\$ ../modules.conf | grep -v ftmod_`
+    infile=`grep -E "^.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`
+    commented=`grep -E "^\#.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`

    if [ -z "$infile" ] ; then
 	echo "${on}WARNING: installed module: $i was not installed by this build.  It is not present in modules.conf.${off}"
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@ -49,6 +49,7 @@ applications/mod_sms
 applications/mod_spandsp
 #applications/mod_spy
 #applications/mod_stress
+applications/mod_test
 #applications/mod_translate
 applications/mod_valet_parking
 #applications/mod_video_filter
@ -134,6 +135,7 @@ languages/mod_lua
 #languages/mod_managed
 #languages/mod_perl
 #languages/mod_python
+#languages/mod_python3
 #languages/mod_v8
 #languages/mod_yaml
 loggers/mod_console
@ -168,7 +170,7 @@ xml_int/mod_xml_cdr
 xml_int/mod_xml_rpc
 xml_int/mod_xml_scgi

-#../../libs/freetdm/mod_freetdm
+#mod_freetdm|https://github.com/freeswitch/freetdm.git -b master

 ## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/xml_int/mod_xml_odbc
--- a/build/modules.conf.most
+++ b/build/modules.conf.most
@ -47,6 +47,7 @@ applications/mod_soundtouch
 applications/mod_spandsp
 applications/mod_spy
 applications/mod_stress
+applications/mod_test
 applications/mod_translate
 applications/mod_valet_parking
 applications/mod_video_filter
@ -127,7 +128,7 @@ languages/mod_java
 languages/mod_lua
 languages/mod_managed
 languages/mod_perl
-languages/mod_python
+languages/mod_python3
 #languages/mod_v8
 languages/mod_yaml
 loggers/mod_console
--- a/build/next-release.txt
+++ b/build/next-release.txt
@ -1 +1 @@
-1.10.4-dev
+1.10.8-dev
--- a/build/standalone_module/configure.ac
+++ b/build/standalone_module/configure.ac
@ -45,6 +45,17 @@ SWITCH_VERSION_MAJOR=`echo $version|cut -d. -f1`
 SWITCH_VERSION_MINOR=`echo $version|cut -d. -f2`
 SWITCH_VERSION_MICRO=`echo $version|cut -d. -f3`

+#  Enable clang address sanitizer bit build
+AC_ARG_ENABLE(address_sanitizer,
+  [AC_HELP_STRING([--enable-address-sanitizer],[build with address sanitizer])],
+  [enable_address_sanitizer="$enable_address_sanitizer"],
+  [enable_address_sanitizer="no"])
+
+if test "${enable_address_sanitizer}" = "yes"; then
+  FREESWITCH_CFLAGS="$FREESWITCH_CFLAGS -fsanitize=address -fno-omit-frame-pointer -fstack-protector-strong"
+  FREESWITCH_LDFLAGS="$FREESWITCH_LDFLAGS -fsanitize=address"
+fi
+
 AC_SUBST(SWITCH_VERSION_MAJOR, [$SWITCH_VERSION_MAJOR])
 AC_SUBST(SWITCH_VERSION_MINOR, [$SWITCH_VERSION_MINOR])
 AC_SUBST(SWITCH_VERSION_MICRO, [$SWITCH_VERSION_MICRO])
--- a/build/swigall.sh
+++ b/build/swigall.sh
@ -13,6 +13,11 @@ make swigclean
 make mod_python_wrap.cpp
 cd ../../../..

+cd src/mod/languages/mod_python3
+make swigclean
+make mod_python_wrap.cpp
+cd ../../../..
+
 cd src/mod/languages/mod_java
 make reswig
 cd ../../../..
--- a/clients/flex/com/adobe/air/filesystem/FileUtil.as
+++ b/clients/flex/com/adobe/air/filesystem/FileUtil.as
@ -53,7 +53,7 @@ package com.adobe.air.filesystem
 			}
 			else if(os.indexOf("Linux") > -1)
 			{
-				//todo: need to impliment Linux
+				//todo: need to implement Linux
 			}
 			
 			return v;
--- a/clients/flex/com/adobe/air/filesystem/VolumeMonitor.as
+++ b/clients/flex/com/adobe/air/filesystem/VolumeMonitor.as
@ -110,7 +110,7 @@ package com.adobe.air.filesystem
 				timer.addEventListener(TimerEvent.TIMER, onTimerEvent,false,0, true);
 			}
 			
-			//we reinitialize the hash everytime we start watching
+			//we reinitialize the hash every time we start watching
 			volumes = new Dictionary();
 			
 			var v:Array = FileUtil.getRootDirectories();
--- a/clients/flex/com/adobe/net/DynamicURLLoader.as
+++ b/clients/flex/com/adobe/net/DynamicURLLoader.as
@ -35,9 +35,9 @@ package com.adobe.net
 	import flash.net.URLLoader;

 	/**
-	* 	Class that provides a dynamic implimentation of the URLLoader class.
+	* 	Class that provides a dynamic implementation of the URLLoader class.
 	* 
-	* 	This class provides no API implimentations. However, since the class is
+	* 	This class provides no API implementations. However, since the class is
 	* 	declared as dynamic, it can be used in place of URLLoader, and allow
 	* 	you to dynamically attach properties to it (which URLLoader does not allow).
 	* 
--- a/clients/flex/com/adobe/net/MimeTypeMap.as
+++ b/clients/flex/com/adobe/net/MimeTypeMap.as
@ -169,7 +169,7 @@ package com.adobe.net
 		}

 		/**
-		 * Returns the prefered extension for the given mimetype.
+		 * Returns the preferred extension for the given mimetype.
 		 */
 		public function getExtension(mimetype:String):String
 		{
--- a/clients/flex/com/adobe/net/URI.as
+++ b/clients/flex/com/adobe/net/URI.as
@ -64,7 +64,7 @@ package com.adobe.net
 	 * URI syntax (e.g. custom query syntax or special handling of
 	 * non-hierarchical URI's), this class can be fully subclassed.  If you
 	 * intended to subclass URI, please see the source code for complete
-	 * documation on protected members and protected fuctions.</p>
+	 * documentation on protected members and protected functions.</p>
 	 * 
 	 * @langversion ActionScript 3.0
 	 * @playerversion Flash 9.0 
@ -203,7 +203,7 @@ package com.adobe.net
 		
 		
 		/**
-		 * @private Private initializiation.
+		 * @private Private initialization.
 		 */
 		protected function initialize() : void
 		{
@ -332,7 +332,7 @@ package com.adobe.net
 		 * well formed.  Sometimes characters that should have been escaped
 		 * are not, and those situations would break a regexp pattern.  This
 		 * function attempts to be smart about what it is parsing based on
-		 * location of characters relative to eachother.  This function has
+		 * location of characters relative to each other.  This function has
 		 * been proven through real-world use to parse the vast majority
 		 * of URI's correctly.
 		 *
@ -835,7 +835,7 @@ package com.adobe.net
 		 * to be properly escaped and unescaped, it must be split into its
 		 * component parts.  This accessor escapes/unescapes the entire query
 		 * part without regard for it's component parts.  This has the
-		 * possibliity of leaving the query string in an ambiguious state in
+		 * possibliity of leaving the query string in an ambiguous state in
 		 * regards to its syntax.  If the contents of the query part are
 		 * important, it is recommended that get/setQueryValue() or
 		 * get/setQueryByMap() are used instead.</p>
@ -2340,7 +2340,7 @@ package com.adobe.net
 		 * <p>This function is intended to be a helper function.
 		 * It is not all-knowning and will probably make mistakes
 		 * when attempting to parse a string of unknown origin.  If
-		 * your applicaiton is receiving input from the user, your
+		 * your application is receiving input from the user, your
 		 * application should already have a good idea what the user
 		 * should  be entering, and your application should be
 		 * pre-processing the user's input to make sure it is well formed
@ -2354,7 +2354,7 @@ package com.adobe.net
 		 * on a URI that was created from unknownToURI() may not match
 		 * the input string due to the difference in escaping.</p>
 		 *
-		 * @param unknown	a potental URI string that should be parsed
+		 * @param unknown	a potential URI string that should be parsed
 		 * and loaded into this object.
 		 * @param defaultScheme	if it is determined that the passed string
 		 * looks like a URI, but it is missing the scheme part, this
--- a/clients/flex/com/adobe/serialization/json/JSONEncoder.as
+++ b/clients/flex/com/adobe/serialization/json/JSONEncoder.as
@ -104,7 +104,7 @@ package com.adobe.serialization.json
 		}
 		
 		/**
-		 * Escapes a string accoding to the JSON specification.
+		 * Escapes a string according to the JSON specification.
 		 *
 		 * @param str The string to be escaped
 		 * @return The string with escaped special characters
--- a/clients/flex/com/adobe/serialization/json/JSONParseError.as
+++ b/clients/flex/com/adobe/serialization/json/JSONParseError.as
@ -47,7 +47,7 @@ package com.adobe.serialization.json {
 		/**
 		 * Constructs a new JSONParseError.
 		 *
-		 * @param message The error message that occured during parsing
+		 * @param message The error message that occurred during parsing
 		 * @langversion ActionScript 3.0
 		 * @playerversion Flash 9.0
 		 * @tiptext
--- a/clients/flex/com/adobe/utils/DateUtil.as
+++ b/clients/flex/com/adobe/utils/DateUtil.as
@ -74,7 +74,7 @@ package com.adobe.utils
 		*	@param Optional parameter indicating whether the search should be case
 		*	sensitive
 		* 
-		* 	@return A int that represents that month represented by the specifed
+		* 	@return A int that represents that month represented by the specified
 		*	short name.
 		*
 		* 	@langversion ActionScript 3.0
@ -114,7 +114,7 @@ package com.adobe.utils
 		* 
 		* 	@param m A full month name.
 		* 
-		* 	@return A int that represents that month represented by the specifed
+		* 	@return A int that represents that month represented by the specified
 		*	full month name.
 		*
 		* 	@langversion ActionScript 3.0
@ -154,7 +154,7 @@ package com.adobe.utils
 		* 
 		* 	@param m A short day name.
 		* 
-		* 	@return A int that represents that short day represented by the specifed
+		* 	@return A int that represents that short day represented by the specified
 		*	full month name.
 		*
 		* 	@langversion ActionScript 3.0
@ -194,7 +194,7 @@ package com.adobe.utils
 		* 
 		* 	@param m A full day name.
 		* 
-		* 	@return A int that represents that full day represented by the specifed
+		* 	@return A int that represents that full day represented by the specified
 		*	full month name.
 		*
 		* 	@langversion ActionScript 3.0
@ -675,7 +675,7 @@ package com.adobe.utils
 		}
 		
 		/**
-		 * Converts a date into just befor midnight.
+		 * Converts a date into just before midnight.
 		 */
 		public static function makeNight(d:Date):Date
 		{
--- a/clients/flex/com/adobe/utils/StringUtil.as
+++ b/clients/flex/com/adobe/utils/StringUtil.as
@ -79,7 +79,7 @@ package com.adobe.utils
 		*	@param input The String whose beginning and ending whitespace will
 		*	will be removed.
 		*
-		*	@returns A String with whitespace removed from the begining and end	
+		*	@returns A String with whitespace removed from the beginning and end
 		*
 		* 	@langversion ActionScript 3.0
 		*	@playerversion Flash 9.0
@ -95,7 +95,7 @@ package com.adobe.utils
 		* 
 		*	@param input The String whose beginning whitespace will will be removed.
 		*
-		*	@returns A String with whitespace removed from the begining	
+		*	@returns A String with whitespace removed from the beginning
 		*
 		* 	@langversion ActionScript 3.0
 		*	@playerversion Flash 9.0
--- a/clients/flex/jquery-1.4.2.js
+++ b/clients/flex/jquery-1.4.2.js
@ -519,7 +519,7 @@ jQuery.extend({

 	noop: function() {},

-	// Evalulates a script in a global context
+	// Evaluates a script in a global context
 	globalEval: function( data ) {
 		if ( data && rnotwhite.test(data) ) {
 			// Inspired by code by Andrea Giammarchi
@ -855,7 +855,7 @@ function now() {
 		htmlSerialize: !!div.getElementsByTagName("link").length,

 		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
+		// (IE uses .cssText instead)
 		style: /red/.test( a.getAttribute("style") ),

 		// Make sure that URLs aren't manipulated
@ -1310,7 +1310,7 @@ jQuery.fn.extend({
 					classNames = value.split( rspace );

 				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
+					// check each className given, space separated list
 					state = isBool ? state : !self.hasClass( className );
 					self[ state ? "addClass" : "removeClass" ]( className );
 				}
@ -1364,7 +1364,7 @@ jQuery.fn.extend({
 						var option = options[ i ];

 						if ( option.selected ) {
-							// Get the specifc value for the option
+							// Get the specific value for the option
 							value = jQuery(option).val();

 							// We don't need an array for one selects
@ -2636,7 +2636,7 @@ var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^
 	baseHasDuplicate = true;

 // Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
+// optimization where it does not always call our comparison
 // function. If that is the case, discard the hasDuplicate value.
 //   Thus far that includes Google Chrome.
 [0, 0].sort(function(){
@ -3415,7 +3415,7 @@ if ( document.documentElement.compareDocumentPosition ) {
 	};
 }

-// Utility function for retreiving the text value of an array of DOM nodes
+// Utility function for retrieving the text value of an array of DOM nodes
 function getText( elems ) {
 	var ret = "", elem;

@ -4149,7 +4149,7 @@ jQuery.fn.extend({
 			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
 				// IE copies events bound via attachEvent when
 				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
+				// clone will also remove the events from the original
 				// In order to get around this, we use innerHTML.
 				// Unfortunately, this means some modifications to
 				// attributes in IE that are actually only stored
@ -4886,7 +4886,7 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp
 jQuery.extend({

 	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
+		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
@ -4911,7 +4911,7 @@ jQuery.extend({
 	},

 	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
+		// shift arguments if data argument was omitted
 		if ( jQuery.isFunction( data ) ) {
 			type = type || callback;
 			callback = data;
@ -4948,7 +4948,7 @@ jQuery.extend({
 		// Create the request object; Microsoft failed to properly
 		// implement the XMLHttpRequest in IE7 (can't request local files),
 		// so we use the ActiveXObject when it is available
-		// This function can be overriden by calling jQuery.ajaxSetup
+		// This function can be overridden by calling jQuery.ajaxSetup
 		xhr: window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ?
 			function() {
 				return new window.XMLHttpRequest();
--- a/clients/flex/jquery.tmpl.js
+++ b/clients/flex/jquery.tmpl.js
@ -362,7 +362,7 @@
 	function updateWrapped( options, wrapped ) {
 		// Build the wrapped content.
 		options._wrap = build( options, true,
-			// Suport imperative scenario in which options.wrapped can be set to a selector or an HTML string.
+			// Support imperative scenario in which options.wrapped can be set to a selector or an HTML string.
 			jQuery.isArray( wrapped ) ? wrapped : [htmlExpr.test( wrapped ) ? wrapped : jQuery( wrapped ).html()]
 		).join("");
 	}
--- a/conf/FreeMono.ttf
+++ b/conf/FreeMono.ttf
--- a/conf/curl/autoload_configs/conference.conf.xml
+++ b/conf/curl/autoload_configs/conference.conf.xml
@ -53,7 +53,7 @@
      <!-- 'say:' will be considered text to say with TTS -->
      <!-- Set a default path here so you can use relative paths in the other sound params-->
      <param name="sound-prefix" value="$${sound_prefix}"/>
-      <!-- File to play to acknowledge succees -->
+      <!-- File to play to acknowledge success -->
      <!--<param name="ack-sound" value="beep.wav"/>-->
      <!-- File to play to acknowledge failure -->
      <!--<param name="nack-sound" value="beeperr.wav"/>-->
--- a/conf/curl/autoload_configs/timezones.conf.xml
+++ b/conf/curl/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/curl/autoload_configs/xml_cdr.conf.xml
+++ b/conf/curl/autoload_configs/xml_cdr.conf.xml
@ -6,7 +6,7 @@
    <!-- optional: credentials to send to web server -->
    <!--    <param name="cred" value="user:pass"/> -->

-    <!-- the total number of retries (not counting the first 'try') to post to webserver incase of failure -->
+    <!-- the total number of retries (not counting the first 'try') to post to webserver in case of failure -->
    <!-- <param name="retries" value="2"/> -->

    <!-- delay between retries in seconds, default is 5 seconds -->
--- a/conf/insideout/autoload_configs/conference.conf.xml
+++ b/conf/insideout/autoload_configs/conference.conf.xml
@ -53,7 +53,7 @@
      <!-- 'say:' will be considered text to say with TTS -->
      <!-- Set a default path here so you can use relative paths in the other sound params-->
      <param name="sound-prefix" value="$${sound_prefix}"/>
-      <!-- File to play to acknowledge succees -->
+      <!-- File to play to acknowledge success -->
      <!--<param name="ack-sound" value="beep.wav"/>-->
      <!-- File to play to acknowledge failure -->
      <!--<param name="nack-sound" value="beeperr.wav"/>-->
--- a/conf/insideout/autoload_configs/modules.conf.xml
+++ b/conf/insideout/autoload_configs/modules.conf.xml
@ -81,6 +81,7 @@
    <load module="mod_v8"/>
    <!-- <load module="mod_perl"/> -->
    <!-- <load module="mod_python"/> -->
+    <!-- <load module="mod_python3"/> -->
    <!-- <load module="mod_java"/> -->
    <load module="mod_lua"/>

--- a/conf/insideout/autoload_configs/timezones.conf.xml
+++ b/conf/insideout/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/insideout/autoload_configs/xml_cdr.conf.xml
+++ b/conf/insideout/autoload_configs/xml_cdr.conf.xml
@ -6,7 +6,7 @@
    <!-- optional: credentials to send to web server -->
    <!--    <param name="cred" value="user:pass"/> -->

-    <!-- the total number of retries (not counting the first 'try') to post to webserver incase of failure -->
+    <!-- the total number of retries (not counting the first 'try') to post to webserver in case of failure -->
    <!-- <param name="retries" value="2"/> -->

    <!-- delay between retries in seconds, default is 5 seconds -->
--- a/conf/insideout/dialplan/default.xml
+++ b/conf/insideout/dialplan/default.xml
@ -2,7 +2,7 @@
    NOTICE:
    
    This context is usually accessed via authenticated callers on the sip profile on port 5060 
-    or transfered callers from the public context which arrived via the sip profile on port 5080.
+    or transferred callers from the public context which arrived via the sip profile on port 5080.
    
    Authenticated users will use the user_context variable on the user to determine what context
    they can access.  You can also add a user in the directory with the cidr= attribute acl.conf.xml
@ -330,7 +330,7 @@
    </extension>

    <!-- Create a conference on the fly and pull someone in at the same time. --> 
-    <extension name="dyanmic conference">
+    <extension name="dynamic conference">
      <condition field="destination_number" expression="^5001$">
 	<action application="conference" data="bridge:mydynaconf:sofia/${use_profile}/1234@conference.freeswitch.org"/>
      </condition>
--- a/conf/insideout/sip_profiles/internal.xml
+++ b/conf/insideout/sip_profiles/internal.xml
@ -129,6 +129,8 @@
    <!-- add a ;received="<ip>:<port>" to the contact when replying to register for nat handling -->
    <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
    <param name="auth-calls" value="$${internal_auth_calls}"/>
+    <!-- Force subscription requests to require authentication -->
+    <param name="auth-subscriptions" value="true"/>
    <!-- Force the user and auth-user to match. -->
    <param name="inbound-reg-force-matching-username" value="true"/>
    <!-- on authed calls, authenticate *all* the packets not just invite -->
--- a/conf/minimal/autoload_configs/timezones.conf.xml
+++ b/conf/minimal/autoload_configs/timezones.conf.xml
@ -196,7 +196,7 @@
 	<zone name="America/Santarem" value="BRT3" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
--- a/conf/minimal/sip_profiles/internal.xml
+++ b/conf/minimal/sip_profiles/internal.xml
@ -1,6 +1,8 @@
 <profile name="internal">
  <settings>
    <param name="auth-calls" value="true"/>
+    <!-- Force subscription requests to require authentication -->
+    <param name="auth-subscriptions" value="true"/>
    <param name="apply-nat-acl" value="nat.auto"/>

    <param name="debug" value="0"/>
--- a/conf/rayo/autoload_configs/conference.conf.xml
+++ b/conf/rayo/autoload_configs/conference.conf.xml
@ -64,7 +64,7 @@
      <!-- Override the default path here, after which you use relative paths in the other sound params -->
      <!-- Note: The default path is the conference's first caller's sound_prefix -->
      <!--<param name="sound-prefix" value="$${sound_prefix}"/>-->
-      <!-- File to play to acknowledge succees -->
+      <!-- File to play to acknowledge success -->
      <!--<param name="ack-sound" value="beep.wav"/>-->
      <!-- File to play to acknowledge failure -->
      <!--<param name="nack-sound" value="beeperr.wav"/>-->
--- a/conf/rayo/autoload_configs/spandsp.conf.xml
+++ b/conf/rayo/autoload_configs/spandsp.conf.xml
@ -10,7 +10,7 @@

    2) copy conf/config.FS0 to /var/spool/hylafax/etc (or wherver the appropriate dir is on your system)

-    Subsequent modem configs would incrment the 0 to 1 and so on.
+    Subsequent modem configs would increment the 0 to 1 and so on.

 -->
      <param name="total-modems" value="0"/>
--- a/conf/rayo/autoload_configs/timezones.conf.xml
+++ b/conf/rayo/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/sbc/autoload_configs/timezones.conf.xml
+++ b/conf/sbc/autoload_configs/timezones.conf.xml
@ -184,7 +184,7 @@
 	<zone name="America/Rosario" value="ART3ARST,M10.1.0/0,M3.3.0/0" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.2.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/St_Barthelemy" value="AST4" />
--- a/conf/testing/autoload_configs/amrwb.conf.xml
+++ b/conf/testing/autoload_configs/amrwb.conf.xml
@ -0,0 +1,24 @@
+<configuration name="amrwb.conf">
+	<settings>
+	<!--  AMRWB modes (supported bitrates):
+		mode 8 AMR-WB_23.85 23.85 Kbit/s
+		mode 7 AMR-WB_23.05 23.05 Kbit/s
+		mode 7 AMR-WB_19.85 19.85 Kbit/s
+		mode 6 AMR-WB_18.25 18.25 Kbit/s
+		mode 5 AMR-WB_15.85 15.85 Kbit/s
+		mode 4 AMR-WB_14.25 14.25 Kbit/s
+		mode 3 AMR-WB_12.65 12.65 Kbit/s
+		mode 2 AMR-WB_8.85 8.85 Kbit/s
+		mode 1 AMR-WB_6.60 6.60 Kbit/s
+	-->
+	<param name="default-bitrate" value="8"/>
+	 <!-- Enable VoLTE specific FMTP -->
+	<param name="volte" value="1"/>
+	<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
+	<param name="adjust-bitrate" value="0"/>
+	<!-- force OA when originating -->
+	<param name="force-oa" value="0"/>
+	<!-- don't mirror mode-set in SDP answer, but use our own (default-bitrate). -->
+	<param name="mode-set-overwrite" value="0"/>
+  </settings>
+</configuration>
--- a/conf/testing/autoload_configs/opus.conf.xml
+++ b/conf/testing/autoload_configs/opus.conf.xml
@ -6,6 +6,7 @@
    <param name="complexity" value="10"/>
    <param name="use-jb-lookahead" value="true"/>
 	<param name="keep-fec-enabled" value="true"/>
-    <param name="adjust-bitrate" value="true"/>
+	<param name="adjust-bitrate" value="true"/>
+    <param name="mono" value="0"/>
  </settings>
 </configuration>
--- a/conf/testing/autoload_configs/timezones.conf.xml
+++ b/conf/testing/autoload_configs/timezones.conf.xml
@ -196,7 +196,7 @@
 	<zone name="America/Santarem" value="BRT3" />
 	<zone name="America/Santiago" value="CLST" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
--- a/conf/testing/sip_profiles/internal.xml
+++ b/conf/testing/sip_profiles/internal.xml
@ -216,6 +216,14 @@
    <!-- TLS ciphers default: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH  -->
    <param name="tls-ciphers" value="$${sip_tls_ciphers}"/>

+    <!--
+        Connect timeout for outgoing requests using TLS (in milliseconds).
+        Set the timeout and SIP engine will try again sending an outgoing request
+        and when possible - using an alternative address (DNS failover).
+        Default - 0 (disabled)
+    -->
+    <!-- <param name="tls-orq-connect-timeout" value="3000" /> -->
+
    <!-- turn on auto-flush during bridge (skip timer sleep when the socket already has data)
         (reduces delay on latent connections default true, must be disabled explicitly)-->
    <!--<param name="rtp-autoflush-during-bridge" value="false"/>-->
@ -267,6 +275,8 @@
    <!-- add a ;received="<ip>:<port>" to the contact when replying to register for nat handling -->
    <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
    <param name="auth-calls" value="$${internal_auth_calls}"/>
+    <!-- Force subscription requests to require authentication -->
+    <param name="auth-subscriptions" value="true"/>
    <!-- Force the user and auth-user to match. -->
    <param name="inbound-reg-force-matching-username" value="true"/>
    <!-- on authed calls, authenticate *all* the packets not just invite -->
--- a/conf/vanilla/autoload_configs/amr.conf.xml
+++ b/conf/vanilla/autoload_configs/amr.conf.xml
@ -15,5 +15,7 @@
 	  <param name="volte" value="0"/>
 	  <!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
 	  <param name="adjust-bitrate" value="0"/> 
+	  <!-- force OA when originating -->
+	  <param name="force-oa" value="0"/> 
 	</settings>
 </configuration>
--- a/conf/vanilla/autoload_configs/amrwb.conf.xml
+++ b/conf/vanilla/autoload_configs/amrwb.conf.xml
@ -1,7 +1,24 @@
 <configuration name="amrwb.conf">
-  <settings>
-    <param name="default-bitrate" value="8"/>
-    <param name="volte" value="1"/>
-    <param name="adjust-bitrate" value="0"/>
+	<settings>
+	<!--  AMRWB modes (supported bitrates):
+		mode 8 AMR-WB_23.85 23.85 Kbit/s
+		mode 7 AMR-WB_23.05 23.05 Kbit/s
+		mode 7 AMR-WB_19.85 19.85 Kbit/s
+		mode 6 AMR-WB_18.25 18.25 Kbit/s
+		mode 5 AMR-WB_15.85 15.85 Kbit/s
+		mode 4 AMR-WB_14.25 14.25 Kbit/s
+		mode 3 AMR-WB_12.65 12.65 Kbit/s
+		mode 2 AMR-WB_8.85 8.85 Kbit/s
+		mode 1 AMR-WB_6.60 6.60 Kbit/s
+	-->
+	<param name="default-bitrate" value="8"/>
+	 <!-- Enable VoLTE specific FMTP -->
+	<param name="volte" value="1"/>
+	<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
+	<param name="adjust-bitrate" value="0"/>
+	<!-- force OA when originating -->
+	<param name="force-oa" value="0"/>
+	<!-- don't mirror mode-set in SDP answer, but use our own (default-bitrate). -->
+	<param name="mode-set-overwrite" value="0"/>
  </settings>
 </configuration>
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@ -122,6 +122,7 @@
    <!-- <load module="mod_v8"/> -->
    <!-- <load module="mod_perl"/> -->
    <!-- <load module="mod_python"/> -->
+    <!-- <load module="mod_python3"/> -->
    <!-- <load module="mod_java"/> -->
    <load module="mod_lua"/>

--- a/conf/vanilla/autoload_configs/opus.conf.xml
+++ b/conf/vanilla/autoload_configs/opus.conf.xml
@ -28,6 +28,8 @@
 	<!-- Max capture rate, 8000, 12000, 16000, 24000 and 48000 are valid options -->
        <!--<param name="sprop-maxcapturerate" value="0"/>-->
 	<!-- Enable automatic bitrate variation during the call based on RTCP feedback -->
-        <!--<param name="adjust-bitrate" value="1"/>-->
+	<!--<param name="adjust-bitrate" value="1"/>-->
+	<!-- will enforce mono even if the remote party wants stereo. must be used in conjunction with param "max-audio-channels" set to 1 in switch.conf.xml. -->
+		<param name="mono" value="0"/>
    </settings>
 </configuration>
--- a/conf/vanilla/autoload_configs/spandsp.conf.xml
+++ b/conf/vanilla/autoload_configs/spandsp.conf.xml
@ -28,6 +28,7 @@
    <fax-settings>
 	<param name="use-ecm"		value="true"/>
 	<param name="verbose"		value="false"/>
+	<!--param name="verbose-log-level"	value="INFO"/-->
 	<param name="disable-v17"	value="false"/>
 	<param name="ident"		value="SpanDSP Fax Ident"/>
 	<param name="header"		value="SpanDSP Fax Header"/>
--- a/conf/vanilla/autoload_configs/timezones.conf.xml
+++ b/conf/vanilla/autoload_configs/timezones.conf.xml
@ -197,7 +197,7 @@
 	<zone name="America/Santarem" value="BRT3" />
 	<zone name="America/Santiago" value="CLT3" />
 	<zone name="America/Santo_Domingo" value="AST4" />
-	<zone name="America/Sao_Paulo" value="BRT3BRST,M10.3.0/0,M2.3.0/0" />
+	<zone name="America/Sao_Paulo" value="BRT3" />
 	<zone name="America/Scoresbysund" value="EGT1EGST,M3.5.0/0,M10.5.0/1" />
 	<zone name="America/Shiprock" value="MST7MDT,M3.2.0,M11.1.0" />
 	<zone name="America/Sitka" value="AKST9AKDT,M3.2.0,M11.1.0" />
--- a/conf/vanilla/autoload_configs/verto.conf.xml
+++ b/conf/vanilla/autoload_configs/verto.conf.xml
@ -2,6 +2,7 @@

  <settings>
    <param name="debug" value="0"/>
+    <!-- <param name="kslog" value="true"/> -->
    <!-- seconds to wait before hanging up a disconnected channel -->
    <!-- <param name="detach-timeout-sec" value="120"/> -->
    <!-- enable broadcasting all FreeSWITCH events in Verto -->
--- a/conf/vanilla/sip_profiles/external.xml
+++ b/conf/vanilla/sip_profiles/external.xml
@ -92,5 +92,7 @@
    <param name="tls-verify-in-subjects" value=""/>
    <!-- TLS version ("sslv23" (default), "tlsv1"). NOTE: Phones may not work with TLSv1 -->
    <param name="tls-version" value="$${sip_tls_version}"/>
+    <!-- TLS ciphers default: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH -->
+    <param name="tls-ciphers" value="$${sip_tls_ciphers}"/>
  </settings>
 </profile>
--- a/conf/vanilla/sip_profiles/internal-ipv6.xml
+++ b/conf/vanilla/sip_profiles/internal-ipv6.xml
@ -36,6 +36,8 @@
    <!-- <param name="bitpacking" value="aal2"/> -->
    <!--max number of open dialogs in proceeding -->
    <!--<param name="max-proceeding" value="1000"/>-->
+    <!--max number of receiving requests per second (Default: 1000, 0 - unlimited) -->
+    <!--<param name="max-recv-requests-per-second" value="0"/>-->
    <!--session timers for all call to expire after the specified seconds -->
    <!--<param name="session-timeout" value="1800"/>-->
    <!--<param name="multiple-registrations" value="true"/>-->
--- a/conf/vanilla/sip_profiles/internal.xml
+++ b/conf/vanilla/sip_profiles/internal.xml
@ -172,6 +172,8 @@
    <!-- <param name="bitpacking" value="aal2"/> -->
    <!--max number of open dialogs in proceeding -->
    <!--<param name="max-proceeding" value="1000"/>-->
+    <!--max number of receiving requests per second (Default: 1000, 0 - unlimited) -->
+    <!--<param name="max-recv-requests-per-second" value="0"/> -->
    <!--session timers for all call to expire after the specified seconds -->
    <!--<param name="session-timeout" value="1800"/>-->
    <!-- Can be 'true' or 'contact' -->
@ -216,6 +218,14 @@
    <!-- TLS ciphers default: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH  -->
    <param name="tls-ciphers" value="$${sip_tls_ciphers}"/>

+    <!--
+        Connect timeout for outgoing requests using TLS (in milliseconds).
+        Set the timeout and SIP engine will try again sending an outgoing request
+        and when possible - using an alternative address (DNS failover).
+        Default - 0 (disabled)
+    -->
+    <!-- <param name="tls-orq-connect-timeout" value="3000" /> -->
+
    <!-- turn on auto-flush during bridge (skip timer sleep when the socket already has data)
         (reduces delay on latent connections default true, must be disabled explicitly)-->
    <!--<param name="rtp-autoflush-during-bridge" value="false"/>-->
@ -267,6 +277,8 @@
    <!-- add a ;received="<ip>:<port>" to the contact when replying to register for nat handling -->
    <!--<param name="NDLB-received-in-nat-reg-contact" value="true"/>-->
    <param name="auth-calls" value="$${internal_auth_calls}"/>
+    <!-- Force subscription requests to require authentication -->
+    <param name="auth-subscriptions" value="true"/>
    <!-- Force the user and auth-user to match. -->
    <param name="inbound-reg-force-matching-username" value="true"/>
    <!-- on authed calls, authenticate *all* the packets not just invite -->
--- a/configure.ac
+++ b/configure.ac
@ -3,10 +3,10 @@

 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.10.4-dev], bugs@freeswitch.org)
+AC_INIT([freeswitch], [1.10.8-dev], bugs@freeswitch.org)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [10])
-AC_SUBST(SWITCH_VERSION_MICRO, [4-dev])
+AC_SUBST(SWITCH_VERSION_MICRO, [8-dev])
 AC_SUBST(SWITCH_VERSION_REVISION, [])
 AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])

@ -598,7 +598,7 @@ AC_ARG_ENABLE(srtp,
 AM_CONDITIONAL([ENABLE_SRTP],[test "${enable_srtp}" = "yes"])

 have_openal=no
-AC_CHECK_LIB(openal, alMidiGainSOFT, [have_openal="yes"])
+AC_CHECK_LIB(openal, alcLoopbackOpenDeviceSOFT, [have_openal="yes"])
 AM_CONDITIONAL([HAVE_OPENAL],[test "${have_openal}" = "yes"])

 AC_ARG_ENABLE(zrtp,
@ -699,7 +699,13 @@ AC_DEFINE_UNQUOTED([POSTGRESQL_MAJOR_VERSION], ${POSTGRESQL_MAJOR_VERSION}, [Spe
 AC_DEFINE_UNQUOTED([POSTGRESQL_MINOR_VERSION], ${POSTGRESQL_MINOR_VERSION}, [Specifies the version of PostgreSQL we are linking against])
 AC_DEFINE_UNQUOTED([POSTGRESQL_PATCH_VERSION], ${POSTGRESQL_PATCH_VERSION}, [Specifies the version of PostgreSQL we are linking against])
 have_libpq=no
+save_LIBS="${LIBS}"
+save_CPPFLAGS="${CPPFLAGS}"
+LIBS="${POSTGRESQL_LDFLAGS}"
+CPPFLAGS="${POSTGRESQL_CFLAGS}"
 AC_CHECK_LIB([pq], [PQgetvalue], [have_libpq="yes"])
+LIBS="${save_LIBS}"
+CPPFLAGS="${save_CPPFLAGS}"
 AM_CONDITIONAL([HAVE_PGSQL],[test "${have_libpq}" = "yes"])
 AC_SUBST([POSTGRESQL_CFLAGS], [$POSTGRESQL_CFLAGS])
 AC_SUBST([POSTGRESQL_LDFLAGS], [$POSTGRESQL_LDFLAGS])
@ -714,6 +720,16 @@ PKG_CHECK_MODULES([MARIADB], [libmariadb >= 3.0.9],[
  ])
 ])

+PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[
+  AM_CONDITIONAL([HAVE_SPANDSP],[true])],[
+    AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent])
+])
+
+PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.6],[
+  AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
+    AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
+])
+
 AC_ARG_ENABLE(deprecated-core-db-events,
 	[AS_HELP_STRING([--enable-deprecated-core-db-events], [Keep deprecated core db events])],,[enable_deprecated_core_db_events="no"])

@ -822,6 +838,10 @@ PKG_CHECK_MODULES([AMRWB], [opencore-amrwb >= 0.1.0 vo-amrwbenc >= 0.1.0],[
 		AM_CONDITIONAL([HAVE_AMRWB],[true])],[
 		AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_AMRWB],[false])])

+PKG_CHECK_MODULES([STIRSHAKEN], [stirshaken],[
+		AM_CONDITIONAL([HAVE_STIRSHAKEN],[true])],[
+		AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_STIRSHAKEN],[false])])
+
 AC_CHECK_LIB(apr-1, apr_pool_mutex_set, use_system_apr=yes, use_system_apr=no)
 AM_CONDITIONAL([SYSTEM_APR],[test "${use_system_apr}" = "yes"])
 AC_CHECK_LIB(aprutil-1, apr_queue_pop_timeout, use_system_aprutil=yes, use_system_aprutil=no)
@ -1388,7 +1408,9 @@ PKG_CHECK_MODULES([VLC], [libvlc >= 2.1.0],[

 PKG_CHECK_MODULES([OPENCV], [opencv >= 2.4.5],[
  AM_CONDITIONAL([HAVE_OPENCV],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])
+  PKG_CHECK_MODULES([OPENCV], [opencv4 >= 2.4.5],[
+    AM_CONDITIONAL([HAVE_OPENCV],[true])],[
+    AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])])

 PKG_CHECK_MODULES([OPUSFILE_DECODE], [opusfile >= 0.5],[
   AM_CONDITIONAL([HAVE_OPUSFILE_DECODE],[true])],[
@ -1509,11 +1531,25 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[

 PKG_CHECK_MODULES([KS], [libks >= 1.1.0],[
  AM_CONDITIONAL([HAVE_KS],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])])
+    if module_enabled mod_verto; then
+      AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf])
+    else
+      if module_enabled mod_signalwire; then
+        AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
+      else
+        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
+      fi
+    fi
+])

 PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
  AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])])
+    if module_enabled mod_signalwire; then
+      AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf])
+    else
+      AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
+    fi
+])

 PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[
  AM_CONDITIONAL([HAVE_AMQP],[true])],[
@ -1556,6 +1592,17 @@ AS_IF([test "x$enable_core_libedit_support" != "xno"],[
      AC_MSG_ERROR([You need to either install libedit-dev (>= 2.11) or configure with --disable-core-libedit-support])
      ])])])

+AC_ARG_ENABLE(systemd,
+  [AS_HELP_STRING([--enable-systemd], [Compile with systemd notify support])])
+
+AS_IF([test "x$enable_systemd" = "xyes"],[
+  PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 219], [
+    AC_DEFINE([HAVE_SYSTEMD], [1], [Define to 1 if systemd is available])])
+])
+
+AC_SUBST(SYSTEMD_LIBS)
+
+
 dnl ---------------------------------------------------------------------------
 dnl - OpenLDAP SDK
 dnl ---------------------------------------------------------------------------
@ -1682,7 +1729,7 @@ if test "x$ac_cv_have_php" != "xno" -a "x$ac_cv_have_php_config" != "xno"; then
 fi

 #
-# Python checks for mod_python
+# Python checks for mod_python (scroll down to see python3 checks for mod_python3)
 #
 AC_ARG_WITH(
 	[python],
@ -1802,6 +1849,127 @@ else
 	AC_MSG_WARN([python support disabled, building mod_python will fail!])
 fi

+#
+# Python3 checks for mod_python3
+#
+AC_ARG_WITH(
+	[python3],
+	[AS_HELP_STRING([--with-python3], [Use system provided version of python3 (default: try)])],
+	[with_python3="$withval"],
+	[with_python3="try"]
+)
+
+if test "$with_python3" != "no"
+then
+	save_CFLAGS="$CFLAGS"
+	save_LIBS="$LIBS"
+
+	if test "$with_python3" != "yes" -a "$with_python3" != "try" ; then
+		AC_MSG_CHECKING([for python3])
+		if test ! -x "$with_python3" ; then
+			AC_MSG_ERROR([Specified python3 does not exist or is not executable: $with_python3])
+		fi
+		AC_MSG_RESULT([$with_python3])
+		AC_SUBST([PYTHON3], ["$with_python3"])
+	else
+		AC_PATH_PROG([PYTHON3], ["python3"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
+	fi
+
+	if test "$PYTHON3" != "no" ; then
+		AC_MSG_CHECKING([python3 version])
+		PYTHON3_VER="`$PYTHON3 -V 2>&1 | cut -d' ' -f2`"
+
+		if test -z "$PYTHON3_VER" ; then
+			AC_MSG_ERROR([Unable to detect python3 version])
+		fi
+		AC_MSG_RESULT([$PYTHON3_VER])
+
+		AC_MSG_CHECKING([for python3 distutils])
+		python3_result="`$PYTHON3 -c 'import distutils;' 2>&1`"
+		if test -z "$python3_result" ; then
+			python3_has_distutils="yes"
+		else
+			python3_has_distutils="no"
+		fi
+		AC_MSG_RESULT([$python3_has_distutils])
+
+		if test "$python3_has_distutils" != "no" ; then
+			AC_MSG_CHECKING([location of python3 site-packages])
+
+			PYTHON3_SITE_DIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(0));'`"
+
+			if test -z "$PYTHON3_SITE_DIR" ; then
+				AC_MSG_ERROR([Unable to detect python3 site-packages path])
+			elif test ! -d "$PYTHON3_SITE_DIR" ; then
+				AC_MSG_ERROR([Path $PYTHON3_SITE_DIR returned by python3 does not exist!])
+			fi
+			AC_MSG_RESULT([$PYTHON3_SITE_DIR])
+			AC_SUBST([PYTHON3_SITE_DIR], [$PYTHON3_SITE_DIR])
+
+			#
+			# python3 distutils found, get settings from python3 directly
+			#
+			PYTHON3_CFLAGS="`$PYTHON3 -c 'from distutils import sysconfig; flags = [[\"-I\" + sysconfig.get_python_inc(0), \"-I\" + sysconfig.get_python_inc(1), \" \".join(sysconfig.get_config_var(\"CFLAGS\").split())]]; print(\" \".join(flags));' | sed -e 's/-arch i386//g;s/-arch x86_64//g'`"
+			PYTHON3_LDFLAGS="`$PYTHON3 -c 'from distutils import sysconfig; ldver = sysconfig.get_config_var(\"LDVERSION\"); libs = sysconfig.get_config_var(\"LIBS\").split() + sysconfig.get_config_var(\"SYSLIBS\").split(); libs.append(\"-lpython\" + [[ldver,sysconfig.get_config_var(\"VERSION\")]][[ldver==None]]); print(\" \".join(libs));'`"
+			PYTHON3_LIB="`$PYTHON3 -c 'from distutils import sysconfig; ldver = sysconfig.get_config_var(\"LDVERSION\"); print(\"python\" + [[ldver,sysconfig.get_config_var(\"VERSION\")]][[ldver==None]]);'`"
+			PYTHON3_LIBDIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_config_var(\"LIBDIR\"));'`"
+
+			# handle python3 being installed into /usr/local
+			AC_MSG_CHECKING([python3 libdir])
+			if test -z "`echo $PYTHON3_LIBDIR | grep "/usr/lib"`" ; then
+				PYTHON3_LDFLAGS="-L$PYTHON3_LIBDIR $PYTHON3_LDFLAGS"
+				LIBS="-L$PYTHON3_LIBDIR $LIBS"
+			fi
+			AC_MSG_RESULT([$PYTHON3_LIBDIR])
+
+			# check libpython3
+			AC_CHECK_LIB([$PYTHON3_LIB], [main], [has_libpython3="yes"], [has_libpython3="no"])
+
+			if test "$has_libpython3" = "no" ; then
+				AS_IF([test "$with_python3" = "try"],
+				 	[AC_MSG_WARN([$PYTHON3_LIB is unusable])],
+					[AC_MSG_ERROR([$PYTHON3_LIB is unusable])]
+				)
+			fi
+
+			# check whether system libpython3 is usable and has threads support
+			CFLAGS="$PYTHON3_CFLAGS"
+			LIBS="$PYTHON3_LDFLAGS"
+			AC_CHECK_FUNC([PyThread_init_thread], [python3_has_threads="yes"], [python3_has_threads="no"])
+
+			if test "$python3_has_threads" = "no"; then
+				AS_IF([test "$with_python3" = "try"],
+					[AC_MSG_WARN([Your python3 lacks threads support, can not build mod_python3])],
+					[AC_MSG_ERROR([Your python3 lacks threads support, can not build mod_python3])]
+				)
+			else
+				AC_MSG_NOTICE([Your python3 seems OK, do not forget to enable mod_python3 in modules.conf])
+				AC_SUBST([PYTHON3_CFLAGS],  [$PYTHON3_CFLAGS])
+				AC_SUBST([PYTHON3_LDFLAGS], [$PYTHON3_LDFLAGS])
+			fi
+		else
+			AS_IF([test "$with_python3" = "try"],
+				[AC_MSG_WARN([Could not find or use python3 distutils module: $python3_result])],
+				[AC_MSG_ERROR([Could not find or use python3 distutils module: $python3_result])]
+			)
+		fi
+
+		LIBS="$save_LIBS"
+		CFLAGS="$save_CFLAGS"
+
+		unset python3_has_threads
+		unset python3_has_distutils
+		unset python3_result
+	else
+		AS_IF([test "$with_python3" = "try"],
+			[AC_MSG_WARN([Could not find python3, mod_python3 will not build, use --with-python3 to specify the location])],
+			[AC_MSG_ERROR([Could not find python3, use --with-python3 to specify the location])]
+		)
+	fi
+else
+	AC_MSG_WARN([python3 support disabled, building mod_python3 will fail!])
+fi
+
 #
 # SNMP checks for mod_snmp
 #
@ -1832,6 +2000,55 @@ if test "${enable_address_sanitizer}" = "yes"; then
  APR_ADDTO(LDFLAGS, -fsanitize=address)
 fi

+#  Enable HEAP profiler (requires libgoogle-perftools-dev package)
+AC_ARG_ENABLE(heap_profiler,
+  [AC_HELP_STRING([--enable-heap-profiler],[build with google heap profiler])],
+  [enable_heap_profiler="$enable_heap_profiler"],
+  [enable_heap_profiler="no"])
+
+#  Enable CPU profiler (requires libgoogle-perftools-dev package)
+AC_ARG_ENABLE(cpu_profiler,
+  [AC_HELP_STRING([--enable-cpu-profiler],[build with google cpu profiler])],
+  [enable_cpu_profiler="$enable_cpu_profiler"],
+  [enable_cpu_profiler="no"])
+
+PKG_CHECK_MODULES([TCMALLOC], [libtcmalloc], [have_tcmalloc=yes], [have_tcmalloc=no])
+
+if test "${enable_heap_profiler}" = "yes" || test "${enable_cpu_profiler}" = "yes"; then
+  if test "x$have_tcmalloc" != "xyes" ; then
+    AC_MSG_ERROR([You must install libgoogle-perftools-dev in order to use heap or cpu profiler])
+  fi
+fi
+
+# WARNING: When both enabled you can NOT link them statically and MUST use the special library
+if test "${enable_heap_profiler}" = "yes" && test "${enable_cpu_profiler}" = "yes"; then
+  APR_ADDTO(CFLAGS, -ltcmalloc_and_profiler)
+  APR_ADDTO(CXXFLAGS, -ltcmalloc_and_profiler)
+  APR_ADDTO(LDFLAGS, -ltcmalloc_and_profiler)
+else
+  if test "${enable_heap_profiler}" = "yes"; then
+    APR_ADDTO(CFLAGS, -ltcmalloc)
+    APR_ADDTO(CXXFLAGS, -ltcmalloc)
+    APR_ADDTO(LDFLAGS, -ltcmalloc)
+  fi
+
+  if test "${enable_cpu_profiler}" = "yes"; then
+    APR_ADDTO(CFLAGS, -lprofiler)
+    APR_ADDTO(CXXFLAGS, -lprofiler)
+    APR_ADDTO(LDFLAGS, -lprofiler)
+  fi
+fi
+
+#  Enable fake dlclose
+AC_ARG_ENABLE(fake_dlclose,
+  [AC_HELP_STRING([--enable-fake-dlclose],[Do not unload dynamic libraries])],
+  [enable_fake_dlclose="$enable_fake_dlclose"],
+  [enable_fake_dlclose="no"])
+
+if test "${enable_fake_dlclose}" = "yes"; then
+  APR_ADDTO(SWITCH_AM_CFLAGS, -DHAVE_FAKE_DLCLOSE)
+fi
+
 AC_ARG_ENABLE(,
  [AC_HELP_STRING([--enable-pool-sanitizer],[build with sanitizer friendly pool behavior])],
  [enable_pool_sanitizer="$enable_pool_sanitizer"],
@ -1992,6 +2209,7 @@ AC_CONFIG_FILES([Makefile
 		src/mod/languages/mod_managed/Makefile
 		src/mod/languages/mod_perl/Makefile
 		src/mod/languages/mod_python/Makefile
+		src/mod/languages/mod_python3/Makefile
 		src/mod/languages/mod_v8/Makefile
 		src/mod/languages/mod_yaml/Makefile
 		src/mod/languages/mod_basic/Makefile
@ -2058,7 +2276,7 @@ AM_CONDITIONAL(HAVE_G729, [ test -d ${switch_srcdir}/libs/libg729 ])
 LIBTOOL='$(SHELL) $(switch_builddir)/libtool'
 TOUCH_TARGET='if test -f "$@";then touch "$@";fi;'
 CONF_MODULES='$$(grep -v "\#" $(switch_builddir)/modules.conf | sed "s/|.*//" | sed -e "s|^.*/||" | sort | uniq )'
-CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | grep -v "\#\#" | sed "s/|.*//" | sed -e "s|^.*/||" | sort | uniq )'
+CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | grep -v "\#\#" | sed "s/|.*//" | sed "s/\#/\#\//"| sed -e "s|^.*/||" | sort | uniq )'
 OUR_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-all ; done )"; echo $$mods )'
 OUR_CLEAN_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-clean ; done )"; echo $$mods )'
 OUR_INSTALL_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'
@ -2104,10 +2322,7 @@ if test "$use_system_aprutil" != "yes"; then
 fi
 AC_CONFIG_SUBDIRS([libs/iksemel])
 AC_CONFIG_SUBDIRS([libs/libdingaling])
-AC_CONFIG_SUBDIRS([libs/sofia-sip])
-AC_CONFIG_SUBDIRS([libs/freetdm])
 AC_CONFIG_SUBDIRS([libs/unimrcp])
-AC_CONFIG_SUBDIRS([libs/spandsp])
 if test "x${enable_zrtp}" = "xyes"; then
   AC_CONFIG_SUBDIRS([libs/libzrtp])
 fi
--- a/debian/README.source
+++ b/debian/README.source
@ -63,7 +63,7 @@ The format of debian/modules.conf is:
 Building the Debian packaging
 -----------------------------

-If you want actualy Debian binary or source packages to upload to your
+If you want actually Debian binary or source packages to upload to your
 own repository, you'll need to build them as described here.  We have
 some fancy automatic tools to accomplish this.  The tools allow you to
 start from a very bare Debian image and generate working packages.
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@ -29,7 +29,7 @@ conf_dir="../conf"
 lang_dir="../conf/vanilla/lang"
 fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media."
 mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="."
-supported_debian_distros="wheezy jessie stretch buster sid"
+supported_debian_distros="wheezy jessie stretch buster bullseye sid"
 supported_ubuntu_distros="trusty utopic xenial"
 supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
@ -299,13 +299,13 @@ print_source_control () {
  esac
  local debhelper_dep="debhelper (>= 8.0.0)"
  if [ ${use_sysvinit} = "false" ]; then
-      debhelper_dep=${debhelper_dep}", dh-systemd"
+      debhelper_dep=${debhelper_dep}", dh-systemd | debhelper (>= 8.0.0)"
  fi
  cat <<EOF
 Source: freeswitch
 Section: comm
 Priority: optional
-Maintainer: FreeSWITCH Solutions, LLC <support@freeswitch.com>
+Maintainer: SignalWire, Inc <support@signalwire.com>
 Build-Depends:
 # for debian
 ${debhelper_dep},
@ -325,14 +325,17 @@ Build-Depends:
 # configure options
 libssl1.0-dev | libssl-dev, unixodbc-dev, libpq-dev,
 libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev,
- python-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
+ python-dev | python-dev-is-python2, python3-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev, libtpl-dev (>= 1.5),
 # documentation
 doxygen,
 # for APR (not essential for build)
 uuid-dev, libexpat1-dev, libgdbm-dev, libdb-dev,
 # used by many modules
 libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl-dev,
- bison, zlib1g-dev,
+ bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.6),
+ libspandsp3-dev,
+# used to format the private freeswitch apt-repo key properly
+ gnupg,
 # module build-depends
 $(debian_wrap "${mod_build_depends}")
 Standards-Version: 3.9.3
@ -368,7 +371,7 @@ Description: Cross-Platform Scalable Multi-Protocol Soft Switch

 Package: libfreeswitch1
 Architecture: amd64 armhf
-Depends: \${shlibs:Depends}, \${misc:Depends}
+Depends: \${shlibs:Depends}, \${misc:Depends}, libsofia-sip-ua0 (>= 1.13.6)
 Recommends:
 Suggests: libfreeswitch1-dbg
 Conflicts: freeswitch-all (<= 1.6.7)
@ -680,7 +683,7 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 freeswitch-mod-java (= \${binary:Version}),
 freeswitch-mod-lua (= \${binary:Version}),
 freeswitch-mod-perl (= \${binary:Version}),
- freeswitch-mod-python (= \${binary:Version}),
+ freeswitch-mod-python3 (= \${binary:Version}),
 freeswitch-mod-yaml (= \${binary:Version}),
 freeswitch-mod-console (= \${binary:Version}),
 freeswitch-mod-logfile (= \${binary:Version}),
@ -919,7 +922,7 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
 freeswitch-mod-java-dbg (= \${binary:Version}),
 freeswitch-mod-lua-dbg (= \${binary:Version}),
 freeswitch-mod-perl-dbg (= \${binary:Version}),
- freeswitch-mod-python-dbg (= \${binary:Version}),
+ freeswitch-mod-python3-dbg (= \${binary:Version}),
 freeswitch-mod-yaml-dbg (= \${binary:Version}),
 freeswitch-mod-console-dbg (= \${binary:Version}),
 freeswitch-mod-logfile-dbg (= \${binary:Version}),
--- a/debian/control-modules
+++ b/debian/control-modules
@ -492,6 +492,7 @@ Description: Adds mod_verto.
 Adds mod_verto.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev

 ## mod/event_handlers

@ -665,11 +666,17 @@ Description: mod_perl
 Adds mod_perl.
 Build-Depends: libperl-dev
 Build-Depends-Buster: libperl-dev, libgdbm-compat-dev
+Build-Depends-Bullseye: libperl-dev, libgdbm-compat-dev

 Module: languages/mod_python
 Description: mod_python
 Adds mod_python.
-Build-Depends: python-dev 
+Build-Depends: python-dev | python-dev-is-python2
+
+Module: languages/mod_python3
+Description: mod_python3
+ Adds mod_python3.
+Build-Depends: python3-dev

 Module: languages/mod_v8
 Description: mod_v8
--- a/debian/copyright
+++ b/debian/copyright
@ -1310,45 +1310,6 @@ Files: libs/js/nsprpub/pr/tests/tmocon.c
 Copyright: 1998-2004 Netscape Communications Corporation
 License: MPL-1.1 or GPL-2+

-Files: libs/spandsp/*
-Copyright: 2001-2012, Steve Underwood
- 2006 Michael Jerris
- 1991-1997 Silicon Graphics, Inc.
- 1990-1997 Sam Leffler
- 1993 CMU
- 2004, Horizon Wimba, Inc.
- 1990, 1995  Frank D. Cringle.
-License: LGPL-2.1
-
-Files: libs/spandsp/tests/*
- libs/spandsp/spandsp-sim/g1050.c
- libs/spandsp/spandsp-sim/line_model.c
- libs/spandsp/spandsp-sim/make_line_models.c
- libs/spandsp/spandsp-sim/spandsp-sim.h
- libs/spandsp/spandsp-sim/test_utils.c
- libs/spandsp/src/image_translate.c
- libs/spandsp/src/make_at_dictionary.c
- libs/spandsp/src/make_cielab_luts.c
- libs/spandsp/src/make_math_fixed_tables.c
- libs/spandsp/src/make_modem_filter.c
- libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c
- libs/spandsp/test-data/itu/fax/generate_dithered_tif.c
- libs/spandsp/test-data/itu/fax/generate_sized_pages.c
- libs/spandsp/test-data/itu/fax/generate_striped_pages.c
-Copyright: 2001-2012, Steve Underwood
-License: GPL-2
-
-Files: libs/spandsp/tests/ademco_contactid_tests.c
- libs/spandsp/tests/regression_tests.sh
- libs/spandsp/tests/timezone_tests.c
- libs/spandsp/tests/tsb85_extra_tests.sh
- libs/spandsp/tests/tsb85_tests.c
- libs/spandsp/tests/tsb85_tests.sh
- libs/spandsp/tests/v42bis_tests.sh
- libs/spandsp/tests/fax_tests.sh
-Copyright: 2001-2012, Steve Underwood
-License: LGPL-2.1
-
 Files: src/mod/applications/mod_cluechoo/sl.h
 Copyright: 1993 Toyoda Masashi
 License: FIXME
@ -1441,11 +1402,6 @@ Files: libs/libsndfile/src/G72x/*
 Copyright: Abandoned, Sun Microsystems, Inc.
 License: public-domain

-Files: libs/spandsp/src/spandsp/fast_convert.h
-Copyright: 2001-2004 Erik de Castro Lopo <erikd@mega-nerd.com>
- 2009 Steve Underwood
-License: LGPL-2.1
-
 Files: libs/libsndfile/*
 libs/win32/libsndfile/*
 Copyright: 1999-2009 Erik de Castro Lopo <erikd@mega-nerd.com>
--- a/debian/freeswitch-mod-python.install.tmpl
+++ b/debian/freeswitch-mod-python.install.tmpl
@ -1 +1 @@
-/usr/lib/python*/*-packages/freeswitch.py
+/usr/lib/python2*/*-packages/freeswitch.py
--- a/debian/freeswitch-mod-python3.install.tmpl
+++ b/debian/freeswitch-mod-python3.install.tmpl
@ -0,0 +1 @@
+/usr/lib/python3*/*-packages/freeswitch.py
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@ -162,15 +162,6 @@ Rules:
   Matches: the\sLicense\sat\shttp://www.mozilla.org/MPL/
   Matches: GNU\sGeneral\sPublic\sLicense\sVersion\s2\sor\slater
   License: MPL-1.1 or GPL-2+
-  -
-   Glob: libs/spandsp/tests/g726_tests.c
-   Matches: Copyright\s(C)\s2006\sSteve\sUnderwood
-   Matches: specification.\sThese\sare\scopyright\smaterial,\sand\sso\scannot\sbe\sdistributed\swith\sthis\stest\ssoftware.
-   Copyright: 2006 Steve Underwood
-  -
-   Glob: libs/spandsp/*/g722.[ch]
-   Matches: Copyright\s\(c\)\sCMU\s+1993
-   Copyright: 1993 CMU
  -
   Glob: libs/libwebsockets/win32port/zlib/inftrees.c
   Matches: Copyright\s1995-2010\sMark\sAdler\s.;
--- a/debian/rules
+++ b/debian/rules
@ -73,7 +73,7 @@ override_dh_auto_clean:
 	./configure -C --enable-portable-binary --disable-dependency-tracking \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --localstatedir=/var --sysconfdir=/etc \
-		--with-gnu-ld --with-python --with-erlang --with-openssl \
+		--with-gnu-ld --with-python --with-python3 --with-erlang --with-openssl \
 		--enable-core-odbc-support --enable-zrtp
 	touch $@

@ -85,6 +85,7 @@ override_dh_auto_configure: .stamp-configure
 	make iksemel-dep
 	make -j$(NJOBS)
 	make -C libs/esl pymod
+	make -C libs/esl py3mod
 	make -C libs/esl perlmod
 	touch $@

@ -99,6 +100,7 @@ override_dh_strip:
 override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install -- -C libs/esl pymod-install
+	dh_auto_install -- -C libs/esl py3mod-install
 	dh_auto_install -- -C libs/esl perlmod-install
 	rm -f debian/tmp/usr/share/freeswitch/grammar/model/communicator/COPYING

--- a/debian/util.sh
+++ b/debian/util.sh
@ -46,9 +46,9 @@ find_distro () {
  case "$1" in
    experimental) echo "sid";;
    unstable) echo "sid";;
-    testing) echo "buster";;
-    stable) echo "stretch";;
-    oldstable) echo "jessie";;
+    testing) echo "bullseye";;
+    stable) echo "buster";;
+    oldstable) echo "stretch";;
    *) echo "$1";;
  esac
 }
@ -56,9 +56,9 @@ find_distro () {
 find_suite () {
  case "$1" in
    sid) echo "unstable";;
-    buster) echo "testing";;
-    stretch) echo "stable";;
-    jessie) echo "oldstable";;
+    bullseye) echo "testing";;
+    buster) echo "stable";;
+    stretch) echo "oldstable";;
    *) echo "$1";;
  esac
 }
@ -298,7 +298,9 @@ build_debs () {
        for X in /etc/apt/sources.list.d/*; do cat $X >> /tmp/fs.sources.list; done
      fi
      custom_sources_file="/tmp/fs.sources.list"
-      apt-key exportall > "/tmp/fs.gpg"
+      apt-key exportall > "/tmp/fs.tmp.gpg"
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --import /tmp/fs.tmp.gpg
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --export > "/tmp/fs.gpg"
      custom_keyring="/tmp/fs.gpg"
    fi
    if [ "$custom_sources_file" == "" ]; then
@ -309,7 +311,7 @@ build_debs () {
      echo "deb [trusted=yes] http://files.freeswitch.org/repo/deb/freeswitch-1.8/ stretch main" >> "/tmp/fs.sources.list"
    fi
    if [[ "$custom_keyring" == "/tmp/fs.gpg" && ! -r "/tmp/fs.gpg" ]]; then
-      cat << EOF > "/tmp/fs.gpg"
+      cat << EOF > "/tmp/fs.tmp.gpg"
 -----BEGIN PGP PUBLIC KEY BLOCK-----

 mQINBFlVeA4BEADg3MkzUvnbuqG7S6ppt0BJIYx2WIlDzsj2EBPBBo7VpppWPGa/
@ -363,6 +365,8 @@ Y4o4oqgePeTYzkxVYj8=
 =XPvO
 -----END PGP PUBLIC KEY BLOCK-----
 EOF
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --import /tmp/fs.tmp.gpg
+      gpg --no-default-keyring --keyring /tmp/fs.tmp.keyring.gpg  --export > "/tmp/fs.gpg"
    fi

    local distro="$(find_distro $1)" dsc="$2" arch="$3"
--- a/docker/base_image/README.md
+++ b/docker/base_image/README.md
@ -70,7 +70,7 @@ systemd enable freeswitch-docker.service

 .bashrc file
 ------------
-To simplify freeswitch managment you can add alias for ```fs_cli``` to ```.bashrc``` file as example bellow.
+To simplify freeswitch management you can add alias for ```fs_cli``` to ```.bashrc``` file as example bellow.
 ```sh
 alias fs_cli='docker exec -i -t freeswitch /usr/bin/fs_cli'
 ```
--- a/docker/base_image/docker-entrypoint.sh
+++ b/docker/base_image/docker-entrypoint.sh
@ -43,7 +43,7 @@ wget_helper() {
    local SOUND_FILE=$1
    grep -q $SOUND_FILE /usr/share/freeswitch/sounds/soundfiles_present.txt 2> /dev/null
    if [ "$?" -eq 0 ]; then
-        echo "Skiping download of $SOUND_FILE. Already present"
+        echo "Skipping download of $SOUND_FILE. Already present"
        return
    fi
    wget $BASEURL/$SOUND_FILE
@ -99,7 +99,7 @@ SOUND_RATES=$(echo "$SOUND_RATES" | sed -e 's/:/\n/g')
 SOUND_TYPES=$(echo "$SOUND_TYPES" | sed -e 's/:/\n/g')

 if [ -z "$SOUND_RATES" -o -z "$SOUND_TYPES" ]; then
-	echo "Environment variables 'SOUND_RATES' or 'SOUND_TYPES' not defined. Skiping sound files checking."
+	echo "Environment variables 'SOUND_RATES' or 'SOUND_TYPES' not defined. Skipping sound files checking."
 else
 	download_sound_types
 	extract_sound_files
--- a/docs/Doxygen.conf
+++ b/docs/Doxygen.conf
@ -278,10 +278,10 @@ TYPEDEF_HIDES_STRUCT   = NO
 # For small to medium size projects (<1000 input files) the default value is
 # probably good enough. For larger projects a too small cache size can cause
 # doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
+# causing a significant performance penalty.
 # If the system has enough physical memory increasing the cache will improve the
 # performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
+# a logarithmic scale so increasing the size by one will roughly double the
 # memory usage. The cache size is given by this formula:
 # 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
 # corresponding to a cache size of 2^16 = 65536 symbols
--- a/docs/phrase/README.TXT
+++ b/docs/phrase/README.TXT
@ -8,9 +8,9 @@ language.  If you are capable of recording each language please do so and
 contribute them to the project.  As phrases are added, the files will need to be
 updated for the respective phrase_xx.xml file.
 make_checks.sh - script to compare phrase_en.xml with other language xml files.
-Script output contans prompt elements with attributes:
+Script output contains prompt elements with attributes:
 translated - value 'false' or not displayed;
-transpated-to - tranlation value if exists;
+translated-to - translation value if exists;
 more-then-one-translation - displayed if exist two or more for given wav file.

 How can you contribute?
--- a/docs/phrase/make_checks.sh
+++ b/docs/phrase/make_checks.sh
@ -3,13 +3,13 @@ SAXON_JAR=/usr/share/java/saxon9he.jar
 XML=$1

 if  [ ! -f "$SAXON_JAR" ]; then
-	echo "Please update 'SAXON_JAR' varaiable value to location of SAXON jar"
+	echo "Please update 'SAXON_JAR' variable value to location of SAXON jar"
 	exit -1
 fi

 if [ -z "$XML" ]; then
 	echo "Error: Please enter xml file name that must be ckecked."
-	echo "Exmple: make_checks.sh phrase_es_ES.xml > comparison_result.xml"
+	echo "Example: make_checks.sh phrase_es_ES.xml > comparison_result.xml"
 	exit -1
 fi

--- a/erlang.spec
+++ b/erlang.spec
@ -1,297 +0,0 @@
-%define ver %{VERSION_NUMBER}
-%define rel %{RELEASE_NUMBER}
-
-Name:           erlang
-Version:        %{ver}
-Release:        %{rel}.1%{?dist}
-Summary:        General-purpose programming language and runtime environment
-
-Group:          Development/Languages
-License:        ERPL
-URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_R14B03.tar.gz
-Source1:        http://www.erlang.org/download/otp_doc_html_R14B03.tar.gz
-Source2:        http://www.erlang.org/download/otp_doc_man_R14B03.tar.gz
-Patch1:         otp-R14B-00-0001-Do-not-format-man-pages.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ncurses-devel
-BuildRequires:  openssl-devel
-BuildRequires:  unixODBC-devel
-BuildRequires:  tcl-devel
-BuildRequires:  tk-devel
-BuildRequires:  gd-devel
-# BuildRequires:  jdk
-BuildRequires:  flex
-BuildRequires:  m4
-
-Requires:       tk
-
-# Added virtual Provides for each erlang module
-Provides: erlang-appmon = %{version}-%{release}
-Provides: erlang-asn1 = %{version}-%{release}
-Provides: erlang-common_test = %{version}-%{release}
-Provides: erlang-compiler = %{version}-%{release}
-Provides: erlang-cosEvent = %{version}-%{release}
-Provides: erlang-cosEventDomain = %{version}-%{release}
-Provides: erlang-cosFileTransfer = %{version}-%{release}
-Provides: erlang-cosNotification = %{version}-%{release}
-Provides: erlang-cosProperty = %{version}-%{release}
-Provides: erlang-cosTime = %{version}-%{release}
-Provides: erlang-cosTransactions = %{version}-%{release}
-Provides: erlang-crypto = %{version}-%{release}
-Provides: erlang-debugger = %{version}-%{release}
-Provides: erlang-dialyzer = %{version}-%{release}
-Provides: erlang-docbuilder = %{version}-%{release}
-Provides: erlang-edoc = %{version}-%{release}
-Provides: erlang-erts = %{version}-%{release}
-Provides: erlang-et = %{version}-%{release}
-Provides: erlang-eunit = %{version}-%{release}
-Provides: erlang-gs = %{version}-%{release}
-Provides: erlang-hipe = %{version}-%{release}
-Provides: erlang-ic = %{version}-%{release}
-Provides: erlang-inets = %{version}-%{release}
-Provides: erlang-inviso = %{version}-%{release}
-Provides: erlang-kernel = %{version}-%{release}
-Provides: erlang-megaco = %{version}-%{release}
-Provides: erlang-mnesia = %{version}-%{release}
-Provides: erlang-observer = %{version}-%{release}
-Provides: erlang-odbc = %{version}-%{release}
-Provides: erlang-orber = %{version}-%{release}
-Provides: erlang-os_mon = %{version}-%{release}
-Provides: erlang-otp_mibs = %{version}-%{release}
-Provides: erlang-parsetools = %{version}-%{release}
-Provides: erlang-percept = %{version}-%{release}
-Provides: erlang-pman = %{version}-%{release}
-Provides: erlang-public_key = %{version}-%{release}
-Provides: erlang-runtime_tools = %{version}-%{release}
-Provides: erlang-sasl = %{version}-%{release}
-Provides: erlang-snmp = %{version}-%{release}
-Provides: erlang-ssh = %{version}-%{release}
-Provides: erlang-ssl = %{version}-%{release}
-Provides: erlang-stdlib = %{version}-%{release}
-Provides: erlang-syntax_tools = %{version}-%{release}
-Provides: erlang-test_server = %{version}-%{release}
-Provides: erlang-toolbar = %{version}-%{release}
-Provides: erlang-tools = %{version}-%{release}
-Provides: erlang-tv = %{version}-%{release}
-Provides: erlang-typer = %{version}-%{release}
-Provides: erlang-webtool = %{version}-%{release}
-Provides: erlang-xmerl = %{version}-%{release}
-
-%description
-Erlang is a general-purpose programming language and runtime
-environment. Erlang has built-in support for concurrency, distribution
-and fault tolerance. Erlang is used in several large telecommunication
-systems from Ericsson.
-
-
-%package doc
-Summary: Erlang documentation
-Group: Development/Languages
-
-%description doc
-Documentation for Erlang.
-
-
-%prep
-%setup -q -n otp_src_%{ver}%{rel}
-#%setup -q -n otp_src_%{ver}
-
-%build
-# WARN: --enable-dynamic-ssl-lib needed for preventing strange messages about missing dependencies on EPEL
-# see https://bugzilla.redhat.com/458646 and https://bugzilla.redhat.com/499525
-%ifarch sparcv9 sparc64
-CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib
-%else
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib
-%endif
-chmod -R u+w .
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make INSTALL_PREFIX=$RPM_BUILD_ROOT install
-
-# clean up
-find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.o | xargs chmod 644
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f
-
-# doc
-mkdir -p erlang_doc
-tar -C erlang_doc -zxf %{SOURCE1}
-tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2}
-
-# make links to binaries
-#mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-#cd $RPM_BUILD_ROOT/%{_bindir}
-#for file in erl erlc escript dialyzer
-#do
-#  ln -sf ../%{_lib}/erlang/bin/$file .
-#done
-
-# remove buildroot from installed files
-cd $RPM_BUILD_ROOT/%{_libdir}/erlang
-sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS EPLICENCE README.md
-%{_bindir}/*
-%{_libdir}/erlang
-
-
-%files doc
-%defattr(-,root,root)
-%doc erlang_doc/*
-
-
-%post
-%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null
-
-
-%changelog
-* Wed Sep 29 2010 Anthony Molinaro <anthony.molinaro@openx.org> - R14B-00.1
- modified R13B04 spec to work with R14B
-
-* Wed Jul  7 2010 Anthony Molinaro <anthony.molinaro@openx.org> - R13B-04.1
- modified the R12B spec to work with R13B04
-
-* Mon Jun  7 2010 Peter Lemenkov <lemenkov@gmail.com> - R12B-5.10
- Added missing virtual provides erlang-erts
-
-* Tue May 25 2010 Peter Lemenkov <lemenkov@gmail.com> - R12B-5.9
- Use java-1.4.2 only for EL-[45]
- Added virtual provides for each erlang module
- Small typo fix
-
-* Mon Apr 19 2010 Peter Lemenkov <lemenkov@gmail.com> - R12B-5.8
- Patches rebased
- Added patches 6,7 from trunk
- Use %%configure
-
-* Tue Apr 21 2009 Debarshi Ray <rishi@fedoraproject.org> R12B-5.7
- Updated rpath patch.
- Fixed configure to respect $RPM_OPT_FLAGS.
-
-* Sun Mar  1 2009 Gerard Milmeister <gemi@bluewin.ch> - R12B-5.6
- new release R12B-5
- link escript and dialyzer to %{_bindir}
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - R12B-5.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Feb 14 2009 Dennis Gilmore <dennis@ausil.us> - R12B-4.5
- fix sparc arches to compile
-
-* Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> - R12B-4.4
- rebuild with new openssl
-
-* Sat Oct 25 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-4.1
- new release R12B-4
-
-* Fri Sep  5 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-3.3
- fixed sslrpath patch
-
-* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa@redhat.com> - R12B-3.2
- fix license tag
-
-* Sun Jul  6 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-3.1
- new release R12B-3
-
-* Thu Mar 27 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-1.1
- new release R12B-1
-
-* Sat Feb 23 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-0.3
- disable strict aliasing optimization
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - R12B-0.2
- Autorebuild for GCC 4.3
-
-* Sat Dec  8 2007 Gerard Milmeister <gemi@bluewin.ch> - R12B-0.1
- new release R12B-0
-
-* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - R11B-6
- - Rebuild for deps
-
-* Sun Aug 19 2007 Gerard Milmeister <gemi@bluewin.ch> - R11B-5.3
- fix some permissions
-
-* Sat Aug 18 2007 Gerard Milmeister <gemi@bluewin.ch> - R11B-5.2
- enable dynamic linking for ssl
-
-* Sat Aug 18 2007 Gerard Milmeister <gemi@bluewin.ch> - R11B-5.1
- new release R11B-5
-
-* Sat Mar 24 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - R11B-2.4
- Require java-1.5.0-gcj-devel for build.
-
-* Sun Dec 31 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-2.3
- remove buildroot from installed files
-
-* Sat Dec 30 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-2.2
- added patch for compiling with glibc 2.5
-
-* Sat Dec 30 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-2.1
- new version R11B-2
-
-* Mon Aug 28 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-0.3
- Rebuild for FE6
-
-* Wed Jul  5 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-0.2
- add BR m4
-
-* Thu May 18 2006 Gerard Milmeister <gemi@bluewin.ch> - R11B-0.1
- new version R11B-0
-
-* Wed May  3 2006 Gerard Milmeister <gemi@bluewin.ch> - R10B-10.3
- added patch for run_erl by Knut-Håvard Aksnes
-
-* Mon Mar 13 2006 Gerard Milmeister <gemi@bluewin.ch> - R10B-10.1
- new version R10B-10
-
-* Thu Dec 29 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-9.1
- New Version R10B-9
-
-* Sat Oct 29 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-8.2
- updated rpath patch
-
-* Sat Oct 29 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-8.1
- New Version R10B-8
-
-* Sat Oct  1 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-6.4
- Added tk-devel and tcl-devel to buildreq
- Added tk to req
-
-* Tue Sep  6 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-6.3
- Remove perl BuildRequires
-
-* Tue Aug 30 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-6.2
- change /usr/lib to %%{_libdir}
- redirect output in %%post to /dev/null
- add unixODBC-devel to BuildRequires
- split doc off to erlang-doc package
-
-* Sat Jun 25 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-6.1
- New Version R10B-6
-
-* Sun Feb 13 2005 Gerard Milmeister <gemi@bluewin.ch> - R10B-3.1
- New Version R10B-3
-
-* Mon Dec 27 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:R10B-2-0.fdr.1
- New Version R10B-2
-
-* Wed Oct  6 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:R10B-0.fdr.1
- New Version R10B
-
-* Thu Oct 16 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:R9B-1.fdr.1
- First Fedora release
--- a/freeswitch.spec
+++ b/freeswitch.spec
@ -4,7 +4,7 @@
 #
 # includes module(s): freeswitch-devel freeswitch-codec-passthru-amr freeswitch-codec-passthru-amrwb freeswitch-codec-passthru-g729 
 #                     freeswitch-codec-passthru-g7231 freeswitch-lua freeswitch-mariadb freeswitch-pgsql freeswitch-perl freeswitch-python freeswitch-v8 freeswitch-signalwire
-#                     freeswitch-lan-de freeswitch-lang-en freeswitch-lang-fr freeswitch-lang-hu freeswitch-lang-ru freeswitch-freetdm
+#                     freeswitch-lan-de freeswitch-lang-en freeswitch-lang-fr freeswitch-lang-hu freeswitch-lang-ru
 #		      and others
 #
 # Initial Version Copyright (C) 2007 Peter Nixon and Michal Bielicki, All Rights Reserved.
@ -25,7 +25,7 @@
 #                 Ken Rice <krice@freeswitch.org>
 #                 Chris Rienzo <crienzo@grasshopper.com>
 #
-# Maintainer(s): Ken Rice <krice@freeswitch.org>
+# Maintainer(s): SignalWire, Inc <support@signalwire.com>
 #
 ######################################################################################################################
 # Module build settings
@ -37,8 +37,6 @@
 %define build_mod_esl 0
 %define build_mod_rayo 1
 %define build_mod_ssml 1
-%define build_mod_shout 1
-%define build_mod_opusfile 0
 %define build_mod_v8 0

 %{?with_sang_tc:%define build_sng_tc 1 }
@ -47,8 +45,6 @@
 %{?with_py26_esl:%define build_py26_esl 1 }
 %{?with_timerfd:%define build_timerfd 1 }
 %{?with_mod_esl:%define build_mod_esl 1 }
-%{?with_mod_shout:%define build_mod_shout 1 }
-%{?with_mod_opusfile:%define build_mod_opusfile 1 }
 %{?with_mod_v8:%define build_mod_v8 1 }

 %define nonparsedversion 1.7.0
@ -122,12 +118,10 @@ Vendor:       	http://www.freeswitch.org/
 #
 ######################################################################################################################
 Source0:        http://files.freeswitch.org/%{name}-%{nonparsedversion}.tar.bz2
-Source1:	http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
-Source2:	http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz
+Source1:	http://files.freeswitch.org/downloads/libs/freeradius-client-1.1.7.tar.gz
+Source2:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
 Source3:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
 Source4:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
-Source5:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
-Source6:	http://files.freeswitch.org/downloads/libs/libmemcached-0.32.tar.gz
 Prefix:        	%{prefix}


@ -138,107 +132,62 @@ Prefix:        	%{prefix}
 ######################################################################################################################

 %if 0%{?suse_version} > 100
-#BuildRequires: openldap2-devel
 BuildRequires: lzo-devel
-%else
-#BuildRequires: openldap-devel
 %endif
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bzip2
-BuildRequires: curl-devel
+BuildRequires: curl-devel >= 7.19
 BuildRequires: gcc-c++
-BuildRequires: gnutls-devel
 BuildRequires: libtool >= 1.5.17
-BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 1.0.1e
+BuildRequires: sofia-sip-devel >= 1.13.6
+BuildRequires: spandsp3-devel >= 3.0
 BuildRequires: pcre-devel 
 BuildRequires: speex-devel 
-BuildRequires: sqlite-devel
+BuildRequires: sqlite-devel >= 3.6.20
 BuildRequires: libtiff-devel
-BuildRequires: ldns-devel
 BuildRequires: libedit-devel
-BuildRequires: perl
 BuildRequires: yasm
-%if 0%{?fedora} >= 8 || 0%{?rhel} >= 6
-BuildRequires: perl-ExtUtils-Embed
-%endif
 BuildRequires: pkgconfig
-%if 0%{?rhel} < 6 && 0%{?fedora} <= 6
-BuildRequires: termcap
-%endif
 BuildRequires: unixODBC-devel
-BuildRequires: gdbm-devel
-%if 0%{?suse_version} > 100
-BuildRequires: db-devel
-%else
-BuildRequires: db4-devel
-%endif
-BuildRequires: python-devel
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
 BuildRequires: libjpeg-devel
-#BuildRequires: mono-devel
-BuildRequires: alsa-lib-devel
 BuildRequires: which
 BuildRequires: zlib-devel
-BuildRequires: e2fsprogs-devel
-BuildRequires: libtheora-devel
 BuildRequires: libxml2-devel
-BuildRequires: bison
-BuildRequires: net-snmp-devel
-BuildRequires: libmemcached-devel
-BuildRequires: portaudio-devel
 BuildRequires: libsndfile-devel
-BuildRequires: broadvoice-devel
-BuildRequires: flite-devel
-BuildRequires: ilbc2-devel 
-BuildRequires: g722_1-devel
-BuildRequires: codec2-devel
-BuildRequires: libsilk-devel
-BuildRequires: libyuv-devel >= 0.0.1280
-BuildRequires: lua-devel
-BuildRequires: mongo-c-driver-devel
-BuildRequires: opus-devel
-BuildRequires: soundtouch-devel >= 1.7.1
-%if %{build_py26_esl}
-BuildRequires: python26-devel
-Requires: python26
-%endif
-Requires: alsa-lib
-Requires: libogg
-Requires: libvorbis
-Requires: curl
-Requires: ncurses
+Requires: curl >= 7.19
 Requires: pcre
 Requires: speex
-Requires: sqlite
+Requires: sqlite >= 3.6.20
 Requires: libtiff
 Requires: libedit
 Requires: openssl >= 1.0.1e
 Requires: unixODBC
 Requires: libjpeg
-#Requires: openldap
-Requires: db4
-Requires: gdbm
 Requires: zlib
-Requires: libtiff
-Requires: python
-Requires: libtheora
 Requires: libxml2
 Requires: libsndfile

-%if %{?suse_version:1}0
-%if 0%{?suse_version} > 910
-#BuildRequires: autogen
+%if 0%{?rhel} == 7
+# to build mariadb module required gcc >= 4.9 (more details GH #1046)
+# On CentOS 7 dist you can install fresh gcc using command
+# yum install centos-release-scl && yum install devtoolset-9
+BuildRequires: devtoolset-9
 %endif
+%if 0%{?rhel} == 8
+# we want use fresh gcc on RHEL 8 based dists
+# On CentOS 8 dist you can install fresh gcc using command
+# dnf install gcc-toolset-9
+BuildRequires: gcc-toolset-9
 %endif

 %if 0%{?suse_version} > 800
-#PreReq:       /usr/sbin/useradd /usr/sbin/groupadd
 PreReq:       %insserv_prereq %fillup_prereq
 %endif

+%if 0%{?fedora}
+BuildRequires: gumbo-parser-devel
+%endif

 ######################################################################################################################
 #
@ -367,7 +316,7 @@ Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}

 %description application-distributor
-Provides FreeSWITCH mod_distributor, a simple round-robbin style distribution 
+Provides FreeSWITCH mod_distributor, a simple round-robin style distribution
 to call gateways.

 %package application-easyroute
@ -383,6 +332,7 @@ Engine. Uses ODBC to connect to the DB of your choice.
 Summary:	FreeSWITCH mod_enum
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  ldns-devel

 %description application-enum
 Provides FreeSWITCH mod_enum, a ENUM dialplan, with API and Dialplan extensions 
@ -490,6 +440,7 @@ Provides FreeSWITCH mod_limit, provide application to limit both concurrent and
 Summary:	FreeSWITCH mod_memcache
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  libmemcached-devel

 %description application-memcache
 Provides FreeSWITCH mod_memcache, implements an API interface to memcached which
@ -501,6 +452,7 @@ alleviating database load."
 Summary:	FreeSWITCH mod_mongo
 Group:		System/Libraries
 Requires:	%{name} = %{version}-%{release}
+BuildRequires:  mongo-c-driver-devel

 %description application-mongo
 Provides FreeSWITCH mod_mongo, which implements an API interface to mongodb.
@ -521,7 +473,7 @@ Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}

 %description application-rad_auth
-Provides FreeSWITCH mod_rad_auth, authetication via RADIUS protocol from FreeSWITCH dialplan
+Provides FreeSWITCH mod_rad_auth, authentication via RADIUS protocol from FreeSWITCH dialplan

 %package application-redis
 Summary:	FreeSWITCH mod_redis
@ -582,6 +534,7 @@ and appearance of the programmable softkeys on Snom phones
 Summary:	FreeSWITCH mod_soundtouch
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  soundtouch-devel >= 1.7.1

 %description application-soundtouch
 Provides FreeSWITCH mod_soundtouch, uses the soundtouch library, which can do
@ -658,6 +611,8 @@ system for backend voicemail systems
 Summary:	FreeSWITCH mod_flite
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       flite >= 2.0.0
+BuildRequires:  flite-devel >= 2.0.0

 %description asrtts-flite
 Provides FreeSWITCH mod_flite, a interface to the flite text to speech engine
@ -666,6 +621,7 @@ Provides FreeSWITCH mod_flite, a interface to the flite text to speech engine
 Summary:	FreeSWITCH mod_pocketsphinx
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  bison

 %description asrtts-pocketsphinx
 Provides FreeSWITCH mod_pocketsphinx, a interface to the OpenSource 
@ -715,6 +671,7 @@ Pass-through AMR WideBand Codec support for FreeSWITCH open source telephony pla
 Summary:        BroadVoice16 and BroadVoice32 WideBand Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  broadvoice-devel

 %description codec-bv
 BroadVoice16 and BroadVoice32 WideBand Codec support for FreeSWITCH open source telephony platform
@ -723,6 +680,7 @@ BroadVoice16 and BroadVoice32 WideBand Codec support for FreeSWITCH open source
 Summary:        Codec2 Narrow Band Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  codec2-devel

 %description codec-codec2
 CODEC2 narrow band codec support for FreeSWITCH open source telephony platform.
@ -759,6 +717,7 @@ Summary:        iLCB Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       ilbc2
+BuildRequires:  ilbc2-devel 


 %description codec-ilbc
@ -792,6 +751,8 @@ MP4V Video Codec support for FreeSWITCH open source telephony platform
 Summary:        Opus Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       opus >= 1.1
+BuildRequires:  opus-devel >= 1.1

 %description codec-opus
 OPUS Codec support for FreeSWITCH open source telephony platform
@ -813,6 +774,7 @@ Sangoma D100 and D500 Codec Card Support
 Summary:        Silk Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  libsilk-devel

 %description codec-silk
 Silk Codec (from Skype) support for FreeSWITCH open source telephony platform
@ -821,6 +783,7 @@ Silk Codec (from Skype) support for FreeSWITCH open source telephony platform
 Summary:        Siren Codec support for FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
+BuildRequires:  g722_1-devel

 %description codec-siren
 Siren Codec support for FreeSWITCH open source telephony platform. Using 
@ -888,7 +851,7 @@ XMPP support for FreeSWITCH open source telephony platform. Allows FreeSWITCH
 to be used as a client for GoogleTalk or other XMPP Servers.

 #%package endpoint-gsmopen
-#Summary:        Generic GSM enpoint support for FreeSWITCH open source telephony platform
+#Summary:        Generic GSM endpoint support for FreeSWITCH open source telephony platform
 #Group:          System/Libraries
 #Requires:       %{name} = %{version}-%{release}
 #
@ -898,12 +861,12 @@ to be used as a client for GoogleTalk or other XMPP Servers.
 #SMS is handled via the standard CHAT API in FreeSWITCH.

 #%package endpoint-h323
-#Summary:        H.323 enpoint support for FreeSWITCH open source telephony platform
+#Summary:        H.323 endpoint support for FreeSWITCH open source telephony platform
 #Group:          System/Libraries
 #Requires:       %{name} = %{version}-%{release}
 #
 #%description endpoint-h323
-#H.323 enpoint support for FreeSWITCH open source telephony platform
+#H.323 endpoint support for FreeSWITCH open source telephony platform

 #%package endpoint-khomp
 #Summary:        khomp endpoint support for FreeSWITCH open source telephony platform
@ -919,6 +882,7 @@ Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:	alsa-lib
 BuildRequires:	alsa-lib-devel
+BuildRequires:	portaudio-devel

 %description endpoint-portaudio
 PortAudio endpoint support for FreeSWITCH open source telephony platform.
@ -957,52 +921,6 @@ Requires:       %{name} = %{version}-%{release}
 %description endpoint-rtc
 Verto protocol support for FreeSWITCH open source telephony platform.

-%package freetdm
-Summary:	Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH
-Group:		System/Libraries
-Requires:        %{name} = %{version}-%{release}
-
-%description freetdm
-FreeTDM
-
-%if %{build_sng_isdn}
-
-%package freetdm-sng-isdn
-Summary:	Sangoma ISDN Module for FreeTDM
-Group:		System/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-freetdm = %{version}-%{release}
-Requires: wanpipe 
-Requires: libsng_isdn 
-BuildRequires: wanpipe 
-BuildRequires: libsng_isdn 
-
-%description freetdm-sng-isdn
-Sangoma ISDN Module for freetdm
-
-%endif
-
-%if %{build_sng_ss7}
-
-%package freetdm-sng-ss7
-Summary:	Provides a unified interface to hardware TDM cards and ss7 stacks for FreeSWITCH, Sangoma SS7 Module
-Group:		System/Libraries
-Requires:        %{name} = %{version}-%{release}
-Requires:       %{name}-freetdm = %{version}-%{release}
-Requires: wanpipe 
-Requires: libsng_ss7 
-BuildRequires: wanpipe 
-BuildRequires: libsng_ss7 
-%if 0%{?fedora_version} >= 8 || 0%{?rhel} >= 6
-Requires: openssl098e
-BuildRequires: openssl098e
-%endif
-
-%description freetdm-sng-ss7
-Sangoma SMG-SS7 drivers for FreeTDM
-
-%endif
-
 ######################################################################################################################
 #				FreeSWITCH Event Handler Modules
 ######################################################################################################################
@ -1010,7 +928,8 @@ Sangoma SMG-SS7 drivers for FreeTDM
 %package event-cdr-mongodb
 Summary:	MongoDB CDR Logger for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
-Requires:	 %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+BuildRequires:  mongo-c-driver-devel

 %description event-cdr-mongodb
 MongoDB CDR Logger for FreeSWITCH
@ -1054,7 +973,7 @@ JSON and XML Logger for the FreeSWITCH open source telephony platform
 %package kazoo
 Summary:	Kazoo Module for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
-Requires:	 %{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	erlang
 BuildRequires:	erlang

@ -1064,7 +983,7 @@ Kazoo Module for FreeSWITCH.
 %package event-multicast
 Summary:	Multicast Event System for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
-Requires:	 %{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}

 %description event-multicast
 Multicast Event System for FreeSWITCH.
@ -1156,6 +1075,7 @@ a native format sound file is available then FreeSWITCH can use it.
 Summary:	PortAudio Media Steam support for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
 Requires:	%{name} = %{version}-%{release}
+BuildRequires:	portaudio-devel

 %description format-portaudio-stream
 Portaudio Streaming interface Audio for FreeSWITCH
@ -1170,7 +1090,6 @@ Mod shell stream is a FreeSWITCH module to allow you to stream audio from an
 arbitrary shell command. You could use it to read audio from a database, from 
 a soundcard, etc. 

-%if %{build_mod_shout}
 %package format-mod-shout
 Summary:	Implements Media Steaming from arbitrary shell commands for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
@ -1185,19 +1104,16 @@ BuildRequires:	lame-devel
 %description format-mod-shout
 Mod Shout is a FreeSWITCH module to allow you to stream audio from MP3s or a i
 shoutcast stream.
-%endif

-%if %{build_mod_opusfile}
-%package format-mod-opusfile
+%package format-opusfile
 Summary:	Plays Opus encoded files
 Group:		System/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	opusfile >= 0.5
 BuildRequires:	opusfile-devel >= 0.5

-%description format-mod-opusfile
+%description format-opusfile
 Mod Opusfile is a FreeSWITCH module to allow you to play Opus encoded files
-%endif

 %if %{build_mod_ssml}
 %package format-ssml
@ -1225,6 +1141,7 @@ Implements TGML Tone Generation for the FreeSWITCH open source telephony platfor
 Summary:	Lua support for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
 Requires:	%{name} = %{version}-%{release}
+BuildRequires:  lua-devel

 %description	lua

@ -1233,6 +1150,8 @@ Summary:	Perl support for the FreeSWITCH open source telephony platform
 Group:		System/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	perl
+BuildRequires:	perl-devel
+BuildRequires:	perl-ExtUtils-Embed

 %description	perl

@ -1240,7 +1159,8 @@ Requires:	perl
 Summary:        Python support for the FreeSWITCH open source telephony platform
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:	python
+Requires:       python
+BuildRequires:  python-devel

 %description    python

@ -1258,7 +1178,7 @@ Requires:	%{name} = %{version}-%{release}
 ######################################################################################################################

 %package lang-en
-Summary:	Provides english language dependand modules and speech config for the FreeSWITCH Open Source telephone platform.
+Summary:	Provides english language dependent modules and speech config for the FreeSWITCH Open Source telephone platform.
 Group:          System/Libraries
 Requires:        %{name} = %{version}-%{release}

@ -1266,7 +1186,7 @@ Requires:        %{name} = %{version}-%{release}
 English language phrases module and directory structure for say module and voicemail

 %package lang-ru
-Summary:        Provides russian language dependand modules and speech config for the FreeSWITCH Open Source telephone platform.
+Summary:        Provides russian language dependent modules and speech config for the FreeSWITCH Open Source telephone platform.
 Group:          System/Libraries
 Requires:        %{name} = %{version}-%{release}

@ -1306,12 +1226,12 @@ Requires:        %{name} = %{version}-%{release}
 Spanish language phrases module and directory structure for say module and voicemail

 %package lang-pt
-Summary:        Provides Portugese language dependend modules and speech config for the FreeSWITCH Open Source telephone platform.
+Summary:        Provides Portuguese language dependend modules and speech config for the FreeSWITCH Open Source telephone platform.
 Group:          System/Libraries
 Requires:        %{name} = %{version}-%{release}

 %description lang-pt
-Portugese language phrases module and directory structure for say module and voicemail
+Portuguese language phrases module and directory structure for say module and voicemail

 %package lang-sv
 Summary:        Provides Swedish language dependend modules and speech config for the FreeSWITCH Open Source telephone platform.
@ -1351,7 +1271,7 @@ platform.
 %package xml-cdr
 Summary:        Provides XML CDR interface for the FreeSWITCH Open Source telephone platform.
 Group:          System/Libraries
-Requires:        %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}

 %description xml-cdr
 Provides XML CDR interface for the FreeSWITCH Open Source telephone platform.
@ -1359,7 +1279,7 @@ Provides XML CDR interface for the FreeSWITCH Open Source telephone platform.
 %package xml-curl
 Summary:        Provides XML Curl interface for the FreeSWITCH Open Source telephone platform.
 Group:          System/Libraries
-Requires:        %{name} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}

 %description xml-curl
 Provides XML Curl interface for the FreeSWITCH Open Source telephone platform.
@ -1387,6 +1307,8 @@ The Perl ESL module allows for native interaction with FreeSWITCH over the event
 %package	-n python-ESL
 Summary:	The Python ESL module allows for native interaction with FreeSWITCH over the event socket interface.
 Group:		System Environment/Libraries
+Requires:	python
+BuildRequires:	python-devel

 %description	-n python-ESL
 The Python ESL module allows for native interaction with FreeSWITCH over the event socket interface.
@ -1465,8 +1387,6 @@ cp %{SOURCE1} libs/
 cp %{SOURCE2} libs/
 cp %{SOURCE3} libs/
 cp %{SOURCE4} libs/
-cp %{SOURCE5} libs/
-cp %{SOURCE6} libs/

 #Hotfix for redefined %_sysconfdir
 sed -ie 's:confdir="${sysconfdir}/freeswitch":confdir="$sysconfdir":' ./configure.ac
@ -1565,7 +1485,7 @@ DIRECTORIES_MODULES=""
 #						Endpoints
 #
 ######################################################################################################################
-ENDPOINTS_MODULES="endpoints/mod_dingaling ../../libs/freetdm/mod_freetdm \
+ENDPOINTS_MODULES="endpoints/mod_dingaling \
 			endpoints/mod_loopback endpoints/mod_portaudio endpoints/mod_rtmp \
 			endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_sofia"

@ -1590,17 +1510,11 @@ EVENT_HANDLERS_MODULES+=" event_handlers/mod_rayo"
 #					File and Audio Format Handlers
 #
 ######################################################################################################################
-FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_portaudio_stream \
-                 formats/mod_shell_stream formats/mod_sndfile formats/mod_tone_stream"
-%if %{build_mod_shout}
-FORMATS_MODULES+=" formats/mod_shout "
-%endif
+FORMATS_MODULES="formats/mod_local_stream formats/mod_native_file formats/mod_opusfile formats/mod_portaudio_stream \
+                 formats/mod_shell_stream formats/mod_shout formats/mod_sndfile formats/mod_tone_stream"
 %if %{build_mod_ssml}
 FORMATS_MODULES+=" formats/mod_ssml"
 %endif
-%if %{build_mod_opusfile}
-FORMATS_MODULES+=" formats/mod_opusfile"
-%endif

 ######################################################################################################################
 #
@ -1667,6 +1581,16 @@ export DESTDIR=%{buildroot}/
 export PKG_CONFIG_PATH=/usr/bin/pkg-config:$PKG_CONFIG_PATH
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"

+%if 0%{?rhel} == 7
+# to build mod_mariadb we need gcc >= 4.9 (more details GH #1046)
+export CFLAGS="$CFLAGS -Wno-error=expansion-to-defined"
+. /opt/rh/devtoolset-9/enable
+%endif
+%if 0%{?rhel} == 8
+# we want use fresh gcc on RHEL 8 based dists
+. /opt/rh/gcc-toolset-9/enable
+%endif
+
 ######################################################################################################################
 #
 #				Bootstrap, Configure and Build the whole enchilada
@ -1710,6 +1634,7 @@ autoreconf --force --install
 --with-odbc \
 --with-erlang \
 --with-openssl \
+--enable-zrtp \
 %{?configure_options}

 unset MODULES
@ -1726,6 +1651,15 @@ cd libs/esl
 #
 ######################################################################################################################
 %install
+%if 0%{?rhel} == 7
+# to build mod_mariadb we need gcc >= 4.9
+. /opt/rh/devtoolset-9/enable
+%endif
+%if 0%{?rhel} == 8
+# we want use fresh gcc on RHEL 8 based dists
+. /opt/rh/gcc-toolset-9/enable
+%endif
+

 %{__make} DESTDIR=%{buildroot} install

@ -1733,6 +1667,7 @@ cd libs/esl
 %{__mkdir} -p %{buildroot}%{prefix}/log
 %{__mkdir} -p %{buildroot}%{logfiledir}
 %{__mkdir} -p %{buildroot}%{runtimedir}
+%{__mkdir} -p %{buildroot}%{_localstatedir}/cache/freeswitch

 #install the esl stuff
 cd libs/esl
@ -2070,7 +2005,7 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/directory/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/directory/default/*
 ######################################################################################################################
-#							IVR Menues
+#							IVR Menus
 ######################################################################################################################
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/ivr_menus/*.xml
 ######################################################################################################################
@ -2161,6 +2096,7 @@ fi
 %{MODINSTDIR}/mod_httapi.so*

 %files application-http-cache
+%dir %attr(0750, freeswitch, daemon) %{_localstatedir}/cache/freeswitch
 %{MODINSTDIR}/mod_http_cache.so*

 %files application-lcr
@ -2349,32 +2285,6 @@ fi
 %files endpoint-rtc
 %{MODINSTDIR}/mod_rtc.so*

-######################################################################################################################
-#
-#						FreeTDM Module for TDM Interaction
-#
-######################################################################################################################
-%files freetdm
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/tones.conf
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/freetdm.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/pika.conf
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/freetdm.conf
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/wanpipe.conf
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/zt.conf
-%{LIBDIR}/libfreetdm.so*
-%{MODINSTDIR}/mod_freetdm.so*
-%{MODINSTDIR}/ftmod_skel*.so*
-%{MODINSTDIR}/ftmod_[a-r,t-z]*.so*
-
-%if %{build_sng_ss7}
-%files freetdm-sng-ss7
-%{MODINSTDIR}/ftmod_sangoma_ss7.so*
-%endif
-
-%if %{build_sng_isdn}
-%files freetdm-sng-isdn
-%{MODINSTDIR}/ftmod_sangoma_isdn.so*
-%endif

 ######################################################################################################################
 #
@ -2432,16 +2342,17 @@ fi
 %files format-native-file
 %{MODINSTDIR}/mod_native_file.so*

+%files format-opusfile
+%{MODINSTDIR}/mod_opusfile.so*
+
 %files format-portaudio-stream
 %{MODINSTDIR}/mod_portaudio_stream.so*

 %files format-shell-stream
 %{MODINSTDIR}/mod_shell_stream.so*

-%if %{build_mod_shout}
 %files format-mod-shout
 %{MODINSTDIR}/mod_shout.so*
-%endif

 %if %{build_mod_ssml}
 %files format-ssml
@ -2458,18 +2369,15 @@ fi
 ######################################################################################################################
 %files lua
 %{MODINSTDIR}/mod_lua*.so*
-%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/lua.conf.xml

 %files perl
 %{MODINSTDIR}/mod_perl*.so*
 %{prefix}/perl/*
-%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/perl.conf.xml

 %files python
 %{MODINSTDIR}/mod_python*.so*
-%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/python.conf.xml

 %if %{build_mod_v8}
@ -2479,7 +2387,6 @@ fi
 %{LIBDIR}/libicui18n.so
 %{LIBDIR}/libicuuc.so
 %endif
-%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/autoload_configs
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/v8.conf.xml

 ######################################################################################################################
@ -2671,7 +2578,7 @@ fi
 * Wed Jun 19 2013 - krice@freeswitch.org
 - tweak files included for vanilla configs
 * Wed Sep 19 2012 - krice@freeswitch.org
- Add support for Spanish and Portugese say language modules
+- Add support for Spanish and Portuguese say language modules
 * Thu Jan 26 2012 - krice@freeswitch.org
 - complete rework of spec file
 * Tue Jun 14 2011 - michal.bielicki@seventhsignal.de
@ -2690,7 +2597,7 @@ fi
 - fixes for ss7 freetdm modules
 - added mod_opus
 - added selector for sangoma modules
- addded python esl module to rpm
+- added python esl module to rpm
 - some minor cleanups
 - cut sangoma modules into separate rpms as addons for freetdm
 * Tue Jan 18 2011 - michal.bielicki@seventhsignal.de
@ -2708,7 +2615,7 @@ fi
 - added mod_nibblebill to standard modules
 * Sun Sep 26 2010 - michal.bielicki@seventhsignal.de
 - added portaudio_stream module
- some more formating work
+- some more formatting work
 * Mon Jul 19 2010 - michal.bielicki@seventhsignal.de
 - new hash module config file added to freeswitch.spec
 * Mon Jul 19 2010 - michal.bielicki@seventhsignal.de
@ -2721,7 +2628,7 @@ fi
 - Added Contributors
 - Added Anthony's copyright for the whole package into the header
 * Tue Jun 22 2010 - michal.bielicki@seventhsignal.de
- Reorganized the modules alphabeticaly
+- Reorganized the modules alphabetically
 - synced SFEopensolaris and centos spec
 - started to fix Run Dependencies
 - added mod_say_ru which seemd to have gone missing
@ -2733,7 +2640,7 @@ fi
 - replaced mod_limit with mod_db
 - added mod_spy
 - added mod_valet_parking
- addded mod_memcache
+- added mod_memcache
 - added mod_distributor
 - added mod_avmd
 * Thu Apr 29 2010 - michal.bielicki@seventhsignal.de
@ -2753,7 +2660,7 @@ fi
 * Sat Nov 21 2009 - michal.bielicki@seventhsignal.de
 - added patch by Igor Neves <neves.igor@gmail.com>: Added some checkup in %post and %postun to prevent upgrades from removing freeswitch user
 * Wed Nov 18 2009 - michal.bielicki@seventhsignal.de
- added new config files for diretory and distributor
+- added new config files for directory and distributor
 - removed sangoma boost from openzap for builds that do not inherit wanpipe while building.
 * Fri Jul 24 2009 - mike@jerris.com
 - removed mod_http
@ -2818,7 +2725,7 @@ fi
 - fixed odbc requirements
 - added all buildable modules
 - added redhat style init file
- splitted off language dependant stuff into separate language files
+- split off language dependent stuff into separate language files
 - disable non complete language modules
 * Tue Apr 24 2007 - peter+rpmspam@suntel.com.tr
 - Added a debug package
--- a/fscomm/preferences/prefdialog.ui
+++ b/fscomm/preferences/prefdialog.ui
@ -1092,7 +1092,7 @@
             <item row="10" column="0" colspan="2">
              <widget class="QLabel" name="label_47">
               <property name="text">
-                <string>Noise Supressor</string>
+                <string>Noise Suppressor</string>
               </property>
              </widget>
             </item>
--- a/html5/verto/README
+++ b/html5/verto/README
@ -1,9 +0,0 @@
-This needs to be fleshed out more.
-It would be nice to develop a web app here that implements a web phone.
-Do not base it on the demo because it was just tossed together.
-
-To run jshint:
-
-	cd js
-	npm install
-	grunt
--- a/html5/verto/demo/css/images/ajax-loader.gif
+++ b/html5/verto/demo/css/images/ajax-loader.gif
--- a/html5/verto/demo/css/images/icons-18-black.png
+++ b/html5/verto/demo/css/images/icons-18-black.png
--- a/html5/verto/demo/css/images/icons-18-white.png
+++ b/html5/verto/demo/css/images/icons-18-white.png
--- a/html5/verto/demo/css/images/icons-36-black.png
+++ b/html5/verto/demo/css/images/icons-36-black.png
--- a/html5/verto/demo/css/images/icons-36-white.png
+++ b/html5/verto/demo/css/images/icons-36-white.png
--- a/html5/verto/demo/css/images/loading.gif
+++ b/html5/verto/demo/css/images/loading.gif
--- a/html5/verto/demo/css/images/login.gif
+++ b/html5/verto/demo/css/images/login.gif
--- a/html5/verto/demo/css/jquery.mobile.min.css
+++ b/html5/verto/demo/css/jquery.mobile.min.css
--- a/html5/verto/demo/css/jsontable.css
+++ b/html5/verto/demo/css/jsontable.css
@ -1,65 +0,0 @@
-.nthChildTest > div:nth-child(odd) {
-	display: none;
-}
-
-.jsDataTable > thead > tr > th {
-
-    border-width:4px;
-    padding: 2px;
-    font-size:10pt;
-    text-align: left;
-
-}
-
-.jsDataTable > thead > tr > th.notSortable {
-	padding: 5px;
-}
-
-.jsDataTable > tbody > tr > td {
-	border-bottom: 1px solid #ccc;
-	padding: 2px;
-	vertical-align: middle;
-        height:25px;
-	font-size: 10px;
-}
-
-.jsDataTable {
-    font-family: verdana; 
-    font-size:10pt;
-}
-
-.jsDataTable > tbody > tr:nth-child(odd),
-.jsDataTable > tbody > tr.odd {
-	background-color: #ffffee;
-}
-.jsDataTable > tbody > tr:nth-child(even),
-.jsDataTable > tbody > tr.even {
-	background-color: #ffffff;
-}
-
-.jsDataTable > thead th.sortAsc,
-.jsDataTable > thead th.sortDesc {
-    color:ffffff;
-
-    background-color: #7777ff;
-    background-position: right center;
-    background-repeat: no-repeat;
-}
-
-.jsDataTable > thead th.sortAsc {
-	background-image: url(/images/table/asc.png);
-}
-
-.jsDataTable > thead th.sortDesc {
-	background-image: url(/images/table/desc.png);
-}
-
-.jsDataTable.clickable > tbody > tr,
-.clickable > .jsDataTable > tbody > tr {
-	cursor: pointer;
-}
-
-.jsDataTable.clickable > tbody > tr.nonDataRow,
-.clickable > .jsDataTable > tbody > tr.nonDataRow {
-    cursor: auto;
-}
--- a/html5/verto/demo/favicon.ico
+++ b/html5/verto/demo/favicon.ico
--- a/html5/verto/demo/images/ajax-loader.gif
+++ b/html5/verto/demo/images/ajax-loader.gif
--- a/html5/verto/demo/images/icons-18-black.png
+++ b/html5/verto/demo/images/icons-18-black.png
--- a/html5/verto/demo/images/icons-18-white.png
+++ b/html5/verto/demo/images/icons-18-white.png
--- a/html5/verto/demo/images/icons-36-black.png
+++ b/html5/verto/demo/images/icons-36-black.png
--- a/html5/verto/demo/images/icons-36-white.png
+++ b/html5/verto/demo/images/icons-36-white.png
--- a/html5/verto/demo/images/loading.gif
+++ b/html5/verto/demo/images/loading.gif
--- a/html5/verto/demo/images/login.gif
+++ b/html5/verto/demo/images/login.gif
--- a/html5/verto/demo/img/cc_banner.gif
+++ b/html5/verto/demo/img/cc_banner.gif
--- a/html5/verto/demo/img/logo.png
+++ b/html5/verto/demo/img/logo.png
--- a/html5/verto/demo/img/logo_big.png
+++ b/html5/verto/demo/img/logo_big.png
--- a/Show More
+++ b/Show More