summaryrefslogtreecommitdiffstats
path: root/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2018-10-14 11:01:55 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-12-09 22:23:08 +0100
commit78790d3e9c37cb7fc75b03305f5ae4af30e566b6 (patch)
tree49cd02d092ff8013ace5773e186902bf66fd7e6c /package/asterisk/0006-build-fix-issues-building-without-ssl.patch
parentc48bff9da6101bff35ff420030e5ab2c430352b4 (diff)
downloadbuildroot-78790d3e9c37cb7fc75b03305f5ae4af30e566b6.tar.gz
buildroot-78790d3e9c37cb7fc75b03305f5ae4af30e566b6.zip
package/asterisk: bump version to 16.0.0
- removed patches applied upstream, re-numbered remaining patches - not available for static builds anymore: https://github.com/asterisk/asterisk/commit/8e36064109b6fabc6cd8caa59e48f9b523c7485b - fixed license hashes after upstream whitespace removal https://github.com/asterisk/asterisk/commit/fd0ca1c3f9b972a52d48a82b492fd6bac772dc78 - removed configure options not provided by upstream anymore - fixed configure error, the file is included in asterisk source: checking for bridges/bridge_softmix/include/hrirs.h... configure: error: cannot check for file existence when cross compiling - added "-without-pjproject-bundled" as noted in https://wiki.asterisk.org/wiki/display/AST/New+in+15 - upstream switched from ncurses to libedit: https://github.com/asterisk/asterisk/commit/d6fda173a40e078db219e9aaceb7f3ce9ba1b4e4 - added libatomic when needed - updated core sound package Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/asterisk/0006-build-fix-issues-building-without-ssl.patch')
-rw-r--r--package/asterisk/0006-build-fix-issues-building-without-ssl.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/package/asterisk/0006-build-fix-issues-building-without-ssl.patch b/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
deleted file mode 100644
index b02031e5ab..0000000000
--- a/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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>
-
OpenPOWER on IntegriCloud