main/freeswitch: upgrade to 1.6.9

3 files changed, 96 insertions, 5 deletions

diff --git a/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch b/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch
new file mode 100644
index 0000000000..66b824f55d
--- /dev/null
+++ b/main/freeswitch/0001-mod_avmd-use-posix-isinf.patch
@@ -0,0 +1,38 @@
+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
+--- 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))
+ #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
+
diff --git a/main/freeswitch/0001-sofia-sip-byte-order.patch b/main/freeswitch/0001-sofia-sip-byte-order.patch
new file mode 100644
index 0000000000..6344a3557d
--- /dev/null
+++ b/main/freeswitch/0001-sofia-sip-byte-order.patch
@@ -0,0 +1,45 @@
+From fa276af16c696e505f66e6ca18ab343f985e8f2b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 27 Jul 2016 07:31:16 +0000
+Subject: [PATCH] sofia-sip: byte-order
+
+---
+ libs/sofia-sip/libsofia-sip-ua/tport/ws.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+index 7fe9f18..27d95b2 100644
+--- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
++++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c
+@@ -703,14 +703,12 @@ ssize_t ws_close(wsh_t *wsh, int16_t reason)
+ 
+ uint64_t hton64(uint64_t val)
+ {
+-	if (__BYTE_ORDER == __BIG_ENDIAN) return (val);
+-	else return __bswap_64(val);
++	return be64toh(val);
+ }
+ 
+ uint64_t ntoh64(uint64_t val)
+ {
+-	if (__BYTE_ORDER == __BIG_ENDIAN) return (val);
+-	else return __bswap_64(val);
++	return htobe64(val);
+ }
+ 
+ 
+-- 
+2.9.1
+
+diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac
+index ca6bd3a..3d5677b 100644
+--- a/libs/sofia-sip/configure.ac
++++ b/libs/sofia-sip/configure.ac
+@@ -218,7 +218,6 @@ fi
+ AC_C_CONST
+ AC_C_INLINE
+ AC_C_INLINE_DEFINE
+-AC_C_BIGENDIAN(AC_DEFINE([__BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([__BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian]))
+ 
+ AC_C_VAR_FUNC
+ AC_C_MACRO_FUNCTION
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 583f70227f..133b8f90eb 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Contributor: Cameron Banta <cbanta@gmail.com>
 pkgname=freeswitch
-pkgver=1.6.7
-pkgrel=2
+pkgver=1.6.9
+pkgrel=0
 pkgdesc="A communications platform written in C from the ground up"
 url="http://www.freeswitch.org"
 arch="all"
@@ -65,6 +65,8 @@ _libsources="
 
 source="http://files.freeswitch.org/freeswitch-releases/$pkgname-$pkgver.tar.xz
 	$_libsources
+	0001-mod_avmd-use-posix-isinf.patch
+	0001-sofia-sip-byte-order.patch
 	0002-FS-verto-bswap_64.patch
 	getlib.patch
 	modules.conf
@@ -225,19 +227,25 @@ conf() {
 	mkdir -p "$pkgdir"/etc/freeswitch/scripts
 }
 
-md5sums="2723dd2e034872b76562000f8b407569  freeswitch-1.6.7.tar.xz
+md5sums="1c4aaf13d4f77879eae9847a751b743c  freeswitch-1.6.9.tar.xz
+ab5aede02ac33ea21fdf8e2a2dcaaaa3  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="9c7ca2d39985fdc39659054179465540e926880f032f855c0df74d6eec41a794  freeswitch-1.6.7.tar.xz
+sha256sums="aa5f191113be2bd44cb4f2108da3dcc37be3234c6b733896fbff97526ac66451  freeswitch-1.6.9.tar.xz
+6098fcd5879d32e05ab77bd5e38f797d5e3f92523c83ede0abe3db4125c8d834  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="c808fcfed7bb48afcea06b21dae6bd5d24ab0cf71b5f39583ae2b3be2fad2d5bd1d9673c93118163de3b72a14442136860a6f1b66940b901cdbac9b8f308197b  freeswitch-1.6.7.tar.xz
+sha512sums="24a3b09ba5f48dc34cc921120e704f35e497a94196a51d76f3b177d9331a7bd52527d3e5bba23badfb26cfdfdca3e72b3c070587cc6d7d532746061788228748  freeswitch-1.6.9.tar.xz
+e3f4c2567a983bb67021a4384388797d0027cf51bc3866c8803b30902d84dcf299ba8db9982bc3a27aa2d5c2ce2cd3da174c791386b5fa3de04eb9806cc89abb  0001-mod_avmd-use-posix-isinf.patch
+8572fcb10242d7064a1a8f7e62e2d6f9cf0eb1725233791592f9f0a5b39e7979e6804406a6fe7d653444d579d92e7696860fd766708c9906f6d604f28e0a0c63  0001-sofia-sip-byte-order.patch
 5f93150e1acd632df98bc3bed5613fb1e45180ae4096dcfee5c060da213c8355339260eaf5758cd77c785f6d84cf0661650a872ec574b586ab19803d4f6955f8  0002-FS-verto-bswap_64.patch
 4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4  getlib.patch
 6deecb303e765d44bdd970d5a7079c9dd9ce17d12056b68cd978a182a86b477b4a3c19d2f5a18f36199ca2e0594a3b84de521ab821e2f8c89f7449a3d7f21279  modules.conf