From 357e5c1a833742ee0cb732c5a569bb272b799b5a Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 12 May 2016 16:58:00 +0200 Subject: [PATCH] libwebsockets: update to 2.0.1. --- srcpkgs/libwebsockets/patches/fix-ipv6.patch | 11 --------- .../libwebsockets/patches/fix-libressl.patch | 24 ------------------- srcpkgs/libwebsockets/template | 4 ++-- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/libwebsockets/patches/fix-ipv6.patch delete mode 100644 srcpkgs/libwebsockets/patches/fix-libressl.patch diff --git a/srcpkgs/libwebsockets/patches/fix-ipv6.patch b/srcpkgs/libwebsockets/patches/fix-ipv6.patch deleted file mode 100644 index 599ca549816..00000000000 --- a/srcpkgs/libwebsockets/patches/fix-ipv6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/server.c.orig 2016-05-05 22:02:19.415381744 +0200 -+++ lib/server.c 2016-05-05 22:02:25.795382036 +0200 -@@ -67,7 +67,7 @@ lws_context_init_server(struct lws_conte - else - #endif - #ifdef LWS_USE_IPV6 -- if (LWS_IPV6_ENABLED(context)) -+ if (LWS_IPV6_ENABLED(vhost->context)) - sockfd = socket(AF_INET6, SOCK_STREAM, 0); - else - #endif diff --git a/srcpkgs/libwebsockets/patches/fix-libressl.patch b/srcpkgs/libwebsockets/patches/fix-libressl.patch deleted file mode 100644 index ef8abfb4498..00000000000 --- a/srcpkgs/libwebsockets/patches/fix-libressl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/ssl.c.orig 2016-05-05 21:56:47.926366544 +0200 -+++ lib/ssl.c 2016-05-05 21:56:11.400364869 +0200 -@@ -197,7 +197,9 @@ lws_ssl_destroy(struct lws_vhost *vhost) - #if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL) - ERR_remove_state(0); - #else --#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) && \ -+ !defined(OPENSSL_IS_BORINGSSL) - ERR_remove_thread_state(); - #else - ERR_remove_thread_state(NULL); -@@ -689,7 +691,9 @@ lws_ssl_context_destroy(struct lws_context *context) - #if (OPENSSL_VERSION_NUMBER < 0x01000000) || defined(USE_WOLFSSL) - ERR_remove_state(0); - #else --#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100005L) && \ -+ !defined(LIBRESSL_VERSION_NUMBER) && \ -+ !defined(OPENSSL_IS_BORINGSSL) - ERR_remove_thread_state(); - #else - ERR_remove_thread_state(NULL); diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template index 45e9e2beb06..b7f11187f5d 100644 --- a/srcpkgs/libwebsockets/template +++ b/srcpkgs/libwebsockets/template @@ -1,6 +1,6 @@ # Template file for 'libwebsockets' pkgname=libwebsockets -version=2.0.0 +version=2.0.1 revision=1 build_style=cmake hostmakedepends="cmake" @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="LGPL-2" homepage="https://libwebsockets.org" distfiles="https://github.com/warmcat/libwebsockets/archive/v$version.tar.gz" -checksum=c2fa0f62caa9a82b2032af42f577e9079cc743889f02828a332211197ba43995 +checksum=f98cf9e35385863cfe64a5f181403bf3113cc5d82604c4811e1373ba8676ef88 CFLAGS="-Wno-error" libwebsockets-devel_package() {