summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/asterisk/Makefile2
-rw-r--r--package/asterisk/patches/patch-main_tcptls_c16
2 files changed, 17 insertions, 1 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 05f1a4290..27eb3b924 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -72,7 +72,6 @@ CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \
--without-tonezone \
--without-asound \
--without-curses \
- --without-gtk \
--without-gtk2 \
--without-h323 \
--without-iksemel \
@@ -117,6 +116,7 @@ endif
INSTALL_STYLE:= manual
+TARGET_CFLAGS+= -fgnu89-inline
TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread
MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
ASTLDFLAGS="${TARGET_LDFLAGS}"
diff --git a/package/asterisk/patches/patch-main_tcptls_c b/package/asterisk/patches/patch-main_tcptls_c
new file mode 100644
index 000000000..bf1c21c25
--- /dev/null
+++ b/package/asterisk/patches/patch-main_tcptls_c
@@ -0,0 +1,16 @@
+--- asterisk-1.8.28.2.orig/main/tcptls.c 2014-06-13 07:06:27.000000000 +0200
++++ asterisk-1.8.28.2/main/tcptls.c 2016-09-25 20:47:30.313327069 +0200
+@@ -753,9 +753,12 @@ static int __ssl_setup(struct ast_tls_co
+ cfg->ssl_ctx = SSL_CTX_new(SSLv2_client_method());
+ } else
+ #endif
++#ifndef OPENSSL_NO_SSL3_METHOD
+ if (ast_test_flag(&cfg->flags, AST_SSL_SSLV3_CLIENT)) {
+ cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
+- } else if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
++ } else
++#endif
++ if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
+ cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
+ } else {
+ /* SSLv23_client_method() sends SSLv2, this was the original