net-libs/libwebsockets: bump to 2.1.1

4 files changed, 100 insertions, 1 deletions

diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index f10bd5c17fe..7003902bc6b 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,4 @@
 DIST libwebsockets-1.7.8.tar.gz 2914823 SHA256 59809ed49e1143933d7a178b92e01db2dc9a68b5582faa425224dac3b813c744 SHA512 43599347275f5b3e92749691f00eea57a434e8a123111119fe624b56a7267dbd85d4257bd0d1386b13504a0b4102920dfc337629b6fd218f0e5e17c37d692768 WHIRLPOOL 50e60db2784172674c8cc34e67c98ae52e5367b6958bd8a8ae839ce08cf9101944513ca8ca697b2da8a565a927af4aecc049c9d1e87d06f9ee8e68a16aba5a5a
 DIST libwebsockets-1.7.9.tar.gz 2915358 SHA256 86a5105881ea2cb206f8795483d294e9509055decf60436bcc1e746262416438 SHA512 d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56 WHIRLPOOL fd4682cd941b23d79239c5351eeb129274b3d566aad5962825cfd3fbed262f69503dc0adde2eb7b65e4d446de09133595646695925c8633745c5aecd45a0af00
 DIST libwebsockets-2.0.2.tar.gz 2998585 SHA256 7ab40b7c28b25d7a3776283219447876502163d89269b3c05739cfc3753525bc SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a WHIRLPOOL 576e16dd9638822056142b3c72a53ba2d3582d5c15b3f0c971abc6017d3d34d3c7df503414f33cc3b68cf8033b5ff5cb6dc9b286d1c9c5d890bc0928f61a1439
+DIST libwebsockets-2.1.1.tar.gz 3769593 SHA256 96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683 WHIRLPOOL 7eae91b00d0c80c7589114ff4d3544aded742babdf2ff1c0cf1091f846f844c86b20b1983709e20c429c5caa98ae808b4094723695e36fdc124ea81d4ad49747
diff --git a/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch b/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
new file mode 100644
index 00000000000..9fe9489297f
--- /dev/null
+++ b/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
@@ -0,0 +1,22 @@
+From f9f5a5760782b68fba190fb46d306f7c08f027c0 Mon Sep 17 00:00:00 2001
+From: Silas Parker <skyhisi@users.github.invalid>
+Date: Tue, 14 Feb 2017 17:55:13 +0800
+Subject: [PATCH] gcc-format-strings: ipv6
+
+---
+ lib/libwebsockets.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
+index 770cb24..8ee906a 100755
+--- a/lib/libwebsockets.c
++++ b/lib/libwebsockets.c
+@@ -670,7 +670,7 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
+ #ifdef LWS_USE_IPV6
+ 	if (LWS_IPV6_ENABLED(vh)) {
+ 		if (!lws_plat_inet_ntop(AF_INET6, &((struct sockaddr_in6 *)ads)->sin6_addr, rip, rip_len)) {
+-			lwsl_err("inet_ntop", strerror(LWS_ERRNO));
++			lwsl_err("inet_ntop: %s", strerror(LWS_ERRNO));
+ 			return -1;
+ 		}
+ 
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
new file mode 100644
index 00000000000..29e65d4f6d8
--- /dev/null
+++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="canonical libwebsockets.org websocket library"
+HOMEPAGE="https://libwebsockets.org/"
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp libev libressl libuv server-status smtp sqlite3 static-libs"
+
+REQUIRED_USE="
+	libressl? ( ssl )
+	http-proxy? ( client )
+	generic-sessions? ( sqlite3 )
+	generic-sessions? ( smtp )
+	smtp? ( libuv )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	http-proxy? ( net-libs/libhubbub )
+	libev?      ( dev-libs/libev )
+	libuv?      ( dev-libs/libuv )
+	sqlite3?    ( dev-db/sqlite )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl?  ( dev-libs/libressl:0= )
+		)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+src_prepare() {
+	epatch "${FILESDIR}/${P}-x86-build.patch"
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLWS_IPV6=$(usex ipv6 ON OFF)
+		-DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
+		-DLWS_WITH_HTTP2=$(usex http2 ON OFF)
+		-DLWS_WITH_STATIC=$(usex static-libs ON OFF)
+		-DLWS_WITH_LIBEV=$(usex libev ON OFF)
+		-DLWS_WITH_LIBUV=$(usex libuv ON OFF)
+		-DLWS_WITH_SSL=$(usex ssl ON OFF)
+		-DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
+		-DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
+		-DLWS_WITH_CGI=$(usex cgi ON OFF)
+		-DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF)
+		-DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF)
+		-DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+		-DLWS_WITH_LEJP=$(usex lejp ON OFF)
+		-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF)
+		-DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF)
+		-DLWS_WITH_SMTP=$(usex smtp ON OFF)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 80de53e2760..66e688123d4 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -14,12 +14,20 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
-		libwebsockets is a C library designed to make development of websockets clients and servers easier (possible).
+		libwebsockets is a C library for lightweight websocket clients and servers.
 	</longdescription>
 	<use>
+		<flag name="access-log">Support generating Apache-compatible access logs</flag>
+		<flag name="cgi">Include CGI (spawn process with network-connected stdin/out/err) APIs</flag>
 		<flag name="client">The client part of the library and libwebsockets-test-client</flag>
+		<flag name="generic-sessions">With the Generic Sessions plugin</flag>
 		<flag name="http2">Support the HTTP/2 protocol</flag>
+		<flag name="http-proxy">Support for rewriting HTTP proxying</flag>
+		<flag name="lejp">With the Lightweight JSON Parser</flag>
 		<flag name="libev">Support event loops via dev-libs/libev</flag>
 		<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag>
+		<flag name="server-status">Support json + jscript server monitoring</flag>
+		<flag name="smtp">Provide SMTP support</flag>
+		<flag name="sqlite3">Require SQLITE3 support</flag>
 	</use>
 </pkgmetadata>