diff options
Diffstat (limited to 'net-libs/nodejs')
| -rw-r--r-- | net-libs/nodejs/Manifest | 23 | ||||
| -rw-r--r-- | net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch | 534 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-12.22.1-r1.ebuild (renamed from net-libs/nodejs/nodejs-12.22.1.ebuild) | 6 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-12.22.3-r1.ebuild (renamed from net-libs/nodejs/nodejs-12.22.3.ebuild) | 6 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-12.22.5-r1.ebuild (renamed from net-libs/nodejs/nodejs-12.22.4.ebuild) | 9 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-14.16.1-r1.ebuild (renamed from net-libs/nodejs/nodejs-14.16.1.ebuild) | 6 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-14.17.3-r1.ebuild (renamed from net-libs/nodejs/nodejs-14.17.3.ebuild) | 6 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-14.17.5-r1.ebuild (renamed from net-libs/nodejs/nodejs-14.17.4.ebuild) | 11 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-16.6.1-r1.ebuild (renamed from net-libs/nodejs/nodejs-16.6.1.ebuild) | 6 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-16.6.2-r1.ebuild | 230 | ||||
| -rw-r--r-- | net-libs/nodejs/nodejs-99999999.ebuild | 6 |
11 files changed, 806 insertions, 37 deletions
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest index 90a1c39eb012..fce7bfb91d50 100644 --- a/net-libs/nodejs/Manifest +++ b/net-libs/nodejs/Manifest @@ -3,6 +3,7 @@ AUX nodejs-12.20.1-fix_ppc64_crashes.patch 1788 BLAKE2B 48a5c5343b654fe57f021644 AUX nodejs-12.22.1-jinja_collections_abc.patch 3159 BLAKE2B 52de2f76151fffa436bf8a53ef6f38cee0cc566832a31c68cfb8fd36a82a187cebe389041355137b2f2a53454e26b0460bfc8a63154528d51264aa01503db10f SHA512 197ae5b316af6a253614fb0f9cdef644678a9eede770b3443ab417397c40caea1fc00c7300dd67af859ffeab56a851b70778bc68bc915559fab1f3dcb27c0461 AUX nodejs-12.22.1-uvwasi_shared_libuv.patch 297 BLAKE2B 1f23155371499f891cf796c9b5c8b4c7f69074550ab2de15971a2b53f80eaaeb32aacc661fcd305de68c188302d2ce16db7b702b28fbbfc37b666b370e2159e7 SHA512 31572ac8332a9551d3273516c91665d6064ae905b8676fe12aacaa1f10f3302dc31e41ea328452685be75c4956a1d7f4833df31dca35d8259d0fc13534547de4 AUX nodejs-12.22.1-v8_icu69.patch 2923 BLAKE2B 0e4da87a091dde4f84a980d43223f8d085b50e4cb16fac66d0a275a2257f8b61e1a2996e8a4a469f282c1a7ab622d9b9183b1801818af3ca40051fb4661e8f12 SHA512 e30ecb75b3fdf33cf9efa74250e4b91ab9ebfb81cce4d6f926c6a04cc20bf8222f68b2af4eecbbcd77fa5bc922b8a62be8fe8d918e309baccc09dafa40029e10 +AUX nodejs-12.22.5-shared_c-ares_nameser_h.patch 15742 BLAKE2B e55d3aec80abffc81230ea46619d82d61fd2266ef62a96f39c47d7f9f5b6f61a4e978475c2e963214abdc45d5582d98c21e6be9f926f078108feb5f655b5c88a SHA512 080ede859262f5507a913b1f9995092ed075777e94c73c23ee74d74c739e9b2e6b4cc3afad189a333692f10485e7e3e12a15662286df2c946f73bdd6083baee8 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23 AUX nodejs-14.15.0-fix_ppc64_crashes.patch 1633 BLAKE2B cded0eba081ff80f02ebc019d976503cc30ed8fd9974951d9c8b9dd659db7f17e54f30d59ec171711cfeeda16d43ed49d8b0fc1574c07014d5266c578de02814 SHA512 14b9b0a5963deafb972f455867831ecb349ffd5af229467c1e985c9a6c4f0f4f0faf905a51e50b8a6bf130040dde45407b37ab6d7ad6b1ecb9ef8209d9585396 AUX nodejs-14.16.1-v8_icu69.patch 2938 BLAKE2B d69206f4903c63df7bf1882bc9d41510a30d2c8bac8141ac08b949578b17e842761edeb10295b95b7aed96cf1ca38c6bdb3bc4b83d8fe2b795a39d50d779f883 SHA512 55933a40c9ca46b2a00a9d6ba6a2b5f08ce0b85692b602b38b05c323c46778f267c8ac5f960661165b4221c8ea84f92bd5957773b9a5e6ff49277a258df3e380 @@ -10,17 +11,19 @@ AUX nodejs-15.2.0-global-npm-config.patch 582 BLAKE2B ee05b2b54a0d2f0b7d6d2a1215 AUX nodejs-99999999-llhttp.patch 506 BLAKE2B eea449910b97dfc320247f20bf20467f6c5bfe46f7acc95761270928b3413ffaa04ee948d8dece9a8ba47288804144c75ebda1009af17169b36bcd5b39aa0c33 SHA512 13cdbaf73696b4feef1fec48ac43f6a6d80f59096a81308c746655e2cffa0b0ef78850facff103f27062fd25192d8abd7bc200b36bd25df7bd4b800f80da0c5c DIST node-v12.22.1.tar.xz 23650180 BLAKE2B 90b0a8ab3842483fea0c776e0245e63539a986c18f55abd8c7cd22ec399ccde22fa5b008d3e07c0f07713b5a45a1ee2a0bc370c04408800db2ee59cd92fcb5be SHA512 eaead633611bda04ab9be200aeddf3b4004b8104e9c6af246023b8008003dd3a7103e1508ea690443e59c6591521b04a2d71c7344343f2a20d1c935ef51c66a0 DIST node-v12.22.3.tar.xz 23662268 BLAKE2B b686d96ce1a2e1678c1565dbc6025738be85dc6b0e21b39742265639eb8da590b33f86afa5ca3ecaa4c70e4155a97e413e4d6e5da9ec0c5cb19a876241e599e5 SHA512 11684b6df15b6b74b8674ebf2c2bb950d1e52b83f90478638e85dd11a163dc7c62ae888bc4c1c29e89179e0c47fdccc26bee2817d64eb3ff926b2d3e648c351c -DIST node-v12.22.4.tar.xz 23653388 BLAKE2B dfed2c23f7bbafe20d955dbe382ee8b2b40d17a8f4a9266242b405d5c3cb8654e8727817822d33a06c121cd0f04a027cdd3e4483c70e95f17cb4032ab4429bc5 SHA512 dc833f60474bb5659870573d751cb0e90cef87f94f0111d379a66ba593bf1ac00f624be75839bdcbeb3380c5ca52ef87cd0ffbe8f4e89345b0dec3165b9ce85e +DIST node-v12.22.5.tar.xz 23654908 BLAKE2B ca4f304e31f091ae656142035851d6e4427d8b2ddd2a69506dec96efbb1269a19a08e9ab8d44dfe10f8429bc239e4102f3f030adb25e9c41901c7d94b53e88c8 SHA512 80f3c673a1f2af7fffd6aaa556c06b8225034c8413e1a738c19d491aff1b3e6ed388df66ecbff88e4bfbefe1013dac7e3beb301456c2099b6a954ba468b21883 DIST node-v14.16.1.tar.xz 33297064 BLAKE2B 0927434c63cd248e90a4002b50c7a0fd68a5527a4cd7424b451840ddf0c403ba452979b195e598cc3b323e24233248a74a1274519ce8cd3a2f4e71dc7a8f3dcb SHA512 d4f5fbab69592ae555613b2186090b85a458d2211b6035989aee2617bfd0f6768ca767ec45ce12756a9c452d00af7237edee3b1ae526049e9fcd01f8f67680c0 DIST node-v14.17.3.tar.xz 33585080 BLAKE2B 37267c9da2d773dbbe95f7378f5b0c2b0dc397b17850be325f9fec637c6745dede4ca4136ba4bf109d72d8982ee985f1e077cc706165f1be2e3dc3053edfe229 SHA512 c6096715299f155b96df873976da91e854da7e99cde635cdb65d5c962abc5283dac86b8ddce4f5a9f7498f9793ff08943645b5e5b0b23395dfe035f7295218bb -DIST node-v14.17.4.tar.xz 33592020 BLAKE2B ad8a49715b3d568a5dc66b759d9c3074ea78c1c2293b1642549e32d26c5213ccc8fce4a531ef7727e3a74a63ddc26d8b71ac20bf5c86bf0af09467c2306363ef SHA512 c06228f1a82cf887fa1557be58a8814027926f5c9750c9f1a1656afd6f58151be08e05203343c62fb9a3957d99a73bee6fe509e52543fdbc5bd4c05a1e76c3cf +DIST node-v14.17.5.tar.xz 33585724 BLAKE2B cf79397caad8c81e4096f344f9fdb88d8ecea44b97fe208256dfd4afb750ecdf52142a2dc0430285b9d5117bdd43fa5ce42b4418926eec4d2c7f0a5f5d1a1539 SHA512 9d62c8946d05862d96a13a71b241a097b9f592a9e5f7362c81d8f3c74e7c5546a308b4c74bef34a66cafeef5d1a87d9d3e5ae8bb87d470c1ecf5abb8de0dedb5 DIST node-v16.6.1.tar.xz 33715224 BLAKE2B 2a95dbac7606de45e6c0669ee1c1ec1ee7c105ebbb241fbcae2ec0611df1da21ade28d28d9e011569d600b46fbcb6a32fff11456efb676386ed3cbbdc26d3e16 SHA512 408924c587f7d92074d8cb66903bd4f6c13a3a1f50fd05ead67feb85ed44cbf2ba1a4aebec8fe51ec77c102d3c310fbabb6e2557795a29536c091e9140fcf143 -EBUILD nodejs-12.22.1.ebuild 6450 BLAKE2B 5a540cf0588d177b2be4af525f3cc3b8d0de648b27c51ea2f1d07304711573180ab601f1149a4e8453446e8237f33f1a7b47d44956000856a85fde56693b48ec SHA512 c22aaa0bcfc45a6597162ed09df0facceb2352e2265e718e177d905afc96edb7c1e7c3647cfe98c9ab4a3c11aad7f9f2e7726a66fb680202ec83ff6310057d5e -EBUILD nodejs-12.22.3.ebuild 7081 BLAKE2B d19b9826fde72e436c85082a4db792bc65c22077a6935b105e431f0c0d0721bfba270e1b6caf9f511632afd6825fa84980e3164a8112d81256183576bfc9caa8 SHA512 07b137e3f19621208f3617cfaf4d98ea733c0aed6f152c717addf59bede2ab972835226a8ab8b60db167bee560a47f9f428ba8cb781b3475f42b7c7c0baadfe7 -EBUILD nodejs-12.22.4.ebuild 7075 BLAKE2B bfb063d663713b81f9abdcc238f05dcf3e7e467c591f0a799655e7d0bc5b0b0020d884585ea8238d5806abd905cf7f709b1f632ab2aa22400233aab2becdfc29 SHA512 63471461c8cf575e256adebfb29423fc419bbba1a39601c7ad844e5cd835aef72fc9f229b79324624655a3ae8542dbc99046b14765ff1445be3409a34a0dd8c7 -EBUILD nodejs-14.16.1.ebuild 6147 BLAKE2B 6172c84baadb436d99ce1bb4dfa21deae28452a4fa7efe136a2868d837c0b26db3c92494fcc018e178080aca31be2ec69232cdeee5794ac4a8ba001305514dba SHA512 73fa6ae5d4c1b7e69e7f04adcdb0ecf431d349dd194671442dba28ce8db60e3383154888a743145c3ffe248d51896fb4b9032a980aaf048cc49e80a7a0c3ef29 -EBUILD nodejs-14.17.3.ebuild 7075 BLAKE2B 8bee554d2f20581ab82fb7abb85dcca4c942b33b93b22f15ba5a4e56006160dbf234ab1fa7f1ee765fe09a3166519d8c6761c7b1904c633153b692af57cba174 SHA512 e3b0f7e2d2e71ac063ebefd23d83343dcce1055b399d6a5f3e860faafbe790ac8fe53cd8dc145b474d133f8521911a7d878e9eb99a1af8e3d093e5f6c01f2068 -EBUILD nodejs-14.17.4.ebuild 7113 BLAKE2B 3cb79fe139ef02582038dd125987e20d90e40871223853469767fb9058dd27891f93ec3798c1c23a4f0fadbd7440499cbe7b0e0f488d67682caf0fdefcd19dd4 SHA512 1e78ceb1c1a09b69cd3ebaed57b9c29658627c1d03e907b40749bb40d9e4f96ca1cb6cc50b0d66f51ec4b419a458d24913a61cb69fb208514a24f6b3eb584e21 -EBUILD nodejs-16.6.1.ebuild 6538 BLAKE2B 7d88a79528f7455bdfb8b6c94da8076343a98247886dd57a3e785a4e7f99470a6513f66528b8b4f1a116c860ee075200cc3442b820b5f25229d93b8770c12995 SHA512 849c115192b313b628a05063c970bfc967d91fb3e26cc558502ed89d435693e9b0e0c1cab80f815b98de5a85b6f11e3fdafa79b07b67cf784c40abd799668bbc -EBUILD nodejs-99999999.ebuild 6483 BLAKE2B d4ad4b4ca614a7ead97e4ae37493dfb4bb5da2a4d04bcf8126720401f2a76515608f6de44a6378813c98bdfb112d741072b9e3d9474e3d6248db556d452299e9 SHA512 398caa97aa48d604c91ad8dfc74b4d5b4fcb28a42d535b401253b04f79b0f7c450f25ec03b7b54d41755fa7bb734fe6031e2d0515849301b080dff1dfe98ab9b +DIST node-v16.6.2.tar.xz 33713996 BLAKE2B a4974da7004779179bd3bb0f99bb703f789a89c3ffcf194e83ed4ad07b005cc4ff23dd16f69ed1fee5f2d142e9cd813acb9687021a8cf1a64475093928b4e107 SHA512 978fd8204f7512a42256b0b50d674280c418595970a1327f3197fcde1f8787816c243611c24cada8c979352d77452393481600b96e66c72c294bcd04cf33f45f +EBUILD nodejs-12.22.1-r1.ebuild 6456 BLAKE2B 29a755a858a2a1eefccfb2f42339b53c9e5ef44c833874e08cc600800af87268405af2f24df34f9f4b4c186acd1150a2b5bd76351063f9a4c2d9e1340c62a3fd SHA512 e9c80caf28d669d1cae2c3a957360e802826212cca3245580b87122030172e2559144a77efc40e851805e00391699928be4266dfa8881cf9fc4dee8c0e18c59f +EBUILD nodejs-12.22.3-r1.ebuild 7087 BLAKE2B d0aefc2c382287b43363e128a2aef8426c30cdabf4866da0daff3de38cc80d854938d305f30829416ce730e951411eb401b0663a0ae9d493db3db6ad7437f4f8 SHA512 24d08f94b7fd54e6fdb3bc4d7388886ab7ed7e518aec8a713d4677ff03a60d79cd32efb8349983d86a41597569aeb5cc40703e35ccc4b3f52a3c1e8fa9d9d508 +EBUILD nodejs-12.22.5-r1.ebuild 7139 BLAKE2B 799386c24e9a9e6374d27467a24004ba7b75822b7dd8b98ebff460788bcd992d11f0d40b1733dd9586881bebd71a442c77ff5a3ada8eeb4d4ae180d39186746c SHA512 afc5134414c3633f71c023914dbb94feabb58c1f3145d0475f628302fea9104910c31e73d34de596a30f594413780bbe072ad17432fbecb9649751295a751d53 +EBUILD nodejs-14.16.1-r1.ebuild 6153 BLAKE2B f689b1e81329f64e179e7c8c2e4feea3c12792592d8d0cc26392304f9cbfa1649396f3452ed58e299aa7573763583143c3436071c724d1a6e3fccaff628d6d3e SHA512 f79b28c87879b16c73138543dee685a3eee0c710087f1c6cf12b2b8f81bddefb1e3b5d9ea275d9c181a796f7490796bf154c1a7eff7eba4c958ef42f397aabab +EBUILD nodejs-14.17.3-r1.ebuild 7081 BLAKE2B 97ce89a4b40783c8277e1e7f74af3928797f5db3baf8046ac755ed544c65b986ed964258a4a9e9392210d1959929d4be1969c7ca19cefae394744e7de6a7f296 SHA512 8935847e62f3df16f7f73dd94f7c0e8290cb0db4309cb356ccca9de425f1190175b64a1c33e519954f8323ba02f32816a5d9b01e81b8572b36ff571b2b670447 +EBUILD nodejs-14.17.5-r1.ebuild 7178 BLAKE2B e53fa59e142c9c4e7764466ad3ef783298841c5007009ca3c767f8370a39a3e715b1604b35f5b3dc79094f35ba2eb57d587f48b3097dd1792fa386e44a3ddfec SHA512 9e428c7d7c87bb1dd72c11e0c36ddb2d4c4bfe892fd57179ef0b28e82386f49f4f5ff32d20565beeceb852cb021c69c4f3d3343de2589a23644aa0c8844f9d0b +EBUILD nodejs-16.6.1-r1.ebuild 6544 BLAKE2B 73f3d973cbc445f46f90be8d8e96edb1f03e8a34a26c145d87cbcb90ca19d65f21e12f263ec3e0aff6db472120163e8d7247cdb6f571bb73bc33034e5ef0de28 SHA512 0a248eed198782d5b4abfd738cc3007cc6ab4743e7ee8c018ef5eaeb106b4036a8ced89a5be42fd739964900c90460972e6aa4bb1ad57c297118b4d84c7fe1c7 +EBUILD nodejs-16.6.2-r1.ebuild 6604 BLAKE2B 6998b4499705dbdaba2a2a14545fcb5c9ead195811419516f7fbaa0f686bd11f0b7448a526442fb2c892f886722b04c95150ae2626f44263ece10af51787447e SHA512 867da8350e320a2ab214e0c23e65b5c1b513ebfdce55d93f5309fdb8410ef870af9ccbb5cf17a1e6fcd8f086bc37217f7bb5bddfe517cc53bf762f04583cb88e +EBUILD nodejs-99999999.ebuild 6489 BLAKE2B c4e59483c43302d8940092ae30fd6bc8a07da74303c48a2266ea7ca9b9eefce583a396a1cce568cf5f07b583c6e1731f7ec3b01ffec7bcf5085dacffaa3bfddc SHA512 5f9c426c2a5c89cb76f21b9842a07deec615e6de79754b0be527b729b1e822cd8787340052dffba4e6d703dd9a2cbe5cd8bca299465589cc37417b2505ae533f MISC metadata.xml 1000 BLAKE2B 2dd8788da6451360d25beeca97fe03a52761cf0478ddd03e4680e805b0f31309fb16e44c65f1ca7475f197e4f2f53b14a0a07d08d1324387191e0389d124e6a0 SHA512 a2dc0a100769ba541ac469df0ea74c20b057620fedfaeaf87516d62fb0eea00d1a42ec39f14713e37a44079a076a2770497e81ff0e9b987c70f234c6458e114c diff --git a/net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch b/net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch new file mode 100644 index 000000000000..f90084c2bb2e --- /dev/null +++ b/net-libs/nodejs/files/nodejs-12.22.5-shared_c-ares_nameser_h.patch @@ -0,0 +1,534 @@ +From aff98a5667c22794e2eaf658f6dfbee54cdd4a3b Mon Sep 17 00:00:00 2001 +From: Felix Yan <felixonmars@archlinux.org> +Date: Thu, 12 Aug 2021 02:44:43 +0800 +Subject: [PATCH 1/2] deps: fix building with system c-ares on Linux + +The change in #39724 breaks building with system c-ares +(`--shared-cares`): +``` +In file included from ../src/cares_wrap.cc:25: +../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or +directory + 25 | # include <ares_nameser.h> + | ^~~~~~~~~~~~~~~~ +``` + +Since `ares_nameser.h` isn't available with a default system c-ares +installation, let's copy it as our private header here. + +Tested to build fine on Arch Linux with shared c-ares. +--- + src/ares_nameser.h | 482 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 482 insertions(+) + create mode 100644 src/ares_nameser.h + +diff --git a/src/ares_nameser.h b/src/ares_nameser.h +new file mode 100644 +index 000000000000..5270e5a3a6a0 +--- /dev/null ++++ b/src/ares_nameser.h +@@ -0,0 +1,482 @@ ++ ++#ifndef ARES_NAMESER_H ++#define ARES_NAMESER_H ++ ++#ifdef HAVE_ARPA_NAMESER_H ++# include <arpa/nameser.h> ++#endif ++#ifdef HAVE_ARPA_NAMESER_COMPAT_H ++# include <arpa/nameser_compat.h> ++#endif ++ ++/* ============================================================================ ++ * arpa/nameser.h may or may not provide ALL of the below defines, so check ++ * each one individually and set if not ++ * ============================================================================ ++ */ ++ ++#ifndef NS_PACKETSZ ++# define NS_PACKETSZ 512 /* maximum packet size */ ++#endif ++ ++#ifndef NS_MAXDNAME ++# define NS_MAXDNAME 256 /* maximum domain name */ ++#endif ++ ++#ifndef NS_MAXCDNAME ++# define NS_MAXCDNAME 255 /* maximum compressed domain name */ ++#endif ++ ++#ifndef NS_MAXLABEL ++# define NS_MAXLABEL 63 ++#endif ++ ++#ifndef NS_HFIXEDSZ ++# define NS_HFIXEDSZ 12 /* #/bytes of fixed data in header */ ++#endif ++ ++#ifndef NS_QFIXEDSZ ++# define NS_QFIXEDSZ 4 /* #/bytes of fixed data in query */ ++#endif ++ ++#ifndef NS_RRFIXEDSZ ++# define NS_RRFIXEDSZ 10 /* #/bytes of fixed data in r record */ ++#endif ++ ++#ifndef NS_INT16SZ ++# define NS_INT16SZ 2 ++#endif ++ ++#ifndef NS_INADDRSZ ++# define NS_INADDRSZ 4 ++#endif ++ ++#ifndef NS_IN6ADDRSZ ++# define NS_IN6ADDRSZ 16 ++#endif ++ ++#ifndef NS_CMPRSFLGS ++# define NS_CMPRSFLGS 0xc0 /* Flag bits indicating name compression. */ ++#endif ++ ++#ifndef NS_DEFAULTPORT ++# define NS_DEFAULTPORT 53 /* For both TCP and UDP. */ ++#endif ++ ++/* ============================================================================ ++ * arpa/nameser.h should provide these enumerations always, so if not found, ++ * provide them ++ * ============================================================================ ++ */ ++#ifndef HAVE_ARPA_NAMESER_H ++ ++typedef enum __ns_class { ++ ns_c_invalid = 0, /* Cookie. */ ++ ns_c_in = 1, /* Internet. */ ++ ns_c_2 = 2, /* unallocated/unsupported. */ ++ ns_c_chaos = 3, /* MIT Chaos-net. */ ++ ns_c_hs = 4, /* MIT Hesiod. */ ++ /* Query class values which do not appear in resource records */ ++ ns_c_none = 254, /* for prereq. sections in update requests */ ++ ns_c_any = 255, /* Wildcard match. */ ++ ns_c_max = 65536 ++} ns_class; ++ ++typedef enum __ns_type { ++ ns_t_invalid = 0, /* Cookie. */ ++ ns_t_a = 1, /* Host address. */ ++ ns_t_ns = 2, /* Authoritative server. */ ++ ns_t_md = 3, /* Mail destination. */ ++ ns_t_mf = 4, /* Mail forwarder. */ ++ ns_t_cname = 5, /* Canonical name. */ ++ ns_t_soa = 6, /* Start of authority zone. */ ++ ns_t_mb = 7, /* Mailbox domain name. */ ++ ns_t_mg = 8, /* Mail group member. */ ++ ns_t_mr = 9, /* Mail rename name. */ ++ ns_t_null = 10, /* Null resource record. */ ++ ns_t_wks = 11, /* Well known service. */ ++ ns_t_ptr = 12, /* Domain name pointer. */ ++ ns_t_hinfo = 13, /* Host information. */ ++ ns_t_minfo = 14, /* Mailbox information. */ ++ ns_t_mx = 15, /* Mail routing information. */ ++ ns_t_txt = 16, /* Text strings. */ ++ ns_t_rp = 17, /* Responsible person. */ ++ ns_t_afsdb = 18, /* AFS cell database. */ ++ ns_t_x25 = 19, /* X_25 calling address. */ ++ ns_t_isdn = 20, /* ISDN calling address. */ ++ ns_t_rt = 21, /* Router. */ ++ ns_t_nsap = 22, /* NSAP address. */ ++ ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */ ++ ns_t_sig = 24, /* Security signature. */ ++ ns_t_key = 25, /* Security key. */ ++ ns_t_px = 26, /* X.400 mail mapping. */ ++ ns_t_gpos = 27, /* Geographical position (withdrawn). */ ++ ns_t_aaaa = 28, /* Ip6 Address. */ ++ ns_t_loc = 29, /* Location Information. */ ++ ns_t_nxt = 30, /* Next domain (security). */ ++ ns_t_eid = 31, /* Endpoint identifier. */ ++ ns_t_nimloc = 32, /* Nimrod Locator. */ ++ ns_t_srv = 33, /* Server Selection. */ ++ ns_t_atma = 34, /* ATM Address */ ++ ns_t_naptr = 35, /* Naming Authority PoinTeR */ ++ ns_t_kx = 36, /* Key Exchange */ ++ ns_t_cert = 37, /* Certification record */ ++ ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */ ++ ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */ ++ ns_t_sink = 40, /* Kitchen sink (experimentatl) */ ++ ns_t_opt = 41, /* EDNS0 option (meta-RR) */ ++ ns_t_apl = 42, /* Address prefix list (RFC3123) */ ++ ns_t_ds = 43, /* Delegation Signer (RFC4034) */ ++ ns_t_sshfp = 44, /* SSH Key Fingerprint (RFC4255) */ ++ ns_t_rrsig = 46, /* Resource Record Signature (RFC4034) */ ++ ns_t_nsec = 47, /* Next Secure (RFC4034) */ ++ ns_t_dnskey = 48, /* DNS Public Key (RFC4034) */ ++ ns_t_tkey = 249, /* Transaction key */ ++ ns_t_tsig = 250, /* Transaction signature. */ ++ ns_t_ixfr = 251, /* Incremental zone transfer. */ ++ ns_t_axfr = 252, /* Transfer zone of authority. */ ++ ns_t_mailb = 253, /* Transfer mailbox records. */ ++ ns_t_maila = 254, /* Transfer mail agent records. */ ++ ns_t_any = 255, /* Wildcard match. */ ++ ns_t_zxfr = 256, /* BIND-specific, nonstandard. */ ++ ns_t_caa = 257, /* Certification Authority Authorization. */ ++ ns_t_max = 65536 ++} ns_type; ++ ++typedef enum __ns_opcode { ++ ns_o_query = 0, /* Standard query. */ ++ ns_o_iquery = 1, /* Inverse query (deprecated/unsupported). */ ++ ns_o_status = 2, /* Name server status query (unsupported). */ ++ /* Opcode 3 is undefined/reserved. */ ++ ns_o_notify = 4, /* Zone change notification. */ ++ ns_o_update = 5, /* Zone update message. */ ++ ns_o_max = 6 ++} ns_opcode; ++ ++typedef enum __ns_rcode { ++ ns_r_noerror = 0, /* No error occurred. */ ++ ns_r_formerr = 1, /* Format error. */ ++ ns_r_servfail = 2, /* Server failure. */ ++ ns_r_nxdomain = 3, /* Name error. */ ++ ns_r_notimpl = 4, /* Unimplemented. */ ++ ns_r_refused = 5, /* Operation refused. */ ++ /* these are for BIND_UPDATE */ ++ ns_r_yxdomain = 6, /* Name exists */ ++ ns_r_yxrrset = 7, /* RRset exists */ ++ ns_r_nxrrset = 8, /* RRset does not exist */ ++ ns_r_notauth = 9, /* Not authoritative for zone */ ++ ns_r_notzone = 10, /* Zone of record different from zone section */ ++ ns_r_max = 11, ++ /* The following are TSIG extended errors */ ++ ns_r_badsig = 16, ++ ns_r_badkey = 17, ++ ns_r_badtime = 18 ++} ns_rcode; ++ ++#endif /* HAVE_ARPA_NAMESER_H */ ++ ++ ++/* ============================================================================ ++ * arpa/nameser_compat.h typically sets these. However on some systems ++ * arpa/nameser.h does, but may not set all of them. Lets conditionally ++ * define each ++ * ============================================================================ ++ */ ++ ++#ifndef PACKETSZ ++# define PACKETSZ NS_PACKETSZ ++#endif ++ ++#ifndef MAXDNAME ++# define MAXDNAME NS_MAXDNAME ++#endif ++ ++#ifndef MAXCDNAME ++# define MAXCDNAME NS_MAXCDNAME ++#endif ++ ++#ifndef MAXLABEL ++# define MAXLABEL NS_MAXLABEL ++#endif ++ ++#ifndef HFIXEDSZ ++# define HFIXEDSZ NS_HFIXEDSZ ++#endif ++ ++#ifndef QFIXEDSZ ++# define QFIXEDSZ NS_QFIXEDSZ ++#endif ++ ++#ifndef RRFIXEDSZ ++# define RRFIXEDSZ NS_RRFIXEDSZ ++#endif ++ ++#ifndef INDIR_MASK ++# define INDIR_MASK NS_CMPRSFLGS ++#endif ++ ++#ifndef NAMESERVER_PORT ++# define NAMESERVER_PORT NS_DEFAULTPORT ++#endif ++ ++ ++/* opcodes */ ++#ifndef O_QUERY ++# define O_QUERY 0 /* ns_o_query */ ++#endif ++#ifndef O_IQUERY ++# define O_IQUERY 1 /* ns_o_iquery */ ++#endif ++#ifndef O_STATUS ++# define O_STATUS 2 /* ns_o_status */ ++#endif ++#ifndef O_NOTIFY ++# define O_NOTIFY 4 /* ns_o_notify */ ++#endif ++#ifndef O_UPDATE ++# define O_UPDATE 5 /* ns_o_update */ ++#endif ++ ++ ++/* response codes */ ++#ifndef SERVFAIL ++# define SERVFAIL ns_r_servfail ++#endif ++#ifndef NOTIMP ++# define NOTIMP ns_r_notimpl ++#endif ++#ifndef REFUSED ++# define REFUSED ns_r_refused ++#endif ++#if defined(_WIN32) && !defined(HAVE_ARPA_NAMESER_COMPAT_H) && defined(NOERROR) ++# undef NOERROR /* it seems this is already defined in winerror.h */ ++#endif ++#ifndef NOERROR ++# define NOERROR ns_r_noerror ++#endif ++#ifndef FORMERR ++# define FORMERR ns_r_formerr ++#endif ++#ifndef NXDOMAIN ++# define NXDOMAIN ns_r_nxdomain ++#endif ++/* Non-standard response codes, use numeric values */ ++#ifndef YXDOMAIN ++# define YXDOMAIN 6 /* ns_r_yxdomain */ ++#endif ++#ifndef YXRRSET ++# define YXRRSET 7 /* ns_r_yxrrset */ ++#endif ++#ifndef NXRRSET ++# define NXRRSET 8 /* ns_r_nxrrset */ ++#endif ++#ifndef NOTAUTH ++# define NOTAUTH 9 /* ns_r_notauth */ ++#endif ++#ifndef NOTZONE ++# define NOTZONE 10 /* ns_r_notzone */ ++#endif ++#ifndef TSIG_BADSIG ++# define TSIG_BADSIG 16 /* ns_r_badsig */ ++#endif ++#ifndef TSIG_BADKEY ++# define TSIG_BADKEY 17 /* ns_r_badkey */ ++#endif ++#ifndef TSIG_BADTIME ++# define TSIG_BADTIME 18 /* ns_r_badtime */ ++#endif ++ ++ ++/* classes */ ++#ifndef C_IN ++# define C_IN 1 /* ns_c_in */ ++#endif ++#ifndef C_CHAOS ++# define C_CHAOS 3 /* ns_c_chaos */ ++#endif ++#ifndef C_HS ++# define C_HS 4 /* ns_c_hs */ ++#endif ++#ifndef C_NONE ++# define C_NONE 254 /* ns_c_none */ ++#endif ++#ifndef C_ANY ++# define C_ANY 255 /* ns_c_any */ ++#endif ++ ++ ++/* types */ ++#ifndef T_A ++# define T_A 1 /* ns_t_a */ ++#endif ++#ifndef T_NS ++# define T_NS 2 /* ns_t_ns */ ++#endif ++#ifndef T_MD ++# define T_MD 3 /* ns_t_md */ ++#endif ++#ifndef T_MF ++# define T_MF 4 /* ns_t_mf */ ++#endif ++#ifndef T_CNAME ++# define T_CNAME 5 /* ns_t_cname */ ++#endif ++#ifndef T_SOA ++# define T_SOA 6 /* ns_t_soa */ ++#endif ++#ifndef T_MB ++# define T_MB 7 /* ns_t_mb */ ++#endif ++#ifndef T_MG ++# define T_MG 8 /* ns_t_mg */ ++#endif ++#ifndef T_MR ++# define T_MR 9 /* ns_t_mr */ ++#endif ++#ifndef T_NULL ++# define T_NULL 10 /* ns_t_null */ ++#endif ++#ifndef T_WKS ++# define T_WKS 11 /* ns_t_wks */ ++#endif ++#ifndef T_PTR ++# define T_PTR 12 /* ns_t_ptr */ ++#endif ++#ifndef T_HINFO ++# define T_HINFO 13 /* ns_t_hinfo */ ++#endif ++#ifndef T_MINFO ++# define T_MINFO 14 /* ns_t_minfo */ ++#endif ++#ifndef T_MX ++# define T_MX 15 /* ns_t_mx */ ++#endif ++#ifndef T_TXT ++# define T_TXT 16 /* ns_t_txt */ ++#endif ++#ifndef T_RP ++# define T_RP 17 /* ns_t_rp */ ++#endif ++#ifndef T_AFSDB ++# define T_AFSDB 18 /* ns_t_afsdb */ ++#endif ++#ifndef T_X25 ++# define T_X25 19 /* ns_t_x25 */ ++#endif ++#ifndef T_ISDN ++# define T_ISDN 20 /* ns_t_isdn */ ++#endif ++#ifndef T_RT ++# define T_RT 21 /* ns_t_rt */ ++#endif ++#ifndef T_NSAP ++# define T_NSAP 22 /* ns_t_nsap */ ++#endif ++#ifndef T_NSAP_PTR ++# define T_NSAP_PTR 23 /* ns_t_nsap_ptr */ ++#endif ++#ifndef T_SIG ++# define T_SIG 24 /* ns_t_sig */ ++#endif ++#ifndef T_KEY ++# define T_KEY 25 /* ns_t_key */ ++#endif ++#ifndef T_PX ++# define T_PX 26 /* ns_t_px */ ++#endif ++#ifndef T_GPOS ++# define T_GPOS 27 /* ns_t_gpos */ ++#endif ++#ifndef T_AAAA ++# define T_AAAA 28 /* ns_t_aaaa */ ++#endif ++#ifndef T_LOC ++# define T_LOC 29 /* ns_t_loc */ ++#endif ++#ifndef T_NXT ++# define T_NXT 30 /* ns_t_nxt */ ++#endif ++#ifndef T_EID ++# define T_EID 31 /* ns_t_eid */ ++#endif ++#ifndef T_NIMLOC ++# define T_NIMLOC 32 /* ns_t_nimloc */ ++#endif ++#ifndef T_SRV ++# define T_SRV 33 /* ns_t_srv */ ++#endif ++#ifndef T_ATMA ++# define T_ATMA 34 /* ns_t_atma */ ++#endif ++#ifndef T_NAPTR ++# define T_NAPTR 35 /* ns_t_naptr */ ++#endif ++#ifndef T_KX ++# define T_KX 36 /* ns_t_kx */ ++#endif ++#ifndef T_CERT ++# define T_CERT 37 /* ns_t_cert */ ++#endif ++#ifndef T_A6 ++# define T_A6 38 /* ns_t_a6 */ ++#endif ++#ifndef T_DNAME ++# define T_DNAME 39 /* ns_t_dname */ ++#endif ++#ifndef T_SINK ++# define T_SINK 40 /* ns_t_sink */ ++#endif ++#ifndef T_OPT ++# define T_OPT 41 /* ns_t_opt */ ++#endif ++#ifndef T_APL ++# define T_APL 42 /* ns_t_apl */ ++#endif ++#ifndef T_DS ++# define T_DS 43 /* ns_t_ds */ ++#endif ++#ifndef T_SSHFP ++# define T_SSHFP 44 /* ns_t_sshfp */ ++#endif ++#ifndef T_RRSIG ++# define T_RRSIG 46 /* ns_t_rrsig */ ++#endif ++#ifndef T_NSEC ++# define T_NSEC 47 /* ns_t_nsec */ ++#endif ++#ifndef T_DNSKEY ++# define T_DNSKEY 48 /* ns_t_dnskey */ ++#endif ++#ifndef T_TKEY ++# define T_TKEY 249 /* ns_t_tkey */ ++#endif ++#ifndef T_TSIG ++# define T_TSIG 250 /* ns_t_tsig */ ++#endif ++#ifndef T_IXFR ++# define T_IXFR 251 /* ns_t_ixfr */ ++#endif ++#ifndef T_AXFR ++# define T_AXFR 252 /* ns_t_axfr */ ++#endif ++#ifndef T_MAILB ++# define T_MAILB 253 /* ns_t_mailb */ ++#endif ++#ifndef T_MAILA ++# define T_MAILA 254 /* ns_t_maila */ ++#endif ++#ifndef T_ANY ++# define T_ANY 255 /* ns_t_any */ ++#endif ++#ifndef T_ZXFR ++# define T_ZXFR 256 /* ns_t_zxfr */ ++#endif ++#ifndef T_CAA ++# define T_CAA 257 /* ns_t_caa */ ++#endif ++#ifndef T_MAX ++# define T_MAX 65536 /* ns_t_max */ ++#endif ++ ++ ++#endif /* ARES_NAMESER_H */ + +From db4643979ee676b3a3d6cdf2fb597d399cf8013f Mon Sep 17 00:00:00 2001 +From: Felix Yan <felixonmars@archlinux.org> +Date: Fri, 13 Aug 2021 00:01:59 +0800 +Subject: [PATCH 2/2] build: ignore cpplint for third-party ares_nameser.h + +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index ec4c774748cd..c418995c53c1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1289,6 +1289,7 @@ jslint-ci: lint-js-ci + LINT_CPP_ADDON_DOC_FILES_GLOB = test/addons/??_*/*.cc test/addons/??_*/*.h + LINT_CPP_ADDON_DOC_FILES = $(wildcard $(LINT_CPP_ADDON_DOC_FILES_GLOB)) + LINT_CPP_EXCLUDE ?= ++LINT_CPP_EXCLUDE += src/ares_nameser.h + LINT_CPP_EXCLUDE += src/node_root_certs.h + LINT_CPP_EXCLUDE += $(LINT_CPP_ADDON_DOC_FILES) + LINT_CPP_EXCLUDE += $(wildcard test/js-native-api/??_*/*.cc test/js-native-api/??_*/*.h test/node-api/??_*/*.cc test/node-api/??_*/*.h) diff --git a/net-libs/nodejs/nodejs-12.22.1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild index 930eb364bbf3..3d3ce369fbb6 100644 --- a/net-libs/nodejs/nodejs-12.22.1.ebuild +++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild @@ -25,11 +25,11 @@ REQUIRED_USE=" " RDEPEND=" - >=app-arch/brotli-1.0.9 + >=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 + >=net-dns/c-ares-1.16.0:= >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0 + >=net-libs/nghttp2-1.40.0:= sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( diff --git a/net-libs/nodejs/nodejs-12.22.3.ebuild b/net-libs/nodejs/nodejs-12.22.3-r1.ebuild index b8cc085d244f..27428510de80 100644 --- a/net-libs/nodejs/nodejs-12.22.3.ebuild +++ b/net-libs/nodejs/nodejs-12.22.3-r1.ebuild @@ -33,11 +33,11 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" - >=app-arch/brotli-1.0.9 + >=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 + >=net-dns/c-ares-1.16.0:= >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0 + >=net-libs/nghttp2-1.40.0:= sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( diff --git a/net-libs/nodejs/nodejs-12.22.4.ebuild b/net-libs/nodejs/nodejs-12.22.5-r1.ebuild index aa0282ea003f..ec373926c7ba 100644 --- a/net-libs/nodejs/nodejs-12.22.4.ebuild +++ b/net-libs/nodejs/nodejs-12.22.5-r1.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi @@ -33,11 +33,11 @@ REQUIRED_USE=" RESTRICT="!test? ( test )" RDEPEND=" - >=app-arch/brotli-1.0.9 + >=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.39.0:= - >=net-dns/c-ares-1.16.0 + >=net-dns/c-ares-1.17.2:= >=net-libs/http-parser-2.9.3:= - >=net-libs/nghttp2-1.40.0 + >=net-libs/nghttp2-1.40.0:= sys-libs/zlib icu? ( >=dev-libs/icu-64.2:= ) system-ssl? ( @@ -60,6 +60,7 @@ PATCHES=( "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch + "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch "${FILESDIR}"/${PN}-99999999-llhttp.patch ) diff --git a/net-libs/nodejs/nodejs-14.16.1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild index 6143804f9ac8..472fe628bfe2 100644 --- a/net-libs/nodejs/nodejs-14.16.1.ebuild +++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild @@ -25,10 +25,10 @@ REQUIRED_USE="inspector? ( icu ssl ) # FIXME: test-fs-mkdir fails with "no such file or directory". Investigate. RESTRICT="test" -RDEPEND=">=app-arch/brotli-1.0.9 +RDEPEND=">=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.16.1 - >=net-libs/nghttp2-1.41.0 + >=net-dns/c-ares-1.16.1:= + >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( diff --git a/net-libs/nodejs/nodejs-14.17.3.ebuild b/net-libs/nodejs/nodejs-14.17.3-r1.ebuild index 50bc635ffeae..e18f47e1cf7d 100644 --- a/net-libs/nodejs/nodejs-14.17.3.ebuild +++ b/net-libs/nodejs/nodejs-14.17.3-r1.ebuild @@ -31,10 +31,10 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" -RDEPEND=">=app-arch/brotli-1.0.9 +RDEPEND=">=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.16.1 - >=net-libs/nghttp2-1.41.0 + >=net-dns/c-ares-1.16.1:= + >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( diff --git a/net-libs/nodejs/nodejs-14.17.4.ebuild b/net-libs/nodejs/nodejs-14.17.5-r1.ebuild index d65617465791..db0eeada2103 100644 --- a/net-libs/nodejs/nodejs-14.17.4.ebuild +++ b/net-libs/nodejs/nodejs-14.17.5-r1.ebuild @@ -19,11 +19,11 @@ if [[ ${PV} == *9999 ]]; then else SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" SLOT="0/$(ver_cut 1)" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" S="${WORKDIR}/node-v${PV}" fi -IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl system-icu +system-ssl systemtap test" +IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" REQUIRED_USE="inspector? ( icu ssl ) npm? ( ssl ) system-icu? ( icu ) @@ -31,10 +31,10 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" -RDEPEND=">=app-arch/brotli-1.0.9 +RDEPEND=">=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.16.1 - >=net-libs/nghttp2-1.41.0 + >=net-dns/c-ares-1.17.2:= + >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( @@ -53,6 +53,7 @@ PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch + "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch ) diff --git a/net-libs/nodejs/nodejs-16.6.1.ebuild b/net-libs/nodejs/nodejs-16.6.1-r1.ebuild index 236455536464..4e4fc546d14c 100644 --- a/net-libs/nodejs/nodejs-16.6.1.ebuild +++ b/net-libs/nodejs/nodejs-16.6.1-r1.ebuild @@ -31,10 +31,10 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" -RDEPEND=">=app-arch/brotli-1.0.9 +RDEPEND=">=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.0 - >=net-libs/nghttp2-1.41.0 + >=net-dns/c-ares-1.17.0:= + >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" diff --git a/net-libs/nodejs/nodejs-16.6.2-r1.ebuild b/net-libs/nodejs/nodejs-16.6.2-r1.ebuild new file mode 100644 index 000000000000..c4a9b3591702 --- /dev/null +++ b/net-libs/nodejs/nodejs-16.6.2-r1.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +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/" +LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/nodejs/node" + SLOT="0" +else + SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz" + SLOT="0/$(ver_cut 1)" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" + S="${WORKDIR}/node-v${PV}" +fi + +IUSE="cpu_flags_x86_sse2 debug doc +icu inspector lto +npm pax-kernel +snapshot +ssl +system-icu +system-ssl systemtap test" +REQUIRED_USE="inspector? ( icu ssl ) + npm? ( ssl ) + system-icu? ( icu ) + system-ssl? ( ssl )" + +RESTRICT="!test? ( test )" + +RDEPEND=">=app-arch/brotli-1.0.9:= + >=dev-libs/libuv-1.40.0:= + >=net-dns/c-ares-1.17.2:= + >=net-libs/nghttp2-1.41.0:= + sys-libs/zlib + system-icu? ( >=dev-libs/icu-67:= ) + system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" +BDEPEND="${PYTHON_DEPS} + sys-apps/coreutils + virtual/pkgconfig + systemtap? ( dev-util/systemtap ) + test? ( net-misc/curl ) + pax-kernel? ( sys-apps/elfix )" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch + "${FILESDIR}"/${PN}-12.22.5-shared_c-ares_nameser_h.patch + "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch +) + +pkg_pretend() { + (use x86 && ! use cpu_flags_x86_sse2) && \ + die "Your CPU doesn't support the required SSE2 instruction." + + if [[ ${MERGE_TYPE} != "binary" ]]; then + if use lto; then + if tc-is-gcc; then + if [[ $(gcc-major-version) -ge 11 ]]; then + # Bug #787158 + die "LTO builds of ${PN} using gcc-11+ currently fail tests and produce runtime errors. Either switch to gcc-10 or unset USE=lto for this ebuild" + fi + fi + fi + fi +} + +src_prepare() { + tc-export AR 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 + + # 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.8.0-paxmarking.patch ) + + # All this test does is check if the npm CLI produces warnings of any sort, + # failing if it does. Overkill, much? Especially given one possible warning + # is that there is a newer version of npm available upstream (yes, it does + # use the network if available), thus making it a real possibility for this + # test to begin failing one day even though it was fine before. + rm -f test/parallel/test-release-npm.js + + default +} + +src_configure() { + xdg_environment_reset + + # LTO compiler flags are handled by configure.py itself + filter-flags '-flto*' + + local myconf=( + --shared-brotli + --shared-cares + --shared-libuv + --shared-nghttp2 + --shared-zlib + ) + use debug && myconf+=( --debug ) + use lto && myconf+=( --enable-lto ) + if use system-icu; then + myconf+=( --with-intl=system-icu ) + elif use icu; then + myconf+=( --with-intl=full-icu ) + else + myconf+=( --with-intl=none ) + fi + use inspector || myconf+=( --without-inspector ) + use npm || myconf+=( --without-npm ) + use snapshot || myconf+=( --without-node-snapshot ) + if use ssl; then + use system-ssl && myconf+=( --shared-openssl --openssl-use-def-ca-store ) + else + myconf+=( --without-ssl ) + fi + + 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 + keepdir /etc/npm + + # Install bash completion for `npm` + local tmp_npm_completion_file="$(TMPDIR="${T}" mktemp -t npm.XXXXXXXXXX)" + "${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}" + newbashcomp "${tmp_npm_completion_file}" npm + + # Move man pages + doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/* + + # Clean up + rm -f "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} + rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} + + 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() { + if has usersandbox ${FEATURES}; then + rm -f "${S}"/test/parallel/test-fs-mkdir.js + ewarn "You are emerging ${PN} with 'usersandbox' enabled. Excluding tests known to fail in this mode." \ + "For full test coverage, emerge =${CATEGORY}/${PF} with 'FEATURES=-usersandbox'." + fi + + out/${BUILDTYPE}/cctest || die + "${EPYTHON}" tools/test.py --mode=${BUILDTYPE,,} --flaky-tests=dontcare -J message parallel sequential || die +} diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index a2a2634d16c8..d9745115c19f 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -31,10 +31,10 @@ REQUIRED_USE="inspector? ( icu ssl ) RESTRICT="!test? ( test )" -RDEPEND=">=app-arch/brotli-1.0.9 +RDEPEND=">=app-arch/brotli-1.0.9:= >=dev-libs/libuv-1.40.0:= - >=net-dns/c-ares-1.17.0 - >=net-libs/nghttp2-1.41.0 + >=net-dns/c-ares-1.17.0:= + >=net-libs/nghttp2-1.41.0:= sys-libs/zlib system-icu? ( >=dev-libs/icu-67:= ) system-ssl? ( >=dev-libs/openssl-1.1.1:0= )" |