Merge branch 'signalwire:master' into gcs2

.drone.yml

@@ -4,49 +4,67 @@ name: unit-tests
 
 steps:
     - name: bootstrap
-      image: signalwire/freeswitch-public-base
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
       commands:
       - cat /proc/sys/kernel/core_pattern
       - ./bootstrap.sh -j
 
     - name: configure
-      image: signalwire/freeswitch-public-base
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
       commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.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
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
       - git clone https://github.com/freeswitch/sofia-sip.git
       - cd sofia-sip && ./autogen.sh && ./configure.gnu && make -j`nproc` && make install && cd ..
-      - echo "applications/mod_test" >> modules.conf
       - 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
       - sed -i '/formats\\/mod_opusfile/s/^#//g' modules.conf
       - sed -i '/languages\\/mod_lua/s/^#//g' modules.conf
-      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1;
+      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
-      - ./configure --enable-address-sanitizer
+      - ./configure --enable-address-sanitizer --enable-fake-dlclose
 
     - name: build
-      image: signalwire/freeswitch-public-base
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
       commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.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
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
       - 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
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
       commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.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
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
       - cd sofia-sip && make install && cd ..
       - make install || true
       - cd tests/unit
+      - export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1:fast_unwind_on_malloc=0
       - ./run-tests.sh
       - ls -la /cores
       - mkdir logs && (mv log_run-tests_*.html logs || true) && (mv backtrace_*.txt logs || true)
@@ -79,17 +97,23 @@ name: scan-build
 
 steps:
     - name: bootstrap
-      image: signalwire/freeswitch-public-base:stretch
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
       commands:
       - ./bootstrap.sh -j
 
     - name: configure
-      image: signalwire/freeswitch-public-base:stretch
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
       commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
       - 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
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
       - cp build/modules.conf.most modules.conf
       #Enable/Uncomment mods
       - echo 'codecs/mod_openh264' >> modules.conf
@@ -116,13 +140,19 @@ steps:
       - ./configure
 
     - name: scan-build
-      image: signalwire/freeswitch-public-base:stretch
+      image: signalwire/freeswitch-public-base:bullseye
       pull: always
+      environment:
+        REPOTOKEN:
+          from_secret: repotoken
       commands:
+      - echo "machine freeswitch.signalwire.com password $REPOTOKEN" > /etc/apt/auth.conf
       - 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
+      - export REPOTOKEN=''
+      - rm -rf /etc/apt/auth.conf
       - 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-11 -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`
@@ -148,6 +178,6 @@ trigger:
 
 ---
 kind: signature
-hmac: 5d5cfb225053294d7cf1a4fed88eaf9a3a53c99a7bad4dc7164eece336c8861a
+hmac: 780e4aaee61e3683ea4a8d6fe5131f7c9e62ebad727546013f18df0fca80d705
 
 ...

.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
@@ -165,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
@@ -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

Freeswitch.2017.sln

@@ -69,7 +69,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "autoload_configs", "autoloa
 		conf\vanilla\autoload_configs\conference.conf.xml = conf\vanilla\autoload_configs\conference.conf.xml
 		conf\vanilla\autoload_configs\console.conf.xml = conf\vanilla\autoload_configs\console.conf.xml
 		conf\vanilla\autoload_configs\dialplan_directory.conf.xml = conf\vanilla\autoload_configs\dialplan_directory.conf.xml
-		conf\vanilla\autoload_configs\dingaling.conf.xml = conf\vanilla\autoload_configs\dingaling.conf.xml
 		conf\vanilla\autoload_configs\enum.conf.xml = conf\vanilla\autoload_configs\enum.conf.xml
 		conf\vanilla\autoload_configs\event_multicast.conf.xml = conf\vanilla\autoload_configs\event_multicast.conf.xml
 		conf\vanilla\autoload_configs\event_socket.conf.xml = conf\vanilla\autoload_configs\event_socket.conf.xml
@@ -166,8 +165,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vm", "vm", "{3DAF028C-AB5B-
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sound Files", "Sound Files", "{4F227C26-768F-46A3-8684-1D08A46FB374}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "unimrcp", "unimrcp", "{62F27B1A-C919-4A70-8478-51F178F3B18F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.2017.vcxproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.2017.vcxproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}"
@@ -198,8 +195,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "src\mod\asr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.2017.vcxproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.2017.vcxproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.2017.vcxproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_console", "src\mod\loggers\mod_console\mod_console.2017.vcxproj", "{1C453396-D912-4213-89FD-9B489162B7B5}"
@@ -217,20 +212,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\appl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.2017.vcxproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.2017.vcxproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.2017.vcxproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsqlite", "libs\win32\sqlite\sqlite.2017.vcxproj", "{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "libs\win32\apr\libapr.2017.vcxproj", "{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.2017.vcxproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.2017.vcxproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "libs\win32\apr-util\xml.2017.vcxproj", "{155844C3-EC5F-407F-97A4-A2DDADED9B2F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.2017.vcxproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthread", "libs\win32\pthread\pthread.2017.vcxproj", "{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4}"
@@ -380,29 +369,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbroadvoice", "libs\win32
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bv", "src\mod\codecs\mod_bv\mod_bv.2017.vcxproj", "{D5C87B19-150D-4EF3-A671-96589BD2D14A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aprtoolkit", "libs\unimrcp\libs\apr-toolkit\aprtoolkit.2017.vcxproj", "{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpf", "libs\unimrcp\libs\mpf\mpf.2017.vcxproj", "{B5A00BFA-6083-4FAE-A097-71642D6473B5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcp", "libs\unimrcp\libs\mrcp\mrcp.2017.vcxproj", "{1C320193-46A6-4B34-9C56-8AB584FC1B56}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpclient", "libs\unimrcp\libs\mrcp-client\mrcpclient.2017.vcxproj", "{72782932-37CC-46AE-8C7F-9A7B1A6EE108}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsignaling", "libs\unimrcp\libs\mrcp-signaling\mrcpsignaling.2017.vcxproj", "{12A49562-BAB9-43A3-A21D-15B60BBB4C31}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2transport", "libs\unimrcp\libs\mrcpv2-transport\mrcpv2transport.2017.vcxproj", "{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unirtsp", "libs\unimrcp\libs\uni-rtsp\unirtsp.2017.vcxproj", "{504B3154-7A4F-459D-9877-B951021C3F1F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\unimrcp\modules\mrcp-sofiasip\mrcpsofiasip.2017.vcxproj", "{746F3632-5BB2-4570-9453-31D6D58A7D8E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpunirtsp", "libs\unimrcp\modules\mrcp-unirtsp\mrcpunirtsp.2017.vcxproj", "{DEB01ACB-D65F-4A62-AED9-58C1054499E9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2017.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2017.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"
@@ -451,8 +417,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsmlib", "src\mod\endpoints
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsmopen", "src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj", "{74B120FF-6935-4DFE-A142-CDB6BEA99C90}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzrtp", "libs\libzrtp\projects\win\libzrtp.2017.vcxproj", "{C13CC324-0032-4492-9A30-310A6BD64FF5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_redis", "src\mod\applications\mod_redis\mod_redis.2017.vcxproj", "{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libs\win32\libjpeg\libjpeg.2017.vcxproj", "{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1}"
@@ -752,17 +716,6 @@ Global
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|Win32.Build.0 = Release|Win32
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.ActiveCfg = Release|x64
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3}.Release|x64.Build.0 = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|Win32.ActiveCfg = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64.ActiveCfg = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.All|x64.Build.0 = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|Win32.Build.0 = Debug|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.ActiveCfg = Debug|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Debug|x64.Build.0 = Debug|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.ActiveCfg = Release|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|Win32.Build.0 = Release|Win32
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.ActiveCfg = Release|x64
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}.Release|x64.Build.0 = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|Win32.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64.ActiveCfg = Release|x64
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}.All|x64.Build.0 = Release|x64
@@ -840,17 +793,6 @@ Global
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|Win32.Build.0 = Release|Win32
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.ActiveCfg = Release|x64
 		{05515420-16DE-4E63-BE73-85BE85BA5142}.Release|x64.Build.0 = Release|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|Win32.ActiveCfg = Release DLL|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64.ActiveCfg = Release DLL|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.All|x64.Build.0 = Release DLL|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|Win32.Build.0 = Debug|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.ActiveCfg = Debug|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Debug|x64.Build.0 = Debug|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.ActiveCfg = Release|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|Win32.Build.0 = Release|Win32
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.ActiveCfg = Release|x64
-		{1906D736-08BD-4EE1-924F-B536249B9A54}.Release|x64.Build.0 = Release|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|Win32.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64.ActiveCfg = Release Dll|x64
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750}.All|x64.Build.0 = Release Dll|x64
@@ -884,17 +826,6 @@ Global
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|Win32.Build.0 = Release|Win32
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.ActiveCfg = Release|x64
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF}.Release|x64.Build.0 = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|Win32.ActiveCfg = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64.ActiveCfg = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.All|x64.Build.0 = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|x64.Build.0 = Debug|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.ActiveCfg = Release|x64
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|x64.Build.0 = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|Win32.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.All|x64.Build.0 = Release|x64
@@ -906,17 +837,6 @@ Global
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|Win32.Build.0 = Release|Win32
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.ActiveCfg = Release|x64
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3}.Release|x64.Build.0 = Release|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|Win32.ActiveCfg = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.ActiveCfg = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.All|x64.Build.0 = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|Win32.Build.0 = Debug|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.ActiveCfg = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Debug|x64.Build.0 = Debug|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.ActiveCfg = Release|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|Win32.Build.0 = Release|Win32
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.ActiveCfg = Release|x64
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F}.Release|x64.Build.0 = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|Win32.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.ActiveCfg = Release|x64
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B}.All|x64.Build.0 = Release|x64
@@ -1697,116 +1617,6 @@ Global
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|Win32.Build.0 = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.All|x64.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|Win32.Build.0 = Debug|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.ActiveCfg = Debug|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Debug|x64.Build.0 = Debug|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.ActiveCfg = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|Win32.Build.0 = Release|Win32
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.ActiveCfg = Release|x64
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2}.Release|x64.Build.0 = Release|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|Win32.Build.0 = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.All|x64.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|Win32.Build.0 = Debug|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.ActiveCfg = Debug|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Debug|x64.Build.0 = Debug|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.ActiveCfg = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|Win32.Build.0 = Release|Win32
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.ActiveCfg = Release|x64
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5}.Release|x64.Build.0 = Release|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|Win32.Build.0 = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.All|x64.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|Win32.Build.0 = Debug|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.ActiveCfg = Debug|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Debug|x64.Build.0 = Debug|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.ActiveCfg = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|Win32.Build.0 = Release|Win32
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.ActiveCfg = Release|x64
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56}.Release|x64.Build.0 = Release|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|Win32.Build.0 = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.All|x64.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|Win32.Build.0 = Debug|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.ActiveCfg = Debug|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Debug|x64.Build.0 = Debug|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.ActiveCfg = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|Win32.Build.0 = Release|Win32
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.ActiveCfg = Release|x64
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108}.Release|x64.Build.0 = Release|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|Win32.Build.0 = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.All|x64.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.ActiveCfg = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|Win32.Build.0 = Debug|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.ActiveCfg = Debug|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Debug|x64.Build.0 = Debug|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.ActiveCfg = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|Win32.Build.0 = Release|Win32
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.ActiveCfg = Release|x64
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31}.Release|x64.Build.0 = Release|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|Win32.Build.0 = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.All|x64.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|Win32.Build.0 = Debug|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.ActiveCfg = Debug|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Debug|x64.Build.0 = Debug|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.ActiveCfg = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|Win32.Build.0 = Release|Win32
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.ActiveCfg = Release|x64
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA}.Release|x64.Build.0 = Release|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|Win32.Build.0 = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.All|x64.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|Win32.Build.0 = Debug|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.ActiveCfg = Debug|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Debug|x64.Build.0 = Debug|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.ActiveCfg = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|Win32.Build.0 = Release|Win32
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.ActiveCfg = Release|x64
-		{504B3154-7A4F-459D-9877-B951021C3F1F}.Release|x64.Build.0 = Release|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|Win32.Build.0 = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.All|x64.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|Win32.Build.0 = Debug|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.ActiveCfg = Debug|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Debug|x64.Build.0 = Debug|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.ActiveCfg = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|Win32.Build.0 = Release|Win32
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.ActiveCfg = Release|x64
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E}.Release|x64.Build.0 = Release|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|Win32.Build.0 = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.All|x64.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|Win32.Build.0 = Debug|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.ActiveCfg = Debug|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Debug|x64.Build.0 = Debug|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.ActiveCfg = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|Win32.Build.0 = Release|Win32
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.ActiveCfg = Release|x64
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9}.Release|x64.Build.0 = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64
@@ -2053,17 +1863,6 @@ Global
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|Win32.Build.0 = Release|Win32
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.ActiveCfg = Release|x64
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90}.Release|x64.Build.0 = Release|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.ActiveCfg = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|Win32.Build.0 = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.All|x64.ActiveCfg = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|Win32.Build.0 = Debug|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.ActiveCfg = Debug|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Debug|x64.Build.0 = Debug|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.ActiveCfg = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|Win32.Build.0 = Release|Win32
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.ActiveCfg = Release|x64
-		{C13CC324-0032-4492-9A30-310A6BD64FF5}.Release|x64.Build.0 = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|Win32.ActiveCfg = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.ActiveCfg = Release|x64
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6}.All|x64.Build.0 = Release|x64
@@ -2739,7 +2538,6 @@ Global
 		{713E4747-1126-40B1-BD84-58F9A7745423} = {57199684-EC63-4A60-9DC6-11815AF6B413}
 		{F1B71990-EB04-4EB5-B28A-BC3EB6F7E843} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}
 		{3DAF028C-AB5B-4183-A01B-DCC43F5A87F0} = {D4A12E4C-DBDA-4614-BA26-3425AE9F60F5}
-		{62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
 		{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
 		{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
@@ -2753,7 +2551,6 @@ Global
 		{8B754330-A434-4791-97E5-1EE67060BAC0} = {0C808854-54D1-4230-BFF5-77B5FD905000}
 		{692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{D3EC0AFF-76FC-4210-A825-9A17410660A3} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
-		{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
 		{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
@@ -2761,13 +2558,10 @@ Global
 		{C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{B5881A85-FE70-4F64-8607-2CAAE52669C6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{05515420-16DE-4E63-BE73-85BE85BA5142} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
-		{1906D736-08BD-4EE1-924F-B536249B9A54} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{F057DA7F-79E5-4B00-845C-EF446EF055E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{E727E8F6-935D-46FE-8B0E-37834748A0E3} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
-		{155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
 		{DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
@@ -2840,16 +2634,6 @@ Global
 		{432DB165-1EB2-4781-A9C0-71E62610B20A} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
-		{13DEECA0-BDD4-4744-A1A2-8EB0A44DF3D2} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{B5A00BFA-6083-4FAE-A097-71642D6473B5} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{1C320193-46A6-4B34-9C56-8AB584FC1B56} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{72782932-37CC-46AE-8C7F-9A7B1A6EE108} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{12A49562-BAB9-43A3-A21D-15B60BBB4C31} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{A9EDAC04-6A5F-4BA7-BC0D-CCE7B255B6EA} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{504B3154-7A4F-459D-9877-B951021C3F1F} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{746F3632-5BB2-4570-9453-31D6D58A7D8E} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{DEB01ACB-D65F-4A62-AED9-58C1054499E9} = {62F27B1A-C919-4A70-8478-51F178F3B18F}
-		{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
 		{ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
@@ -2873,7 +2657,6 @@ Global
 		{9DE35039-A8F6-4FBF-B1B6-EB527F802411} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{26C82FCE-E0CF-4D10-A00C-D8E582FFEB53} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{74B120FF-6935-4DFE-A142-CDB6BEA99C90} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
-		{C13CC324-0032-4492-9A30-310A6BD64FF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{886B5E9D-F2C2-4AF2-98C8-EF98C4C770E6} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
 		{019DBD2A-273D-4BA4-BF86-B5EFE2ED76B1} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{D2396DD7-7D38-473A-ABB7-6F96D65AE1B9} = {9DE35039-A8F6-4FBF-B1B6-EB527F802411}

LICENSE

@@ -3,8 +3,8 @@ Upstream-Name: freeswitch
 Source: https://freeswitch.org/
 
 Files: *
-Copyright: 2005-2014 Anthony Minessale II <anthm@freeswitch.org>
+Copyright: 2005-2022 Anthony Minessale II <anthm@freeswitch.org>
- 2005-2014 Anthony Minessale II
+ 2005-2022 Anthony Minessale II
 License: MPL-1.1
                            MOZILLA PUBLIC LICENSE
                                  Version 1.1
@@ -1011,12 +1011,6 @@ License: MPL-1.1 or GPL-2+
       use the text of this Exhibit A rather than the text found in the
       Original Code Source Code for Your Modifications.]
 
-Files: libs/unimrcp/*
-Copyright: 2008-2010 Arsen Chaloyan
- 2009-2010 Tomas Valenta, Arsen Chaloyan
- 2001-2006 Steve Underwood
-License: Apache-2.0
-
 Files: */inet_pton.c
  libs/curl/lib/inet_ntop.c
  libs/curl/lib/mprintf.c
@@ -1595,15 +1589,6 @@ Files: libs/silk/*
 Copyright: 2006-2011, Skype Limited.
 License: BSD-2-clause
 
-Files: libs/libdingaling/*
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- 2001-2003 Allan Saddi <allan@saddi.com>
-License: MPL-1.1
-
-Files: libs/libdingaling/src/sha1.[ch]
-Copyright: 2001-2003 Allan Saddi <allan@saddi.com>
-License: BSD-2-clause
-
 Files: libs/libcodec2/*
 Copyright: 1990-2010 David Rowe
  1990-2010 David Rowe 2009
@@ -1724,27 +1709,6 @@ License: LGPL-2.1
 Files: libs/broadvoice/autogen.sh
 License: GPL-2
 
-Files: libs/libzrtp/*
-Copyright: 2006-2012 Philip R. Zimmermann.
- 1993-2005 Colin Plumb
- 1998-2006, Dr Brian Gladman, Worcester, UK.
- 2002, Bryce "Zooko" Wilcox-O'Hearn
- 2010 Soft Industry
-License: AGPL-3 or MPL-1.1
-
-Files: libs/libzrtp/test/cmockery/cmockery.c
-Copyright: 2008 Google Inc
-License: Apache-2.0
-
-Files: libs/libzrtp/third_party/bnlib/legal.c
- libs/libzrtp/third_party/bnlib/*
-Copyright: 1993-2005 Colin Plumb
-License: GPL-2 or GPL-3 or MPL-1.1
-
-Files: libs/libzrtp/third_party/bnlib/test/md5.c
-Copyright: 1995 Abandoned Colin Plumb
-License: public-domain
-
 Files: libs/win32/sqlite/sqlite3.[ch]
  libs/win32/sqlite/parse.c
 Copyright: 2006 Abandoned D. Richard Hipp <drh@hwaci.com>

Makefile.am

@@ -15,16 +15,6 @@ AM_LIBAPR_CPPFLAGS := $(shell ./libs/apr/apr-1-config --cppflags --includes)
 AM_LIBAPR_LDFLAGS := $(shell ./libs/apr/apr-1-config --ldflags)
 AM_LIBAPR_LIBS := $(subst $(switch_builddir)/,,$(shell ./libs/apr/apr-1-config \--libs))
 endif
-if SYSTEM_APRUTIL
-AM_LIBAPU_CPPFLAGS := $(shell apu-1-config --includes)
-AM_LIBAPU_LDFLAGS := $(shell apu-1-config --ldflags)
-AM_LIBAPU_LIBS := $(shell apu-1-config \--libs)
-AM_LIBAPU_LINKLIBTOOL := $(shell apu-1-config \--link-libtool)
-else
-AM_LIBAPU_CPPFLAGS := $(shell ./libs/apr-util/apu-1-config --includes)
-AM_LIBAPU_LDFLAGS := $(shell ./libs/apr-util/apu-1-config --ldflags)
-AM_LIBAPU_LIBS := $(subst $(switch_builddir)/,,$(shell ./libs/apr-util/apu-1-config \--libs))
-endif
 
 
 AM_CFLAGS   = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) 
@@ -141,11 +131,6 @@ CORE_LIBS=
 if ENABLE_LIBVPX
 CORE_LIBS += libs/libvpx/libvpx.a
 endif
-if SYSTEM_APRUTIL
-CORE_LIBS += $(AM_LIBAPU_LINKLIBTOOL)
-else
-CORE_LIBS +=  libs/apr-util/libaprutil-1.la
-endif
 if SYSTEM_APR
 CORE_LIBS += $(AM_LIBAPR_LINKLIBTOOL)
 else
@@ -248,7 +233,7 @@ 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) $(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) $(SPANDSP_LIBS) $(SOFIA_SIP_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
@@ -259,19 +244,6 @@ if HAVE_ODBC
 libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
 endif
 
-if ENABLE_ZRTP
-CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bgaes
-CORE_CFLAGS += -I$(switch_srcdir)/libs/libzrtp/third_party/bnlib
-CORE_CFLAGS += -isystem $(switch_srcdir)/libs/libzrtp/include
-ZRTP_LDFLAGS = -L$(switch_srcdir)/libs/libzrtp/third_party/bnlib
-ZRTP_LDFLAGS += -L$(switch_srcdir)/libs/libzrtp
-ZRTP_LIBS = -lbn -lzrtp
-libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
-libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
-CORE_LIBS += libs/libzrtp/libzrtp.a
-LIBS += libs/libzrtp/third_party/bnlib/libbn.a
-endif
-
 library_includetestdir = $(includedir)/test
 library_includetest_HEADERS = \
 	src/include/test/switch_fct.h \
@@ -300,6 +272,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 \
@@ -309,6 +282,7 @@ library_include_HEADERS = \
 	src/include/switch_jitterbuffer.h \
 	src/include/switch_estimators.h \
 	src/include/switch_rtcp_frame.h \
+	src/include/switch_spandsp.h \
 	src/include/switch_stun.h \
 	src/include/switch_nat.h \
 	src/include/switch_log.h \
@@ -338,6 +312,7 @@ nodist_libfreeswitch_la_SOURCES = \
 
 libfreeswitch_la_SOURCES = \
 	src/switch_apr.c \
+	src/switch_apr_queue.c \
 	src/switch_buffer.c \
 	src/switch_caller.c \
 	src/switch_channel.c \
@@ -364,6 +339,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 \
@@ -383,6 +359,7 @@ libfreeswitch_la_SOURCES = \
 	src/switch_ivr_say.c \
 	src/switch_ivr_menu.c \
 	src/switch_ivr.c \
+	src/switch_spandsp.c \
 	src/switch_stun.c \
 	src/switch_nat.c \
 	src/switch_log.c \
@@ -580,9 +557,6 @@ src/include/switch_version.h: src/include/switch_version.h.in Makefile $(switch_
 libs/libedit/src/.libs/libedit.a:
 	cd libs/libedit && $(MAKE)
 
-libs/libzrtp/libzrtp.a:
-	cd libs/libzrtp && $(MAKE)
-
 libs/libvpx/Makefile: libs/libvpx/.update
 	cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(VISIBILITY_FLAG)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --size-limit=16384x16384
 
@@ -596,17 +570,15 @@ libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr
 libs/apr/libapr-1.la: libs/apr/Makefile libs/apr/.update
 	@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep  "j"`" ] ; then touch $(switch_srcdir)/src/include/switch.h; cd libs/apr && $(MAKE) $(MFLAGS) && touch libapr-1.la; fi
 
