1 |
commit: eedb87e4ca9074a1b5f982be059d7d5a6a653279 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Fri May 1 09:02:06 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 1 15:09:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedb87e4 |
7 |
|
8 |
net-libs/libwebsockets: change of IUSE flags |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
12 |
Signed-off-by: Luka Perkov <luka.perkov <AT> sartura.hr> |
13 |
Acked-by: Jaco Kroon <jaco <AT> uls.co.za> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/15452 |
15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
16 |
|
17 |
net-libs/libwebsockets/libwebsockets-4.0.4.ebuild | 28 ++++++++++++++++------- |
18 |
net-libs/libwebsockets/metadata.xml | 6 +++++ |
19 |
2 files changed, 26 insertions(+), 8 deletions(-) |
20 |
|
21 |
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild |
22 |
index 7620aaaa024..66623dc9f91 100644 |
23 |
--- a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild |
24 |
+++ b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild |
25 |
@@ -12,14 +12,16 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}. |
26 |
LICENSE="MIT" |
27 |
SLOT="0/16" # libwebsockets.so.16 |
28 |
KEYWORDS="~amd64 ~arm ~x86" |
29 |
-IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 |
30 |
- +lejp libev libevent libressl libuv peer-limits server-status smtp socks5 |
31 |
- sqlite3 ssl static-libs threads zip" |
32 |
+IUSE="access-log caps cgi client dbus +dir +extensions +file-ops generic-sessions http-proxy +http-uncommon-headers http2 ipv6 |
33 |
+ +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 |
34 |
+ sqlite3 ssl static-libs +testapps threads zip" |
35 |
|
36 |
REQUIRED_USE=" |
37 |
generic-sessions? ( smtp sqlite3 ) |
38 |
http-proxy? ( client ) |
39 |
smtp? ( libuv ) |
40 |
+ ssl? ( ?? ( libressl mbedtls ) ) |
41 |
+ testapps? ( extensions ) |
42 |
?? ( libev libevent ) |
43 |
" |
44 |
|
45 |
@@ -32,10 +34,12 @@ RDEPEND=" |
46 |
libuv? ( dev-libs/libuv:= ) |
47 |
sqlite3? ( dev-db/sqlite:= ) |
48 |
ssl? ( |
49 |
- !libressl? ( dev-libs/openssl:0= ) |
50 |
- libressl? ( dev-libs/libressl:0= ) |
51 |
- ) |
52 |
-" |
53 |
+ !libressl? ( |
54 |
+ !mbedtls? ( dev-libs/openssl:0= ) |
55 |
+ mbedtls? ( >net-libs/mbedtls-2.0.0 ) |
56 |
+ ) |
57 |
+ )" |
58 |
+ |
59 |
DEPEND="${RDEPEND}" |
60 |
BDEPEND="dev-lang/perl" |
61 |
|
62 |
@@ -47,20 +51,28 @@ src_configure() { |
63 |
local mycmakeargs=( |
64 |
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON |
65 |
-DLWS_HAVE_LIBCAP=$(usex caps) |
66 |
+ -DLWS_HAVE_SYS_CAPABILITY_H=$(usex caps) |
67 |
-DLWS_IPV6=$(usex ipv6) |
68 |
+ -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex testapps) |
69 |
-DLWS_ROLE_DBUS=$(usex dbus) |
70 |
-DLWS_WITHOUT_CLIENT=$(usex !client) |
71 |
-DLWS_WITHOUT_TEST_CLIENT=$(usex !client) |
72 |
-DLWS_WITH_ACCESS_LOG=$(usex access-log) |
73 |
-DLWS_WITH_CGI=$(usex cgi) |
74 |
+ -DLWS_WITH_DIR=$(usex dir) |
75 |
+ -DLWS_WITHOUT_EXTENSIONS=$(usex !extensions) |
76 |
+ -DLWS_WITH_FILE_OPS=$(usex file-ops) |
77 |
-DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions) |
78 |
-DLWS_WITH_HTTP2=$(usex http2) |
79 |
+ -DLWS_WITH_HTTP_BASIC_AUTH=$(usex http-uncommon-headers) |
80 |
-DLWS_WITH_HTTP_PROXY=$(usex http-proxy) |
81 |
+ -DLWS_WITH_HTTP_UNCOMMON_HEADERS=$(usex http-uncommon-headers) |
82 |
-DLWS_WITH_HUBBUB=$(usex http-proxy) |
83 |
-DLWS_WITH_LEJP=$(usex lejp) |
84 |
-DLWS_WITH_LIBEV=$(usex libev) |
85 |
-DLWS_WITH_LIBEVENT=$(usex libevent) |
86 |
-DLWS_WITH_LIBUV=$(usex libuv) |
87 |
+ -DLWS_WITH_MBEDTLS=$(usex mbedtls) |
88 |
-DLWS_WITH_PEER_LIMITS=$(usex peer-limits) |
89 |
-DLWS_WITH_SERVER_STATUS=$(usex server-status) |
90 |
-DLWS_WITH_SMTP=$(usex smtp) |
91 |
@@ -70,7 +82,7 @@ src_configure() { |
92 |
-DLWS_WITH_STATIC=$(usex static-libs) |
93 |
-DLWS_WITH_THREADPOOL=$(usex threads) |
94 |
-DLWS_WITH_ZIP_FOPS=$(usex zip) |
95 |
- -DLWS_WITHOUT_TESTAPPS=ON |
96 |
+ -DLWS_WITHOUT_TESTAPPS=$(usex !testapps) |
97 |
) |
98 |
|
99 |
cmake_src_configure |
100 |
|
101 |
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml |
102 |
index 6aa0f75c884..026a4eee25a 100644 |
103 |
--- a/net-libs/libwebsockets/metadata.xml |
104 |
+++ b/net-libs/libwebsockets/metadata.xml |
105 |
@@ -20,14 +20,20 @@ |
106 |
<use> |
107 |
<flag name="access-log">Support generating Apache-compatible access logs</flag> |
108 |
<flag name="cgi">Include CGI (spawn process with network-connected stdin/out/err) APIs</flag> |
109 |
+ <flag name="dir">Enable directory scanning api support</flag> |
110 |
+ <flag name="file-ops">Support file operations vfs</flag> |
111 |
<flag name="client">The client part of the library and libwebsockets-test-client</flag> |
112 |
+ <flag name="extensions">Compile with extensions</flag> |
113 |
<flag name="generic-sessions">With the Generic Sessions plugin</flag> |
114 |
<flag name="http2">Support the HTTP/2 protocol</flag> |
115 |
<flag name="http-proxy">Support for rewriting HTTP proxying</flag> |
116 |
+ <flag name="http-uncommon-headers">Inlude less common http header support</flag> |
117 |
<flag name="lejp">With the Lightweight JSON Parser</flag> |
118 |
<flag name="libev">Support event loops via dev-libs/libev</flag> |
119 |
<flag name="libevent">Support event loops via dev-libs/libevent</flag> |
120 |
<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag> |
121 |
+ <flag name="mbedtls">Use mbedTLS replacement for OpenSSL</flag> |
122 |
+ <flag name="testapps">Build the libwebsocket-test-apps</flag> |
123 |
<flag name="peer-limits">Track peers and restrict resources a single peer can allocate</flag> |
124 |
<flag name="server-status">Support json + jscript server monitoring</flag> |
125 |
<flag name="smtp">Provide SMTP support</flag> |