From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E41E1382C5 for ; Tue, 12 May 2020 13:58:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB74BE099C; Tue, 12 May 2020 13:58:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96CC8E099C for ; Tue, 12 May 2020 13:58:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E1DE350185 for ; Tue, 12 May 2020 13:58:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DBE624E for ; Tue, 12 May 2020 13:58:00 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1589291831.e7cc544fb599cc222e3bd56de8fb13fb6caf7f79.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libwebsockets/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libwebsockets/libwebsockets-4.0.7.ebuild net-libs/libwebsockets/metadata.xml X-VCS-Directories: net-libs/libwebsockets/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: e7cc544fb599cc222e3bd56de8fb13fb6caf7f79 X-VCS-Branch: master Date: Tue, 12 May 2020 13:58:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b3f1ed3a-522e-4bd4-8a0d-cf779d200829 X-Archives-Hash: b3dc10d8ee9a84e314ae2732e807c5f2 commit: e7cc544fb599cc222e3bd56de8fb13fb6caf7f79 Author: Jakov Smolic sartura hr> AuthorDate: Tue May 5 10:24:30 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue May 12 13:57:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cc544f net-libs/libwebsockets: change of IUSE flags Closes: https://bugs.gentoo.org/720926 Closes: https://bugs.gentoo.org/720020 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Luka Perkov sartura.hr> Acked-by: Jaco Kroon uls.co.za> Closes: https://github.com/gentoo/gentoo/pull/15637 Signed-off-by: Joonas Niilola gentoo.org> net-libs/libwebsockets/libwebsockets-4.0.7.ebuild | 12 +++++++++--- net-libs/libwebsockets/metadata.xml | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild index 7620aaaa024..081c762f0a8 100644 --- a/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild +++ b/net-libs/libwebsockets/libwebsockets-4.0.7.ebuild @@ -13,13 +13,15 @@ LICENSE="MIT" SLOT="0/16" # libwebsockets.so.16 KEYWORDS="~amd64 ~arm ~x86" IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 - +lejp libev libevent libressl libuv peer-limits server-status smtp socks5 + +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 sqlite3 ssl static-libs threads zip" REQUIRED_USE=" + access-log? ( http2 ) generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) + ssl? ( ?? ( libressl mbedtls ) ) ?? ( libev libevent ) " @@ -32,8 +34,10 @@ RDEPEND=" libuv? ( dev-libs/libuv:= ) sqlite3? ( dev-db/sqlite:= ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + !libressl? ( + !mbedtls? ( dev-libs/openssl:0= ) + mbedtls? ( >net-libs/mbedtls-2.0.0 ) + ) ) " DEPEND="${RDEPEND}" @@ -44,6 +48,7 @@ PATCHES=( ) src_configure() { + append-cflags -Wno-error local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DLWS_HAVE_LIBCAP=$(usex caps) @@ -61,6 +66,7 @@ src_configure() { -DLWS_WITH_LIBEV=$(usex libev) -DLWS_WITH_LIBEVENT=$(usex libevent) -DLWS_WITH_LIBUV=$(usex libuv) + -DLWS_WITH_MBEDTLS=$(usex mbedtls) -DLWS_WITH_PEER_LIMITS=$(usex peer-limits) -DLWS_WITH_SERVER_STATUS=$(usex server-status) -DLWS_WITH_SMTP=$(usex smtp) diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml index 6aa0f75c884..23c9033fcec 100644 --- a/net-libs/libwebsockets/metadata.xml +++ b/net-libs/libwebsockets/metadata.xml @@ -28,6 +28,7 @@ Support event loops via dev-libs/libev Support event loops via dev-libs/libevent Support asynchronous I/O via dev-libs/libuv + Use mbedTLS replacement for OpenSSL Track peers and restrict resources a single peer can allocate Support json + jscript server monitoring Provide SMTP support