-libs/apr-util/libaprutil-1.la: libs/apr/libapr-1.la libs/apr-util libs/apr-util/.update
+SRTP_SRC =	libs/srtp/srtp/srtp.c libs/srtp/crypto/cipher/cipher.c libs/srtp/crypto/cipher/null_cipher.c \
-	@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 \
 		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
@@ -697,7 +669,7 @@ yesdepends:
 	rm .nodepends
 
 iksemel-dep:
-	make -C src/mod/endpoints/mod_dingaling deps
+	make -C src/mod/formats/mod_ssml deps
 
 core: $(switch_builddir)/modules.conf src/include/switch_version.h $(CORE_LIBS) 
 	$(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
@@ -741,7 +713,7 @@ pristine:
 	git clean -fdx
 	git reset --hard
 
-update-clean: clean python-reconf
+update-clean: clean python-reconf python3-reconf
 	cd libs/esl && $(MAKE) clean
 	cd libs/srtp && $(MAKE) clean
 
@@ -758,6 +730,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
@@ -773,7 +749,7 @@ iks-reconf:
 	cd libs/iksemel && $(MAKE) clean
 	cd libs/iksemel && autoreconf -fi
 	cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
-	$(MAKE) mod_dingaling-clean
+	$(MAKE) mod_ssml-clean
 
 cluecon:
 	@clear

README.md

@@ -8,7 +8,7 @@ Visit  [https://signalwire.com](https://signalwire.com/)  or https://github.com/
 
 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.
+See https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/ for more detailed instructions.
 
 ## Additional Help
 
@@ -24,15 +24,26 @@ The main index for documentation is available at:
 
   * https://freeswitch.org/confluence/
 
+
 ### Release notes:
 
   * https://freeswitch.org/confluence/display/FREESWITCH/Release+Notes
 
-### Installation
+### Install from packages
 
-Step by step tutorials to install FreeSWITCH from packages or source code are available at:
+Step by step tutorials to install FreeSWITCH from packages:
 
-  * [Debian 10 Buster](https://freeswitch.org/confluence/display/FREESWITCH/Debian+10+Buster) [<b>Recommended</b>]
+  * [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian) [<b>Recommended</b>]
+  * [Raspberry Pi](https://freeswitch.org/confluence/display/FREESWITCH/Raspberry+Pi)
+  * [CentOS 7](https://freeswitch.org/confluence/display/FREESWITCH/CentOS+7+and+RHEL+7)
+
+### Build from source
+
+Example Dockerfiles to build FreeSWITCH and dependencies from source:
+  * https://github.com/signalwire/freeswitch/tree/master/docker/examples
+
+Step by step tutorials to build FreeSWITCH with provided dependency packages:
+  * [Debian](https://freeswitch.org/confluence/display/FREESWITCH/Debian#Debian-buildfromsource) [<b>Recommended</b>]
   * [Raspberry Pi](https://freeswitch.org/confluence/display/FREESWITCH/Raspberry+Pi)
   * [CentOS 7](https://freeswitch.org/confluence/display/FREESWITCH/CentOS+7+and+RHEL+7)
 
@@ -56,8 +67,8 @@ This is the place to get answers faster and chat with other users in real time.
 Slack Community:
   * https://signalwire.community/
 
-Mailing list:
+Mailing list (ARCHIVED):
 
-  * http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
+  * http://lists.freeswitch.org/pipermail/freeswitch-users/
 
 **Thank you for using FreeSWITCH!**

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Send an e-mail to security@signalwire.com to report a vulnerability. If accepted, we'll create a security advisory and add you and your team as collaborators. Please allow our team sufficient time to resolve the vulnerability before disclosing it; we'll remain in contact about the fix and may ask for your assistance to verify it is resolved.

bootstrap.sh

@@ -10,7 +10,7 @@ BGJOB=false
 VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
-SUBDIRS="apr libzrtp iksemel libdingaling srtp freetdm unimrcp fs";
+SUBDIRS="apr iksemel srtp fs";
 
 while getopts 'jhd:v' o; do 
   case "$o" in
@@ -170,13 +170,6 @@ bootstrap_apr() {
   # Remove autoconf 2.5x's cache directory
   rm -rf autom4te*.cache
 
-  echo "Entering directory ${LIBDIR}/apr-util"
-  cd ${LIBDIR}/apr-util
-  ./buildconf
-}
-
-bootstrap_libzrtp() {
-  (cd ${LIBDIR}/libzrtp && ./bootstrap.sh)
 }
 
 # Libs automake automation function
@@ -263,7 +256,7 @@ bootstrap_libs_post() {
 bootstrap_libs() {
   for i in ${SUBDIRS}; do
     case "$i" in
-      apr|fs|libzrtp)
+      apr|fs)
         ${BGJOB} && wait
         bootstrap_$i
         continue

build/buildmrcpserver.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-base=`pwd`
-cd libs/unimrcp
-./configure --with-pocketsphinx=$base/libs/pocketsphinx-0.5.99 --with-sphinxbase=$base/libs/sphinxbase-0.4.99 --with-flite=$base/libs/flite-1.3.99 --with-apr=$base/libs/apr --with-apr-util=$base/libs/apr-util --with-sofia-sip=$base/libs/sofia-sip --prefix=/usr/local/unimrcpserver --enable-pocketsphinx-plugin --enable-flite-plugin --disable-demosynth-plugin --disable-demorecog-plugin --disable-recorder-plugin --disable-cepstral-plugin
-make
-make install

build/buildzrtp.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-tar zxf libzrtp-0.81.514.tar.gz
-cd libzrtp-0.81.514
-patch -p1 < ../patches/zrtp_bnlib_pic.diff
-cd projects/gnu/
-./configure CFLAGS="-fPIC"
-make
-make install

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

build/modcheck.sh

@@ -21,8 +21,8 @@ cd $here
 for i in $files ; do
     mod=${i%%.*}
 
-    infile=`grep ^.*$mod\$ ../modules.conf | grep -v ftmod_`
+    infile=`grep -E "^.*$mod(\|.*)?$" ../modules.conf | grep -v ftmod_`
-    commented=`grep ^\#.*$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}"

build/modmake.rules.in

@@ -188,7 +188,7 @@ $(MODNAME).o: $(MODDIR)/$(SOURCEFILE) \
   $(switch_srcdir)/src/include/switch_event.h $(switch_srcdir)/src/include/switch_resample.h \
   $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \
   $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \
-  $(switch_srcdir)/src/include/switch_xml.h
+  $(switch_srcdir)/src/include/switch_xml.h $(switch_srcdir)/src/include/switch_spandsp.h
 	@echo Compiling $<...
 	if test -f "$(CSOURCEFILE)" -o -f "$(MODDIR)/$(CSOURCEFILE)"; then \
 		if test ! -z $(VERBOSE) ; then echo $(COMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
@@ -211,7 +211,7 @@ $(MODNAME).lo: $(MODDIR)/$(SOURCEFILE) \
   $(switch_srcdir)/src/include/switch_event.h $(switch_srcdir)/src/include/switch_resample.h \
   $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \
   $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \
-  $(switch_srcdir)/src/include/switch_xml.h
+  $(switch_srcdir)/src/include/switch_xml.h $(switch_srcdir)/src/include/switch_spandsp.h
 	@echo Compiling $<...
 	if test -f "$(CSOURCEFILE)" -o -f "$(MODDIR)/$(CSOURCEFILE)"; then \
 		if test ! -z $(VERBOSE) ; then echo $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
@@ -261,6 +261,8 @@ $(switch_srcdir)/src/include/switch_ivr.h:
 
 $(switch_srcdir)/src/include/switch_rtp.h:
 
+$(switch_srcdir)/src/include/switch_spandsp.h:
+
 $(switch_srcdir)/src/include/switch_stun.h:
 
 $(switch_srcdir)/src/include/switch_log.h:

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
@@ -59,7 +60,6 @@ applications/mod_voicemail
 #asr_tts/mod_flite
 #asr_tts/mod_pocketsphinx
 #asr_tts/mod_tts_commandline
-#asr_tts/mod_unimrcp
 codecs/mod_amr
 #codecs/mod_amrwb
 codecs/mod_b64
@@ -86,7 +86,6 @@ dialplans/mod_dialplan_asterisk
 dialplans/mod_dialplan_xml
 #directories/mod_ldap
 #endpoints/mod_alsa
-#endpoints/mod_dingaling
 #endpoints/mod_gsmopen
 #endpoints/mod_h323
 #endpoints/mod_khomp
@@ -134,6 +133,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 +168,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

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
@@ -57,7 +58,6 @@ applications/mod_voicemail_ivr
 asr_tts/mod_flite
 asr_tts/mod_pocketsphinx
 asr_tts/mod_tts_commandline
-asr_tts/mod_unimrcp
 codecs/mod_amr
 codecs/mod_amrwb
 codecs/mod_b64
@@ -83,7 +83,6 @@ dialplans/mod_dialplan_directory
 dialplans/mod_dialplan_xml
 directories/mod_ldap
 #endpoints/mod_alsa
-endpoints/mod_dingaling
 #endpoints/mod_gsmopen
 #endpoints/mod_h323
 #endpoints/mod_khomp
@@ -127,7 +126,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

build/next-release.txt

@@ -1 +1 @@
-1.10.7-dev
+1.10.12-dev

build/sounds_version.txt

@@ -1,5 +1,5 @@
-en-us-callie 1.0.52
+en-us-callie 1.0.53
-en-us-allison 1.0.1
+en-us-allison 1.0.2
 ru-RU-elena 1.0.51
 ru-RU-kirill 1.0.0
 ru-RU-vika 1.0.0

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 ../../../..

cmake_modules/FindAPRUtil.cmake

@@ -1,49 +0,0 @@
-# Locate APR-Util include paths and libraries
-
-# This module defines
-# APRUTIL_INCLUDES, where to find apr.h, etc.
-# APRUTIL_LIBS, the libraries to link against to use APR.
-# APRUTIL_FOUND, set to yes if found
-
-find_program(APRUTIL_CONFIG_EXECUTABLE
-    apu-1-config
-    /usr/local/apr-util/1.2.12/bin
-    /usr/local/bin
-    /usr/bin
-    C:/Progra~1/apr/bin
-    )
-
-mark_as_advanced(APRUTIL_CONFIG_EXECUTABLE)
-
-macro(_apu_invoke _varname _regexp)
-    execute_process(
-        COMMAND ${APRUTIL_CONFIG_EXECUTABLE} ${ARGN}
-        OUTPUT_VARIABLE _apr_output
-        RESULT_VARIABLE _apr_failed
-    )
-
-    if(_apr_failed)
-        message(FATAL_ERROR "apu-1-config ${ARGN} failed")
-    else(_apr_failed)
-        string(REGEX REPLACE "[\r\n]"  "" _apr_output "${_apr_output}")
-        string(REGEX REPLACE " +$"     "" _apr_output "${_apr_output}")
-
-        if(NOT ${_regexp} STREQUAL "")
-            string(REGEX REPLACE "${_regexp}" " " _apr_output "${_apr_output}")
-        endif(NOT ${_regexp} STREQUAL "")
-
-        separate_arguments(_apr_output)
-
-        set(${_varname} "${_apr_output}")
-    endif(_apr_failed)
-endmacro(_apu_invoke)
-
-_apu_invoke(APRUTIL_INCLUDES "(^| )-I"  --includes)
-_apu_invoke(APRUTIL_LIBS     ""         --link-ld)
-
-if(APRUTIL_LIBS AND APRUTIL_INCLUDES)
-    set(APRUTIL_FOUND "YES")
-    set(APRUTIL_DEFINITIONS "")
-    message (STATUS "apr-util found: YES ${APRUTIL_LIBS}")
-endif(APRUTIL_LIBS AND APRUTIL_INCLUDES)
-

conf/curl/autoload_configs/dingaling.conf.xml

@@ -1,9 +0,0 @@
-<configuration name="dingaling.conf" description="XMPP Jingle Endpoint">
-  <settings>
-    <param name="debug" value="0"/>
-    <param name="codec-prefs" value="PCMU"/>
-  </settings>
-
-  <X-PRE-PROCESS cmd="include" data="../jingle_profiles/*.xml"/>
-
-</configuration>

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"/>
 

conf/insideout/sip_profiles/external.xml

@@ -48,7 +48,6 @@
     <param name="auth-calls" value="false"/>
     <param name="rtp-timeout-sec" value="1800"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

conf/insideout/sip_profiles/internal-ipv6.xml

@@ -70,9 +70,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

conf/insideout/sip_profiles/internal.xml

@@ -106,9 +106,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

conf/rayo/autoload_configs/rayo.conf.xml

@@ -277,36 +277,6 @@
 				</input>
 			]]>
 		</alias>
-		<alias name="input_voice_yesno_unimrcp" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" recognizer="unimrcp">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
-		<alias name="input_voice_yesno_unimrcp_timeout" target="call">
-			<![CDATA[
-				<input xmlns="urn:xmpp:rayo:input:1" mode="voice" recognizer="unimrcp" max-silence="5000" initial-timeout="5000">
-					<grammar content-type="application/srgs+xml>
-					<![CDATA[
-						<grammar xmlns="http://www.w3.org/2001/06/grammar"
-							xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-							xsi:schemaLocation="http://www.w3.org/2001/06/grammar http://www.w3.org/TR/speech-grammar/grammar.xsd"
-							xml:lang="en-US" version="1.0">
-								<rule id="yesno"><one-of><item>yes</item><item>no</item></one-of></rule></grammar>
-					]]]]><![CDATA[>
-					</grammar>
-				</input>
-			]]>
-		</alias>
 
 		<alias name="input_voice_yesno_pocketsphinx" target="call">
 			<![CDATA[

conf/rayo/autoload_configs/switch.conf.xml

@@ -145,8 +145,6 @@
     <!-- <param name="rtp-start-port" value="16384"/> -->
     <!-- <param name="rtp-end-port" value="32768"/> -->
 
-    <param name="rtp-enable-zrtp" value="true"/>
-
     <!--
 	 Native PostgreSQL support was removed from the FreeSWITCH Core!
 	 =================================

conf/rayo/sip_profiles/external.xml

@@ -57,7 +57,6 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="$${external_auth_calls}"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

conf/rayo/vars.xml

@@ -14,13 +14,6 @@
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
   <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
 
-  <!--
-      Enable ZRTP globally you can override this on a per channel basis
-      
-      http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp)
-  -->
-  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
-
   <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU,PCMA"/>
   <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA"/>
 

conf/sbc/sbc_profiles/external.xml

@@ -49,7 +49,6 @@
     <param name="auth-calls" value="false"/>
     <param name="rtp-timeout-sec" value="1800"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

conf/sbc/sbc_profiles/internal-ipv6.xml

@@ -69,9 +69,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

conf/sbc/sbc_profiles/internal.xml

@@ -110,9 +110,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

conf/testing/autoload_configs/switch.conf.xml

@@ -150,8 +150,6 @@
     <!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
     <!-- <param name="rtp-port-usage-robustness" value="true"/> -->
 
-    <param name="rtp-enable-zrtp" value="true"/>
-
     <!--
 	 Native PostgreSQL support was removed from the FreeSWITCH Core!
 	 =================================

conf/testing/sip_profiles/external-ipv6.xml

@@ -51,7 +51,6 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

conf/testing/sip_profiles/external.xml

@@ -57,7 +57,6 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

conf/testing/sip_profiles/internal-ipv6.xml

@@ -71,9 +71,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

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"/>-->
@@ -238,9 +246,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

conf/testing/vars.xml

@@ -7,7 +7,6 @@
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
   <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
   <X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
-  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
   <X-PRE-PROCESS cmd="set" data="global_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
   <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=OPUS,G722,PCMU,PCMA,VP8,H264,H263,H263-1998,G7221@32000h"/>
   <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/>

conf/vanilla/autoload_configs/dingaling.conf.xml

@@ -1,9 +0,0 @@
-<configuration name="dingaling.conf" description="XMPP Jingle Endpoint">
-  <settings>
-    <param name="debug" value="0"/>
-    <param name="codec-prefs" value="H264,PCMU"/>
-  </settings>
-
-  <X-PRE-PROCESS cmd="include" data="../jingle_profiles/*.xml"/>
-
-</configuration>

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"/>
 

conf/vanilla/autoload_configs/signalwire.conf.xml

@@ -0,0 +1,14 @@
+<configuration name="signalwire.conf" description="SignalWire">
+  <settings>
+    <!-- on/off/file-path -->
+    <!--<param name="kslog" value="on"/>-->
+    <!--<param name="blade-bootstrap" value="blade://switchblade:2100"/>-->
+    <!--<param name="adoption-service" value="https://adopt.signalwire.com/adoption"/>-->
+    <!--<param name="stun-server" value="stun.freeswitch.org"/>-->
+    <!--<param name="caller-id-in-from" value="true"/>-->
+    <!--<authentication></authentication>-->
+    
+    <!-- override dialplan context for calls on connector -->
+    <!--<param name="override-context" value="signalwire"/-->
+  </settings>
+</configuration>

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"/>

conf/vanilla/autoload_configs/switch.conf.xml

@@ -153,8 +153,6 @@
     <!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
     <!-- <param name="rtp-port-usage-robustness" value="true"/> -->
 
-    <param name="rtp-enable-zrtp" value="false"/>
-
     <!--
 	 Store encryption keys for secure media in channel variables and call CDRs. Default: false.
 	 WARNING: If true, anyone with CDR access can decrypt secure media!
@@ -184,6 +182,9 @@
     <!-- <param name="core-db-dsn" value="postgresql://freeswitch:@127.0.0.1/freeswitch?options=-c%20client_min_messages%3DNOTICE" /> -->
     <!-- <param name="core-db-dsn" value="mariadb://Server=localhost;Database=freeswitch;Uid=freeswitch;Pwd=pass;" /> -->
     <!-- <param name="core-db-dsn" value="dsn:username:password" /> -->
+
+    <!-- <param name="odbc-skip-autocommit-flip" value="true" /> -->
+
     <!-- 
 	 Allow to specify the sqlite db at a different location (In this example, move it to ramdrive for
 	 better performance on most linux distro (note, you loose the data if you reboot))

conf/vanilla/autoload_configs/unimrcp.conf.xml

@@ -1,23 +0,0 @@
-<configuration name="unimrcp.conf" description="UniMRCP Client">
-  <settings>
-    <!-- UniMRCP profile to use for TTS -->
-    <param name="default-tts-profile" value="voxeo-prophecy8.0-mrcp1"/>
-    <!-- UniMRCP profile to use for ASR -->
-    <param name="default-asr-profile" value="voxeo-prophecy8.0-mrcp1"/>
-    <!-- UniMRCP logging level to appear in freeswitch.log.  Options are:
-         EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG -->
-    <param name="log-level" value="DEBUG"/>
-    <!-- Enable events for profile creation, open, and close -->
-    <param name="enable-profile-events" value="false"/>
-
-    <param name="max-connection-count" value="100"/>
-    <param name="offer-new-connection" value="1"/>
-    <param name="request-timeout" value="3000"/>
-  </settings>
-
-  <profiles>
-    <X-PRE-PROCESS cmd="include" data="../mrcp_profiles/*.xml"/>
-  </profiles>
-
-</configuration>
-

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 -->

conf/vanilla/dialplan/default.xml

@@ -443,10 +443,6 @@
 	     This will take the SAS from the b-leg and send it to the display on the a-leg phone.
 	     Known working with Polycom and Snom maybe others.
 	-->
-	<!--
-	<action application="set" data="exec_after_bridge_app=${sched_api(+4 zrtp expand uuid_display ${uuid} \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas1_string )}  \${uuid_getvar(\${uuid_getvar(${uuid} signal_bond)} zrtp_sas2_string )} )}"/>
-	<action application="export" data="nolocal:zrtp_secure_media=true"/>
-	-->
 	<action application="bridge" data="sofia/${use_profile}/$1@conference.freeswitch.org"/>
       </condition>
     </extension>
@@ -768,13 +764,6 @@
       </condition>
     </extension>
 
-    <!-- install zrtp_agent.lua into scripts (ZRTP == 9787) -->
-    <extension name="zrtp_enrollement">
-      <condition field="destination_number" expression="^9787$">
-	<action application="lua" data="zrtp_agent.lua"/>
-      </condition>
-    </extension>
-
     <!--
 	You will no longer hear the bong tone.  The wav file is playing stating the call is secure.
 	The file will not play unless you have both TLS and SRTP active.
@@ -786,10 +775,8 @@
 	<action application="answer"/>
 	<action application="execute_extension" data="is_secure XML features"/>
 	<action application="playback" data="$${hold_music}"/>
-	<anti-action application="set" data="zrtp_secure_media=true"/>
 	<anti-action application="answer"/>
 	<anti-action application="playback" data="silence_stream://2000"/>
-	<anti-action application="execute_extension" data="is_zrtp_secure XML features"/>
 	<anti-action application="playback" data="$${hold_music}"/>
       </condition>
     </extension>

conf/vanilla/dialplan/features.xml

@@ -44,15 +44,7 @@
 	<action application="transfer" data="$1 XML default"/>
       </condition>
     </extension>
-
+ 
-    <extension name="is_zrtp_secure" continue="true">
-      <condition field="${zrtp_secure_media_confirmed}" expression="^true$">
-	<action application="sleep" data="1000"/>
-	<action application="playback" data="misc/call_secured.wav"/>
-	<anti-action application="eval" data="not_secure"/>
-      </condition>
-    </extension>
-
     <extension name="is_secure" continue="true">
       <!-- Only Truly consider it secure if its TLS and SRTP --> 
       <condition field="${sip_via_protocol}" expression="tls"/>

conf/vanilla/freeswitch.xml

@@ -9,11 +9,11 @@
 
     Before you start to modify this default please visit this wiki page:
 
-    http://wiki.freeswitch.org/wiki/Getting_Started_Guide#Some_stuff_to_try_out.21
+    https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Configuration/Default-Configuration_6587388/#6-configuration-files
 
     If all else fails you can read our FAQ located at:
 
-    http://wiki.freeswitch.org/wiki/FreeSwitch_FAQ
+    https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Miscellaneous/FAQ/
 
     NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
 -->

conf/vanilla/jingle_profiles/client.xml

@@ -1,36 +0,0 @@
-<include>
-  <!-- Client Profile (Original mode) -->
-  <!-- to use this profile take the x- away from the open and close tags so its <profile> and </profile> -->
-  <x-profile type="client">
-    <param name="name" value="$${xmpp_client_profile}"/>
-    <param name="login" value="myjid@myserver.com/talk"/>
-    <param name="password" value="mypass"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="message" value="Jingle all the way"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <!-- <param name="ext-rtp-ip" value="auto-nat"/> -->
-    <param name="auto-login" value="true"/>
-    <!-- SASL "plain" or "md5" -->
-    <param name="sasl" value="plain"/>
-    <!-- if the server where the jabber is hosted is not the same as the one in the jid -->
-    <!--<param name="server" value="alternate.server.com"/>-->
-    <!-- Enable TLS or not -->
-    <param name="tls" value="true"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- default extension (if one cannot be determined) -->
-    <param name="exten" value="888"/>
-    <!-- VAD choose one -->
-    <!-- <param name="vad" value="in"/> -->
-    <!-- <param name="vad" value="out"/> -->
-    <!--<param name="vad" value="both"/>-->
-    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-    <!--<param name="candidate-acl" value="wan.auto"/>-->
-    <param name="local-network-acl" value="localnet.auto"/>
-
-    <!-- google voice does not work on this yet ....ikr... -->
-    <!--<param name="use-jingle" value="true"/>-->
-
-  </x-profile>
-</include>

conf/vanilla/jingle_profiles/server.xml

@@ -1,21 +0,0 @@
-<include>
-  <!-- Component (Server to Server Login) -->
-  <!-- to use this profile take the x- away from the open and close tags so its <profile> and </profile> -->
-  <x-profile type="component">
-    <param name="name" value="$${xmpp_server_profile}"/>
-    <param name="password" value="secret"/>
-    <param name="dialplan" value="XML"/>
-    <param name="context" value="public"/>
-    <param name="rtp-ip" value="$${bind_server_ip}"/>
-    <param name="server" value="jabber.server.org:5347"/>
-    <!-- disable to trade async for more calls -->
-    <param name="use-rtp-timer" value="true"/>
-    <!-- "_auto_" means the extension will be automaticly set to the called jid -->
-    <param name="exten" value="_auto_"/>
-    <!--<param name="vad" value="both"/>-->
-    <!--<param name="avatar" value="/path/to/tiny.jpg"/>-->
-    <!--If you have ODBC support and a working dsn you can use it instead of SQLite-->
-    <!--<param name="odbc-dsn" value="dsn:user:pass"/>-->
-    <!--<param name="candidate-acl" value="wan.auto"/>-->
-  </x-profile>
-</include>

conf/vanilla/mrcp_profiles/loquendo-7-mrcp-v2.xml

@@ -1,32 +0,0 @@
-<include>
-  <!-- Loquendo MRCP Server 7 MRCPv2 -->
-  <profile name="loquendo7-mrcp2" version="2">
-    <!--param name="client-ext-ip" value="auto"-->
-    <param name="client-ip" value="auto"/>
-    <param name="client-port" value="5090"/>
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="5060"/>
-    <!--param name="force-destination" value="1"/-->
-    <param name="sip-transport" value="udp"/>
-    <!--param name="ua-name" value="FreeSWITCH"/-->
-    <!--param name="sdp-origin" value="FreeSWITCH"/-->
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-    <param name="jsgf-mime-type" value="application/jsgf"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/mrcp_profiles/nuance-1.0.0-mrcp-v1.xml

@@ -1,39 +0,0 @@
-<include>
-  <!-- Nuance MRCP 1.0.0 Server -->
-  <profile name="nuance-mrcp1" version="1">
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="synthesizer"/>
-    <param name="speechrecog" value="recognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!-- enable/disable rtcp support -->
-    <param name="rtcp" value="1"/>
-    <!-- rtcp bye policies (rtcp must be enabled first)
-         0 - disable rtcp bye
-         1 - send rtcp bye at the end of session
-         2 - send rtcp bye also at the end of each talkspurt (input)
-    -->
-    <param name="rtcp-bye" value="2"/>
-    <!-- rtcp transmission interval in msec (set 0 to disable) -->
-    <param name="rtcp-tx-interval" value="5000"/>
-    <!-- period (timeout) to check for new rtcp messages in msec (set 0 to disable) -->
-    <param name="rtcp-rx-resolution" value="1000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v1.xml

@@ -1,39 +0,0 @@
-<include>
-  <!-- Nuance Speech Server 5.0 MRCPv1 -->
-  <profile name="nuance5-mrcp1" version="1">
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="4900"/>
-    <param name="resource-location" value="media"/>
-    <param name="speechsynth" value="speechsynthesizer"/>
-    <param name="speechrecog" value="speechrecognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!-- enable/disable rtcp support -->
-    <param name="rtcp" value="1"/>
-    <!-- rtcp bye policies (rtcp must be enabled first)
-             0 - disable rtcp bye
-             1 - send rtcp bye at the end of session
-             2 - send rtcp bye also at the end of each talkspurt (input)
-      -->
-    <param name="rtcp-bye" value="2"/>
-    <!-- rtcp transmission interval in msec (set 0 to disable) -->
-    <param name="rtcp-tx-interval" value="5000"/>
-    <!-- period (timeout) to check for new rtcp messages in msec (set 0 to disable) -->
-    <param name="rtcp-rx-resolution" value="1000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/mrcp_profiles/nuance-5.0-mrcp-v2.xml

@@ -1,43 +0,0 @@
-<include>
-  <!-- Nuance Speech Server 5.0 MRCPv2 -->
-  <profile name="nuance5-mrcp2" version="2">
-    <!--param name="client-ext-ip" value="auto"-->
-    <param name="client-ip" value="auto"/>
-    <param name="client-port" value="5090"/>
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="5060"/>
-    <!--param name="force-destination" value="1"/-->
-    <param name="sip-transport" value="udp"/>
-    <!--param name="ua-name" value="FreeSWITCH"/-->
-    <!--param name="sdp-origin" value="FreeSWITCH"/-->
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!-- enable/disable rtcp support -->
-    <param name="rtcp" value="1"/>
-    <!-- rtcp bye policies (rtcp must be enabled first)
-             0 - disable rtcp bye
-             1 - send rtcp bye at the end of session
-             2 - send rtcp bye also at the end of each talkspurt (input)
-    -->
-    <param name="rtcp-bye" value="2"/>
-    <!-- rtcp transmission interval in msec (set 0 to disable) -->
-    <param name="rtcp-tx-interval" value="5000"/>
-    <!-- period (timeout) to check for new rtcp messages in msec (set 0 to disable) -->
-    <param name="rtcp-rx-resolution" value="1000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/mrcp_profiles/unimrcpserver-mrcp-v1.xml

@@ -1,27 +0,0 @@
-<include>
-  <!-- UniMRCP Server MRCPv1 -->
-  <profile name="unimrcpserver-mrcp1" version="1">
-    <param name="server-ip" value="10.5.5.152"/>
-    <param name="server-port" value="1554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="speechsynthesizer"/>
-    <param name="speechrecog" value="speechrecognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/mrcp_profiles/vestec-mrcp-v1.xml

@@ -1,26 +0,0 @@
-<include>
-  <!-- Vestec VASRE MRCP Server -->
-  <profile name="vestec-mrcp-v1" version="1">
-    <param name="server-ip" value="127.0.0.1"/>
-    <param name="server-port" value="1554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="speechsynthesizer"/>
-    <param name="speechrecog" value="speechrecognizer"/>
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="14000"/>
-    <param name="rtp-port-max" value="15000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/mrcp_profiles/voxeo-prophecy-8.0-mrcp-v1.xml

@@ -1,27 +0,0 @@
-<include>
-  <!-- Voxeo Prophecy 8.0 MRCPv1 -->
-  <profile name="voxeo-prophecy8.0-mrcp1" version="1">
-    <param name="server-ip" value="99.185.85.31"/>
-    <param name="server-port" value="554"/>
-    <param name="resource-location" value=""/>
-    <param name="speechsynth" value="synthesizer"/>
-    <param name="speechrecog" value="recognizer"/>
-    <!--param name="rtp-ext-ip" value="auto"/-->
-    <param name="rtp-ip" value="auto"/>
-    <param name="rtp-port-min" value="4000"/>
-    <param name="rtp-port-max" value="5000"/>
-    <!--param name="playout-delay" value="50"/-->
-    <!--param name="max-playout-delay" value="200"/-->
-    <!--param name="ptime" value="20"/-->
-    <param name="codecs" value="PCMU PCMA L16/96/8000"/>
-
-    <!-- Add any default MRCP params for SPEAK requests here -->
-    <synthparams>
-    </synthparams>
-
-    <!-- Add any default MRCP params for RECOGNIZE requests here -->
-    <recogparams>
-      <!--param name="start-input-timers" value="false"/-->
-    </recogparams>
-  </profile>
-</include>

conf/vanilla/sip_profiles/external-ipv6.xml

@@ -57,7 +57,6 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

conf/vanilla/sip_profiles/external.xml

@@ -57,7 +57,6 @@
     <param name="nonce-ttl" value="60"/>
     <param name="auth-calls" value="false"/>
     <param name="inbound-late-negotiation" value="true"/>
-    <param name="inbound-zrtp-passthru" value="true"/> <!-- (also enables late negotiation) -->
     <!--
         DO NOT USE HOSTNAMES, ONLY IP ADDRESSES IN THESE SETTINGS!
     -->

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"/>-->
@@ -71,9 +73,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

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"/>-->
@@ -229,6 +239,9 @@
     <!-- Or, if you have PGSQL support, you can use that -->
     <!--<param name="odbc-dsn" value="pgsql://hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE' application_name='freeswitch'" />-->
 
+    <!-- By default each profile will give the database 1000 ms to spin-up on load -->
+    <!--<param name="db-spin-up-wait-ms" value="1000" />-->
+
     <!--Uncomment to set all inbound calls to no media mode-->
     <!--<param name="inbound-bypass-media" value="true"/>-->
 
@@ -238,9 +251,6 @@
     <!-- Let calls hit the dialplan before selecting codec for the a-leg -->
     <param name="inbound-late-negotiation" value="true"/>
 
-    <!-- Allow ZRTP clients to negotiate end-to-end security associations (also enables late negotiation) -->
-    <param name="inbound-zrtp-passthru" value="true"/>
-
     <!-- this lets anything register -->
     <!--  comment the next line and uncomment one or both of the other 2 lines for call authentication -->
     <!-- <param name="accept-blind-reg" value="true"/> -->

conf/vanilla/vars.xml

@@ -41,7 +41,6 @@
       storage_dir
       cache_dir
       core_uuid
-      zrtp_enabled
       nat_public_addr
       nat_private_addr
       nat_type
@@ -64,12 +63,6 @@
   <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/>
   <X-PRE-PROCESS cmd="set" data="use_profile=external"/>
   <X-PRE-PROCESS cmd="set" data="rtp_sdes_suites=AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH"/>
-  <!--
-      Enable ZRTP globally you can override this on a per channel basis
-
-      http://wiki.freeswitch.org/wiki/ZRTP (on how to enable zrtp)
-  -->
-  <X-PRE-PROCESS cmd="set" data="zrtp_secure_media=true"/>
   <!--
       NOTICE: When using SRTP it's critical that you do not offer or accept
       variable bit rate codecs, doing so would leak information and possibly
@@ -144,13 +137,13 @@
       By default without specifying any crypto suites FreeSWITCH will offer
       crypto suites from strongest to weakest accepting the strongest each
       endpoint has in common.  If you wish to force specific crypto suites you
-      can do so by appending the suites in a comma separated list in the order
+      can do so by appending the suites in a colon separated list in the order
       that you wish to offer them in.
 
       Examples:
 
-          rtp_secure_media=mandatory:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
+          rtp_secure_media=mandatory:AES_CM_256_HMAC_SHA1_80:AES_CM_256_HMAC_SHA1_32
-          rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80,AES_CM_256_HMAC_SHA1_32
+          rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80:AES_CM_256_HMAC_SHA1_32
           rtp_secure_media=optional:AES_CM_256_HMAC_SHA1_80
           rtp_secure_media=true:AES_CM_256_HMAC_SHA1_80
 

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.7-dev], bugs@freeswitch.org)
+AC_INIT([freeswitch], [1.10.12-dev], bugs@freeswitch.org)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [10])
-AC_SUBST(SWITCH_VERSION_MICRO, [7-dev])
+AC_SUBST(SWITCH_VERSION_MICRO, [12-dev])
 AC_SUBST(SWITCH_VERSION_REVISION, [])
 AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, [])
 
@@ -248,7 +248,7 @@ m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
 m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])
 m4_defun([_LT_AC_LANG_RC_CONFIG], [:])
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
 
 #Check for compiler vendor
 AX_COMPILER_VENDOR
@@ -582,7 +582,7 @@ AC_SUBST(SYS_XMLRPC_CFLAGS)
 AC_SUBST(SYS_XMLRPC_LDFLAGS)
 AM_CONDITIONAL([SYSTEM_XMLRPCC],[test "${enable_xmlrpcc}" = "yes"])
 
-for luaversion in luajit lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
+for luaversion in luajit lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua; do
   PKG_CHECK_MODULES([LUA],[${luaversion}],[have_lua=yes],[have_lua=no])
   if test ${have_lua} = yes; then
     break
@@ -598,16 +598,9 @@ 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,
-	[AS_HELP_STRING([--enable-zrtp], [Compile with zrtp Support])],,[enable_zrtp="no"])
-if test "x$enable_zrtp" = "xyes" ; then
-   LIBS="-lpthread $LIBS"
-   APR_ADDTO(SWITCH_AM_CFLAGS, -DENABLE_ZRTP)
-fi
-
 PA_LIBS=
 
 PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
@@ -622,8 +615,6 @@ fi
 
 AC_SUBST(PA_LIBS)
 
-AM_CONDITIONAL([ENABLE_ZRTP],[test "x$enable_zrtp" != "xno"])
-
 AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
 
 AC_ARG_ENABLE(core-odbc-support,
@@ -665,12 +656,13 @@ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
 case $host in
      *-darwin*)
 	path_push_unique PKG_CONFIG_PATH /usr/local/opt/libpq/lib/pkgconfig
+	path_push_unique PKG_CONFIG_PATH /usr/local/opt/openssl/lib/pkgconfig
      ;;
 esac
 
 if test "$PKG_CONFIG" = "no" \
 	|| test x"$enable_core_pgsql_pkgconfig" = x"no" \
-	|| ! pkg-config libpq; then
+	|| ! pkg-config --modversion libpq > /dev/null; then
 	if test "$PG_CONFIG" != "no"; then
 		AC_MSG_CHECKING([for PostgreSQL libraries via pg_config])
 		POSTGRESQL_CFLAGS="-I`$PG_CONFIG --includedir`"
@@ -682,7 +674,6 @@ if test "$PKG_CONFIG" = "no" \
 		POSTGRESQL_PATCH_VERSION=`$PG_CONFIG --version | awk '{ print $NF }' | awk -F. '{ print $3 }'`
 	fi
 else
-
 	AC_MSG_CHECKING([for PostgreSQL libraries via pkg_config])
 	POSTGRESQL_CFLAGS="`$PKG_CONFIG --cflags libpq`"
 	POSTGRESQL_LIBDIR="`$PKG_CONFIG libpq --libs-only-L`"
@@ -725,7 +716,7 @@ PKG_CHECK_MODULES([SPANDSP], [spandsp >= 3.0],[
     AC_MSG_ERROR([no usable spandsp; please install spandsp3 devel package or equivalent])
 ])
 
-PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.4],[
+PKG_CHECK_MODULES([SOFIA_SIP], [sofia-sip-ua >= 1.13.17],[
   AM_CONDITIONAL([HAVE_SOFIA_SIP],[true])],[
     AC_MSG_ERROR([no usable sofia-sip; please install sofia-sip-ua devel package or equivalent])
 ])
@@ -844,8 +835,6 @@ PKG_CHECK_MODULES([STIRSHAKEN], [stirshaken],[
 
 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)
-AM_CONDITIONAL([SYSTEM_APRUTIL],[test "${use_system_aprutil}" = "yes"])
 
 save_LIBS="$LIBS"
 LIBS=
@@ -883,7 +872,7 @@ AC_SUBST(LIBTOOL_LIB_EXTEN)
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h sys/prctl.h sys/select.h netdb.h execinfo.h sys/time.h])
+AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h sys/prctl.h sys/select.h netdb.h sys/time.h])
 
 # Solaris 11 privilege management
 AS_CASE([$host],
@@ -1090,8 +1079,8 @@ if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then
 fi
 
 # Tested and fixed lot of modules, but some are untested.  Will be added back when the core team decide it ready
-# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_dingaling mod_opal mod_h323 mod_khomp 
+# Untested modules : mod_osp mod_soundtouch mod_sangoma_codec mod_opal mod_h323 mod_khomp 
-#                    mod_unimrcp mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed
+#                    mod_cepstral mod_erlang_event mod_snmp mod_perl mod_java mod_managed
 #
 #saved_CFLAGS="$CFLAGS"
 #AC_CACHE_CHECK([whether compiler supports -Wunused-but-set-variable], [ac_cv_gcc_unused_but_set_variable], [
@@ -1363,7 +1352,21 @@ PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.16.0],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
 
 PKG_CHECK_MODULES([SHOUT], [shout >= 2.2.2],[
-  AM_CONDITIONAL([HAVE_SHOUT],[true])],[
+  AM_CONDITIONAL([HAVE_SHOUT],[true])
+  SHOUT_VERSION="`$PKG_CONFIG --modversion shout`"
+  SHOUT_MAJOR_VERSION="`echo $SHOUT_VERSION | cut -d. -f1`"
+  SHOUT_MINOR_VERSION="`echo $SHOUT_VERSION | cut -d. -f2`"
+  SHOUT_PATCH_VERSION="`echo $SHOUT_VERSION | cut -d. -f3`"
+  test -n "$SHOUT_PATCH_VERSION" || SHOUT_PATCH_VERSION=0
+  AC_MSG_NOTICE([SHOUT version: $SHOUT_VERSION])
+  AC_MSG_NOTICE([SHOUT major version: $SHOUT_MAJOR_VERSION])
+  AC_MSG_NOTICE([SHOUT minor version: $SHOUT_MINOR_VERSION])
+  AC_MSG_NOTICE([SHOUT patch version: $SHOUT_PATCH_VERSION])
+  AC_SUBST([SHOUT_VERSION])
+  AC_SUBST([SHOUT_MAJOR_VERSION])
+  AC_SUBST([SHOUT_MINOR_VERSION])
+  AC_SUBST([SHOUT_PATCH_VERSION])
+  ],[
   AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SHOUT],[false])])
 
 mp3lame=false
@@ -1408,7 +1411,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])],[
@@ -1527,13 +1532,33 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
   ])
 ])
 
-PKG_CHECK_MODULES([KS], [libks >= 1.1.0],[
+PKG_CHECK_MODULES([KS], [libks2 >= 2.0.0],[
   AM_CONDITIONAL([HAVE_KS],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])])
+  PKG_CHECK_MODULES([KS], [libks >= 1.8.2],[
+    AM_CONDITIONAL([HAVE_KS],[true])],[
+      if module_enabled mod_verto; then
+        AC_MSG_ERROR([You need to either install libks2 or libks or disable mod_verto in modules.conf])
+      else
+        if module_enabled mod_signalwire; then
+          AC_MSG_ERROR([You need to either install libks2 or 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],[
+PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client2 >= 2.0.0],[
   AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])])
+  PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
+    AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
+      if module_enabled mod_signalwire; then
+        AC_MSG_ERROR([You need to either install signalwire-client-c2 or 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])],[
@@ -1576,6 +1601,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 ---------------------------------------------------------------------------
@@ -1702,7 +1738,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],
@@ -1822,6 +1858,143 @@ 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
+
+# pcap lib for unit-testing
+AC_MSG_CHECKING(libpcap)
+AC_CHECK_PROG(HAVE_PCAP_CONFIG,pcap-config,[true],[false])
+if test x"$HAVE_PCAP_CONFIG" = x"true"; then
+   AC_MSG_RESULT(yes)
+   PCAP_CONFIG=pcap-config
+   PCAP_LIBS="`$PCAP_CONFIG --libs`"
+   PCAP_CFLAGS="`$PCAP_CONFIG --cflags`"
+   AM_CONDITIONAL([HAVE_PCAP], [true])
+else
+   AC_MSG_RESULT(no)
+   AM_CONDITIONAL([HAVE_PCAP], [false])
+fi
+AC_SUBST([PCAP_CFLAGS])
+AC_SUBST([PCAP_LIBS])
+
 #
 # SNMP checks for mod_snmp
 #
@@ -1852,6 +2025,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"],
@@ -1933,7 +2155,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/asr_tts/mod_flite/Makefile
 		src/mod/asr_tts/mod_pocketsphinx/Makefile
 		src/mod/asr_tts/mod_tts_commandline/Makefile
-		src/mod/asr_tts/mod_unimrcp/Makefile
 		src/mod/codecs/mod_amr/Makefile
 		src/mod/codecs/mod_amrwb/Makefile
 		src/mod/codecs/mod_b64/Makefile
@@ -1962,7 +2183,6 @@ AC_CONFIG_FILES([Makefile
 		src/mod/dialplans/mod_dialplan_xml/Makefile
 		src/mod/directories/mod_ldap/Makefile
 		src/mod/endpoints/mod_alsa/Makefile
-		src/mod/endpoints/mod_dingaling/Makefile
 		src/mod/endpoints/mod_gsmopen/Makefile
 		src/mod/endpoints/mod_h323/Makefile
 		src/mod/endpoints/mod_khomp/Makefile
@@ -2012,6 +2232,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
@@ -2078,7 +2299,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 )'
@@ -2119,16 +2340,7 @@ AC_CONFIG_SUBDIRS([libs/srtp])
 if test "$use_system_apr" != "yes"; then
    AC_CONFIG_SUBDIRS([libs/apr])
 fi
-if test "$use_system_aprutil" != "yes"; then
-   AC_CONFIG_SUBDIRS([libs/apr-util])
-fi
 AC_CONFIG_SUBDIRS([libs/iksemel])
-AC_CONFIG_SUBDIRS([libs/libdingaling])
-AC_CONFIG_SUBDIRS([libs/freetdm])
-AC_CONFIG_SUBDIRS([libs/unimrcp])
-if test "x${enable_zrtp}" = "xyes"; then
-   AC_CONFIG_SUBDIRS([libs/libzrtp])
-fi
 
 case $host in
    *-openbsd*|*-netbsd*)

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 bookworm sid"
 supported_ubuntu_distros="trusty utopic xenial"
 supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
@@ -71,6 +71,9 @@ avoid_mods_sid=(
 avoid_mods_jessie=(
   directories/mod_ldap
 )
+avoid_mods_bookworm=(
+  languages/mod_python
+)
 avoid_mods_wheezy=(
   event_handlers/mod_amqp
   languages/mod_java
@@ -299,7 +302,7 @@ 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
@@ -325,14 +328,14 @@ 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 | python-dev-is-python3, python3-dev, python-all-dev | python3-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, libsofia-sip-ua-dev (>= 1.13.4),
+ bison, zlib1g-dev, libsofia-sip-ua-dev (>= 1.13.17),
  libspandsp3-dev,
 # used to format the private freeswitch apt-repo key properly
  gnupg,
@@ -371,7 +374,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.17)
 Recommends:
 Suggests: libfreeswitch1-dbg
 Conflicts: freeswitch-all (<= 1.6.7)
@@ -653,11 +656,9 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-flite (= \${binary:Version}),
  freeswitch-mod-pocketsphinx (= \${binary:Version}),
  freeswitch-mod-tts-commandline (= \${binary:Version}),
- freeswitch-mod-unimrcp (= \${binary:Version}),
  freeswitch-mod-dialplan-asterisk (= \${binary:Version}),
  freeswitch-mod-dialplan-directory (= \${binary:Version}),
  freeswitch-mod-dialplan-xml (= \${binary:Version}),
- freeswitch-mod-dingaling (= \${binary:Version}),
  freeswitch-mod-loopback (= \${binary:Version}),
  freeswitch-mod-portaudio (= \${binary:Version}),
  freeswitch-mod-rtc (= \${binary:Version}),
@@ -683,7 +684,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}),
@@ -892,11 +893,9 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-flite-dbg (= \${binary:Version}),
  freeswitch-mod-pocketsphinx-dbg (= \${binary:Version}),
  freeswitch-mod-tts-commandline-dbg (= \${binary:Version}),
- freeswitch-mod-unimrcp-dbg (= \${binary:Version}),
  freeswitch-mod-dialplan-asterisk-dbg (= \${binary:Version}),
  freeswitch-mod-dialplan-directory-dbg (= \${binary:Version}),
  freeswitch-mod-dialplan-xml-dbg (= \${binary:Version}),
- freeswitch-mod-dingaling-dbg (= \${binary:Version}),
  freeswitch-mod-loopback-dbg (= \${binary:Version}),
  freeswitch-mod-portaudio-dbg (= \${binary:Version}),
  freeswitch-mod-rtc-dbg (= \${binary:Version}),
@@ -922,7 +921,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}),

debian/control-modules

@@ -12,6 +12,7 @@ Module: applications/mod_av
 Description: mod_av
  Adds mod_av.
 Build-Depends: libavformat-dev, libswscale-dev, libavresample-dev
+Build-Depends-Bookworm: libavformat-dev, libswscale-dev, libswresample-dev
 
 Module: applications/mod_avmd
 Description: Advanced voicemail detection
@@ -209,7 +210,7 @@ Description: Adds mod_skel
 Module: applications/mod_signalwire
 Description: mod_signalwire
  Adds mod_signalwire.
-Build-Depends: libks, signalwire-client-c
+Build-Depends: libks2, signalwire-client-c2
 
 Module: applications/mod_sms
 Description: Astract SMS
@@ -291,10 +292,6 @@ Module: asr_tts/mod_tts_commandline
 Description: mod_tts_commandline
  Adds mod_tts_commandline.
 
-Module: asr_tts/mod_unimrcp
-Description: mod_unimrcp
- Adds mod_unimrcp.
-
 ## mod/codecs
 
 Module: codecs/mod_amr
@@ -431,10 +428,6 @@ Description: mod_alsa
  Adds mod_alsa.
 Build-Depends: libasound2-dev
 
-Module: endpoints/mod_dingaling
-Description: mod_dingaling
- Adds mod_dingaling.
-
 Module: endpoints/mod_gsmopen
 Description: mod_gsmopen
  Adds mod_gsmopen.
@@ -492,6 +485,8 @@ 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
+Build-Depends-Bookworm: libperl-dev, libgdbm-compat-dev
 
 ## mod/event_handlers
 
@@ -654,6 +649,7 @@ Module: languages/mod_lua
 Description: mod_lua
  Adds mod_lua.
 Build-Depends: liblua5.2-dev | liblua5.1-dev
+Build-Depends-Bookworm: liblua5.3-dev | liblua5.2-dev | liblua5.1-dev
 
 Module: languages/mod_managed
 Description: mod_managed
@@ -665,11 +661,19 @@ 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
+Build-Depends-Bookworm: 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
+Build-Depends-Bookworm: python3-dev, python3-setuptools
 
 Module: languages/mod_v8
 Description: mod_v8

debian/copyright

@@ -1011,12 +1011,6 @@ License: MPL-1.1 or GPL-2+
       use the text of this Exhibit A rather than the text found in the
       Original Code Source Code for Your Modifications.]
 
-Files: libs/unimrcp/*
-Copyright: 2008-2010 Arsen Chaloyan
- 2009-2010 Tomas Valenta, Arsen Chaloyan
- 2001-2006 Steve Underwood
-License: Apache-2.0
-
 Files: */inet_pton.c
  libs/curl/lib/inet_ntop.c
  libs/curl/lib/mprintf.c
@@ -1595,15 +1589,6 @@ Files: libs/silk/*
 Copyright: 2006-2011, Skype Limited.
 License: BSD-2-clause
 
-Files: libs/libdingaling/*
-Copyright: 2005-2014, Anthony Minessale II <anthm@freeswitch.org>
- 2001-2003 Allan Saddi <allan@saddi.com>
-License: MPL-1.1
-
-Files: libs/libdingaling/src/sha1.[ch]
-Copyright: 2001-2003 Allan Saddi <allan@saddi.com>
-License: BSD-2-clause
-
 Files: libs/libcodec2/*
 Copyright: 1990-2010 David Rowe
  1990-2010 David Rowe 2009
@@ -1724,27 +1709,6 @@ License: LGPL-2.1
 Files: libs/broadvoice/autogen.sh
 License: GPL-2
 
-Files: libs/libzrtp/*
-Copyright: 2006-2012 Philip R. Zimmermann.
- 1993-2005 Colin Plumb
- 1998-2006, Dr Brian Gladman, Worcester, UK.
- 2002, Bryce "Zooko" Wilcox-O'Hearn
- 2010 Soft Industry
-License: AGPL-3 or MPL-1.1
-
-Files: libs/libzrtp/test/cmockery/cmockery.c
-Copyright: 2008 Google Inc
-License: Apache-2.0
-
-Files: libs/libzrtp/third_party/bnlib/legal.c
- libs/libzrtp/third_party/bnlib/*
-Copyright: 1993-2005 Colin Plumb
-License: GPL-2 or GPL-3 or MPL-1.1
-
-Files: libs/libzrtp/third_party/bnlib/test/md5.c
-Copyright: 1995 Abandoned Colin Plumb
-License: public-domain
-
 Files: libs/win32/sqlite/sqlite3.[ch]
  libs/win32/sqlite/parse.c
 Copyright: 2006 Abandoned D. Richard Hipp <drh@hwaci.com>

debian/freeswitch-mod-python.install.tmpl

@@ -1 +1 @@
-/usr/lib/python*/*-packages/freeswitch.py
+/usr/lib/python2*/*-packages/freeswitch.py

debian/freeswitch-mod-python3.install.tmpl

@@ -0,0 +1 @@
+/usr/lib/python3*/*-packages/freeswitch.py

debian/license-reconcile.yml

@@ -23,11 +23,6 @@ Rules:
   -
    Glob: libs/srtp/update.sh
    Copyright: Ingate Systems AB
-  -
-   Glob: libs/libzrtp/third_party/bnlib/test/md5.c
-   Matches: This\scode\sis\sin\sthe\spublic\sdomain;\sdo\swith\sit\swhat\syou\swish.
-   Copyright: 1995 Abandoned Colin Plumb
-   License: public-domain
   -
    Glob: src/g711.c
    Matches: Copyright\s\(C\)\s2006\sSteve\sUnderwood
@@ -56,28 +51,6 @@ Rules:
    Glob: src/include/switch_cpp.h
    Matches: Author[:]\sYossi\sNeiman\s<freeswitch@cartissolutions.com>,\s\(C\)\s2007////\sCopyright[:]
    Copyright: 2007 Yossi Neiman <freeswitch@cartissolutions.com>
-  -
-   Glob: libs/libzrtp/*
-   Matches: For\slicensing\sand\sother\slegal\sdetails,\ssee\sthe\sfile\szrtp_legal.c.
-   License: AGPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/third_party/bnlib/*
-   Matches: For\slicensing\sand\sother\slegal\sdetails,\ssee\sthe\sfile\slegal.c.
-   License: GPL-2 or GPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/src/zrtp_legal.c
-   Matches: As\sa\sspecial\sexception,\syou\smay\scombine\sthis\slibrary\swith\sthe\scode
-   Matches: License\sVersion\s1.1\s\(MPLv1.1\).
-   License: AGPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/third_party/bnlib/legal.c
-   Matches: As\sa\sspecial\sexception,\syou\smay\scombine\sthis\slibrary\swith\sthe\scode
-   Matches: License\sVersion\s1.1\s\(MPLv1.1\).
-   License: GPL-2 or GPL-3 or MPL-1.1
-  -
-   Glob: libs/libzrtp/projects/symbian/DelayRuner.h
-   Matches: Copyright\s+:\sCopyright\s\(c\)\s2010\sSoft\sIndustry
-   Copyright: 2010 Soft Industry
   -
    Glob: libs/win32/sqlite/*.[ch]
    Matches: The\sauthor\sdisclaims\scopyright\sto\sthis\ssource\scode.

debian/rules

@@ -73,8 +73,8 @@ 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
+		--enable-core-odbc-support
 	touch $@
 
 override_dh_auto_configure: .stamp-configure
@@ -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
 

debian/util.sh

@@ -46,9 +46,10 @@ find_distro () {
   case "$1" in
     experimental) echo "sid";;
     unstable) echo "sid";;
-    testing) echo "buster";;
+    experimental) echo "bookworm";;
-    stable) echo "stretch";;
+    testing) echo "bullseye";;
-    oldstable) echo "jessie";;
+    stable) echo "buster";;
+    oldstable) echo "stretch";;
     *) echo "$1";;
   esac
 }
@@ -56,9 +57,10 @@ find_distro () {
 find_suite () {
   case "$1" in
     sid) echo "unstable";;
-    buster) echo "testing";;
+    bookworm) echo "experimental";;
-    stretch) echo "stable";;
+    bullseye) echo "testing";;
-    jessie) echo "oldstable";;
+    buster) echo "stable";;
+    stretch) echo "oldstable";;
     *) echo "$1";;
   esac
 }

docker/README.md

@@ -2,7 +2,7 @@
 These are the official Docker files for master branch and the current release packages.
 
 ## Volumes
-These containers are setup so that you can mount your freeswitch configuration form a host or data volume container.
+These containers are set up so that you can mount your freeswitch configuration from a host or data volume container.
 
 To mount freeswitch Configuration
 ```
@@ -16,17 +16,19 @@ To mount tmp directory for storing recordings, etc
 
 The container also has a healthcheck where it does a fs_cli status check to make sure the freeswitch service is still running.
 
-# Ports
+## Ports
 
-The container exposes the following ports:
+The container should be run with host networking using `docker run --network host ...`.
 
-- 5060/tcp 5060/udp 5080/tcp 5080/udp as SIP Signaling ports.
+If you prefer to (or for some reason must) publish individual ports via `--publish/-p`, refer to this [issue](https://github.com/moby/moby/issues/11185) and this [potential workaround](https://hub.docker.com/r/bettervoice/freeswitch-container/) regarding using docker with large port ranges.
-- 5066/tcp 7443/tcp as WebSocket Signaling ports.
-- 8021/tcp as Event Socket port.
-- 64535-65535/udp as media ports.
-- 16384-32768/udp
 
+The following ports will be used, depending upon your specific configuration:
 
+- 5060/tcp, 5060/udp, 5080/tcp, 5080/udp - SIP signaling
+- 5061/tcp, 5081/tcp - SIPS signaling
+- 5066/tcp, 7443/tcp - WebSocket signaling
+- 8021/tcp - the Event Socket
+- 16384-32768/udp,  64535-65535/udp - media
 
 
 If you wish to help improve these please submit a pull request at:

docker/examples/Debian11/Dockerfile

@@ -0,0 +1,54 @@
+FROM debian:bullseye
+MAINTAINER Andrey Volk <andrey@signalwire.com>
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install git
+
+RUN git clone https://github.com/signalwire/freeswitch /usr/src/freeswitch
+RUN git clone https://github.com/signalwire/libks /usr/src/libs/libks
+RUN git clone https://github.com/freeswitch/sofia-sip /usr/src/libs/sofia-sip
+RUN git clone https://github.com/freeswitch/spandsp /usr/src/libs/spandsp
+RUN git clone https://github.com/signalwire/signalwire-c /usr/src/libs/signalwire-c
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -yq install \
+# build
+    build-essential cmake automake autoconf 'libtool-bin|libtool' pkg-config \
+# general
+    libssl-dev zlib1g-dev libdb-dev unixodbc-dev libncurses5-dev libexpat1-dev libgdbm-dev bison erlang-dev libtpl-dev libtiff5-dev uuid-dev \
+# core
+    libpcre3-dev libedit-dev libsqlite3-dev libcurl4-openssl-dev nasm \
+# core codecs
+    libogg-dev libspeex-dev libspeexdsp-dev \
+# mod_enum
+    libldns-dev \
+# mod_python3
+    python3-dev \
+# mod_av
+    libavformat-dev libswscale-dev libavresample-dev \
+# mod_lua
+    liblua5.2-dev \
+# mod_opus
+    libopus-dev \
+# mod_pgsql
+    libpq-dev \
+# mod_sndfile
+    libsndfile1-dev libflac-dev libogg-dev libvorbis-dev \
+# mod_shout
+    libshout3-dev libmpg123-dev libmp3lame-dev
+
+RUN cd /usr/src/libs/libks && cmake . -DCMAKE_INSTALL_PREFIX=/usr -DWITH_LIBBACKTRACE=1 && make install
+RUN cd /usr/src/libs/sofia-sip && ./bootstrap.sh && ./configure CFLAGS="-g -ggdb" --with-pic --with-glib=no --without-doxygen --disable-stun --prefix=/usr && make -j`nproc --all` && make install
+RUN cd /usr/src/libs/spandsp && ./bootstrap.sh && ./configure CFLAGS="-g -ggdb" --with-pic --prefix=/usr && make -j`nproc --all` && make install
+RUN cd /usr/src/libs/signalwire-c && PKG_CONFIG_PATH=/usr/lib/pkgconfig cmake . -DCMAKE_INSTALL_PREFIX=/usr && make install
+
+# Enable modules
+RUN sed -i 's|#formats/mod_shout|formats/mod_shout|' /usr/src/freeswitch/build/modules.conf.in
+
+RUN cd /usr/src/freeswitch && ./bootstrap.sh -j
+RUN cd /usr/src/freeswitch && ./configure
+RUN cd /usr/src/freeswitch && make -j`nproc` && make install
+
+# Cleanup the image
+RUN apt-get clean
+
+# Uncomment to cleanup even more
+#RUN rm -rf /usr/src/*

docker/examples/README.md

@@ -0,0 +1,4 @@
+##### Dockerfile examples showing how to build FreeSWITCH without installing FreeSWITCH repo.
+
+[Debian 11](https://github.com/signalwire/freeswitch/blob/dockerfile/docker/examples/Debian11/Dockerfile "Debian 11")
+

docker/master/Dockerfile

@@ -1,61 +1,63 @@
 # vim:set ft=dockerfile:
-FROM debian:jessie
+ARG DEBIAN_VERSION=bookworm
+FROM debian:${DEBIAN_VERSION}
+
+# ARGs are cleared after every FROM
+# see: https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
+ARG DEBIAN_VERSION
+ARG TOKEN
+
+# By default, install the full set of FreeSWITCH packages.  Specify an alternative with:
+#   --build-arg="FS_META_PACKAGE=freeswitch-meta-vanilla"
+# alternatives include:
+#   freeswitch-meta-bare
+#   freeswitch-meta-vanilla
+#   freeswitch-meta-sorbet
+#   freeswitch-meta-all-dbg
+ARG FS_META_PACKAGE=freeswitch-meta-all
 
 # Source Dockerfile:
 # https://github.com/docker-library/postgres/blob/master/9.4/Dockerfile
 
 # explicitly set user/group IDs
-RUN groupadd -r freeswitch --gid=999 && useradd -r -g freeswitch --uid=999 freeswitch
+ARG FREESWITCH_UID=499
-
+ARG FREESWITCH_GID=499
-# grab gosu for easy step-down from root
+RUN groupadd -r freeswitch --gid=${FREESWITCH_GID} && useradd -r -g freeswitch --uid=${FREESWITCH_UID} freeswitch
-RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates wget && rm -rf /var/lib/apt/lists/* \
-    && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture)" \
-    && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/1.2/gosu-$(dpkg --print-architecture).asc" \
-    && gpg --verify /usr/local/bin/gosu.asc \
-    && rm /usr/local/bin/gosu.asc \
-    && chmod +x /usr/local/bin/gosu \
-    && apt-get purge -y --auto-remove ca-certificates wget
 
 # make the "en_US.UTF-8" locale so freeswitch will be utf-8 enabled by default
-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update -qq \
+    && apt-get install -y --no-install-recommends ca-certificates gnupg2 gosu locales wget \
     && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 ENV LANG en_US.utf8
 
-# https://files.freeswitch.org/repo/deb/freeswitch-1.*/dists/jessie/main/binary-amd64/Packages
+# https://freeswitch.org/confluence/display/FREESWITCH/Debian
+# https://developer.signalwire.com/freeswitch/FreeSWITCH-Explained/Installation/Linux/Debian_67240088/
 
-ENV FS_MAJOR debian-unstable
+RUN wget --no-verbose --http-user=signalwire --http-password=${TOKEN} \
-
+      -O /usr/share/keyrings/signalwire-freeswitch-repo.gpg \
-RUN sed -i "s/jessie main/jessie main contrib non-free/" /etc/apt/sources.list
+      https://freeswitch.signalwire.com/repo/deb/debian-release/signalwire-freeswitch-repo.gpg \
-
+    && echo "machine freeswitch.signalwire.com login signalwire password ${TOKEN}" > /etc/apt/auth.conf \
-# https://freeswitch.org/confluence/display/FREESWITCH/Debian+8+Jessie#Debian8Jessie-InstallingfromDebianpackages
+    && echo "deb [signed-by=/usr/share/keyrings/signalwire-freeswitch-repo.gpg] https://freeswitch.signalwire.com/repo/deb/debian-release/ ${DEBIAN_VERSION} main" > /etc/apt/sources.list.d/freeswitch.list \
-
+    && apt-get -qq update \
-RUN apt-get update && apt-get install -y curl \
+    && apt-get install -y ${FS_META_PACKAGE} \
-    && curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - \
+    && apt-get purge -y --auto-remove \
-    && echo "deb http://files.freeswitch.org/repo/deb/$FS_MAJOR/ jessie main" > /etc/apt/sources.list.d/freeswitch.list \
-    && apt-get purge -y --auto-remove curl
-
-RUN apt-get update && apt-get install -y freeswitch-all \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Clean up
-RUN apt-get autoremove
-
 COPY docker-entrypoint.sh /
 # Add anything else here
 
 ## Ports
-# Open the container up to the world.
+# Document ports used by this container
-### 8021 fs_cli, 5060 5061 5080 5081 sip and sips, 64535-65535 rtp
+### 8021 fs_cli, 5060 5061 5080 5081 sip and sips, 5066 ws, 7443 wss, 8081 8082 verto, 16384-32768, 64535-65535 rtp
 EXPOSE 8021/tcp
 EXPOSE 5060/tcp 5060/udp 5080/tcp 5080/udp
 EXPOSE 5061/tcp 5061/udp 5081/tcp 5081/udp
+EXPOSE 5066/tcp
 EXPOSE 7443/tcp
-EXPOSE 5070/udp 5070/tcp
+EXPOSE 8081/tcp 8082/tcp
 EXPOSE 64535-65535/udp
 EXPOSE 16384-32768/udp
 
-
 # Volumes
 ## Freeswitch Configuration
 VOLUME ["/etc/freeswitch"]
@@ -66,11 +68,9 @@ VOLUME ["/tmp"]
 COPY    build/freeswitch.limits.conf /etc/security/limits.d/
 
 # Healthcheck to make sure the service is running
-SHELL       ["/bin/bash"]
+SHELL       ["/bin/bash", "-c"]
 HEALTHCHECK --interval=15s --timeout=5s \
     CMD  fs_cli -x status | grep -q ^UP || exit 1
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-
-
 CMD ["freeswitch"]

docs/Doxygen.conf

@@ -1242,7 +1242,7 @@ SEARCH_INCLUDES        = YES
 
 INCLUDE_PATH           =../libs/apr ../libs/apr-util ../libs/iksemel ../libs/libnatpmp \
 			../libs/miniupnpc ../libs/sofia-sip ../libs/spandsp \
-			../libs/srtp ../libs/unimrcp ../libs/win32 ../libs/xmlrpc-c
+			../libs/srtp ../libs/win32 ../libs/xmlrpc-c
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the

docs/phrase/phrase_de.xml

@@ -814,24 +814,6 @@
       <prompt phrase="Das ist eine ungültige Durchwahl." filename="invalid_extension.wav"/>
       <prompt phrase="Englisch." filename="en.wav"/>
     </misc>
-    <zrtp>
-      <!-- Event prompts -->
-      <prompt phrase="Willkommen bei der Anmeldung zum Z R T P Sicherheits-System." filename="zrtp-enroll_welcome.wav"/>
-      <prompt phrase="Sie müssen den Authentisierungs-String mit Ihrem Gesprächspartner vergleichen. Wenn er nicht übereinstimmt, ist dies ein Hinweis darauf, dass das Gespräch abgehört wird." filename="zrtp-check_sas.wav"/>
-      <prompt phrase="Nur authentisierte Telefone können so konfiguriert werden, dass sie diesem System vertrauen bezüglich der Vermittlung von Verbindungen die mit Z R T P gesichert sind.  Ihr Telefon ist nicht authentisiert, daher wird dieser Anruf nicht vermittelt." filename="zrtp-enroll_not_sip_registered.wav"/>
-      <prompt phrase="Ihr Telefon signalisiert, dass es diesem System bereits vertraut bezüglich der Vermittlung von Verbindungen die mit Z R T P gesichert sind.  Sie müssen deshalb nichts weiter tun." filename="zrtp-enroll_already_enrolled.wav"/>
-      <prompt phrase="Nur Telefone, die das Z R T P Protokoll unterstützen, können diese Nebenstelle Nutzen. Ihr Telefon unterstützt Z R T P nicht, daher wird dieser Anruf nicht vermittelt." filename="zrtp-enroll_notzrtp.wav"/>
-      <prompt phrase="Dieses System ist für die Verarbeitung von mit Z R T P verschlüsselten Telefonanrufen ausgestattet. Sie müssen entscheiden, ob Sie zulassen möchten, dass dieses System Ihre sicheren Telefonanrufe abfangen und möglicherweise überwachen kann. Sie können auflegen, nachdem Sie dies getan haben." filename="zrtp-enroll_confirmed.wav"/>
-      <prompt phrase="Vergleichen Sie diesen Authentifizierungscode mit Ihrem Gesprächspartner, indem Sie sich diesen Code vorlesen." filename="zrtp-is_secure.wav"/>
-      <prompt phrase="Der Authentifizierungscode ist derzeit nicht überprüft." filename="zrtp-is_unverified.wav"/>
-      <prompt phrase="Der Authentifizierungscode ist jetzt überprüft." filename="zrtp-is_verified.wav"/>
-      <prompt phrase="Vielen Dank für Ihren Anruf. Auf Wiedersehen." filename="zrtp-thankyou_goodbye.wav"/>
-      <prompt phrase="Etwas stimmt nicht." filename="zrtp-somethings_wrong.wav"/>
-      <prompt phrase="Fehler." filename="zrtp-status_error.wav"/>
-      <prompt phrase="Verbindung ist nicht sicher." filename="zrtp-status_notsecure.wav"/>
-      <prompt phrase="Verbindung ist sicher." filename="zrtp-status_secure.wav"/>
-      <prompt phrase="Sichere die Verbindung." filename="zrtp-status_securing.wav"/>
-    </zrtp>
   </de>
 </language>
 <!--

docs/phrase/phrase_en.xml

@@ -1253,24 +1253,6 @@
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
     </base256>
-    <zrtp>
-      <!-- Event prompts -->
-      <prompt phrase="Welcome to the ZRTP security enrollment agent." filename="zrtp-enroll_welcome.wav"/>
-      <prompt phrase="You must check the authentication string with your partner. If it doesn't match, it indicates the presence of a wire tapper." filename="zrtp-check_sas.wav"/>
-      <prompt phrase="Only phones that are authenticated can be configured to trust this system to relay ZRTP secured calls. Your phone is not authenticated with this system, so this call will have no effect." filename="zrtp-enroll_not_sip_registered.wav"/>
-      <prompt phrase="Your phone indicates that it already trusts this system to relay ZRTP secured calls, so you do not need to do anything more." filename="zrtp-enroll_already_enrolled.wav"/>
-      <prompt phrase="Only phones equipped with the ZRTP protocol can use this extension. Your phone is not a ZRTP-enable phone, so this call will have no effect." filename="zrtp-enroll_notzrtp.wav"/>
-      <prompt phrase="This system is equipped to handle ZRTP encrypted phone calls. You must decide if you want to allow this system to be in a position to intercept and possibly monitor your secure phone calls. You may hang up after you've done this." filename="zrtp-enroll_confirmed.wav"/>
-      <prompt phrase="Verbally compare this authentication code with your partner." filename="zrtp-is_secure.wav"/>
-      <prompt phrase="Authentication code is now unverified." filename="zrtp-is_unverified.wav"/>
-      <prompt phrase="Authentication code is now verified." filename="zrtp-is_verified.wav"/>
-      <prompt phrase="Thank you for calling. Goodbye." filename="zrtp-thankyou_goodbye.wav"/>
-      <prompt phrase="Something's wrong" filename="zrtp-somethings_wrong.wav"/>
-      <prompt phrase="Error." filename="zrtp-status_error.wav"/>
-      <prompt phrase="Call is not secure." filename="zrtp-status_notsecure.wav"/>
-      <prompt phrase="Call is secure." filename="zrtp-status_secure.wav"/>
-      <prompt phrase="Securing call." filename="zrtp-status_securing.wav"/>
-    </zrtp>
   </en>
 </language>
 <!--

docs/phrase/phrase_es_ES.xml

@@ -992,23 +992,5 @@
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
     </base256>
-    <zrtp>
-      <!-- Event prompts -->
-      <prompt phrase="Bienvenidos al servicio de inscripción ZRTP." filename="zrtp-enroll_welcome.wav"/>
-      <prompt phrase="Usted debe verificar la cadena de caracteres con su destino. Si no coincide, indica la presencia de una escucha telefónica." filename="zrtp-check_sas.wav"/>
-      <prompt phrase="Solo teléfonos autenticados pueden confiar en llamadas securizadas con ZRTP. Su teléfono no está autenticado con este sistema, por lo que esta llamada no estará securizada." filename="zrtp-enroll_not_sip_registered.wav"/>
-      <prompt phrase="Su teléfono indica que confía en este sistema para realizar llamadas seguras con ZRTP, no necesita hacer nada más." filename="zrtp-enroll_already_enrolled.wav"/>
-      <prompt phrase="Solo teléfonos soportando el protocolo ZRTP pueden usar esta extensión. Su teléfono no tiene ZRTP habilitado, por lo que esta llamada no estará securizada." filename="zrtp-enroll_notzrtp.wav"/>
-      <prompt phrase="Este sistema está configurado para manejar llamadas cifradas con ZRTP. Decida si permite al sistema tener la posibilidad de interceptar o monitorizar su llamada. Puede colgar una vez confirmado." filename="zrtp-enroll_confirmed.wav"/>
-      <prompt phrase="Compara verbalmente este código de autenticación con su destino." filename="zrtp-is_secure.wav"/>
-      <prompt phrase="El código de autenticación no está verificado." filename="zrtp-is_unverified.wav"/>
-      <prompt phrase="El código de autenticación está verificado." filename="zrtp-is_verified.wav"/>
-      <prompt phrase="Gracias por llamar. Adiós." filename="zrtp-thankyou_goodbye.wav"/>
-      <prompt phrase="Algún error ha ocurrido." filename="zrtp-somethings_wrong.wav"/>
-      <prompt phrase="Error." filename="zrtp-status_error.wav"/>
-      <prompt phrase="Esta llamada no está protegida." filename="zrtp-status_notsecure.wav"/>
-      <prompt phrase="Esta llamada está protegida." filename="zrtp-status_secure.wav"/>
-      <prompt phrase="Securizando su llamada." filename="zrtp-status_securing.wav"/>
-    </zrtp>
   </es_ES>
 </language>

docs/phrase/phrase_es_MX.xml

@@ -991,23 +991,5 @@
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
     </base256>
-    <zrtp>
-      <!-- Event prompts -->
-      <prompt phrase="Bienvenidos al servicio de inscripción ZRTP." filename="zrtp-enroll_welcome.wav"/>
-      <prompt phrase="Usted debe verificar la cadena de caracteres con su destino. Si no coincide, indica la presencia de una escucha telefónica." filename="zrtp-check_sas.wav"/>
-      <prompt phrase="Solo teléfonos autenticados pueden confiar en llamadas seguras con ZRTP. Su teléfono no está autenticado con este sistema, su llamada no estará securizada." filename="zrtp-enroll_not_sip_registered.wav"/>
-      <prompt phrase="Su teléfono indica que confía en este sistema para realizar llamadas seguras con ZRTP, no necesita hacer nada más." filename="zrtp-enroll_already_enrolled.wav"/>
-      <prompt phrase="Solo teléfonos soportando el protocolo ZRTP pueden usar esta extensión. Su teléfono no tiene ZRTP habilitado, y está llamada no será securizada." filename="zrtp-enroll_notzrtp.wav"/>
-      <prompt phrase="Este sistema está configurado para manejar llamadas cifradas con ZRTP. Decida si permite al sistema tener la posibilidad de interceptar o monitorizar su llamada. Puede colgar una vez confirmado." filename="zrtp-enroll_confirmed.wav"/>
-      <prompt phrase="Compara verbalmente este código de autenticación con su destino." filename="zrtp-is_secure.wav"/>
-      <prompt phrase="El código de autenticación no está verificado." filename="zrtp-is_unverified.wav"/>
-      <prompt phrase="El código de autenticación está verificado." filename="zrtp-is_verified.wav"/>
-      <prompt phrase="Gracias por llamar. Adiós." filename="zrtp-thankyou_goodbye.wav"/>
-      <prompt phrase="Algún error ha ocurrido." filename="zrtp-somethings_wrong.wav"/>
-      <prompt phrase="Error." filename="zrtp-status_error.wav"/>
-      <prompt phrase="Esta llamada no está protegida." filename="zrtp-status_notsecure.wav"/>
-      <prompt phrase="Esta llamada está protegida." filename="zrtp-status_secure.wav"/>
-      <prompt phrase="Securizando su llamada." filename="zrtp-status_securing.wav"/>
-    </zrtp>
   </es_MX>
 </language>

docs/phrase/phrase_pt_BR.xml

@@ -985,23 +985,5 @@
       <prompt phrase="woodlark" filename="woodlark.wav"/> 
       <prompt phrase="yesteryear" filename="yesteryear.wav"/> 
     </base256>
-    <zrtp>
-      <!--  Event prompts --> 
-      <prompt phrase="Bem-vindo ao agente de registro de segurança ZRTP." filename="zrtp-enroll_welcome.wav"/> 
-      <prompt phrase="Você deve verificar a autentificação com o seu destinatário. Se não coincidir, isso indica presença de um dispositivo de escuta telefonica." filename="zrtp-check_sas.wav"/> 
-      <prompt phrase="Somente aqueles telefones que estão autentificados podem ser configurados de maneira segura neste sistema para retransmitir as ligações em ZRTP. O seu telefone não está autentificado com este sistema, esta ligação não será realizada." filename="zrtp-enroll_not_sip_registered.wav"/> 
-      <prompt phrase="O seu telefone indica que é seguro este sistema para realizar ligações seguras em ZRTP, você não precisa fazer nada mais." filename="zrtp-enroll_already_enrolled.wav"/> 
-      <prompt phrase="Somente os telefones equipados com protocolo ZRTP podem usar este ramal. O seu telefone não esta configurado para ZRTP, esta ligação não sera completada." filename="zrtp-enroll_notzrtp.wav"/> 
-      <prompt phrase="Este sistema está configurado para realizar ligações telefónicas encriptadas em ZRTP. Você deve decidir se permitira que este sistema possa interceptar e monitorizar as suas ligações telefónicas seguras. Pode finalizar a ligação depois disso." filename="zrtp-enroll_confirmed.wav"/> 
-      <prompt phrase="Compare verbalmente este código de autentificação com o seu destinatário." filename="zrtp-is_secure.wav"/> 
-      <prompt phrase="O código de autentificação não foi verificado." filename="zrtp-is_unverified.wav"/> 
-      <prompt phrase="O código de autentificação foi verificado." filename="zrtp-is_verified.wav"/> 
-      <prompt phrase="Obrigado pela sua ligação. Até logo." filename="zrtp-thankyou_goodbye.wav"/> 
-      <prompt phrase="Algo falha." filename="zrtp-somethings_wrong.wav"/> 
-      <prompt phrase="Erro." filename="zrtp-status_error.wav"/> 
-      <prompt phrase="A ligação não e segura." filename="zrtp-status_notsecure.wav"/> 
-      <prompt phrase="A ligação é segura." filename="zrtp-status_secure.wav"/> 
-      <prompt phrase="Securizando a ligação." filename="zrtp-status_securing.wav"/> 
-    </zrtp>
   </pt_BR>
 </language>

docs/phrase/phrase_pt_PT.xml

@@ -984,23 +984,5 @@
       <prompt phrase="woodlark" filename="woodlark.wav"/>
       <prompt phrase="yesteryear" filename="yesteryear.wav"/>
     </base256>
-    <zrtp>
-      <!-- Event prompts -->
-      <prompt phrase="Bem-vindo ao agente de registo ZRTP." filename="zrtp-enroll_welcome.wav"/>
-      <prompt phrase="Deve verificar a chave de autenticação com destinatário. Se não for igual, indica a presença de uma escuta." filename="zrtp-check_sas.wav"/>
-      <prompt phrase="Apenas telefones que estão autenticados podem ser configurados para usarem este sistema de retransmissão ZRTP para chamadas com modo de segurança activo. Se o seu telefone não está autenticado com o sistema, esta chamada não terá qualquer efeito." filename="zrtp-enroll_not_sip_registered.wav"/>
-      <prompt phrase="O seu telefone indica que já confia neste sistema de retransmissão ZRTP para chamadas com o modo de segurança activo, portanto você já não precisa de fazer mais nada." filename="zrtp-enroll_already_enrolled.wav"/>
-      <prompt phrase="Apenas telefones equipados com o protocolo ZRTP podem usar esta extensão. O seu telefone não suporta ZRTP, portanto esta chamada não terá qualquer efeito." filename="zrtp-enroll_notzrtp.wav"/>
-      <prompt phrase="Este sistema está preparado para suportar chamadas telefónicas encriptadas em ZRTP. Você deve determinar se deseja permitir que o sistema possa interceptar ou gravar as suas chamadas telefónicas com o modo de segurança activado. Você pode desligar após confirmar este comportamento." filename="zrtp-enroll_confirmed.wav"/>
-      <prompt phrase="Comparando verbalmente o código desta autenticação com o destinatário." filename="zrtp-is_secure.wav"/>
-      <prompt phrase="O código de autenticação não foi verificado." filename="zrtp-is_unverified.wav"/>
-      <prompt phrase="O código de autenticação foi verificado." filename="zrtp-is_verified.wav"/>
-      <prompt phrase="Obrigado por telefonar. Até breve." filename="zrtp-thankyou_goodbye.wav"/>
-      <prompt phrase="Algo está errado" filename="zrtp-somethings_wrong.wav"/>
-      <prompt phrase="Erro." filename="zrtp-status_error.wav"/>
-      <prompt phrase="O modo de segurança não está activo na chamada." filename="zrtp-status_notsecure.wav"/> 
-      <prompt phrase="O modo de segurança está activo na chamada." filename="zrtp-status_secure.wav"/>
-      <prompt phrase="Activando o modo de segurança na chamada." filename="zrtp-status_securing.wav"/>
-    </zrtp>
   </pt_PT>
 </language>

docs/phrase/phrase_ru.xml

@@ -1157,39 +1157,6 @@
       		<prompt phrase="woodlark" filename="woodlark.wav"/>
       		<prompt phrase="yesteryear" filename="yesteryear.wav"/>
     	</base256>
-    	<zrtp>
-      		<!-- Event prompts -->
-      		<prompt phrase="Добро пожаловать в агента регистрации шифрования ZRTP" filename="zrtp-enroll_welcome.wav"/>
-      		<!-- Welcome to the ZRTP security enrollment agent.   -->
-      		<prompt phrase="Вы должны выбрать строку аутентификации с партнером по разговору, Если она не совпадет, система сообщит Вам разрывом линии." filename="zrtp-check_sas.wav"/>
-      		<!-- You must check the authentication string with your partner. If it doesn't match, it indicates the presence of a wire tapper.   -->
-      		<prompt phrase="Только телефоны, прошедшие аутентификацию, могут быть сконфигурированы для доверия системе для обеспечения ZRTP шифрованных звонков, так что такой звонок не даст эффекта." filename="zrtp-enroll_not_sip_registered.wav"/>
-      		<!-- Only phones that are authenticated can be configured to trust this system to relay ZRTP secured calls.  Your phone is not authenticated with this system, so this call will have no effect.  -->
-      		<prompt phrase="Ваш телефон сообщит, что он уже доверяет системе для перенаправления ZRTP шифрованных звонков, так что больше делать ничего не нужно будет" filename="zrtp-enroll_already_enrolled.wav"/>
-      		<!-- Your phone indicates that it already trusts this system to relay ZRTP secured calls, so you do not need to do anything more. -->
-      		<prompt phrase="Только телефоны, с поддержкой протокола ZRTP могут использовать такую функцию. Ваш телефон не поддерживает ZRTP протокол и звонок не даст эффекта ZRTP защиты." filename="zrtp-enroll_notzrtp.wav"/>
-      		<!-- Only phones equipped with the ZRTP protocol can use this extension. Your phone is not a ZRTP-enable phone, so this call will have no effect.-->
-      		<prompt phrase="Система оборудована для проведения шифрованных ZRTP звонков. Вы должны решить, если вы хотите чтобы система была задействована для приема и возможно мониторинга Ваших защищенных звонков. Вы можете повесить трубку после окончания разговора." filename="zrtp-enroll_confirmed.wav"/>
-      		<!-- This system is equipped to handle ZRTP encrypted phone calls. You must decide if you want to allow this system to be in a position to intercept and possibly monitor your secure phone calls. You may hang up after you've done this. -->
-      		<prompt phrase="Договоритесь с партнером по разговору о парольной фразе." filename="zrtp-is_secure.wav"/>
-      		<!-- Verbally compare this authentication code with your partner.   -->
-      		<prompt phrase="Парольная фраза на данный момент не проверена" filename="zrtp-is_unverified.wav"/>
-      		<!-- Authentication code is now unverified.   -->
-      		<prompt phrase="Парольная фраза проверена." filename="zrtp-is_verified.wav"/>
-      		<!-- Authentication code is now verified.   -->
-      		<prompt phrase="Спасибо за звонок. До свидания." filename="zrtp-thankyou_goodbye.wav"/>
-      		<!-- Thank you for calling. Goodbye.   -->
-      		<prompt phrase="Что-то происходит не так." filename="zrtp-somethings_wrong.wav"/>
-      		<!-- Something's wrong   -->
-      		<prompt phrase="Ошибка." filename="zrtp-status_error.wav"/>
-      		<!-- Error.   -->
-      		<prompt phrase="Ваш разговор не шифруется" filename="zrtp-status_notsecure.wav"/>
-      		<!-- Call is not secure.   -->
-      		<prompt phrase="Ваш разговор шифруется." filename="zrtp-status_secure.wav"/>
-      		<!-- Call is secure.   -->
-      		<prompt phrase="Шифрованный вызов." filename="zrtp-status_securing.wav"/>
-      		<!-- Securing call.   -->
-    	</zrtp>
     	<users>
     		<prompt phrase="Для отправки факса" filename="to_send_a_fax.wav"/>
     		<prompt phrase="Абонент с номером ... не отвечает, пожалуйста..." filename="no_answer_please.wav"/>

freeswitch.spec

@@ -140,7 +140,7 @@ BuildRequires: curl-devel >= 7.19
 BuildRequires: gcc-c++
 BuildRequires: libtool >= 1.5.17
 BuildRequires: openssl-devel >= 1.0.1e
-BuildRequires: sofia-sip-devel >= 1.13.4
+BuildRequires: sofia-sip-devel >= 1.13.17
 BuildRequires: spandsp3-devel >= 3.0
 BuildRequires: pcre-devel 
 BuildRequires: speex-devel 
@@ -497,7 +497,7 @@ the entries aloud via a TTS engine
 Summary:	FreeSWITCH mod_signalwire
 Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
-BuildRequires:  libks signalwire-client-c
+BuildRequires:  libks2 signalwire-client-c2
 
 %description application-signalwire
 Provides FreeSWITCH mod_signalwire
@@ -636,15 +636,6 @@ Requires:       %{name} = %{version}-%{release}
 Provides FreeSWITCH mod_tts_commandline, Run a command line and play the 
 output file.
 
-%package asrtts-unimrcp
-Summary:	FreeSWITCH mod_unimrcp
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description asrtts-unimrcp
-Provides FreeSWITCH mod_unimrcp, allows communication with Media Resource 
-Control Protocol (MRCP) servers
-
 ######################################################################################################################
 #				FreeSWITCH Codec Modules
 ######################################################################################################################
@@ -841,15 +832,6 @@ PostgreSQL native support for FreeSWITCH.
 #				FreeSWITCH Endpoint Modules
 ######################################################################################################################
 
-%package endpoint-dingaling
-Summary:        Generic XMPP support for FreeSWITCH open source telephony platform
-Group:          System/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description endpoint-dingaling
-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 endpoint support for FreeSWITCH open source telephony platform
 #Group:          System/Libraries
@@ -1444,7 +1426,7 @@ APPLICATIONS_MODULES="$APPLICATION_MODULES_AC $APPLICATION_MODULES_DE $APPLICATI
 #				Automatic Speech Recognition and Text To Speech Modules
 #
 ######################################################################################################################
-ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_commandline asr_tts/mod_unimrcp"
+ASR_TTS_MODULES="asr_tts/mod_flite asr_tts/mod_pocketsphinx asr_tts/mod_tts_commandline"
 
 ######################################################################################################################
 #
@@ -1485,7 +1467,7 @@ DIRECTORIES_MODULES=""
 #						Endpoints
 #
 ######################################################################################################################
-ENDPOINTS_MODULES="endpoints/mod_dingaling \
+ENDPOINTS_MODULES=" \
 			endpoints/mod_loopback endpoints/mod_portaudio endpoints/mod_rtmp \
 			endpoints/mod_skinny endpoints/mod_verto endpoints/mod_rtc endpoints/mod_sofia"
 
@@ -1634,7 +1616,6 @@ autoreconf --force --install
 --with-odbc \
 --with-erlang \
 --with-openssl \
---enable-zrtp \
 %{?configure_options}
 
 unset MODULES
@@ -1727,6 +1708,8 @@ cd ../..
 %{__rm} -f %{buildroot}/%{MODINSTDIR}/ftmod_sangoma_isdn*
 %endif
 
+%{__rm} -f %{buildroot}/%{LIBDIR}/*.la
+%{__rm} -f %{buildroot}/%{MODINSTDIR}/*.la
 
 
 ######################################################################################################################
@@ -1810,9 +1793,7 @@ fi
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/dialplan/skinny-patterns
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/directory
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/directory/default
-%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/jingle_profiles
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/lang
-%dir %attr(0750, freeswitch, daemon) %{sysconfdir}/mrcp_profiles
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/sip_profiles
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/sip_profiles/external
 %dir %attr(0750, freeswitch, daemon) %{sysconfdir}/sip_profiles/external-ipv6
@@ -1881,10 +1862,8 @@ fi
 #
 ######################################################################################################################
 %files devel
-%{LIBDIR}/*.a
+%{LIBDIR}/*.so*
-%{LIBDIR}/*.la
 %{PKGCONFIGDIR}/*
-%{MODINSTDIR}/*.*a
 %{INCLUDEDIR}/*.h
 %{INCLUDEDIR}/test/*.h
 
@@ -1920,7 +1899,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/curl.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/db.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/dialplan_directory.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/dingaling.conf.xml 
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/directory.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/distributor.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/easyroute.conf.xml
@@ -1960,6 +1938,7 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/rtmp.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sangoma_codec.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/shout.conf.xml
+%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/signalwire.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/skinny.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/smpp.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/sms_flowroute.conf.xml
@@ -1972,7 +1951,6 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/translate.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/tts_commandline.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/unicall.conf.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/unimrcp.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/verto.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/voicemail.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/voicemail_ivr.conf.xml
@@ -2015,11 +1993,9 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/sip_profiles/external/*.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/sip_profiles/external-ipv6/*.xml
 ######################################################################################################################
-#				Other Protocol Profiles (skinny, jingle, mrcp)
+#				Other Protocol Profiles (skinny)
 ######################################################################################################################
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/skinny_profiles/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/jingle_profiles/*.xml
-%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/mrcp_profiles/*.xml
 ######################################################################################################################
 #						Grammar Files
 ######################################################################################################################
@@ -2173,9 +2149,6 @@ fi
 %files asrtts-tts-commandline
 %{MODINSTDIR}/mod_tts_commandline.so*
 
-%files asrtts-unimrcp
-%{MODINSTDIR}/mod_unimrcp.so*
-
 ######################################################################################################################
 #
 #						CODEC Packages
@@ -2258,9 +2231,6 @@ fi
 #
 ######################################################################################################################
 
-%files endpoint-dingaling
-%{MODINSTDIR}/mod_dingaling.so*
-
 #%files endpoint-gsmopen
 #%{MODINSTDIR}/mod_gsmopen.so*
 

libs/.gitignore

@@ -34,40 +34,13 @@ opal
 /apr/build/pkg/pkginfo
 /apr/exports.c
 /apr/export_vars.c
-/apr/include/apr.h
+/apr/include/fspr.h
-/apr/include/arch/unix/apr_private.h
+/apr/include/arch/unix/fspr_private.h
-/apr/include/arch/unix/apr_private.h.in
+/apr/include/arch/unix/fspr_private.h.in
 /apr/.make.dirs
 /apr/Makefile
 /apr/test/internal/Makefile
 /apr/test/Makefile
-/apr-util/aprutil.exp
-/apr-util/apu-1-config
-/apr-util/build/apr_common.m4
-/apr-util/build/find_apr.m4
-/apr-util/build/get-version.sh
-/apr-util/build/install.sh
-/apr-util/build/pkg/pkginfo
-/apr-util/build/rules.mk
-/apr-util/exports.c
-/apr-util/export_vars.c
-/apr-util/export_vars.sh
-/apr-util/include/apr_ldap.h
-/apr-util/include/apu_config.h
-/apr-util/include/apu.h
-/apr-util/include/apu_select_dbm.h
-/apr-util/include/apu_want.h
-/apr-util/include/private/apu_config.h
-/apr-util/include/private/apu_config.h.in
-/apr-util/include/private/apu_select_dbm.h
-/apr-util/.make.dirs
-/apr-util/Makefile
-/apr-util/test/Makefile
-/apr-util/xml/expat/config.h
-/apr-util/xml/expat/lib/config.h
-/apr-util/xml/expat/lib/expat.h
-/apr-util/xml/expat/lib/Makefile
-/apr-util/xml/expat/Makefile
 /broadvoice/config-h.in
 /broadvoice/doc/Makefile
 /broadvoice/doc/Makefile.in
@@ -85,12 +58,6 @@ opal
 /esl/Release/
 /flite-*/
 /freeradius-client-*/
-/freetdm/build/compile
-/freetdm/COPYING
-/freetdm/INSTALL
-/freetdm/Makefile.in
-/freetdm/msvc/Debug/
-/freetdm/msvc/Release/
 /iksemel/build/compile
 /iksemel/doc/Makefile
 /iksemel/doc/Makefile.in
@@ -232,11 +199,6 @@ opal
 /libcodec2/unittest/vqtrainjnd
 /libcodec2/unittest/vqtrainph
 /libcodec2/unittest/vqtrainsp
-/libdingaling/build/compile
-/libdingaling/Makefile
-/libdingaling/Makefile.in
-/libdingaling/src/config.h
-/libdingaling/src/stamp-h1
 /libg722_1/config-h.in
 /libg722_1/doc/Makefile
 /libg722_1/doc/Makefile.in
@@ -589,102 +551,6 @@ opal
 /tiff-*/tools/tiffmedian
 /tiff-*/tools/tiffset
 /tiff-*/tools/tiffsplit
-/unimrcp/build/acmacros/libtool.m4
-/unimrcp/build/acmacros/lt~obsolete.m4
-/unimrcp/build/acmacros/ltoptions.m4
-/unimrcp/build/acmacros/ltsugar.m4
-/unimrcp/build/acmacros/ltversion.m4
-/unimrcp/build/Makefile
-/unimrcp/build/Makefile.in
-/unimrcp/build/pkgconfig/Makefile
-/unimrcp/build/pkgconfig/Makefile.in
-/unimrcp/build/svnrev/Makefile
-/unimrcp/build/svnrev/Makefile.in
-/unimrcp/build/svnrev/svnrev
-!/unimrcp/build/tools/unimrcpservice.exe.manifest
-!/unimrcp/build/uni_revision.h
-!/unimrcp/configure.gnu
-/unimrcp/conf/Makefile
-/unimrcp/conf/Makefile.in
-/unimrcp/data/Makefile
-/unimrcp/data/Makefile.in
-/unimrcp/docs/doxygen.conf
-/unimrcp/libs/apr-toolkit/Makefile
-/unimrcp/libs/apr-toolkit/Makefile.in
-/unimrcp/libs/Makefile
-/unimrcp/libs/Makefile.in
-/unimrcp/libs/mpf/Makefile
-/unimrcp/libs/mpf/Makefile.in
-/unimrcp/libs/mrcp-client/Makefile
-/unimrcp/libs/mrcp-client/Makefile.in
-/unimrcp/libs/mrcp-engine/Makefile
-/unimrcp/libs/mrcp-engine/Makefile.in
-/unimrcp/libs/mrcp/Makefile
-/unimrcp/libs/mrcp/Makefile.in
-/unimrcp/libs/mrcp-server/Makefile
-/unimrcp/libs/mrcp-server/Makefile.in
-/unimrcp/libs/mrcp-signaling/Makefile
-/unimrcp/libs/mrcp-signaling/Makefile.in
-/unimrcp/libs/mrcpv2-transport/Makefile
-/unimrcp/libs/mrcpv2-transport/Makefile.in
-/unimrcp/libs/uni-rtsp/Makefile
-/unimrcp/libs/uni-rtsp/Makefile.in
-/unimrcp/Makefile
-/unimrcp/Makefile.in
-/unimrcp/modules/Makefile
-/unimrcp/modules/Makefile.in
-/unimrcp/modules/mrcp-sofiasip/Makefile
-/unimrcp/modules/mrcp-sofiasip/Makefile.in
-/unimrcp/modules/mrcp-unirtsp/Makefile
-/unimrcp/modules/mrcp-unirtsp/Makefile.in
-/unimrcp/platforms/asr-client/asrclient
-/unimrcp/platforms/asr-client/Makefile
-/unimrcp/platforms/asr-client/Makefile.in
-/unimrcp/platforms/libasr-client/Makefile
-/unimrcp/platforms/libasr-client/Makefile.in
-/unimrcp/platforms/libunimrcp-client/Makefile
-/unimrcp/platforms/libunimrcp-client/Makefile.in
-/unimrcp/platforms/libunimrcp-server/Makefile
-/unimrcp/platforms/libunimrcp-server/Makefile.in
-/unimrcp/platforms/Makefile
-/unimrcp/platforms/Makefile.in
-/unimrcp/platforms/umc/Makefile
-/unimrcp/platforms/umc/Makefile.in
-/unimrcp/platforms/umc/umc
-/unimrcp/platforms/unimrcp-client/Makefile
-/unimrcp/platforms/unimrcp-client/Makefile.in
-/unimrcp/platforms/unimrcp-client/unimrcpclient
-/unimrcp/platforms/unimrcp-server/Makefile
-/unimrcp/platforms/unimrcp-server/Makefile.in
-/unimrcp/platforms/unimrcp-server/unimrcpserver
-/unimrcp/plugins/demo-recog/Makefile
-/unimrcp/plugins/demo-recog/Makefile.in
-/unimrcp/plugins/demo-synth/Makefile
-/unimrcp/plugins/demo-synth/Makefile.in
-/unimrcp/plugins/demo-verifier/Makefile
-/unimrcp/plugins/demo-verifier/Makefile.in
-/unimrcp/plugins/Makefile
-/unimrcp/plugins/Makefile.in
-/unimrcp/plugins/mrcp-cepstral/Makefile
-/unimrcp/plugins/mrcp-cepstral/Makefile.in
-/unimrcp/plugins/mrcp-flite/Makefile
-/unimrcp/plugins/mrcp-flite/Makefile.in
-/unimrcp/plugins/mrcp-pocketsphinx/Makefile
-/unimrcp/plugins/mrcp-pocketsphinx/Makefile.in
-/unimrcp/plugins/mrcp-recorder/Makefile
-/unimrcp/plugins/mrcp-recorder/Makefile.in
-/unimrcp/tests/apttest/Makefile
-/unimrcp/tests/apttest/Makefile.in
-/unimrcp/tests/Makefile
-/unimrcp/tests/Makefile.in
-/unimrcp/tests/mpftest/Makefile
-/unimrcp/tests/mpftest/Makefile.in
-/unimrcp/tests/mrcptest/Makefile
-/unimrcp/tests/mrcptest/Makefile.in
-/unimrcp/tests/rtsptest/Makefile
-/unimrcp/tests/rtsptest/Makefile.in
-/unimrcp/tests/strtablegen/Makefile
-/unimrcp/tests/strtablegen/Makefile.in
 /win32/celt/*/*/libcelt.log
 /win32/libg722_1/*/*/libg722_1.log
 /win32/libshout/*/*/libshout.log
@@ -734,17 +600,7 @@ opal
 /v8-*.zip
 
 # build products we should remove
-!/apr-util/xml/expat/conftools/config.guess
-!/apr-util/xml/expat/conftools/config.sub
-!/apr-util/xml/expat/conftools/install-sh
-!/apr-util/xml/expat/conftools/missing
 !/iksemel/ltmain.sh
-!/libdingaling/config.guess
-!/libdingaling/config.sub
-!/libdingaling/depcomp
-!/libdingaling/install-sh
-!/libdingaling/ltmain.sh
-!/libdingaling/missing
 !/libg722_1/config/depcomp
 !/libg722_1/config/missing
 !/tiff-*/config/depcomp
@@ -756,25 +612,21 @@ ilbc/config/compile
 libg722_1/config/compile
 pcre/compile
 srtp/build/compile
-unimrcp/build/compile
 /pcre-*/
 /speex-*/
 /curl-*/
 /sqlite-*.zip
 /sqlite-*/
+/sqlite/
 /ldns/
 /portaudio/
 portaudio.*.log
-apr-util/configure
-apr-util/xml/expat/configure
 apr/configure
 iksemel/configure
-libdingaling/configure
 libyuv/Makefile
 libyuv/convert
 srtp/configure
 tiff-4.0.2/configure
-unimrcp/configure
 zlib-*/
 zlib-*
 libpq-*/
@@ -799,4 +651,5 @@ mariadb-connector-c-*/
 mariadb-connector-c-*
 /spandsp*/
 /spandsp*
-win32/spandsp/spandsp.h
+win32/spandsp/spandsp.h
+win32/spandsp/win32

libs/apr-util/.update

@@ -1 +0,0 @@
-Thu 18 Nov 2010 20:56:38 EST

libs/apr-util/CHANGES

@@ -1,619 +0,0 @@
-Changes with APR-util 1.2.8
-
-  *) Add support for Berkeley DB 4.5 to the configure scripts.
-     [Garrett Rooney]
-
-  *) Allow apr_queue.h to be included before other APR headers.
-     PR 40891 [Henry Jen <henryjen ztune.net>]
-
-  *) Provide folding in autogenerated .manifest files for Win32 builders
-     using VisualStudio 2005  [William Rowe]
-
-  *) Implement prepared statement support in SQLite3 DBD driver
-     [Bojan Smojver]
-
-  *) Fix to ensure that "deprecated" LDAP interfaces are still 
-     exposed if using OpenLDAP 2.3.  [Joe Orton]
-
-  *) Fix incorrect byte order and incorrect timestamp type
-     in the fallback UUID generator used when no external UUID
-     generator is detected by APR.  PR 37342.  [Max Bowsher]
-
-Changes with APR-util 1.2.7
-
-  *) Fix apr_dbd_init to be safe to call multiple times
-     [Bojan Smojver <bojan rexursive com>, Nick Kew]
-
-  *) Win32 / Netware - add missing apu_version.c for apu_version_string()
-     to the Windows and Netware specific builds.  Unix platforms supported
-     this API since 0.9.1.  [William Rowe, Brad Nicholes].
-
-Changes with APR-util 1.2.6
-
-  *) Stop trying to link against Berkeley DB by default.  To enable use
-     of Berkeley DB users must now explicitly pass --with-berkeley-db to
-     configure, since Berkeley DB is released under a viral license that
-     requires distribution of source code for any program that uses it.
-     [Garrett Rooney]
-
-  *) Stop trying to link against GDBM by default.  To enable use of GDBM
-     users must now explicitly pass --with-gdbm to configure, since GDBM
-     is licensed under the GPL.
-     [Garrett Rooney]
-
-  *) Fix VPATH builds, and symlink builds where apr and apr-util
-     reside in parallel as symlinks to directories with more explicit
-     names, e.g. apr-1.x and apr-util-1.x.  This solves various breakage
-     on Solaris in particular with ./buildconf and ./configure.  Also
-     eliminated the nested ../apr-iconv/buildconf, given that apr-util
-     didn't bother with ../apr/buildconf, and this was inconsistant.
-     [William Rowe]
-
-  *) Fix the escape implementations for the sqlite2 and sqlite3 dbd
-     back ends.
-     [Ronen Mizrahi <ronen tversity.com>, Garrett Rooney]
-
-  *) Add support for Berkeley DB 4.4 to the configure scripts.
-     [Garrett Rooney]
-
-  *) Fix bug in test suite that cause testbuckets to write 8GB file
-     on Mac OS X.  [Justin Erenkrantz]
-
-Changes with APR-util 1.2.2
-
-  *) Teach configure how to find the Novell LDAP SDK. [Graham Leggett]
- 
-  *) Fix usage of ldapssl_init/ldap_sslinit on platforms that support
-     these API's including Win32.  Support APR_HAS_LDAP_START_TLS_S
-     flag in the Win32 LDAP API, to drop usage of ldap_start_ssl_s
-     and ldap_stop_ssl_s on Win32 by default (change the flag in apr_ldap.hw
-     to enable if supported on a given OS level). [William Rowe]
-
-Changes with APR-util 1.2.1
-
-  *) Fix apr_rmm_realloc() offset calculation bug.  [Keith Kelleman
-     <keith.kelleman oracle.com>]
-
-  *) Add sqlite3 support to APR DBD. [Rick Keiner <rick_keiner yahoo.com>]
-
-  *) Fix build failure with non-threaded APR on AIX.  PR 34655.
-     [Ryan Murray <rmurray+apache cyberhqz.com>]
-
-  *) Add sqlite2 support to APR DBD. [Ryan Phillips <ryan trolocsis.com>]
-
-  *) Introduction of APR DBD layer.  [Nick Kew]
-
-Changes with APR-util 1.1.2
-
-  *) Fix libaprutil.rc for Win32 builds [William Rowe, Justin Erenkrantz]
-
-Changes with APR-util 1.1.1
-
-  *) Fix memory leak in buckets when using APR_POOL_DEBUG mode. [Joe Schaefer]
-
-  *) find_apu.m4: Try installed APR-util before bundled copy if --with-apr-util
-     not passed to configure.  [Justin Erenkrantz] 
-
-Changes with APR-util 1.1.0
-
-  *) LDAP: Move all certificate initialisation, and the creation of SSL
-     and TLS connections into the apr_ldap_set_option() API. Add support
-     for client certificates. [Graham Leggett]
- 
-  *) Emit the run-time link path option in apu-config after installation
-     if the user is linking with libtool.  [Justin Erenkrantz]
-
-  *) Port testmd4 and testmd5 to the new test suite. [Thom May]
-
-  *) Allow passing NULL inbuf/inbytes_left parameters to
-     apr_xlate_conv_buffer(), required to correctly terminate the
-     output buffer for some stateful character set encodings.
-     [Joe Orton]
-
-  *) Link libaprutil against the libraries on which it depends.
-     PR 11122.  [Joe Orton]
-
-  *) Add apr_brigade_insert_file() function, to safely insert a file
-     into a brigade, regardless of size.  [Joe Orton]
-
-Changes with APR-util 1.0.2
-
-  *) Teach apr_ldap_init() how to handle STARTTLS in addition to the existing
-     SSL support. Add apr_ldap_option API. [Graham Leggett]
-
-  *) Rework the LDAP toolkit detection to be more accurate than "OpenLDAP
-     detected regardless", while remaining backwards compatible with v1.0.
-     [Graham Leggett]
-
-  *) Added the apr_ldap_ssl_add_cert() API to allow multiple certificates
-     to be stored and used when establishing an SSL connection to different
-     LDAP servers. [Brad Nicholes]
-
-  *) Fix the detection of ldap.h on Solaris - it needs lber.h to be
-     defined first. [Graham Leggett]
-
-  *) Add a build script to create a solaris package. [Graham Leggett]
-
-Changes with APR-util 1.0.1
-
-  *) Add support for Berkeley DB 4.3.  [Jani Averbach <jaa jaa.iki.fi>]
-
-  *) SECURITY: CAN-2004-0786 (cve.mitre.org)
-     Fix input validation in apr_uri_parse() to avoid passing negative
-     length to memcpy for malformed IPv6 literal addresses.
-     [Joe Orton]
-
-Changes with APR-util 1.0
-
-  *) Only install apu-$MAJOR-config and add appropriate detection code to
-     find_apu.m4 (APU_FIND_APU).  [Max Bowsher <maxb ukf.net>]
-
-  *) Overhaul support for LDAP URL parsing. Instead of using incompatible
-     URL parsers and memory that needs freeing, apr-util provides a parser
-     which parses the URL and allocates memory from a pool. [Graham Leggett]
-
-  *) Remove support for LDAP v2.0 SDK toolkits. This will be added
-     back properly later assuming there is demand for it. In the mean
-     time, please use an LDAP v3.0 SDK toolkit. [Graham Leggett]
-
-  *) Add an apr_ldap_err_t structure to handle the return of LDAP
-     specific error codes. [Graham Leggett, Brad Nicholes]
-
-  *) Add APR functions to do the job of ldap_init(), hiding toolkit
-     specific SSL/TLS handling. Code derived from httpd util_ldap.
-     [Graham Leggett]
-
-  *) Add an RPM spec file derived from Fedora Core.
-     [Graham Leggett, Joe Orton]
-
-  *) The whole codebase was relicensed and is now available under
-     the Apache License, Version 2.0 (http://www.apache.org/licenses).
-     [Apache Software Foundation]
-
-  *) A new function, apr_reslist_invalidate, was added so that invalid
-     resources can be removed from a reslist instead of being returned
-     to the reslist in a broken state.  [Nick Kew <nick webthing.com>]
-
-  *) Switch to a single, top-level make. [Greg Stein]
-
-  *) Add timeout feature to apr_reslist_acquire().  
-     [Mladen Turk <mturk apache.org>]
-
-  *) Pass error codes returned from constructors all the way back to
-     the reslist consumer. Also fix a minor reslist memory leak that could
-     happen when a constructor returns an error code.  PR 23492.
-     [Snke Tesch <st@kino-fahrplan.de>, Aaron Bannert]
-
-  *) The following header files have been removed:
-
-     apu_compat.h
-
-Changes with APR-util 0.9.5
-
-  *) Fix corrupt output from the apr_xlate_* interfaces on AIX 4.x.
-     [Joe Orton]
-
-  *) Change the order in which ldap.h and lber.h are defined, to fix
-     a compile bug in Solaris v2.8 which requires lber.h then ldap.h.
-     PR 27379.  [Andrew Connors <andy.connors idea.com>]
- 
-  *) Restore support for SHA1 passwords in apr_validate_password.
-     PR 17343.  [Paul Querna <chip force-elite.com>]
-
-  *) Fix DESTDIR install for bundled expat library.  PR 14076
-     [David S. Madole <david madole.net>]
-
-  *) Fix occasional crash in apr_rmm_realloc().  PR 22915.
-     [Jay Shrauner <shrauner inktomi.com>]
-
-  *) Fix apr_dbm_exists() for sdbm when sizeof(int) != sizeof(size_t). 
-     [Joe Orton]
-
-  *) The whole codebase was relicensed and is now available under
-     the Apache License, Version 2.0 (http://www.apache.org/licenses).
-     [Apache Software Foundation]
-
-  *) Fix xlate.c compile failure on AIX 5.2.  PR 25701.  [Jeff Trawick]
-
-  *) Fixed a bug in apr_rmm that would cause it to mishandle blocks of
-     a size close to the one requested from the allocator.
-     [Kevin Wang <xwang_tech yahoo.com>]
-
-Changes with APR-util 0.9.4
-
-  *) Changed apr_bucket_alloc_create() so that it uses the allocator
-     from the pool that was passed in rather than creating its own.
-     Also, the bucket_allocator is now allocated from the apr_allocator_t
-     rather than using apr_palloc().  Added apr_bucket_alloc_create_ex()
-     which takes an apr_allocator_t* directly rather than an apr_pool_t*.
-     [Cliff Woolley, Jean-Jacques Clar]
-
-  *) Added debugging consistency checks to the buckets code.  Add
-     -DAPR_BUCKET_DEBUG to the build flags to enable.
-     [Cliff Woolley]
-
-  *) Make the version of the db library APU built against visible.
-     [Thom May]
-
-  *) Fix a problem with VPATH builds copying the APR rules.mk into the
-     source directory rather than the build directory.  [Justin Erenkrantz]
-
-  *) SECURITY [httpd incident CAN-2003-0189] Address a thread safety
-     issue with apr_password_validate() on AIX, Linux, Mac OS X, and
-     possibly other platforms.  [Jeff Trawick, Justin Erenkrantz]
-
-  *) Fix a problem with LDAP configuration which caused subsequent
-     configure tests to fail since LIBS contained LDAP libraries for
-     subsequent tests but LDFLAGS no longer included the path to such 
-     LDAP libraries.  [Jeff Trawick]
-
-  *) Fix a problem preventing the use of the bundled Expat when APR-util
-     is built stand-alone.  [Jeff Trawick]
-
-  *) Use the same compiler and preprocessor for the APR-util config tests
-     which were used by APR.  The user can override this via CC and CPP.
-     This was done all along for the actual build, but not necessarily
-     for the config tests.  [Jeff Trawick]
-
-  *) Fix apr_uuid_parse() on EBCDIC machines.  [Jeff Trawick]
-
-  *) Fix alignment problem when allocating memory using apr_rmm. The problem
-     showed up while trying to write a double in the memory allocated.
-     [Madhusudan Mathihalli]
-
-Changes with APR-util 0.9.3
-
-  *) Allow apr_date_parse_rfc to parse 'Sun, 06-Nov-1994 08:49:37 GMT' as a
-     valid date.  [Dmitri Tikhonov <dmitri@netilla.com>]
-
-  *) Fix error in apu-config when symlinks are involved.
-     [Garrett Rooney <rooneg@electricjellyfish.net>]
-
-Changes with APR-util 0.9.2
-
-  *) Fix the APR_BUCKET_IS_foo() macros so they parenthesize their parameter.
-     This fixes compile problems with some types of parameters.
-     [Jim Carlson <jcarlson@jnous.com>]
-
-  *) Queue overwrite, we now return the item pushed, not a reference to it. 
-     [Paul Marquis <PMarquis@pobox.com, Jacob Lewallen <jlwalle@cs.ucr.edu>]
-
-  *) Remove include/apr_ldap.h on distclean.  PR 15592.  [Justin Erenkrantz]
-
-  *) Fix race conditions in apr_queue.
-     [Jacob Lewallen <jlwalle@cs.ucr.edu>]
-
-  *) Stop buildconf copying rules.mk, copy it at configure time. 
-     [Thom May]
-
-  *) Make buildconf copy rules.mk as well. 
-     [Garrett Rooney <rooneg@electricjellyfish.net>]
-
-  *) Add --includedir flag to apu-config.  [Justin Erenkrantz]
-
-  *) Fix brokenness in sdbm when sizeof(int) != sizeof(size_t)
-     (e.g., 64-bit AIX, 64-bit Solaris).  PR 14861.  [Jeff Trawick]
-
-  *) Have buildconf copy required files from apr so that apr-util can build
-     on its own.  [Craig Rodrigues <rodrigc@attbi.com>]
-
-  *) Detect OpenLDAP when used with Solaris 9. PR 13427.
-     [Gary Algier <gaa@ulticom.com>]
-
-  *) Detect Berkeley DB 4.1 when compiled with --with-uniquenames
-     [Thom May]
-
-  *) Allow apu-config to work in symlinked install directories when
-     'realpath' is available.  [Justin Erenkrantz]
-
-  *) Fix bug in apr_strmatch when used with case-insensitive patterns.
-     [Justin Erenkrantz]
-
-  *) Allow apr_queue to have greater than int number of elements.
-     [Justin Erenkrantz]
-
-  *) Detect Berkeley DB 4.0 compiled with --with-uniquenames.
-     [Philip Martin <philip@codematters.co.uk>]
-
-  *) Allocate brigades from a bucket allocator rather than a pool. [Brian Pane]
-
-  *) Update with the latest APR renames [Thom May]
-
-  *) Update doxygen tags.  [Justin Erenkrantz]
-
-  *) Add apr_ldap.hw for Windows build.
-     [Andre Schild <A.Schild@aarboard.ch>]
-
-  *) Add IPv6 literal address support to apr_uri_parse(), apr_uri_unparse(), 
-     and apr_uri_parse_hostinfo().  PR 11887  [Jeff Trawick]
-
-  *) Add apr_brigade_writev()  [Brian Pane]
-
-  *) Add support for Berkeley DB 4.1.  [Justin Erenkrantz]
-
-  *) Add --bindir option to apu-config.  [Justin Erenkrantz]
-
-Changes with APR-util 0.9.1
-
-  *) Add versioning infrastructure.
-     [Justin Erenkrantz]
-
-  *) Running "make check" in the toplevel directory or the test/ directory
-     will build and run all test programs.  [Aaron Bannert]
-
-  *) Bug #9789 : NDBM support 
-     [Toomas Soome <tsoome@muhv.pri.ee>, Ian Holsman]
-
-  *) Added a Thread safe FIFO bounded buffer (apr_queue) [Ian Holsman]
-
-  *) Changed file_bucket_setaside() to use apr_file_setaside() instead
-     of turning the file bucket into an mmap bucket.  [Brian Pane]
-
-  *) Install libaprutil support libraries before installing libaprutil
-     itself, since on some platforms libaprutil is relinked during
-     make install and the support libraries need to exist already.
-     [Jeff Trawick]
-
-  *) Added a Resource List API for threadsafe access to persistent
-     and dynamically created user-defined resources.  [Aaron Bannert]
-
-  *) Adopted apr-util/xlate from apr/i18n for inclusion of apr-iconv
-     as required by missing libiconv.  [William Rowe]
-
-  *) Adopted apr-util/crypto/ uuid and md5 from apr.  [William Rowe]
-
-  *) Look for expat in lib64 directories.  [Peter Poeml <poeml@suse.de>]
-
-  *) Faster implementation of apr_brigade_puts()  [Brian Pane]
-
-  *) Fixed a segfault in apr_date_parse_rfc() for some date formats
-     where it was trying to overlay a potentially static input
-     string even though it didn't really need to.
-     [Cliff Woolley, Doug MacEachern]
-
-  *) Ensure that apu-config does not print libtool libraries when
-     using --libs.  [Justin Erenkrantz]
-
-  *) Added apr_bucket_file_enable_mmap() function to the bucket
-     API to let an application control whether a file bucket may
-     be turned into an mmap bucket upon read.  (The default remains
-     to do the mmap, but this function lets the app prevent the
-     mmap in contexts where mmap would be a bad idea.  Examples
-     include multiprocessors where mmap doesn't scale well and
-     NFS-mounted filesystems where a bus error can result if
-     a memory-mapped file is removed or truncated.) [Brian Pane]
-
-  *) Added string-matching API (apr_strmatch.h)  [Brian Pane]
-
-  *) Rearrange INCLUDES so that APRUTIL_PRIV_INCLUDES is always
-     first.  [Garrett Rooney <rooneg@electricjellyfish.net>]
-
-  *) Add --old-expat option to apu-config to allow users of apr-util to
-     determine what expat it should expect to be installed.  If the
-     flag is set to yes, it should include xmlparse.h.  If it is set to
-     no, it should include expat.h.  [Justin Erenkrantz]
-
-  *) Fix exporting of includes in apu-config.  [Justin Erenkrantz]
-
-  *) Change bucket brigades API to allow a "bucket allocator" to be
-     passed in at certain points.  This allows us to implement freelists
-     so that we can stop using malloc/free so frequently.
-     [Cliff Woolley, Brian Pane]
-
-  *) add apr_rmm_realloc() function
-     [Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>]
-
-  *) renames: apr_ansi_time_to_apr_time becomes apr_time_ansi_put
-     ap_exploded_time_t becomes apr_time_exp_t
-     [Thom May <thom@planetarytramp.net>]
-
-  *) Add detection support for FreeBSD's expat and expat2 ports.
-     [Justin Erenkrantz]
-
-  *) Deprecate check_brigade_flush(), which had several nasty bugs, and
-     which was causing apr_brigade_write()'s logic to be less than obvious.
-     Everything is now done in a slightly rearranged apr_brigade_write().
-     [Cliff Woolley]
-
-  *) Don't add /usr/include to the INCLUDES variable on expat's account.
-     [Joe Orton <joe@manyfish.co.uk>]
-
-  *) Remove the autoconf 2.5x cache directory in buildconf.
-     [Joe Orton <joe@manyfish.co.uk>]
-
-  *) BerkleyDB should NULL out the key if it is @EOF in vt_db_nextkey
-     [Ian Holsman]
-
-  *) Add ability to natively fetch and split brigades based on LF lines.
-     [Justin Erenkrantz]
-
-  *) add --with-berkeley-db=DIR & --with-gdbm  configure flags
-     [Ian Holsman/Justin Erenkrantz]
-
-  *) Fix expat detection to recognize installed versions.
-     [Eric Gillespie, Jr. <epg@pretzelnet.org>]
-
-  *) Add find_apu.m4 to allow third-party programs that use APR-util
-     to have a standard m4 macro for detection.  [Justin Erenkrantz]
-
-  *) Add apu-config - a shell script to allow third-party programs
-     easy access to APR configuration parameters.  [Justin Erenkrantz]
-
-  *) Add GMT offset calculation to apr_date_parse_rfc().  
-     [Justin Erenkrantz]
-
-  *) Introduce the apr_rmm api, to allow relocatable memory management
-     of address-independent data stores, such as shared memory.
-     [William Rowe]
-
-  *) Rework and fix VPATH-build support.  [Justin Erenkrantz]
-
-  *) Add support for Berkeley DB4.  [Justin Erenkrantz]
-
-  *) Improve testdbm help.  [Justin Erenkrantz]
-
-  *) Improve autoconf detection of DBMs.  [Justin Erenkrantz]
-
-  *) BerkeleyDBM v2 now checks minor level for cursor ops [Ian Holsman]
-
-  *) Reading a file bucket bigger than APR_MMAP_LIMIT (4MB) now yields
-     a string of 4MB mmap buckets, rather than a string of 8KB heap buckets
-     plus a 4MB mmap bucket.  To accomodate this, the mmap bucket destroy
-     function explicitly deletes the apr_mmap_t after last reference
-     to avoid having too much of a large file mapped at once if possible.
-     [Cliff Woolley]
-
-  *) Multi-DBM support (via apr_dbm_open_ex).  [Ian Holsman]
-
-  *) Use apr_mmap_dup in mmap_setaside().  [Brian Pane <bpane@pacbell.net>]
-
-  *) Dropped the "w" parameter from apr_bucket_heap_create() and
-     apr_bucket_heap_make().  That parameter was originally intended
-     to return the amount of data copied into the bucket, but it
-     ended up being unnecessary because that amount is invariant from
-     the size of the data and is available as b->length in the
-     resulting bucket anyway.  [Cliff Woolley]
-
-  *) Fix Makefile conversion for BSD/OS.  [Cliff Woolley]
-
-  *) Use APR_XtOffsetOf instead of offsetof() in the ring macros for
-     portability.  [Cliff Woolley]
-
-  *) We now create exports.c and export_vars.h, which in turn create
-     exports.c.  From this we generate two more files with different
-     purposes: aprutil.exp - list of exported symbols; and exports.lo
-     (exports.o) - an object file that can be linked with an executable
-     to force resolution of all apr-util symbols.   [Aaron Bannert]
-
-  *) Fix Berkley DBM support [Ian Holsman <ianh@apache.org>]
-
-  *) Fix apr_brigade_vprintf so that it can handle more than
-     4k of data at one time.  [Cody Sherr <csherr@covalent.net>]
-
-  *) prefix UNP_* flags with APR_URI_
-
-     rename:
-     apr_uri_components                  -> apr_uri_t
-     apr_uri_unparse_components          -> apr_uri_unparse
-     apr_uri_parse_components            -> apr_uri_parse
-     apr_uri_parse_hostinfo_components   -> apr_uri_parse_hostinfo
-
-     s/APU_URI_/APR_URI_/g
-     [Perl]
-
-  *) Landed the link-to-LDAP to the build process, and the LDAP v2/v3
-     compatibility functions.
-     [Dave Carrigan <dave@rudedog.org>, Graham Leggett]
-
-  *) Fix URI unparse function to handle the case where it would place a @
-     when both the username and password were present but omitted.
-     [Jon Travis <jtravis@covalent.net]
-
-  *) Added apr_xml_parse_file() routine and a testxml program.
-     [Ian Holsman <ianh@cnet.com>]
-
-  *) Extend apr_bucket struct to add a pointer to a function used
-     to free the bucket. This change enables custom buckets to
-     completely specify how they are to be allocated and freed.
-     Before this change, custom buckets were required to use the 
-     same memory allocation scheme as the standard APR buckets.
-     [Saeid Sakhitab, Bill Stoddard, Cliff Woolley, Roy Fielding]
-
-  *) Install Expat when installing APR-util.  [Justin Erenkrantz]
-
-  *) Make APR-util configure script rely on APR.  This removes the locally
-     generated copy of libtool and uses the one in APR.  Fix up how we
-     call the expat configure script.  Generate config.nice file.
-     [Justin Erenkrantz]
-
-  *) The apr_bucket lengths are now consistently apr_size_t, while any
-     apr_brigade lengths (short of a read) are consistently apr_off_t.
-     This is required for APR_HAS_LARGE_FILES handling.  [William Rowe]
-
-  *) apr_bucket_file_create() and apr_bucket_file_make() now take a pool
-     parameter which is the pool into which any needed data structures
-     should be created during file_read().  This is used for MMAPing the
-     file and reopening the file if the original apr_file_t is in XTHREAD
-     mode.  [Cliff Woolley]
-
-  *) apr_brigade_partition() now returns an apr_status_t. [Cliff Woolley]
-
-  *) Add MD4 implementation in crypto.  [Sander Striker, Justin Erenkrantz]
-
-  *) Moved httpd 2.0.18's util_date to apr_date and enhanced its parsing
-     capabilities.  [Justin Erenkrantz]
-
-  *) Moved httpd 2.0.18's util_uri to apr_uri and name-protected its
-     symbols and functions.  [Justin Erenkrantz, Roy Fielding]
-
-  *) Rename field "private" in struct apr_xml_elem to "priv" for C++
-     compatibility.  PR #7727  [Joshua MacDonald <jmacd@cs.berkeley.edu>]
-
-  *) Make APR_IMPLEMENT_EXTERNAL_HOOK_BASE generate a 
-     ${namespace}_hook_get_${hookname} function to fetch the
-     list of registered hooks [Doug MacEachern]
-
-  *) Allow LTFLAGS to be overridden by the configure command-line
-     (default="--silent") and introduce LT_LDFLAGS.  [Roy Fielding]
-
-  *) Add APR_SHARELOCK support to apr_sdbm_open(), locking read operations
-     with a shared lock and all write ops with an excl lock.  [Will Rowe]
-
-  *) Namespace protect apr_sdbm, and normalize the return values (including
-     the apr_sdbm_fetch, apr_sdbm_firstkey and apr_sdbm_nextkey functions).
-     Normalized the get/clear error function names, and stores the actual 
-     apr error for apr_sdbm_error_get. [Will Rowe]
-
-  *) Introduce an apr_fileperms_t argument to apr_dbm_open(). [Will Rowe]
-
-  *) Removed apr_bucket_do_create() macro, which was causing warnings
-     about unreachable code in some compilers (notably MSVC).  What
-     used to be done by this macro is now done inline in the various
-     apr_bucket_foo_create() functions.  [Cliff Woolley]
-
-  *) Make clean, distclean, and extraclean consistently according to the
-     Gnu makefile guidelines.  [Justin Erenkrantz <jerenkrantz@ebuilt.com>]
-
-  *) Migrate the --disable-libtool changes from APR to APR-util.
-     This cleans things up, and allows more flexibility when building
-     programs.  [Ryan Bloom]
-
-  *) Allow APR-util to be compiled without libtool.  The default is
-     to use libtool, but it can turned off with --disable-libtool
-     on the configure command.  [Ryan Bloom]
-
-  *) Repair calling convention for apr_register_optional_fn to
-     eliminate GP fault on Win32.  [William Rowe]
-
-  *) Substantial changes to correct linkage and declarations for
-     generic hooks on dso architectures.  [Ben Laurie, Will Rowe]
-
-  *) apr_bucket_shared_destroy() now returns a boolean value.
-     [Cliff Woolley]
-
-  *) We have to initialize the heap buckets to the correct length.
-     we were seeing heap buckets with 17 chars in them reporting
-     a length of 9017, because they were initialized to the amount
-     of memory allocated, instead of the amount of memory used.
-     This was only an issue for heap buckets created by the
-     apr_brigade_* functions.   [Ryan Bloom]
-
-  *) apr_bucket_init_types() and apr_bucket_insert_type() have been
-     removed... they're not needed anymore. [Cliff Woolley]
-
-  *) The apr_bucket_shared and apr_bucket_simple structures have been
-     removed as an API simplification/optimization.  This should be
-     transparent outside APR-util except to callers who attempt to
-     directly manipulate the buckets' internal structure (which is
-     not recommended anyway) and to callers who create their own
-     bucket types. [Cliff Woolley]
-
-  *) apr_bucket_simple_split() and apr_bucket_simple_copy() are now
-     exported functions, which could be helpful in implementing
-     external bucket types. [Cliff Woolley]
-
-  *) The third parameter to apr_bucket_shared_make() is now
-     'apr_off_t length' rather than 'apr_off_t end', since the
-     end usually had to be computed by the caller and all we
-     really want is the length anyway. [Cliff Woolley]
-

