From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Mon, 14 May 2018 06:25:19 +0000 (+0200)
Subject: package/asterisk: Fix issues building without SSL
X-Git-Tag: 2018.05-rc2~57
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/coffee/buildroot.git/commitdiff_plain/c27ed9f618e1d28459868402dad32bd1f48f99e4

package/asterisk: Fix issues building without SSL

Fixes
http://autobuild.buildroot.net/results/7d0/7d069dd5629e406cecd17bacfa818e7c8e6b2064/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---

diff --git a/package/asterisk/0006-build-fix-issues-building-without-ssl.patch b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
new file mode 100644
index 0000000000..b02031e5ab
--- /dev/null
+++ b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
@@ -0,0 +1,57 @@
+From 999e0c17d7e4139d36730752a34fbfde18a4f9f1 Mon Sep 17 00:00:00 2001
+From: Corey Farrell <git@cfware.com>
+Date: Sun, 19 Nov 2017 14:52:59 -0500
+Subject: [PATCH] Build: Fix issues building without SSL.
+
+* Fix conditional in libasteriskssl.
+* Use variables produced by configure to link the SSL and uuid libraries
+  into libasteriskpj.so instead of hard-coding them.
+
+ASTERISK-27431
+
+Change-Id: I3977931fd3ef8c4e4376349ccddb354eb839b58d
+
+Downloaded from upstream master branch
+https://github.com/asterisk/asterisk/commit/999e0c17d7e4139d36730752a34fbfde18a4f9f1
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ main/Makefile         | 4 ++--
+ main/libasteriskssl.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/main/Makefile b/main/Makefile
+index 08d1f65580e..c724e2012b0 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -273,7 +273,7 @@ endif
+ 
+ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS)
+ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
+-$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
++$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+ ifeq ($(GNU_LD),1)
+     $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
+ endif
+@@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib
+ # /lib or /usr/lib
+ $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)
+ $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE
+-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
++$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+ $(ASTPJ_LIB): SOLINK=$(DYLINK)
+ 
+ # Special rules for building a shared library (not a dynamically loadable module)
+diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
+index 8b19e247da9..e2e256f8ffe 100644
+--- a/main/libasteriskssl.c
++++ b/main/libasteriskssl.c
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #if defined(HAVE_OPENSSL) && \
+-	!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++	(!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ 
+ #include <dlfcn.h>
+