1 |
commit: 8ce605f5ac69bd73ccdcaf07240cc909ef43183f |
2 |
Author: yuchen.xie <yuchen.xie <AT> live <DOT> com> |
3 |
AuthorDate: Thu Feb 16 12:03:13 2017 +0000 |
4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 28 03:40:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ce605f5 |
7 |
|
8 |
net-libs/libwebsockets: bump to 2.1.1 |
9 |
|
10 |
net-libs/libwebsockets/Manifest | 1 + |
11 |
.../files/libwebsockets-2.1.1-x86-build.patch | 22 +++++++ |
12 |
net-libs/libwebsockets/libwebsockets-2.1.1.ebuild | 68 ++++++++++++++++++++++ |
13 |
net-libs/libwebsockets/metadata.xml | 10 +++- |
14 |
4 files changed, 100 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest |
17 |
index f10bd5c17fe..7003902bc6b 100644 |
18 |
--- a/net-libs/libwebsockets/Manifest |
19 |
+++ b/net-libs/libwebsockets/Manifest |
20 |
@@ -1,3 +1,4 @@ |
21 |
DIST libwebsockets-1.7.8.tar.gz 2914823 SHA256 59809ed49e1143933d7a178b92e01db2dc9a68b5582faa425224dac3b813c744 SHA512 43599347275f5b3e92749691f00eea57a434e8a123111119fe624b56a7267dbd85d4257bd0d1386b13504a0b4102920dfc337629b6fd218f0e5e17c37d692768 WHIRLPOOL 50e60db2784172674c8cc34e67c98ae52e5367b6958bd8a8ae839ce08cf9101944513ca8ca697b2da8a565a927af4aecc049c9d1e87d06f9ee8e68a16aba5a5a |
22 |
DIST libwebsockets-1.7.9.tar.gz 2915358 SHA256 86a5105881ea2cb206f8795483d294e9509055decf60436bcc1e746262416438 SHA512 d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56 WHIRLPOOL fd4682cd941b23d79239c5351eeb129274b3d566aad5962825cfd3fbed262f69503dc0adde2eb7b65e4d446de09133595646695925c8633745c5aecd45a0af00 |
23 |
DIST libwebsockets-2.0.2.tar.gz 2998585 SHA256 7ab40b7c28b25d7a3776283219447876502163d89269b3c05739cfc3753525bc SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a WHIRLPOOL 576e16dd9638822056142b3c72a53ba2d3582d5c15b3f0c971abc6017d3d34d3c7df503414f33cc3b68cf8033b5ff5cb6dc9b286d1c9c5d890bc0928f61a1439 |
24 |
+DIST libwebsockets-2.1.1.tar.gz 3769593 SHA256 96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683 WHIRLPOOL 7eae91b00d0c80c7589114ff4d3544aded742babdf2ff1c0cf1091f846f844c86b20b1983709e20c429c5caa98ae808b4094723695e36fdc124ea81d4ad49747 |
25 |
|
26 |
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 |
27 |
new file mode 100644 |
28 |
index 00000000000..9fe9489297f |
29 |
--- /dev/null |
30 |
+++ b/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch |
31 |
@@ -0,0 +1,22 @@ |
32 |
+From f9f5a5760782b68fba190fb46d306f7c08f027c0 Mon Sep 17 00:00:00 2001 |
33 |
+From: Silas Parker <skyhisi@××××××××××××.invalid> |
34 |
+Date: Tue, 14 Feb 2017 17:55:13 +0800 |
35 |
+Subject: [PATCH] gcc-format-strings: ipv6 |
36 |
+ |
37 |
+--- |
38 |
+ lib/libwebsockets.c | 2 +- |
39 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
40 |
+ |
41 |
+diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c |
42 |
+index 770cb24..8ee906a 100755 |
43 |
+--- a/lib/libwebsockets.c |
44 |
++++ b/lib/libwebsockets.c |
45 |
+@@ -670,7 +670,7 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name, |
46 |
+ #ifdef LWS_USE_IPV6 |
47 |
+ if (LWS_IPV6_ENABLED(vh)) { |
48 |
+ if (!lws_plat_inet_ntop(AF_INET6, &((struct sockaddr_in6 *)ads)->sin6_addr, rip, rip_len)) { |
49 |
+- lwsl_err("inet_ntop", strerror(LWS_ERRNO)); |
50 |
++ lwsl_err("inet_ntop: %s", strerror(LWS_ERRNO)); |
51 |
+ return -1; |
52 |
+ } |
53 |
+ |
54 |
|
55 |
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..29e65d4f6d8 |
58 |
--- /dev/null |
59 |
+++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild |
60 |
@@ -0,0 +1,68 @@ |
61 |
+# Copyright 1999-2017 Gentoo Foundation |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+# $Id$ |
64 |
+ |
65 |
+EAPI=6 |
66 |
+ |
67 |
+inherit cmake-utils |
68 |
+ |
69 |
+DESCRIPTION="canonical libwebsockets.org websocket library" |
70 |
+HOMEPAGE="https://libwebsockets.org/" |
71 |
+SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
72 |
+ |
73 |
+LICENSE="LGPL-2.1" |
74 |
+SLOT="0/${PV}" |
75 |
+KEYWORDS="~amd64 ~x86" |
76 |
+IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp libev libressl libuv server-status smtp sqlite3 static-libs" |
77 |
+ |
78 |
+REQUIRED_USE=" |
79 |
+ libressl? ( ssl ) |
80 |
+ http-proxy? ( client ) |
81 |
+ generic-sessions? ( sqlite3 ) |
82 |
+ generic-sessions? ( smtp ) |
83 |
+ smtp? ( libuv ) |
84 |
+" |
85 |
+ |
86 |
+RDEPEND=" |
87 |
+ sys-libs/zlib |
88 |
+ http-proxy? ( net-libs/libhubbub ) |
89 |
+ libev? ( dev-libs/libev ) |
90 |
+ libuv? ( dev-libs/libuv ) |
91 |
+ sqlite3? ( dev-db/sqlite ) |
92 |
+ ssl? ( |
93 |
+ !libressl? ( dev-libs/openssl:0= ) |
94 |
+ libressl? ( dev-libs/libressl:0= ) |
95 |
+ ) |
96 |
+" |
97 |
+DEPEND="${RDEPEND} |
98 |
+ dev-lang/perl |
99 |
+" |
100 |
+src_prepare() { |
101 |
+ epatch "${FILESDIR}/${P}-x86-build.patch" |
102 |
+ default |
103 |
+} |
104 |
+ |
105 |
+src_configure() { |
106 |
+ local mycmakeargs=( |
107 |
+ -DLWS_IPV6=$(usex ipv6 ON OFF) |
108 |
+ -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF) |
109 |
+ -DLWS_WITH_HTTP2=$(usex http2 ON OFF) |
110 |
+ -DLWS_WITH_STATIC=$(usex static-libs ON OFF) |
111 |
+ -DLWS_WITH_LIBEV=$(usex libev ON OFF) |
112 |
+ -DLWS_WITH_LIBUV=$(usex libuv ON OFF) |
113 |
+ -DLWS_WITH_SSL=$(usex ssl ON OFF) |
114 |
+ -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF) |
115 |
+ -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF) |
116 |
+ -DLWS_WITH_CGI=$(usex cgi ON OFF) |
117 |
+ -DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF) |
118 |
+ -DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF) |
119 |
+ -DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF) |
120 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON |
121 |
+ -DLWS_WITH_LEJP=$(usex lejp ON OFF) |
122 |
+ -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF) |
123 |
+ -DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF) |
124 |
+ -DLWS_WITH_SMTP=$(usex smtp ON OFF) |
125 |
+ ) |
126 |
+ |
127 |
+ cmake-utils_src_configure |
128 |
+} |
129 |
|
130 |
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml |
131 |
index 80de53e2760..66e688123d4 100644 |
132 |
--- a/net-libs/libwebsockets/metadata.xml |
133 |
+++ b/net-libs/libwebsockets/metadata.xml |
134 |
@@ -14,12 +14,20 @@ |
135 |
<name>Proxy Maintainers</name> |
136 |
</maintainer> |
137 |
<longdescription> |
138 |
- libwebsockets is a C library designed to make development of websockets clients and servers easier (possible). |
139 |
+ libwebsockets is a C library for lightweight websocket clients and servers. |
140 |
</longdescription> |
141 |
<use> |
142 |
+ <flag name="access-log">Support generating Apache-compatible access logs</flag> |
143 |
+ <flag name="cgi">Include CGI (spawn process with network-connected stdin/out/err) APIs</flag> |
144 |
<flag name="client">The client part of the library and libwebsockets-test-client</flag> |
145 |
+ <flag name="generic-sessions">With the Generic Sessions plugin</flag> |
146 |
<flag name="http2">Support the HTTP/2 protocol</flag> |
147 |
+ <flag name="http-proxy">Support for rewriting HTTP proxying</flag> |
148 |
+ <flag name="lejp">With the Lightweight JSON Parser</flag> |
149 |
<flag name="libev">Support event loops via dev-libs/libev</flag> |
150 |
<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag> |
151 |
+ <flag name="server-status">Support json + jscript server monitoring</flag> |
152 |
+ <flag name="smtp">Provide SMTP support</flag> |
153 |
+ <flag name="sqlite3">Require SQLITE3 support</flag> |
154 |
</use> |
155 |
</pkgmetadata> |