| 1 |
commit: e7cc544fb599cc222e3bd56de8fb13fb6caf7f79 |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Tue May 5 10:24:30 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 12 13:57:11 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cc544f |
| 7 |
|
| 8 |
net-libs/libwebsockets: change of IUSE flags |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/720926 |
| 11 |
Closes: https://bugs.gentoo.org/720020 |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 14 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 15 |
Signed-off-by: Luka Perkov <luka.perkov <AT> sartura.hr> |
| 16 |
Acked-by: Jaco Kroon <jaco <AT> uls.co.za> |
| 17 |
Closes: https://github.com/gentoo/gentoo/pull/15637 |
| 18 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 19 |
|
| 20 |
net-libs/libwebsockets/libwebsockets-4.0.7.ebuild | 12 +++++++++--- |
| 21 |
net-libs/libwebsockets/metadata.xml | 1 + |
| 22 |
2 files changed, 10 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild |
| 25 |
index 7620aaaa024..081c762f0a8 100644 |
| 26 |
--- a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild |
| 27 |
+++ b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild |
| 28 |
@@ -13,13 +13,15 @@ LICENSE="MIT" |
| 29 |
SLOT="0/16" # libwebsockets.so.16 |
| 30 |
KEYWORDS="~amd64 ~arm ~x86" |
| 31 |
IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 |
| 32 |
- +lejp libev libevent libressl libuv peer-limits server-status smtp socks5 |
| 33 |
+ +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 |
| 34 |
sqlite3 ssl static-libs threads zip" |
| 35 |
|
| 36 |
REQUIRED_USE=" |
| 37 |
+ access-log? ( http2 ) |
| 38 |
generic-sessions? ( smtp sqlite3 ) |
| 39 |
http-proxy? ( client ) |
| 40 |
smtp? ( libuv ) |
| 41 |
+ ssl? ( ?? ( libressl mbedtls ) ) |
| 42 |
?? ( libev libevent ) |
| 43 |
" |
| 44 |
|
| 45 |
@@ -32,8 +34,10 @@ 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 |
+ !libressl? ( |
| 52 |
+ !mbedtls? ( dev-libs/openssl:0= ) |
| 53 |
+ mbedtls? ( >net-libs/mbedtls-2.0.0 ) |
| 54 |
+ ) |
| 55 |
) |
| 56 |
" |
| 57 |
DEPEND="${RDEPEND}" |
| 58 |
@@ -44,6 +48,7 @@ PATCHES=( |
| 59 |
) |
| 60 |
|
| 61 |
src_configure() { |
| 62 |
+ append-cflags -Wno-error |
| 63 |
local mycmakeargs=( |
| 64 |
-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON |
| 65 |
-DLWS_HAVE_LIBCAP=$(usex caps) |
| 66 |
@@ -61,6 +66,7 @@ src_configure() { |
| 67 |
-DLWS_WITH_LIBEV=$(usex libev) |
| 68 |
-DLWS_WITH_LIBEVENT=$(usex libevent) |
| 69 |
-DLWS_WITH_LIBUV=$(usex libuv) |
| 70 |
+ -DLWS_WITH_MBEDTLS=$(usex mbedtls) |
| 71 |
-DLWS_WITH_PEER_LIMITS=$(usex peer-limits) |
| 72 |
-DLWS_WITH_SERVER_STATUS=$(usex server-status) |
| 73 |
-DLWS_WITH_SMTP=$(usex smtp) |
| 74 |
|
| 75 |
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml |
| 76 |
index 6aa0f75c884..23c9033fcec 100644 |
| 77 |
--- a/net-libs/libwebsockets/metadata.xml |
| 78 |
+++ b/net-libs/libwebsockets/metadata.xml |
| 79 |
@@ -28,6 +28,7 @@ |
| 80 |
<flag name="libev">Support event loops via dev-libs/libev</flag> |
| 81 |
<flag name="libevent">Support event loops via dev-libs/libevent</flag> |
| 82 |
<flag name="libuv">Support asynchronous I/O via dev-libs/libuv</flag> |
| 83 |
+ <flag name="mbedtls">Use mbedTLS replacement for OpenSSL</flag> |
| 84 |
<flag name="peer-limits">Track peers and restrict resources a single peer can allocate</flag> |
| 85 |
<flag name="server-status">Support json + jscript server monitoring</flag> |
| 86 |
<flag name="smtp">Provide SMTP support</flag> |
Archives