From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- net-libs/libwebsockets/Manifest | 8 +-- net-libs/libwebsockets/libwebsockets-4.0.20.ebuild | 1 + net-libs/libwebsockets/libwebsockets-4.1.0.ebuild | 83 --------------------- net-libs/libwebsockets/libwebsockets-4.1.4.ebuild | 84 ++++++++++++++++++++++ net-libs/libwebsockets/metadata.xml | 3 - 5 files changed, 89 insertions(+), 90 deletions(-) delete mode 100644 net-libs/libwebsockets/libwebsockets-4.1.0.ebuild create mode 100644 net-libs/libwebsockets/libwebsockets-4.1.4.ebuild (limited to 'net-libs/libwebsockets') diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest index ad3eae368997..c52a67a0d64c 100644 --- a/net-libs/libwebsockets/Manifest +++ b/net-libs/libwebsockets/Manifest @@ -2,8 +2,8 @@ AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a44 AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6fdee32ac6d57f4afe3fb42cd662202c290c21a28e9c107d61cd3b2ddb25478f93b56008dc939ced28cd1c5abd6314fb1b32 SHA512 b2ab19623557b67abf157aed0317fb2305304e72c7e40c202c0bc855a499bbef64978e9187adcfdd2ef251497144db4a9fbaebaf37a320c7190720e9d194b67a -DIST libwebsockets-4.1.0.tar.gz 12674490 BLAKE2B 243fdcdef0cd9c36ee8bcf3c75b7467200f4fa1e6178cdbb9cc78d20d1aca533e910c9892560bd5c50c3ff98d783665616ea6d283ee8faae3f569bc526a31f42 SHA512 7748021f8a26e26474ae200f50ec8b59f19e69fbc612bbb31bbca2524e4381b2a7dde605740ac355109c9e34593fb5aee523d581ac64d821a594ffaadc16b1cb +DIST libwebsockets-4.1.4.tar.gz 12698800 BLAKE2B 78cb9587af7a5cc368c3c4ce7b8c8cba7d25961595ae8853f52d374b73404e5fbd99ff9b552dc9d6370fd425d6bd28fc69b71be37f2f045817f2cb8f5354dcbc SHA512 4da84f612ad427465c4eea0bdd0db59c21c9e42bb21eb46b904f544dc4078af2c9a957e61430f3569b87cfc96b3addee50ac7a7c77777dcf16350fe441dd8854 EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f -EBUILD libwebsockets-4.0.20.ebuild 2488 BLAKE2B 9553bcaba9e29503a9476fbd0fa0c80a9362fbe3f8ca3b2bed9584f726c41e200124eb252493116c57ecaa19844e13c44dc31ef94387f9454dd50b3c67106a48 SHA512 ef085e6a3e349cab1cc0f0f5a6b5b755b33b9e0cea1e0aac86af47d723d6fe168b5df37705047e09196e2ee69ead66741d4e77ee1da401cedc23c8f2e1c76733 -EBUILD libwebsockets-4.1.0.ebuild 2332 BLAKE2B 27c8a914051a5286c1355ad666687627d6d0cc228c8a0c41fa1ded22c953b92c949ef6898b60e8af3826f555544a29a4e7ec3011c42e75d3574d89b9261c6ad1 SHA512 f61208d9b228cd6047fe45bdb9ad7c07e587395448c6fcb20a59b8b2de7437cb41df8f0891672898600a587780ef762e319b8968136c64b4f774d59c83375c23 -MISC metadata.xml 1894 BLAKE2B e0ad4c00319acf9e3680273380ccba89cc5cf79c893f53bc4c3e6633f1a35f25a771c0d7f1b3516e162e4606d13d84b6a3f9461fe0c576b8c86e9adad2dd3993 SHA512 1fac29b1da39acea4a90ab64594f6c47c2afd6bcc10b8af1f858af191abdaa69125d11983ef69b98655a4dd6d53a992eedb08a1e8ebee5a8dd81ad6b0a39f71c +EBUILD libwebsockets-4.0.20.ebuild 2519 BLAKE2B 88c178b4a7ab0704bdb0660274d59488ed14d7e365c92a991f90963789cb4ea6409f3774e710617ae254f3e1a525d255dc66d21b8c30200bf714fe67be422b4d SHA512 d1ec85cf9704f300ec40186226960fde1474a7654b93665025a4b8ee37b17147d95ff7179e276763b3d23f83b6eab7cfbe52c532475023ec8a5af2e838632f91 +EBUILD libwebsockets-4.1.4.ebuild 2368 BLAKE2B 978ddf6ddc319cc93fcc5a22be81475e5dc329d8ea78f103b7a739bab55fab92522205be1da6783cb5142f650b79d7a099ebdcf52345e4960293afe56ca62138 SHA512 48e48e32e3f971dbab4d896121e180c87457b2e41cf483b130eb0b09e699655875d75d38bf42b25f5b085dc3fd702395c2dfb2fa5c49e505a2fa1e14f1718344 +MISC metadata.xml 1662 BLAKE2B ba4299d39ac10860ea908bf83ccf687af48d3e5764b9823a9d1e727390dc53c569d1e824587fb7e586e211e4366c799b1e91efb817fe6495ed0e6ea643e94147 SHA512 722b59c06d1d1810b21852cac65fd6a7a929f280cbdcdfd0ea97285e8bcbf17ad84d00c7d41308deb2d91905ce3d5f3f0cdc8f5f975a4eb7c0b7fefa431becfe diff --git a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild index b0d538ff9060..134f80a69943 100644 --- a/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild +++ b/net-libs/libwebsockets/libwebsockets-4.0.20.ebuild @@ -21,6 +21,7 @@ REQUIRED_USE=" generic-sessions? ( smtp sqlite3 ) http-proxy? ( client ) smtp? ( libuv ) + socks5? ( client http-proxy ) ssl? ( ?? ( libressl mbedtls ) ) mbedtls? ( ssl ) ?? ( libev libevent ) diff --git a/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild deleted file mode 100644 index 7ff883e7d82d..000000000000 --- a/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="A flexible pure-C library for implementing network protocols" -HOMEPAGE="https://libwebsockets.org/" -SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/17" # libwebsockets.so.17 -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 - +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 ) ) - mbedtls? ( ssl ) - ?? ( libev libevent ) -" - -RDEPEND=" - sys-libs/zlib - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - http-proxy? ( net-libs/libhubbub ) - libev? ( dev-libs/libev ) - libevent? ( dev-libs/libevent:= ) - libuv? ( dev-libs/libuv:= ) - sqlite3? ( dev-db/sqlite:= ) - ssl? ( - !libressl? ( - !mbedtls? ( dev-libs/openssl:0= ) - mbedtls? ( >net-libs/mbedtls-2.0.0 ) - ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-lang/perl - virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - -DDISABLE_WERROR=ON - -DLWS_HAVE_LIBCAP=$(usex caps) - -DLWS_IPV6=$(usex ipv6) - -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_GENERIC_SESSIONS=$(usex generic-sessions) - -DLWS_WITH_HTTP2=$(usex http2) - -DLWS_WITH_HTTP_PROXY=$(usex http-proxy) - -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) - -DLWS_WITH_SOCKS5=$(usex socks5) - -DLWS_WITH_SQLITE3=$(usex sqlite3) - -DLWS_WITH_SSL=$(usex ssl) - -DLWS_WITH_STATIC=$(usex static-libs) - -DLWS_WITH_STRUCT_JSON=$(usex lejp) - -DLWS_WITH_THREADPOOL=$(usex threads) - -DLWS_WITH_ZIP_FOPS=$(usex zip) - -DLWS_WITHOUT_TESTAPPS=ON - ) - - cmake_src_configure -} diff --git a/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild new file mode 100644 index 000000000000..30dbd55c5f2f --- /dev/null +++ b/net-libs/libwebsockets/libwebsockets-4.1.4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="A flexible pure-C library for implementing network protocols" +HOMEPAGE="https://libwebsockets.org/" +SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/17" # libwebsockets.so.17 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="access-log caps cgi client dbus generic-sessions http-proxy http2 ipv6 + +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 ) + socks5? ( client http-proxy ) + ssl? ( ?? ( libressl mbedtls ) ) + mbedtls? ( ssl ) + ?? ( libev libevent ) +" + +RDEPEND=" + sys-libs/zlib + caps? ( sys-libs/libcap ) + dbus? ( sys-apps/dbus ) + http-proxy? ( net-libs/libhubbub ) + libev? ( dev-libs/libev ) + libevent? ( dev-libs/libevent:= ) + libuv? ( dev-libs/libuv:= ) + sqlite3? ( dev-db/sqlite:= ) + ssl? ( + !libressl? ( + !mbedtls? ( dev-libs/openssl:0= ) + mbedtls? ( >net-libs/mbedtls-2.0.0 ) + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/perl + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DDISABLE_WERROR=ON + -DLWS_HAVE_LIBCAP=$(usex caps) + -DLWS_IPV6=$(usex ipv6) + -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_GENERIC_SESSIONS=$(usex generic-sessions) + -DLWS_WITH_HTTP2=$(usex http2) + -DLWS_WITH_HTTP_PROXY=$(usex http-proxy) + -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) + -DLWS_WITH_SOCKS5=$(usex socks5) + -DLWS_WITH_SQLITE3=$(usex sqlite3) + -DLWS_WITH_SSL=$(usex ssl) + -DLWS_WITH_STATIC=$(usex static-libs) + -DLWS_WITH_STRUCT_JSON=$(usex lejp) + -DLWS_WITH_THREADPOOL=$(usex threads) + -DLWS_WITH_ZIP_FOPS=$(usex zip) + -DLWS_WITHOUT_TESTAPPS=ON + ) + + cmake_src_configure +} diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml index 23c9033fcec9..429f0474f146 100644 --- a/net-libs/libwebsockets/metadata.xml +++ b/net-libs/libwebsockets/metadata.xml @@ -19,7 +19,6 @@ Support generating Apache-compatible access logs - Include CGI (spawn process with network-connected stdin/out/err) APIs The client part of the library and libwebsockets-test-client With the Generic Sessions plugin Support the HTTP/2 protocol @@ -32,9 +31,7 @@ Track peers and restrict resources a single peer can allocate Support json + jscript server monitoring Provide SMTP support - Allow use of SOCKS5 proxy on client connections Require SQLITE3 support - Support serving pre-zipped files warmcat/libwebsockets -- cgit v1.2.3