summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin32934 -> 32944 bytes
-rw-r--r--net-libs/libupnp/Manifest4
-rw-r--r--net-libs/libupnp/libupnp-1.12.0.ebuild (renamed from net-libs/libupnp/libupnp-1.10.1.ebuild)2
-rw-r--r--net-libs/libwebsockets/Manifest14
-rw-r--r--net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch22
-rw-r--r--net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch11
-rw-r--r--net-libs/libwebsockets/libwebsockets-1.7.9.ebuild45
-rw-r--r--net-libs/libwebsockets/libwebsockets-2.0.2.ebuild45
-rw-r--r--net-libs/libwebsockets/libwebsockets-2.1.1.ebuild63
-rw-r--r--net-libs/libwebsockets/libwebsockets-2.4.2.ebuild70
-rw-r--r--net-libs/libwebsockets/libwebsockets-3.2.0.ebuild78
-rw-r--r--net-libs/libwebsockets/libwebsockets-3.2.1.ebuild2
-rw-r--r--net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch48
-rw-r--r--net-libs/mbedtls/mbedtls-2.16.4.ebuild94
-rw-r--r--net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild104
-rw-r--r--net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild104
-rw-r--r--net-libs/nodejs/Manifest8
-rw-r--r--net-libs/nodejs/nodejs-12.14.1-r1.ebuild (renamed from net-libs/nodejs/nodejs-12.14.1.ebuild)2
-rw-r--r--net-libs/nodejs/nodejs-13.6.0-r1.ebuild (renamed from net-libs/nodejs/nodejs-13.6.0.ebuild)2
-rw-r--r--net-libs/nodejs/nodejs-13.7.0-r1.ebuild204
-rw-r--r--net-libs/nodejs/nodejs-99999999.ebuild2
21 files changed, 566 insertions, 358 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f90058ff722a..8e6a1e466f1b 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index f0b019d6fd34..6ed3c1f387f3 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,11 +1,11 @@
AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
-DIST libupnp-1.10.1.tar.gz 786273 BLAKE2B d01515783f2fac185998419d9f249d087ca4433c9547537fe77d3a57e41926d0a4e7e97a88e25c9d2614fcb43498ae94992868bddcb5507c518d3f89059255f0 SHA512 f85053670e696e2216ca8e5a90e862f6868a0043aa855278ef2788417cdf2195067c79c4fe593b49a5444cc33fe31ad2073106c6d8cb67c8352e3321dce0a08c
+DIST libupnp-1.12.0.tar.gz 786378 BLAKE2B b1b264c8b254cab79c423fd3efa0911b86aa5ce7ccac35ff61dd5d7fefa9a71d7ce2a513f208b83d66a571483ce8fc179978009908e66b8fc3ff2a1df3d8f26e SHA512 998ef22d2af8e4cbc7fa1f87613ae0aa840e636bb72a5656a97327b0820a46b2b3ed2f3200260c018b5339de2fc4be760d42a3c687e49c7fedb58c1ad2287699
DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
-EBUILD libupnp-1.10.1.ebuild 1060 BLAKE2B cd4c5cb72e16af878bde6092fb5b0d228596f7dc8035c7bf00c6a3123811200aebe881ae117feee1b4f71de406e5720ea4f7a981c9b033614376b269414febe3 SHA512 cbf1c4aae916c0358dc26af22276af0651a2178d5cb8e092fb0421688f33293fc23b878ec30a478436a487c856f3a30b52ff21acb7aa7c6f820202be99d7a516
+EBUILD libupnp-1.12.0.ebuild 1060 BLAKE2B da6762f901283ac89b16ac07ce0e4671b7ac1f7f932ecfe6b02e9c2186f406eb0462875230825acb67122a2d5bede8cb9e68ea8a6215b1e110178dccc4e49392 SHA512 3d561a226cf889dac7f015b5153061378a3e0730c09de1cbc568c62e2a5f1e657f8f3d55e29e7754a1252eec4408f6639bd9e72804cca4fb950e81f993e4ded9
EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
EBUILD libupnp-1.6.25.ebuild 1038 BLAKE2B 5ff0fa549ca82029feeb59b0c67edb10fa46a73c62476a751d1e89a070de94fb563a6bc38ebe604be429e54d66162069695f04df20e225dc22d6b0f8801ea549 SHA512 2d335e95edd391006d6f9cd9324702dbf3380c4e22b56895d919d812b6195f094fed0bb464e8b38ad6e55701c06385f1bc8af803ceef77b2453036c047961ff5
EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
diff --git a/net-libs/libupnp/libupnp-1.10.1.ebuild b/net-libs/libupnp/libupnp-1.12.0.ebuild
index e06f186c5a5e..14fc805526fb 100644
--- a/net-libs/libupnp/libupnp-1.10.1.ebuild
+++ b/net-libs/libupnp/libupnp-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 8699a364f0b3..393290d77f46 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,17 +1,5 @@
-AUX libwebsockets-2.1.1-x86-build.patch 771 BLAKE2B d4b51038dcd6717d6608bfb98da8d0474289927950efc0e6e5d7f2d0ec84e808a4d08e15dc729f7daa4e4c90ab28070ce177b1f64280998f82fc3d0c1a9911dc SHA512 b4f34813309921728e9dcd88e29ae6b2bcb6ac3e55d86e489a85fe9950bc3758d03f7e639773447110c5bb82e4bceee3210569fc065e860f596053ed8c8a317c
AUX libwebsockets-3.2.0-check_chown_result.patch 706 BLAKE2B dece41b49946d138a441c389ff57b5d1814174c90f2e3aea8f269a08c84035fd6853283a47a5eb48dae36ac2c7adc1dfbb85b985a62b2158c87c43c24acf2170 SHA512 79977a3e9142ea4c295a2b3a35f9e902d36fa032ff3ae1f13e6980eb9fa260239205f1b9b5998379a4b56f53e25af72e07c9973d1c67da2cadb254296f964fc4
-AUX libwebsockets-3.2.0-string_assignment.patch 482 BLAKE2B 1e926a64a4c1c0bf2ec99bdb2c9b917800f27e0959688ebe26a5620f7e7722e5911ab9ceeeb75cfa5e56e609d5e6aafa0587f9f326d01458111681c57318c7f0 SHA512 7bfd7c79c8355bb2e1a8824559250f7c4482d27c7b502a6b1d7bbbcc66a95d977f4b64da4c91d5483a1e583b368b6b0cd178c2bca16fca2c6291644e031172c7
AUX libwebsockets-3.2.1-socks5-noclient-compilefailure.patch 943 BLAKE2B 2d5660b54633f4f1c855b0d72ec11763af5b6a550708491a837542978b0a3b2607027c2c5f85375c71ed92f4f3726e10732010bf04565feea5ce765d89cb36ef SHA512 375a5ae24f3399406628fb604ac84670e1a2fb4ae08a4525da721a589e7e06f1265c1d906a037e0e20bca5d88785125f3d831eb853b79e286495ec0e32a22e9d
-DIST libwebsockets-1.7.9.tar.gz 2915358 BLAKE2B 07aad4ab716212924177aa76233d743d6258d261f6cccb286e478f51bfeac609284cf2e43004bd99c271786a7e30357895c8687c11e1c3d7589ed13dbce4fbe8 SHA512 d5bd6171d58b5d5439af48d6cc1e92623e9bf21e059a2d25d362ef81b1bff62e759fe265261dbee0ac4ceb0d0a2490dc1e030dfee2b36eb8ac74df112da1db56
-DIST libwebsockets-2.0.2.tar.gz 2998585 BLAKE2B 0eaf2301abf9a0e47bd865b6e653f3ea23f3b00d4c6da785a8bd871f3ca729dc43152cad10aeaa9a3cd360aeecd0be87e434102e91e0eeaa6b1865031310a362 SHA512 6cd0cfe14ab9aa2ce26624d41290ed3bd0ae4167e93d5db738883dbbe2db851bd75037929a417922c2ef78eae3ff00583134d42da575d961c777e4a1ad0fef4a
-DIST libwebsockets-2.1.1.tar.gz 3769593 BLAKE2B 8d3aaa0a844925fb927fffaf0d11ba1bdbd013db8a680ce4b85cd5d951219598288fa0f2b97ec22bc00ef879586cb5c2c076b774f3411cb6d8ca553e66fb90e2 SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683
-DIST libwebsockets-2.4.2.tar.gz 3777160 BLAKE2B 6aedc0d340e9e03745309cd1a9674b6c7e84ebdbd5232a265c7a4e0deb612665982353c3ba973b58a835b1747448d415a3625ed044973212b5a897b221d73106 SHA512 7bee49f6763ff3ab7861fcda25af8d80f6757c56e197ea42be53e0b2480969eee73de3aee5198f5ff06fd1cb8ab2be4c6495243e83cd0acc235b0da83b2353d1
-DIST libwebsockets-3.2.0.tar.gz 9848976 BLAKE2B 3ad82281c854ad6ca4183f104a0d0eaa6f6e6e6084e3a98b29d8425d335f02a2d3e4f7e7a1b350e87d4ff975c44a5ed6635e3166219d9294bbf5a56ed1357e75 SHA512 afc1c9e259d6d48000b09da111af4129680d50474cdfedbad197ee22260d57a837b67cc6a3f8e6b1aa7ce7dc5d3fd900569783631540501709868125c6d1e4da
DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
-EBUILD libwebsockets-1.7.9.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
-EBUILD libwebsockets-2.0.2.ebuild 1141 BLAKE2B 095294251a25f99ab25d59b60ff1a4c9fa033b29337804e96b0b026af5682e38c40a5dff26de9d6f415f7bc14e1572fc5ffd8128bae2858d822bdb759723e12e SHA512 b8cebfc289d6d54daa9b16030b048e4ca5c5abfeca4d63402aeea697d78f00837990a4dce2a25b0bd30d621c9bd4d41228acbf0d9d9873d685bb00b4adab681e
-EBUILD libwebsockets-2.1.1.ebuild 1841 BLAKE2B c79cdc197d2800a7924cfa134269e1d679c0f6df185f83de157b1211a55e01d0a4cb05797e74ce8946dcda0b1b7266be030824af6fe136aedb89fd21e1535cac SHA512 5561f0c233aad102971bc9d4e626178771b349543bca91e816eace0502672e2e8edcd71e26b9791f657d2f9864b93f5aadcd63f18057ec632d939354d475f191
-EBUILD libwebsockets-2.4.2.ebuild 2120 BLAKE2B 2276db115471732eb30f81cea4fb54aa01fd0f2202c41d1b26234d9468988eca8f376ea3bac3ea105133b56a1b7ef802b9d5ab22de6e107037b1cf2d2d6aaa3a SHA512 4be547c69cfa37ad311270927512d2825facb5ed2fd3aa30498d9301b54fbe05d6138977bdcf2f8fb5672df94ccba2e835757ca6379dadde5bd199fcfe27be2c
-EBUILD libwebsockets-3.2.0.ebuild 2197 BLAKE2B 108153726302053dd624ba9756993aad661a35ddbf26192de95328ff4f7483bb02aeafc1ba5cbde9d6e0389ffd518357d20ede3b81fb36d090c13a8d67229ae5 SHA512 8e75d36efb21584aecb0228c2bace32c8a1f91a07e62a079492a404e505003c15ffca5628ed85980555f01113eb1032a5f1aad3e4d4f1689da122d0e3f9f4efc
-EBUILD libwebsockets-3.2.1.ebuild 2228 BLAKE2B 8fa54c0a655f09ec7eec9ead822c7d4f057a430bc4d937ad1980bd9f9644f543cfdf314ed98b08c2ddbc64d0305cd282ac59062fd70c35b1fe999f00c393344d SHA512 1ef0db784ad0456b6b537e4268047956507b05d32dc4d529f6e1497ab51ce362b2d45be1dac9519fee6c788401aa5c8af6c129f86c4c7d4b77d016827157abcd
+EBUILD libwebsockets-3.2.1.ebuild 2227 BLAKE2B 7af189cdcf997b5c2bff16260316e8e3e9b9d003663a08e52800afa46fe0ca8a59f72e5fdf0a193ebc9b8cedfb39329fa01735382e000c2c3eefe06e9ef40d5d SHA512 947a42364b9b48d99c4d0fc8043538561ad4deaba34a5d8e1fc5154110aff5a2948e5a6e49f66064a0e2cb541d2d436d14db8163f6fc8cdee4e9d6dc73bb389f
MISC metadata.xml 1723 BLAKE2B 561ac0a5b23081a9b351b2d516d63784c40688a399e0ff49522b4a572b32e7d4462a0062680aa6a1e39c6cc364c1b8fddafb1eb7edcdd99e19eafe557710e23e SHA512 7d259d9f7744deede3f3bde1e79f8e17351443cb8dff672f7c550206bf41064a01a43b2bb955a97144bf9319ee190c9f9ffc49a9513c22db6288b49b51c9ace4
diff --git a/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch b/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
deleted file mode 100644
index 9fe9489297f4..000000000000
--- a/net-libs/libwebsockets/files/libwebsockets-2.1.1-x86-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f9f5a5760782b68fba190fb46d306f7c08f027c0 Mon Sep 17 00:00:00 2001
-From: Silas Parker <skyhisi@users.github.invalid>
-Date: Tue, 14 Feb 2017 17:55:13 +0800
-Subject: [PATCH] gcc-format-strings: ipv6
-
----
- lib/libwebsockets.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
-index 770cb24..8ee906a 100755
---- a/lib/libwebsockets.c
-+++ b/lib/libwebsockets.c
-@@ -670,7 +670,7 @@ lws_get_addresses(struct lws_vhost *vh, void *ads, char *name,
- #ifdef LWS_USE_IPV6
- if (LWS_IPV6_ENABLED(vh)) {
- if (!lws_plat_inet_ntop(AF_INET6, &((struct sockaddr_in6 *)ads)->sin6_addr, rip, rip_len)) {
-- lwsl_err("inet_ntop", strerror(LWS_ERRNO));
-+ lwsl_err("inet_ntop: %s", strerror(LWS_ERRNO));
- return -1;
- }
-
diff --git a/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch b/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
deleted file mode 100644
index 86010aafd619..000000000000
--- a/net-libs/libwebsockets/files/libwebsockets-3.2.0-string_assignment.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwebsockets-3.2.0.o/lib/roles/http/client/client.c 2019-08-14 10:22:50.000000000 +0200
-+++ libwebsockets-3.2.0/lib/roles/http/client/client.c 2019-11-07 19:59:52.959534874 +0200
-@@ -214,7 +214,7 @@
- lwsl_client("SOCKS password OK, sending connect\n");
- if (socks_generate_msg(wsi, SOCKS_MSG_CONNECT, &len)) {
- socks_send_msg_fail:
-- *cce = "socks gen msg fail";
-+ cce = "socks gen msg fail";
- goto bail3;
- }
- conn_mode = LRS_WAITING_SOCKS_CONNECT_REPLY;
diff --git a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild b/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
deleted file mode 100644
index b9bba7e9a999..000000000000
--- a/net-libs/libwebsockets/libwebsockets-1.7.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
-
-RDEPEND="
- sys-libs/zlib
- libev? ( dev-libs/libev )
- libuv? ( dev-libs/libuv )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
deleted file mode 100644
index b9bba7e9a999..000000000000
--- a/net-libs/libwebsockets/libwebsockets-2.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+http2 +ssl client ipv6 libev libressl libuv static-libs"
-
-RDEPEND="
- sys-libs/zlib
- libev? ( dev-libs/libev )
- libuv? ( dev-libs/libuv )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
deleted file mode 100644
index 3dcea8a73465..000000000000
--- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm x86"
-IUSE="+http2 +ssl access-log cgi client generic-sessions http-proxy ipv6 lejp libev libressl libuv server-status smtp sqlite3 static-libs"
-
-REQUIRED_USE="
- http-proxy? ( client )
- generic-sessions? ( sqlite3 )
- generic-sessions? ( smtp )
- smtp? ( libuv )
-"
-
-RDEPEND="
- sys-libs/zlib
- http-proxy? ( net-libs/libhubbub )
- libev? ( dev-libs/libev )
- libuv? ( dev-libs/libuv )
- sqlite3? ( dev-db/sqlite )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-PATCHES=( "${FILESDIR}/${P}-x86-build.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DLWS_WITH_CGI=$(usex cgi ON OFF)
- -DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF)
- -DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF)
- -DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- -DLWS_WITH_LEJP=$(usex lejp ON OFF)
- -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF)
- -DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF)
- -DLWS_WITH_SMTP=$(usex smtp ON OFF)
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild b/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
deleted file mode 100644
index 38798f5926c7..000000000000
--- a/net-libs/libwebsockets/libwebsockets-2.4.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="canonical libwebsockets.org websocket library"
-HOMEPAGE="https://libwebsockets.org/"
-SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+http2 +ssl access-log caps cgi client generic-sessions http-proxy ipv6 lejp libev
- libevent libressl libuv peer-limits server-status socks5 smtp sqlite3 static-libs +zip"
-
-REQUIRED_USE="
- http-proxy? ( client )
- generic-sessions? ( sqlite3 )
- generic-sessions? ( smtp )
- smtp? ( libuv )
-"
-
-RDEPEND="
- sys-libs/zlib
- http-proxy? ( net-libs/libhubbub )
- caps? ( sys-libs/libcap )
- libev? ( dev-libs/libev )
- libevent? ( dev-libs/libevent )
- libuv? ( dev-libs/libuv )
- sqlite3? ( dev-db/sqlite )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}
- dev-lang/perl
-"
-
-src_configure() {
- local mycmakeargs=(
- -DLWS_IPV6=$(usex ipv6 ON OFF)
- -DLWS_LINK_TESTAPPS_DYNAMIC=$(usex !static-libs ON OFF)
- -DLWS_WITH_HTTP2=$(usex http2 ON OFF)
- -DLWS_WITH_STATIC=$(usex static-libs ON OFF)
- -DLWS_HAVE_LIBCAP=$(usex caps ON OFF)
- -DLWS_WITH_LIBEV=$(usex libev ON OFF)
- -DLWS_WITH_LIBEVENT=$(usex libevent ON OFF)
- -DLWS_WITH_LIBUV=$(usex libuv ON OFF)
- -DLWS_WITH_PEER_LIMITS=$(usex peer-limits ON OFF)
- -DLWS_WITH_SSL=$(usex ssl ON OFF)
- -DLWS_WITHOUT_CLIENT=$(usex !client ON OFF)
- -DLWS_WITHOUT_TEST_CLIENT=$(usex !client ON OFF)
- -DLWS_WITH_CGI=$(usex cgi ON OFF)
- -DLWS_WITH_HTTP_PROXY=$(usex http-proxy ON OFF)
- -DLWS_WITH_ACCESS_LOG=$(usex access-log ON OFF)
- -DLWS_WITH_SERVER_STATUS=$(usex server-status ON OFF)
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
- -DLWS_WITH_LEJP=$(usex lejp ON OFF)
- -DLWS_WITH_GENERIC_SESSIONS=$(usex generic-sessions ON OFF)
- -DLWS_WITH_SQLITE3=$(usex sqlite3 ON OFF)
- -DLWS_WITH_SMTP=$(usex smtp ON OFF)
- -DLWS_WITH_SOCKS5=$(usex socks5 ON OFF)
- -DLWS_WITH_ZIP_FOPS=$(usex zip ON OFF)
- )
-
- cmake-utils_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
deleted file mode 100644
index 587991e9177c..000000000000
--- a/net-libs/libwebsockets/libwebsockets-3.2.0.ebuild
+++ /dev/null
@@ -1,78 +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="LGPL-2.1"
-SLOT="0/${PV}"
-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"
-
-REQUIRED_USE="
- generic-sessions? ( smtp sqlite3 )
- http-proxy? ( client )
- smtp? ( libuv )
- ?? ( libev libevent )
-"
-
-RDEPEND="
- sys-libs/zlib
- caps? ( sys-libs/libcap )
- http-proxy? ( net-libs/libhubbub )
- libev? ( dev-libs/libev )
- libevent? ( dev-libs/libevent:= )
- libuv? ( dev-libs/libuv:= )
- sqlite3? ( dev-db/sqlite:= )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl"
-
-PATCHES=(
- "${FILESDIR}/libwebsockets-3.2.0-check_chown_result.patch"
- "${FILESDIR}/libwebsockets-3.2.0-string_assignment.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Git=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_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_THREADPOOL=$(usex threads)
- -DLWS_WITH_ZIP_FOPS=$(usex zip)
- -DLWS_WITHOUT_TESTAPPS=ON
- )
-
- cmake_src_configure
-}
diff --git a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
index 90391538d543..57ab8eb8aed2 100644
--- a/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/warmcat/libwebsockets/archive/v${PV}.tar.gz -> ${P}.
LICENSE="LGPL-2.1"
SLOT="0/15" # libwebsockets.so.15
-KEYWORDS="amd64 ~arm x86"
+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"
diff --git a/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch b/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
new file mode 100644
index 000000000000..4e39308ac5a7
--- /dev/null
+++ b/net-libs/mbedtls/files/mbedtls-dont-overwrite-headers.patch
@@ -0,0 +1,48 @@
+From de35f31091b7e6cb20ebc8d8c0afc3b20bc57098 Mon Sep 17 00:00:00 2001
+From: Mihai Moldovan <ionic@ionic.de>
+Date: Thu, 16 Jan 2020 08:59:39 +0100
+Subject: [PATCH] Avoid overwriting tls headers in submodule mode
+
+When crypto is embedded as a submodule and the cmake build system is
+used, it would previously overwrite some header files installed by tls.
+Most of them are harmless (since they should be identical), but config.h
+is a special case.
+
+tls's and crypto's config.h files differ widely in scope and overwriting
+the more general, bigger config.h file from tls with crypto's smaller
+one will make a lot of features unavailable in programs using tls.
+
+Let's just avoid overwriting any tls header in submodule mode.
+
+Note that this will not fix the potential issue that crypto might be
+using a different configuration than tls in the submodule case.
+
+Fixes ARMmbed/mbedtls#2965
+---
+ include/CMakeLists.txt | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index 02f924df4..92229a221 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS)
+ file(GLOB headers "mbedtls/*.h")
+ file(GLOB psa_headers "psa/*.h")
+
++ if(USE_CRYPTO_SUBMODULE)
++ # Don't overwrite mbedtls's header files!
++ # config.h is supposed to be automatically checked for compatibility
++ # in automatic builds, while the other files should not just be
++ # compatible, but also identical in theory.
++ # Practically, we don't check that in crypto but just assume that the
++ # submodule configuration is sane and trust tls's headers.
++ list(REMOVE_ITEM headers "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h"
++ "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h"
++ "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h"
++ "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h")
++ endif(USE_CRYPTO_SUBMODULE)
++
+ install(FILES ${headers}
+ DESTINATION include/mbedtls
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/net-libs/mbedtls/mbedtls-2.16.4.ebuild b/net-libs/mbedtls/mbedtls-2.16.4.ebuild
new file mode 100644
index 000000000000..fa71e95eebe0
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.16.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/12" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ programs? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/mbedtls/config.h || die
+}
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+ use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+ use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_PROGRAMS=$(multilib_native_usex programs)
+ -DENABLE_ZLIB_SUPPORT=$(usex zlib)
+ -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+ -DINSTALL_MBEDTLS_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ use doc && HTML_DOCS=( apidoc )
+
+ einstalldocs
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild
new file mode 100644
index 000000000000..b11f2794a352
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+CRYPTO_SUBMODULE="mbedcrypto-1.1.0d0"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
+ https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/13" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ programs? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/mbedtls/config.h || die
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-dont-overwrite-headers.patch
+)
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+ use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+ use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+ # pretend to be git submodule
+ rmdir "${S}"/crypto
+ mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_PROGRAMS=$(multilib_native_usex programs)
+ -DENABLE_ZLIB_SUPPORT=$(usex zlib)
+ -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+ -DINSTALL_MBEDTLS_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ use doc && HTML_DOCS=( apidoc )
+
+ einstalldocs
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild
new file mode 100644
index 000000000000..1a73d20f220e
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+CRYPTO_SUBMODULE="mbedcrypto-2.0.0"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz
+ https://github.com/ARMmbed/mbed-crypto/archive/${CRYPTO_SUBMODULE}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/13" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ programs? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen media-gfx/graphviz )
+ test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+ local myopt="$@"
+ # check that config.h syntax is the same at version bump
+ sed -i \
+ -e "s://#define ${myopt}:#define ${myopt}:" \
+ include/mbedtls/config.h || die
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-dont-overwrite-headers.patch
+)
+
+src_prepare() {
+ use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+ use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+ use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+ use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+ # pretend to be git submodule
+ rmdir "${S}"/crypto
+ mv "${WORKDIR}"/mbed-crypto-${CRYPTO_SUBMODULE} "${S}"/crypto
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_PROGRAMS=$(multilib_native_usex programs)
+ -DENABLE_ZLIB_SUPPORT=$(usex zlib)
+ -DUSE_STATIC_MBEDTLS_LIBRARY=$(usex static-libs)
+ -DENABLE_TESTING=$(usex test)
+ -DUSE_SHARED_MBEDTLS_LIBRARY=ON
+ -DINSTALL_MBEDTLS_HEADERS=ON
+ -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+ cmake-utils_src_test
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ use doc && HTML_DOCS=( apidoc )
+
+ einstalldocs
+
+ if use programs ; then
+ # avoid file collisions with sys-apps/coreutils
+ local p e
+ for p in "${ED}"/usr/bin/* ; do
+ if [[ -x "${p}" && ! -d "${p}" ]] ; then
+ mv "${p}" "${ED}"/usr/bin/mbedtls_${p##*/} || die
+ fi
+ done
+ for e in aes hash pkey ssl test ; do
+ docinto "${e}"
+ dodoc programs/"${e}"/*.c
+ dodoc programs/"${e}"/*.txt
+ done
+ fi
+}
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index ef935c7e6a6a..323462bca1c3 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -12,10 +12,10 @@ DIST node-v8.17.0.tar.xz 19013844 BLAKE2B 2f35f61ccc2d67132441dace8b59df6565e5df
EBUILD nodejs-10.18.0.ebuild 6276 BLAKE2B 24f1dd3c3af4fec3b456f899744b13b0c9451e55a159db5f56f4fe6a4062942798cd94f0b47b01fa933e51ea2fc91482cf2624e04c43dbd53cecc7bdeb573b57 SHA512 f9a3ca0b9eed22383069c2f4de9a0779ce8a0027bd268f1b8ca41d5d2a55e5010ec45c7d3a990ffbec5acc36d81dced37b30d80bf2b0316828eeeec3ce7827d1
EBUILD nodejs-10.18.1.ebuild 6279 BLAKE2B a620b05278a18edf70fb786e6840238a38b780469479cd9c8fb18deb8c0d89202c0e1ae324b04362538ba1059d6e049e1b7da52f02592a82edf94cc53991e100 SHA512 b243a92aff7c7b3c93321a910c180ae2b26cef726ff96232edfa87352ae38d16ad9fec439428233070df72ba5cfde6a5560a4c798b67b417866b2285af211342
EBUILD nodejs-12.14.0.ebuild 6116 BLAKE2B bcf44cabcf2c5463d1bfb4697212272eec662c41f181b3500ae27aeea17684fc3a5131f6a7e9f3a3a38bf7417c4190f5f3293b691a54899ece793d0c3ff1840e SHA512 6857bd8e8e26e642a133cef54e0df170b6c59a31b46dd68757d6be889c5e360ddbe93f8966eec63d7c91e3cf10a2d71e05b4b07abf001a93380309cdae55dad4
-EBUILD nodejs-12.14.1.ebuild 6119 BLAKE2B 10f8e3c7ef7db2c00fdecc6305bd4928a26a4283613878e8486a18e497c310174033a3f1df31289b6aaa3a2b027f0cbce5568ace197716f9188744fe1a07d773 SHA512 132399c18b562103ac953e2d8fbf6a2045fd9de8902b454774e2d14794ce2818601e09b29bac4abb0fa546108c32d6fa73928375bb78c627cac91468947e1d43
-EBUILD nodejs-13.6.0.ebuild 6140 BLAKE2B 4bad792ead15e0999b02dfe46690cf57ce3fc8fd13f3b6986d26f3046bd22ddbea49eb3a85138a0b0c71d17a8d396dd9e4ff646abd14ef2a62e8c93d95127003 SHA512 8c8a81c2d700105026ba30dd6703aa265554843db7fa9b0673b2641d3a1d6cdb9e1f5904e4dd9558f45ca51a188bc6847cf9bb6f474d92c11e7e2918669db671
-EBUILD nodejs-13.7.0.ebuild 6140 BLAKE2B a4fdc2f755d5c38362f33e622c7a014fd1f8b643cafd940ba76af862511e36987103195d8dc29e40f259fbb3aa76ee6102d5726ffd7134584958734c2fac749c SHA512 a6b075dd8c4b767848227005c743d8b3a0781db476fc7c50a1e106039ec9a219d0ed26f213d15c02e1609d7e3eab256081040206b2f334d905425fd10eaf3887
+EBUILD nodejs-12.14.1-r1.ebuild 6127 BLAKE2B 032f5d5427fc431eed654aed03872f48d243b2017672742db9f540809bd44a3b9c7933ae365159ac0459413080f2327fb2d44c7c86436b3f5f49ac00efb0ea8b SHA512 1ae825a848cffe5111390338084b225f1a353771888dd45698560487fc79e19d77c674cb9862efdba2a15617693134377bfa1403ed60e0eea5dee3bc274f82fc
+EBUILD nodejs-13.6.0-r1.ebuild 6148 BLAKE2B 74293a23b70ce6c9665540550d036f81b2e2cffbc6b5ed78d2042aece3e9d7b11e53b68096e26611456380594a1face29ae4165c9890a1fe0ecaf66d588309f1 SHA512 a3c2f91a9312d24517f3403f2eb1c0d7330a92370e7748a8180798faaf45ce93a783615c9b862be281cec256a8883f5f90cd122ca85c26561ffd4470360f55de
+EBUILD nodejs-13.7.0-r1.ebuild 6148 BLAKE2B 2848363d047918da656f60fa4072d40b6bb0bd9b6f1cdad0245bcfe081d124f2d4827255a168bf5346b781d504b63e2aa158c0a24fdfdd9cf5d788ea120d0027 SHA512 e67c8f1a1d72b72b3536196a9c05d6b5377b37aafac37faff6d1f68e201dcd937c0a2ba56ca6b71df1c5093d4ec73555d18d829bc3761cc947e02214bcbc1cdd
EBUILD nodejs-8.12.0.ebuild 6352 BLAKE2B 15a9b98d89d83fb5959b3b2582cea6a430e9dad5ac6033d7ea32647122ed8cf6a093f7dd90abb93f8585c7c1506d2c801bd439651a447b366fbe75a43259fa55 SHA512 df0848a3e96a62d6191ff0dbcf7ce55eb8da34913c39960e8eb02eb2b3c6d6f6d2202e884c77612b93048c85e6079cc95469c17e8357690936ea92eba400ba7c
EBUILD nodejs-8.17.0.ebuild 6474 BLAKE2B c7748e57d37a828a52127ba285b1b27b472063badf6784fc42616ca5a88a5151bc95162158d34715018db433d8b9e4875f20a7640b1f5b373012d3eb61b5c0eb SHA512 5ca66326a80139455dbe9f2ccb77e588a50142da005c51261f0223b06b4b52d61693f08ce9d22479b8801c5e219a38267e844f3de5a913fad334ebe1dc55cc3c
-EBUILD nodejs-99999999.ebuild 6056 BLAKE2B d9858cbc6b73f4e4875451374e14fba3379351bea97e027011325abbb0f3906d9adeb9eb5742bdb4a14bc136c5cf2bc408776f84e3b0a50419a8d4af80afc1a2 SHA512 4b453c14f159c732fbadb0ffdca80048e05c8a86c0fe8fe3854dee7ee5257190cb1050bea735947e5982aef28b81e5ec6ea20724270c4dc72c6d32e68c9e2bb9
+EBUILD nodejs-99999999.ebuild 6064 BLAKE2B 558a1e4ce81339c8e4ef99bb25b03bb45468817d5cc07dc18c64c3a9c58431c778189bf28b4514cc120166cb6cbf034edaa6efd2a66467b67d2ac7cfbfa643bd SHA512 cf87da1dba9131ad0390c3a8f4e6ef5e8b566631bb2e944ba817f4878b919cd930ad9db217c4d0cf9c0a15ed384632ebf2507c54846edc96fa405986fe28bb42
MISC metadata.xml 549 BLAKE2B 89d9231225010c703e933104cc5beea0706d4e865c61c6cb4f95194d2e0b0e4445800eae8c1074c5c313ace3cf3de2a71a05eed880f055b477023dff9729ab2e SHA512 e34ee9c52b2793f6dddb1f82f538598b5085a4bfea37e30047bd3e9bfabce52e3b826b8a2fe8e0e0842a288e14d8f3c229815e287354bdb121ba3e86018303c4
diff --git a/net-libs/nodejs/nodejs-12.14.1.ebuild b/net-libs/nodejs/nodejs-12.14.1-r1.ebuild
index a9a42fa11ba4..b8a749a17459 100644
--- a/net-libs/nodejs/nodejs-12.14.1.ebuild
+++ b/net-libs/nodejs/nodejs-12.14.1-r1.ebuild
@@ -105,7 +105,7 @@ src_configure() {
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
use inspector || myconf+=( --without-inspector )
use npm || myconf+=( --without-npm )
- use snapshot && myconf+=( --with-snapshot )
+ use snapshot || myconf+=( --without-node-snapshot )
use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
local myarch=""
diff --git a/net-libs/nodejs/nodejs-13.6.0.ebuild b/net-libs/nodejs/nodejs-13.6.0-r1.ebuild
index 3f434606d2fe..640cc3cc0b12 100644
--- a/net-libs/nodejs/nodejs-13.6.0.ebuild
+++ b/net-libs/nodejs/nodejs-13.6.0-r1.ebuild
@@ -103,7 +103,7 @@ src_configure() {
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
use inspector || myconf+=( --without-inspector )
use npm || myconf+=( --without-npm )
- use snapshot && myconf+=( --with-snapshot )
+ use snapshot || myconf+=( --without-node-snapshot )
use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
local myarch=""
diff --git a/net-libs/nodejs/nodejs-13.7.0-r1.ebuild b/net-libs/nodejs/nodejs-13.7.0-r1.ebuild
new file mode 100644
index 000000000000..35f1444b8a49
--- /dev/null
+++ b/net-libs/nodejs/nodejs-13.7.0-r1.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_REQ_USE="threads(+)"
+inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="
+ https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz
+"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm pax_kernel +snapshot +ssl systemtap test"
+REQUIRED_USE="
+ inspector? ( icu ssl )
+ npm? ( ssl )
+"
+
+RDEPEND="
+ >=dev-libs/libuv-1.34.1:=
+ >=net-dns/c-ares-1.15.0
+ >=net-libs/nghttp2-1.40.0
+ sys-libs/zlib
+ icu? ( >=dev-libs/icu-64.2:= )
+ ssl? ( >=dev-libs/openssl-1.1.1:0= )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ systemtap? ( dev-util/systemtap )
+ test? ( net-misc/curl )
+ pax_kernel? ( sys-apps/elfix )
+"
+DEPEND="
+ ${RDEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch
+)
+RESTRICT="test"
+S="${WORKDIR}/node-v${PV}"
+
+pkg_pretend() {
+ (use x86 && ! use cpu_flags_x86_sse2) && \
+ die "Your CPU doesn't support the required SSE2 instruction."
+
+ ( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+ die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+ tc-export CC CXX PKG_CONFIG
+ export V=1
+ export BUILDTYPE=Release
+
+ # fix compilation on Darwin
+ # https://code.google.com/p/gyp/issues/detail?id=260
+ sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+ # less verbose install output (stating the same as portage, basically)
+ sed -i -e "/print/d" tools/install.py || die
+
+ # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+ local LIBDIR=$(get_libdir)
+ sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+ sed -i -e "s/'lib'/'${LIBDIR}'/" deps/npm/lib/npm.js || die
+
+ # Avoid writing a depfile, not useful
+ sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+ sed -i -e "/'-O3'/d" common.gypi node.gypi || die
+
+ # Avoid a test that I've only been able to reproduce from emerge. It doesnt
+ # seem sandbox related either (invoking it from a sandbox works fine).
+ # The issue is that no stdin handle is openened when asked for one.
+ # It doesn't really belong upstream , so it'll just be removed until someone
+ # with more gentoo-knowledge than me (jbergstroem) figures it out.
+ rm test/parallel/test-stdout-close-unref.js || die
+
+ # debug builds. change install path, remove optimisations and override buildtype
+ if use debug; then
+ sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+ BUILDTYPE=Debug
+ fi
+
+ # We need to disable mprotect on two files when it builds Bug 694100.
+ use pax_kernel && PATCHES+=( "${FILESDIR}"/${PN}-13.2.0-paxmarking.patch )
+
+ default
+}
+
+src_configure() {
+ xdg_environment_reset
+
+ local myconf=(
+ --shared-cares --shared-libuv --shared-nghttp2 --shared-zlib
+ )
+ use debug && myconf+=( --debug )
+ use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+ use inspector || myconf+=( --without-inspector )
+ use npm || myconf+=( --without-npm )
+ use snapshot || myconf+=( --without-node-snapshot )
+ use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
+
+ local myarch=""
+ case ${ABI} in
+ amd64) myarch="x64";;
+ arm) myarch="arm";;
+ arm64) myarch="arm64";;
+ ppc64) myarch="ppc64";;
+ x32) myarch="x32";;
+ x86) myarch="ia32";;
+ *) myarch="${ABI}";;
+ esac
+
+ GYP_DEFINES="linux_use_gold_flags=0
+ linux_use_bundled_binutils=0
+ linux_use_bundled_gold=0" \
+ "${EPYTHON}" configure.py \
+ --prefix="${EPREFIX}"/usr \
+ --dest-cpu=${myarch} \
+ $(use_with systemtap dtrace) \
+ "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake -C out
+}
+
+src_install() {
+ local LIBDIR="${ED}/usr/$(get_libdir)"
+ default
+
+ pax-mark -m "${ED}"/usr/bin/node
+
+ # set up a symlink structure that node-gyp expects..
+ dodir /usr/include/node/deps/{v8,uv}
+ dosym . /usr/include/node/src
+ for var in deps/{uv,v8}/include; do
+ dosym ../.. /usr/include/node/${var}
+ done
+
+ if use doc; then
+ docinto html
+ dodoc -r "${S}"/doc/*
+ fi
+
+ if use npm; then
+ dodir /etc/npm
+
+ # Install bash completion for `npm`
+ # We need to temporarily replace default config path since
+ # npm otherwise tries to write outside of the sandbox
+ local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+ sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+ local tmp_npm_completion_file="$(emktemp)"
+ "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+ newbashcomp "${tmp_npm_completion_file}" npm
+ sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+ # Move man pages
+ doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+ # Clean up
+ rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+ rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+ local find_exp="-or -name"
+ local find_name=()
+ for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+ ".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+ "*.md" "*.markdown" "*.bat" "*.cmd"; do
+ find_name+=( ${find_exp} "${match}" )
+ done
+
+ # Remove various development and/or inappropriate files and
+ # useless docs of dependend packages.
+ find "${LIBDIR}"/node_modules \
+ \( -type d -name examples \) -or \( -type f \( \
+ -iname "LICEN?E*" \
+ "${find_name[@]}" \
+ \) \) -exec rm -rf "{}" \;
+ fi
+
+ mv "${ED}"/usr/share/doc/node "${ED}"/usr/share/doc/${PF} || die
+}
+
+src_test() {
+ out/${BUILDTYPE}/cctest || die
+ "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+ elog "The global npm config lives in /etc/npm. This deviates slightly"
+ elog "from upstream which otherwise would have it live in /usr/etc/."
+ elog ""
+ elog "Protip: When using node-gyp to install native modules, you can"
+ elog "avoid having to download extras by doing the following:"
+ elog "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild
index 5c9388651ded..aad8df6897f2 100644
--- a/net-libs/nodejs/nodejs-99999999.ebuild
+++ b/net-libs/nodejs/nodejs-99999999.ebuild
@@ -100,7 +100,7 @@ src_configure() {
use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
use inspector || myconf+=( --without-inspector )
use npm || myconf+=( --without-npm )
- use snapshot && myconf+=( --with-snapshot )
+ use snapshot || myconf+=( --without-node-snapshot )
use ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) || myconf+=( --without-ssl )
local myarch=""
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 18:54:02 +0000