libs/apr-util/CMakeLists.txt

@@ -1,36 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-INCLUDE_DIRECTORIES(include/) 
-
-add_definitions(-DHAVE_CONFIG_H -DDARWIN -DSIGPROCMASK_SETS_THREAD_MASK)
-INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/libs/apr-util/include ${CMAKE_SOURCE_DIR}/libs/apr-util/include/private  ${CMAKE_SOURCE_DIR}/libs/apr/include)    
-
-
-SET (apr-util_SRCS
-crypto/apr_md5.c 
-crypto/uuid.c 
-crypto/apr_sha1.c 
-crypto/getuuid.c
-crypto/apr_md4.c
-encoding/apr_base64.c
-hooks/apr_hooks.c
-misc/apr_reslist.c 
-misc/apr_rmm.c 
-misc/apr_date.c
-misc/apu_version.c
-misc/apr_queue.c
-uri/apr_uri.c
-strmatch/apr_strmatch.c
-xlate/xlate.c 
-)
-
-LINK_LIBRARIES ("-liconv -ldl -lpthread")
-
-ADD_LIBRARY(apr-util STATIC ${apr-util_SRCS})
-
-
-
-
-
-
-

libs/apr-util/INSTALL.MySQL

@@ -1,14 +0,0 @@
-The MySQL driver is not distributed from apache.org due to licensing issues.
-
-If you wish to build the driver, download apr_dbd_mysql.c from
-http://apache.webthing.com/database/
-and copy it into the dbd directory.
-Now run buildconf, followed by configure.
-
-It is distributed under the GPL to conform with MySQL License terms
-This means it cannot be distributed from apache.org, as that would
-violate ASF policy.
-
-Using the driver with APR and Apache is of course allowed,
-and there is no problem with a third party bundling the driver,
-provided you respect both the ASF and GPL licenses.

