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 730F7138350 for ; Fri, 1 May 2020 15:10:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9E13E0B5E; Fri, 1 May 2020 15:10:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6233CE0B5E for ; Fri, 1 May 2020 15:10:01 +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 9FB5034F0B1 for ; Fri, 1 May 2020 15:09:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D7A7201 for ; Fri, 1 May 2020 15:09:56 +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: <1588345777.eedb87e4ca9074a1b5f982be059d7d5a6a653279.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.4.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: eedb87e4ca9074a1b5f982be059d7d5a6a653279 X-VCS-Branch: master Date: Fri, 1 May 2020 15:09:56 +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: 0e571b12-6853-4324-b7b3-79bb1c4699f1 X-Archives-Hash: 0b82dc74087e113513ab0a0bc3f80e66 commit: eedb87e4ca9074a1b5f982be059d7d5a6a653279 Author: Jakov Smolic sartura hr> AuthorDate: Fri May 1 09:02:06 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri May 1 15:09:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedb87e4 net-libs/libwebsockets: change of IUSE flags 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/15452 Signed-off-by: Joonas Niilola gentoo.org> net-libs/libwebsockets/libwebsockets-4.0.4.ebuild | 28 ++++++++++++++++------- net-libs/libwebsockets/metadata.xml | 6 +++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild index 7620aaaa024..66623dc9f91 100644 --- a/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild +++ b/net-libs/libwebsockets/libwebsockets-4.0.4.ebuild @@ -12,14 +12,16 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}. 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 - sqlite3 ssl static-libs threads zip" +IUSE="access-log caps cgi client dbus +dir +extensions +file-ops generic-sessions http-proxy +http-uncommon-headers http2 ipv6 + +lejp libev libevent libressl libuv mbedtls peer-limits server-status smtp socks5 + sqlite3 ssl static-libs +testapps threads zip" REQUIRED_USE=" generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) + ssl? ( ?? ( libressl mbedtls ) ) + testapps? ( extensions ) ?? ( libev libevent ) " @@ -32,10 +34,12 @@ 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}" BDEPEND="dev-lang/perl" @@ -47,20 +51,28 @@ src_configure() { local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DLWS_HAVE_LIBCAP=$(usex caps) + -DLWS_HAVE_SYS_CAPABILITY_H=$(usex caps) -DLWS_IPV6=$(usex ipv6) + -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex testapps) -DLWS_ROLE_DBUS=$(usex dbus) -DLWS_WITHOUT_CLIENT=$(usex !client) -DLWS_WITHOUT_TEST_CLIENT=$(usex !client) -DLWS_WITH_ACCESS_LOG=$(usex access-log) -DLWS_WITH_CGI=$(usex cgi) + -DLWS_WITH_DIR=$(usex dir) + -DLWS_WITHOUT_EXTENSIONS=$(usex !extensions) + -DLWS_WITH_FILE_OPS=$(usex file-ops) -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions) -DLWS_WITH_HTTP2=$(usex http2) + -DLWS_WITH_HTTP_BASIC_AUTH=$(usex http-uncommon-headers) -DLWS_WITH_HTTP_PROXY=$(usex http-proxy) + -DLWS_WITH_HTTP_UNCOMMON_HEADERS=$(usex http-uncommon-headers) -DLWS_WITH_HUBBUB=$(usex http-proxy) -DLWS_WITH_LEJP=$(usex lejp) -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) @@ -70,7 +82,7 @@ src_configure() { -DLWS_WITH_STATIC=$(usex static-libs) -DLWS_WITH_THREADPOOL=$(usex threads) -DLWS_WITH_ZIP_FOPS=$(usex zip) - -DLWS_WITHOUT_TESTAPPS=ON + -DLWS_WITHOUT_TESTAPPS=$(usex !testapps) ) cmake_src_configure diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml index 6aa0f75c884..026a4eee25a 100644 --- a/net-libs/libwebsockets/metadata.xml +++ b/net-libs/libwebsockets/metadata.xml @@ -20,14 +20,20 @@ Support generating Apache-compatible access logs Include CGI (spawn process with network-connected stdin/out/err) APIs + Enable directory scanning api support + Support file operations vfs The client part of the library and libwebsockets-test-client + Compile with extensions With the Generic Sessions plugin Support the HTTP/2 protocol Support for rewriting HTTP proxying + Inlude less common http header support With the Lightweight JSON Parser 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 + Build the libwebsocket-test-apps Track peers and restrict resources a single peer can allocate Support json + jscript server monitoring Provide SMTP support