-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
950 additions
and
0 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
0001-FS-10774-switch_pgsql-Fix-build-for-PostgreSQL-libpq.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From 9d96741f56b7f663fd1b0ad625b4b7042832ebca Mon Sep 17 00:00:00 2001 | ||
From: Italo Rossi <[email protected]> | ||
Date: Mon, 6 Nov 2017 10:35:36 -0300 | ||
Subject: [PATCH] FS-10774 - [switch_pgsql] Fix build for PostgreSQL/libpq 10 | ||
|
||
--- | ||
src/switch_pgsql.c | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/switch_pgsql.c b/src/switch_pgsql.c | ||
index 7928624270..f3411361fd 100644 | ||
--- a/src/switch_pgsql.c | ||
+++ b/src/switch_pgsql.c | ||
@@ -386,7 +386,7 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq | ||
*result_out = res; | ||
res->status = PQresultStatus(res->result); | ||
switch(res->status) { | ||
-#if POSTGRESQL_MAJOR_VERSION >= 9 && POSTGRESQL_MINOR_VERSION >= 2 | ||
+#if (POSTGRESQL_MAJOR_VERSION == 9 && POSTGRESQL_MINOR_VERSION >= 2) || POSTGRESQL_MAJOR_VERSION > 9 | ||
case PGRES_SINGLE_TUPLE: | ||
/* Added in PostgreSQL 9.2 */ | ||
#endif | ||
@@ -397,7 +397,7 @@ SWITCH_DECLARE(switch_pgsql_status_t) switch_pgsql_next_result_timed(switch_pgsq | ||
res->cols = PQnfields(res->result); | ||
} | ||
break; | ||
-#if POSTGRESQL_MAJOR_VERSION >= 9 && POSTGRESQL_MINOR_VERSION >= 1 | ||
+#if (POSTGRESQL_MAJOR_VERSION == 9 && POSTGRESQL_MINOR_VERSION >= 1) || POSTGRESQL_MAJOR_VERSION > 9 | ||
case PGRES_COPY_BOTH: | ||
/* Added in PostgreSQL 9.1 */ | ||
#endif | ||
-- | ||
2.15.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
diff --git a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c | ||
index 6bf0b41..7ef31f7 100644 | ||
--- a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c | ||
+++ b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.c | ||
@@ -16,10 +16,9 @@ | ||
#define ISNAN(x) (!!(_isnan(x))) | ||
#define ISINF(x) (isinf(x)) | ||
#else | ||
- int __isnan(double); | ||
- int __isinf(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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
From fa276af16c696e505f66e6ca18ab343f985e8f2b Mon Sep 17 00:00:00 2001 | ||
From: Natanael Copa <[email protected]> | ||
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([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) | ||
|
||
AC_C_VAR_FUNC | ||
AC_C_MACRO_FUNCTION |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- a/src/mod/endpoints/mod_verto/ws.h | ||
+++ b/src/mod/endpoints/mod_verto/ws.h | ||
@@ -36,6 +36,9 @@ | ||
((x>>40) & 0x000000000000FF00) | \ | ||
(x<<56) | ||
#endif | ||
+#ifndef __bswap_64 | ||
+#include <byteswap.h> | ||
+#endif | ||
#ifdef _MSC_VER | ||
#ifndef strncasecmp | ||
#define strncasecmp _strnicmp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
--- a/src/mod/event_handlers/mod_kazoo/Makefile.am | ||
+++ b/src/mod/event_handlers/mod_kazoo/Makefile.am | ||
@@ -14,10 +14,12 @@ | ||
mod_kazoo_la_LIBADD = $(switch_builddir)/libfreeswitch.la | ||
mod_kazoo_la_LDFLAGS = -avoid-version -module -no-undefined -shared @ERLANG_LDFLAGS@ | ||
|
||
+mod_kazoo.la: kazoo_definitions.h $(mod_kazoo_la_OBJECTS) $(mod_kazoo_la_DEPENDENCIES) $(EXTRA_mod_kazoo_la_DEPENDENCIES) | ||
+ $(AM_V_CCLD)$(mod_kazoo_la_LINK) $(am_mod_kazoo_la_rpath) $(mod_kazoo_la_OBJECTS) $(mod_kazoo_la_LIBADD) $(LIBS) | ||
+ | ||
+ | ||
kazoo_definitions.h: | ||
xxd -i kazoo.conf.xml > kazoo_definitions.h | ||
- | ||
-local_depend: kazoo_definitions.h | ||
|
||
else | ||
install: error |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- a/src/mod/endpoints/mod_rtmp/handshake.h | ||
+++ b/src/mod/endpoints/mod_rtmp/handshake.h | ||
@@ -35,6 +35,12 @@ | ||
#include <openssl/hmac.h> | ||
#include <openssl/sha.h> | ||
|
||
+#ifdef LIBRESSL_VERSION_NUMBER | ||
+#include <openssl/rand.h> | ||
+#undef OPENSSL_VERSION_NUMBER | ||
+#define OPENSSL_VERSION_NUMBER 0x1000107fL | ||
+#endif | ||
+ | ||
#if !defined(_MSC_VER) && !defined(__FUNCTION__) | ||
#define __FUNCTION__ (const char *)__func__ | ||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- a/libs/srtp/crypto/hash/hmac_ossl.c | ||
+++ b/libs/srtp/crypto/hash/hmac_ossl.c | ||
@@ -52,6 +52,12 @@ | ||
#include <openssl/evp.h> | ||
#include <openssl/hmac.h> | ||
|
||
+#ifdef LIBRESSL_VERSION_NUMBER | ||
+#include <openssl/rand.h> | ||
+#undef OPENSSL_VERSION_NUMBER | ||
+#define OPENSSL_VERSION_NUMBER 0x1000107fL | ||
+#endif | ||
+ | ||
#define SHA1_DIGEST_SIZE 20 | ||
|
||
/* the debug module for authentiation */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
--- a/src/include/switch_ssl.h | ||
+++ b/src/include/switch_ssl.h | ||
@@ -47,6 +47,12 @@ | ||
#include <openssl/err.h> | ||
#include <openssl/bio.h> | ||
|
||
+#ifdef LIBRESSL_VERSION_NUMBER | ||
+#include <openssl/rand.h> | ||
+#undef OPENSSL_VERSION_NUMBER | ||
+#define OPENSSL_VERSION_NUMBER 0x1000107fL | ||
+#endif | ||
+ | ||
SWITCH_DECLARE(int) switch_core_cert_extract_fingerprint(X509* x509, dtls_fingerprint_t *fp); | ||
|
||
#else | ||
|
Oops, something went wrong.