libs/apr-util/LICENSE

@@ -1,404 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-
-APACHE PORTABLE RUNTIME SUBCOMPONENTS: 
-
-The Apache Portable Runtime includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
-
-For the include\apr_md5.h component: 
-/*
- * This is work is derived from material Copyright RSA Data Security, Inc.
- *
- * The RSA copyright statement and Licence for that original material is
- * included below. This is followed by the Apache copyright statement and
- * licence for the modifications made to that material.
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD5 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-
-For the passwd\apr_md5.c component:
-
-/*
- * This is work is derived from material Copyright RSA Data Security, Inc.
- *
- * The RSA copyright statement and Licence for that original material is
- * included below. This is followed by the Apache copyright statement and
- * licence for the modifications made to that material.
- */
-
-/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD5 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-/*
- * The apr_md5_encode() routine uses much code obtained from the FreeBSD 3.0
- * MD5 crypt() function, which is licenced as follows:
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- */
-
-For the crypto\apr_md4.c component:
-
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD4 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the include\apr_md4.h component:
-
- *
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD4 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD4 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the test\testmd4.c component:
-
- *
- * This is derived from material copyright RSA Data Security, Inc.
- * Their notice is reproduced below in its entirety.
- *
- * Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
- * rights reserved.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */
-
-For the xml\expat\conftools\install-sh component:
-
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-
-For the expat xml parser component:
-
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-                               and Clark Cooper
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-	
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-	
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====================================================================

