main/freeswitch: upgrade to 1.6.11 and use libressl

2 files changed, 27 insertions, 45 deletions

diff --git a/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch b/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch
index 66b824f55d..7cc1d898c8 100644
--- a/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch
+++ b/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch
@@ -1,38 +1,17 @@
-From 3a0c554bee54fdcaa9a51616175e55f0b3824e39 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 26 Jul 2016 15:14:15 +0000
-Subject: [PATCH] mod_avmd: use posix isinf
-
----
- src/mod/applications/mod_avmd/avmd_desa2_tweaked.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
 diff --git a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c
-index 8eae175..57c1206 100644
+index 6bf0b41..7ef31f7 100644
 --- a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c
 +++ b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c
-@@ -4,12 +4,6 @@
- #include <stdio.h>
- #ifdef WIN32
- #include <float.h>
--#define ISNAN(x) (!!(_isnan(x)))
--#define ISINF(x) (isinf(x))
--#else
--int __isnan(double);
--#define ISNAN(x) (__isnan(x))
--#define ISINF(x) (__isinf(x))
+@@ -16,9 +16,9 @@
+     #define ISNAN(x) (!!(_isnan(x)))
+     #define ISINF(x) (isinf(x))
+ #else
+-    int __isnan(double);
+-    #define ISNAN(x) (__isnan(x))
+-    #define ISINF(x) (__isinf(x))
++    #include <math.h>
++    #define ISNAN(x) (isnan(x))
++    #define ISINF(x) (isinf(x))
  #endif
- #include "avmd_buffer.h"
- #include "avmd_desa2_tweaked.h"
-@@ -51,7 +45,7 @@ avmd_desa2_tweaked(circ_buffer_t *b, size_t i)
-  we do simplified, modified for speed version : */
  
-     result = n/d;
--    if (ISINF(result)) {
-+    if (isinf(result)) {
-         if (n < 0.0)
-             return -10.0;
-         else
--- 
-2.9.1
-
+ #include "avmd_buffer.h"
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 133b8f90eb..662d91c1f8 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.6.9
+pkgver=1.6.11
 pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
@@ -14,18 +14,21 @@ pkggroups="freeswitch"
 makedepends="
 	bash
 	bsd-compat-headers
-	nasm
+	coreutils
 	curl-dev
+	db-dev
 	flac-dev
 	flite-dev
+	gdbm-dev
 	gnutls-dev
 	ilbc-dev
-	ldns-dev
 	lame-dev
+	ldns-dev
 	libedit-dev
 	libjpeg-turbo-dev
 	libogg-dev
 	libpri-dev
+	libressl-dev
 	libshout-dev
 	libsndfile-dev
 	libvorbis-dev
@@ -34,8 +37,9 @@ makedepends="
 	mpg123-dev
 	ncurses-dev
 	net-snmp-dev
-	openssl-dev
+	opus-dev
 	pcre-dev
+	perl-dev
 	portaudio-dev
 	postgresql-dev
 	sngtc_client-dev
@@ -45,9 +49,8 @@ makedepends="
 	unixodbc-dev
 	util-linux-dev
 	xmlrpc-c-dev
+	yasm
 	zlib-dev
-	opus-dev
-	perl-dev db-dev gdbm-dev
 	autoconf automake libtool
 	"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
@@ -227,24 +230,24 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="1c4aaf13d4f77879eae9847a751b743c  freeswitch-1.6.9.tar.xz
-ab5aede02ac33ea21fdf8e2a2dcaaaa3  0001-mod_avmd-use-posix-isinf.patch
+md5sums="6a273b0190c0e00fcb3d4b4267352078  freeswitch-1.6.11.tar.xz
+ea60f2be81b480c555e9182a99b08308  0001-mod_avmd-use-posix-isinf.patch
 3b5a8c48900130e89d4e57307b0f9c34  0001-sofia-sip-byte-order.patch
 1c08df4cf4ef737e6cc6945f9462f08e  0002-FS-verto-bswap_64.patch
 1e7f335ee00f589825ecc9affa779346  getlib.patch
 8027ab932f00579c6d04cb5dde102cda  modules.conf
 c608cca8ad773acebf201f581438c7e7  freeswitch.confd
 3b0bf4847a61afa28229b58763f4c400  freeswitch.initd"
-sha256sums="aa5f191113be2bd44cb4f2108da3dcc37be3234c6b733896fbff97526ac66451  freeswitch-1.6.9.tar.xz
-6098fcd5879d32e05ab77bd5e38f797d5e3f92523c83ede0abe3db4125c8d834  0001-mod_avmd-use-posix-isinf.patch
+sha256sums="c1744fbe8c5d0b478dc493f3b4c5eca8ba3a010df1de034eff738ffb2aea0668  freeswitch-1.6.11.tar.xz
+2dcd13894c8f601e59033fffc21942c41cdc10eef3c6ab15bd9d37d9be2ea9ae  0001-mod_avmd-use-posix-isinf.patch
 7425b9fdc1e4ade9ea34e79e6aa69a61b4700a9562b347c2c157217a32570534  0001-sofia-sip-byte-order.patch
 2685eb17fcd4510e46bb1d88be5550c3cb7b08f2acccfb41b2c680480c91b63e  0002-FS-verto-bswap_64.patch
 ab437c92149b6fc88bc2fc8a228d6a5f8af574e2c90469a6dc4c753d13972c34  getlib.patch
 4db8934a4b41f5c61d1fba8fbd68c91fd18bddcf07419301e3db91df7e911488  modules.conf
 846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1  freeswitch.confd
 aa0d89221ffa47eba4a0e085f6041ee198476409dd15d1e90c5c357ba683f432  freeswitch.initd"
-sha512sums="24a3b09ba5f48dc34cc921120e704f35e497a94196a51d76f3b177d9331a7bd52527d3e5bba23badfb26cfdfdca3e72b3c070587cc6d7d532746061788228748  freeswitch-1.6.9.tar.xz
-e3f4c2567a983bb67021a4384388797d0027cf51bc3866c8803b30902d84dcf299ba8db9982bc3a27aa2d5c2ce2cd3da174c791386b5fa3de04eb9806cc89abb  0001-mod_avmd-use-posix-isinf.patch
+sha512sums="f0f7fd4d03ef50bad98dc5e10f1b34135711667ff7762ea4ec56c3579af0112b409074a51c356838766130bc60857b57263431c2f250939ab380eb0206953367  freeswitch-1.6.11.tar.xz
+4702d9e2f7eaa13bba87f9275ccc58d40c96bf0f966b6b31dfdd60c04ce8e8c544ebad30bec158568520bef7697bdf01b034a02a11c73440de43f9d2dfdd72f7  0001-mod_avmd-use-posix-isinf.patch
 8572fcb10242d7064a1a8f7e62e2d6f9cf0eb1725233791592f9f0a5b39e7979e6804406a6fe7d653444d579d92e7696860fd766708c9906f6d604f28e0a0c63  0001-sofia-sip-byte-order.patch
 5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8  0002-FS-verto-bswap_64.patch
 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4  getlib.patch