From e54ecea1b018411f4a2120a59b975623c674d427 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 8 Nov 2018 15:44:06 -0800 Subject: [PATCH] libwebsockets: Fix build without deprecated OpenSSL APIs Signed-off-by: Rosen Penev --- libs/libwebsockets/Makefile | 2 +- .../patches/010-openssl-deprecated.patch | 11 +++++++++++ libs/libwebsockets/patches/020-fix-travis.patch | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 libs/libwebsockets/patches/010-openssl-deprecated.patch diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 26dc23f54a..b9fe6dc904 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets PKG_VERSION:=3.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/libs/libwebsockets/patches/010-openssl-deprecated.patch b/libs/libwebsockets/patches/010-openssl-deprecated.patch new file mode 100644 index 0000000000..6d43ece429 --- /dev/null +++ b/libs/libwebsockets/patches/010-openssl-deprecated.patch @@ -0,0 +1,11 @@ +--- a/lib/tls/private.h ++++ b/lib/tls/private.h +@@ -64,6 +64,8 @@ + #include + #include + #include ++ #include ++ #include + #ifdef LWS_HAVE_OPENSSL_ECDH_H + #include + #endif diff --git a/libs/libwebsockets/patches/020-fix-travis.patch b/libs/libwebsockets/patches/020-fix-travis.patch index b6e287575c..9631e6e1ef 100644 --- a/libs/libwebsockets/patches/020-fix-travis.patch +++ b/libs/libwebsockets/patches/020-fix-travis.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index b260969..ece281d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1050,9 +1050,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID +@@ -1055,9 +1055,9 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID endif() if (UNIX AND NOT LWS_WITH_ESP32) -- 2.30.2