libs/apr-util/Makefile.in

@@ -1,91 +0,0 @@
-#
-# Top-level Makefile for APRUTIL
-#
-CPP = @CPP@
-
-# gets substituted into some targets
-APRUTIL_MAJOR_VERSION=@APRUTIL_MAJOR_VERSION@
-APRUTIL_DOTTED_VERSION=@APRUTIL_DOTTED_VERSION@
-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
-APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
-APRUTIL_LIBS = @APRUTIL_LIBS@
-
-TARGET_LIB = lib@APRUTIL_LIBNAME@.la
-INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
-APU_CONFIG = apu-$(APRUTIL_MAJOR_VERSION)-config
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-TARGETS = $(TARGET_LIB) aprutil.exp
-
-# bring in rules.mk for standard functionality
-@INCLUDE_RULES@
-@INCLUDE_OUTPUTS@
-
-CLEAN_SUBDIRS = test @APR_ICONV_DIR@
-
-CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
-DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
-	include/private/apu_config.h include/private/apu_private.h \
-	include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \
-	export_vars.sh $(APU_CONFIG) build/rules.mk include/apu_want.h \
-	apr-util.pc build/pkg/pkginfo
-EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
-	exports.c build-outputs.mk \
-	build/apr_common.m4 build/find_apr.m4 build/install.sh \
-	build/config.guess build/config.sub
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-includedir=@includedir@
-top_srcdir=@abs_srcdir@
-top_blddir=@abs_builddir@
-
-# Create apu-config script suitable for the install tree
-apu-config.out: $(APU_CONFIG)
-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
-
-install: $(TARGET_LIB) apu-config.out
-	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
-		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-	for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
-		$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
-	done
-	$(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
-	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
-		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	done
-	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
-	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
-
-$(TARGET_LIB): $(OBJECTS)
-	$(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_LDFLAGS) $(APRUTIL_LIBS)
-
-exports.c: $(HEADERS)
-	$(APR_MKEXPORT) $(HEADERS) > $@
-
-export_vars.c: $(HEADERS)
-	$(APR_MKVAREXPORT) $(HEADERS) > $@
-
-aprutil.exp: exports.c export_vars.c
-	@echo "#! lib@APRUTIL_LIBNAME@.so" > $@
-	@echo "* This file was AUTOGENERATED at build time." >> $@
-	@echo "* Please do not edit by hand." >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
-	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.c | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
-
-dox:
-	doxygen $(top_srcdir)/docs/doxygen.conf
-
-test: check
-check: $(TARGET_LIB)
-	cd test && $(MAKE) check