From affb6cb9ede0d3459c7c6180663f049bf87313bd Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Thu, 7 May 2015 10:11:26 +0000 Subject: [PATCH] libwebsockets: update to 1.4.x release. This changes the ABI and .so number, so it is only suitable for trunk packages. A patch included upstream has been dropped. Full changelog: https://github.com/warmcat/libwebsockets/blob/master/changelog Signed-off-by: Karl Palsson --- libs/libwebsockets/Makefile | 2 +- ...yassl-correct-include-path-for-3.1.x.patch | 25 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 libs/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch diff --git a/libs/libwebsockets/Makefile b/libs/libwebsockets/Makefile index 62cd3fa8bb..7b7fac32de 100644 --- a/libs/libwebsockets/Makefile +++ b/libs/libwebsockets/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebsockets -PKG_VERSION:=1.3-chrome37-firefox30 +PKG_VERSION:=1.4-chrome43-firefox-36 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/libs/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch b/libs/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch deleted file mode 100644 index 4413ac9294..0000000000 --- a/libs/libwebsockets/patches/0001-cyassl-correct-include-path-for-3.1.x.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4fb4a2353db521667d1ec61480bf8179bf585d5f Mon Sep 17 00:00:00 2001 -From: Karl Palsson -Date: Thu, 14 Aug 2014 16:30:48 +0000 -Subject: [PATCH] cyassl: correct include path for 3.1.x - ---- - lib/private-libwebsockets.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h -index 4194498..fbd22b5 100755 ---- a/lib/private-libwebsockets.h -+++ b/lib/private-libwebsockets.h -@@ -155,7 +155,7 @@ - #ifdef LWS_OPENSSL_SUPPORT - #ifdef USE_CYASSL - #include --#include -+#include - unsigned char * - SHA1(const unsigned char *d, size_t n, unsigned char *md); - #else --- -1.8.3.1 - -- 2.30.2