main/freeswitch: upgrade to 1.10.7fs-upgrade-1.10.7

This is a major release with more than 300 changes
containing fixes for 5 security advisories

See:https://github.com/signalwire/freeswitch/releases/tag/v1.10.7

3 files changed, 29 insertions, 21 deletions

diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 547567d0b2..c2164809cc 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,13 +2,14 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.10.6
-pkgrel=2
+pkgver=1.10.7
+pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
 license="MPL-1.1"
 makedepends="
+	apr-dev
 	bash
 	bsd-compat-headers
 	coreutils
@@ -26,6 +27,7 @@ makedepends="
 	libjpeg-turbo-dev
 	libogg-dev
 	libpri-dev
+	libks-dev
 	openssl1.1-compat-dev
 	libpq-dev
 	libshout-dev
@@ -40,10 +42,12 @@ makedepends="
 	pcre-dev
 	perl-dev
 	portaudio-dev
+	python3-dev
 	sngtc_client-dev
 	speex-dev
 	speexdsp-dev
 	sqlite-dev
+	libsrtp-dev
 	tiff-dev
 	unixodbc-dev
 	util-linux-dev
@@ -62,17 +66,17 @@ _freeswitch_group=freeswitch
 pkgusers="$_freeswitch_user"
 pkggroups="$_freeswitch_group"
 subpackages="$pkgname-static $pkgname-dev $pkgname-flite $pkgname-timezones::noarch
-	$pkgname-sample-config:conf:noarch $pkgname-freetdm $pkgname-sangoma
+	$pkgname-sample-config:conf:noarch $pkgname-sangoma
 	$pkgname-snmp $pkgname-pgsql $pkgname-perl $pkgname-perlesl
 	$pkgname-openrc $pkgname-dbg"
 
 source="https://files.freeswitch.org/freeswitch-releases/freeswitch-$pkgver.-release.tar.xz
-	0002-FS-verto-bswap_64.patch
 	configure-lua53.patch
 	include-lua53.patch
 	getlib.patch
 	libvpx-fix-arm-float-abi.patch
 	disable-Werror.patch
+	explicit-darwin-macro.patch
 	modules.conf
 	freeswitch.confd
 	freeswitch.initd
@@ -106,10 +110,7 @@ build() {
 		--enable-system-lua \
 		--enable-system-xmlrpc-c
 
-	# build libvpx with -j1, fails to find headers otherwise
 	make libs/libvpx/libvpx.a
-	# build freetdm with -lexecinfo
-	make -C libs/freetdm LIBS="-lexecinfo"
 	# first build libfreeswitch (in parallel)
 	make src/include/switch_version.h src/include/switch_swigable_cpp.h
 	make libfreeswitch.la
@@ -161,14 +162,6 @@ flite() {
 #		mod_say_th mod_say_he
 }
 
-freetdm() {
-	pkgdesc="Freeswitch FreeTDM Module"
-	install=
-	_mv_mod mod_freetdm ftmod_analog ftmod_analog_em ftmod_libpri \
-		ftmod_skel ftmod_zt
-	mv "$pkgdir"/usr/lib/libfreetdm.so* "$subpkgdir"/usr/lib/
-}
-
 sangoma() {
 	pkgdesc="Freeswitch Sangoma Media Transcode Codec Module"
 	install=
@@ -222,13 +215,15 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-sha512sums="1bb518cca959df73859d3e7a5980a5a98ffa3d092d1100fc5d2cce83da649fc6499feaa88d4ea0196149353f9af231ef8e4aeb089959c1ea75c0f98175c599c6  freeswitch-1.10.6.-release.tar.xz
-5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8  0002-FS-verto-bswap_64.patch
+sha512sums="
+9c0b29f8e631c5e7d073cb2a70c53ffb16780029e462e6171651a54d9f2a2c73f6c871c8bea9e7715ddb40cd7005d73c5931e6a8af33eeb5a01aa7c8a83dda5b  freeswitch-1.10.7.-release.tar.xz
 222e3510790de29e29428c70325eb1d4e7852eb4315ee546f137293868bd71acf89e7c85c5ca9d0eb708090c9eef91878a8e12c1b9d5cc99a68fecbd42ad962f  configure-lua53.patch
 c1960f3c7acf729468b819f7f15d66a251c3967b2784bce18c7755b333156e687c55fdc1aceda588ceb1bf9638e2fd4a31a169b00b15c5040cf1001c3c73913b  include-lua53.patch
 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4  getlib.patch
 98a53f289c3647cafd05b6f847da0504a838a6e06545c133c10fb058c2d941e6bccf2820f44649fc25f94a4a5b7c1280eaee91098e8110f96ed3342c1cb4346c  libvpx-fix-arm-float-abi.patch
 16e9208fca7f0a1985dd01ec38ddabb6a79da83ad6ab004bb66de528ac45f02fadaddc50a9f228e1aa38fae213fa5af0ca858b7af629b67a7d654339f813a68c  disable-Werror.patch
-ceeb2bb37fac580483000daff327a4c005d42b7eabdba4671ed2b0e78cddda8a42ae76e42bdf4a1b2e42874c4709887bcee9cb08a4c1dafcfeaec21e467726bf  modules.conf
+a8a491f468b235ff5d1175e2ce8ebe63528a61fd2af268e8130411065676c0df7d728b4d82a19cef63624e62bd1385dba6749ed31ff846bee567c4bc05feb9eb  explicit-darwin-macro.patch
+02bce241985c0539edc9f330e55761bb1372da66eab087b6f3f8de59fd113c0cb2442e1034d50b4b724bb485f593f429bfc25b82404306f1658a548fd3263ad8  modules.conf
 a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595  freeswitch.confd
-643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca  freeswitch.initd"
+643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca  freeswitch.initd
+"
diff --git a/main/freeswitch/explicit-darwin-macro.patch b/main/freeswitch/explicit-darwin-macro.patch
new file mode 100644
index 0000000000..65027bc8ec
--- /dev/null
+++ b/main/freeswitch/explicit-darwin-macro.patch
@@ -0,0 +1,15 @@
+diff --git a/libs/apr/include/apr_general.h b/libs/apr/include/apr_general.h
+index 3a95628..42eec83 100644
+--- a/libs/apr/include/apr_general.h
++++ b/libs/apr/include/apr_general.h
+@@ -29,10 +29,6 @@
+ #include "apr_pools.h"
+ #include "apr_errno.h"
+ 
+-#if !defined(_ANSI_SOURCE) && defined(_DARWIN_C_SOURCE)
+-#define NSIG __DARWIN_NSIG
+-#endif
+-
+ #if APR_HAVE_SIGNAL_H
+ #include <signal.h>
+ #endif
diff --git a/main/freeswitch/modules.conf b/main/freeswitch/modules.conf
index 294f4dba2c..33d9a25673 100644
--- a/main/freeswitch/modules.conf
+++ b/main/freeswitch/modules.conf
@@ -168,7 +168,5 @@ xml_int/mod_xml_curl
 xml_int/mod_xml_rpc
 xml_int/mod_xml_scgi
 
-../../libs/freetdm/mod_freetdm
-
 ## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/xml_int/mod_xml_odbc