commit 577dc79cc1f7c9856805291b0a4457ba206ba79c Author: Danny Rawlins <contact@romster.me> Date: Fri Aug 27 00:43:23 2021 +1000 nodejs: 16.7.0 -> 16.8.0 diff --git a/nodejs/.signature b/nodejs/.signature index c2dd25c9b..cf6bebc31 100644 --- a/nodejs/.signature +++ b/nodejs/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ewYnNbrIHLubapEK5rgbtvBFa/9yIWruxQ96DY39RA8Jrp3MLSZnFuwXIm3DuBp0LRGsSYrL0DMu/7chapp/gk= -SHA256 (Pkgfile) = 3add4f6b943b94f77ced559622f4268408f12b130d826f3324606a6b0b70dcd4 +RWSE3ohX2g5d/T7j3/5+jI9/9lumxgtlfDb5nA61tGzvBKyZXep2uJmjHZvpTYUn3XSM0fI/V4k2KYL0IOFMzvIVhKaQ6oHBdwQ= +SHA256 (Pkgfile) = 17225317bd4e20def0c804a11e382fec10a21bc39ef15e747ddc907b873a0bc7 SHA256 (.footprint) = 445e23ea8b73919e4841811c4aaf3ef3f47488ca221178d9b041b5628a90ca3a -SHA256 (node-v16.7.0.tar.xz) = fa85fdfbd378e587fa04ad9548e7c9f50e690af9575730d3b330cba6fc3f2d37 +SHA256 (node-v16.8.0.tar.xz) = b8790226312970ba5d8fd98229380c48bf0366eb1a3633091e350a34a4b46392 +SHA256 (system-c-ares.patch) = 1ab0f849fe4fae2d295b6c60c12825d5f2c29f5b28b721916d1b550704b0f5f3 diff --git a/nodejs/Pkgfile b/nodejs/Pkgfile index 31f28d305..c4ce841ce 100644 --- a/nodejs/Pkgfile +++ b/nodejs/Pkgfile @@ -5,15 +5,17 @@ # Optional: brotli c-ares icu nghttp2-libs ninja name=nodejs -version=16.7.0 +version=16.8.0 release=1 -source=(https://nodejs.org/dist/v$version/node-v$version.tar.xz) +source=(https://nodejs.org/dist/v$version/node-v$version.tar.xz + system-c-ares.patch) build() { cd node-v$version prt-get isinst brotli && PKGMK_NODEJS+=' --shared-brotli' prt-get isinst c-ares && PKGMK_NODEJS+=' --shared-cares' + prt-get isinst c-ares && patch -Rp1 -i $SRC/system-c-ares.patch prt-get isinst icu && PKGMK_NODEJS+=' --with-intl=system-icu' prt-get isinst nghttp2-libs && PKGMK_NODEJS+=' --experimental-http-parser --shared-nghttp2' prt-get isinst ninja && PKGMK_NODEJS+=' --ninja' diff --git a/nodejs/system-c-ares.patch b/nodejs/system-c-ares.patch new file mode 100644 index 000000000..9e464f91b --- /dev/null +++ b/nodejs/system-c-ares.patch @@ -0,0 +1,71 @@ +From 0bfb8ec19adf2106c505f3e0a97c99b81694524b Mon Sep 17 00:00:00 2001 +From: Beth Griggs <bgriggs@redhat.com> +Date: Tue, 10 Aug 2021 10:10:09 +0100 +Subject: [PATCH] deps: update c-ares to 1.17.2 + +Refs: https://github.com/c-ares/c-ares/releases/tag/cares-1_17_2 +--- + deps/cares/RELEASE-NOTES | 121 +++-- + deps/cares/cares.gyp | 2 +- + deps/cares/include/ares.h | 2 +- + deps/cares/include/ares_version.h | 4 +- + .../cares/src/lib/ares__parse_into_addrinfo.c | 16 +- + deps/cares/src/lib/ares__sortaddrinfo.c | 4 + + deps/cares/src/lib/ares_create_query.c | 17 +- + deps/cares/src/lib/ares_expand_name.c | 137 ++++- + deps/cares/src/lib/ares_expand_string.c | 7 +- + deps/cares/src/lib/ares_free_hostent.c | 10 +- + deps/cares/src/lib/ares_freeaddrinfo.c | 2 + + deps/cares/src/lib/ares_getaddrinfo.c | 24 +- + deps/cares/src/lib/ares_gethostbyaddr.c | 10 +- + deps/cares/src/lib/ares_gethostbyname.c | 10 +- + deps/cares/src/lib/ares_getnameinfo.c | 10 +- + deps/cares/src/lib/ares_init.c | 88 +++- + deps/cares/src/lib/ares_library_init.c | 9 +- + deps/cares/src/lib/ares_library_init.h | 2 +- + deps/cares/src/lib/ares_nameser.h | 482 ++++++++++++++++++ + deps/cares/src/lib/ares_parse_a_reply.c | 14 +- + deps/cares/src/lib/ares_parse_aaaa_reply.c | 14 +- + deps/cares/src/lib/ares_parse_caa_reply.c | 14 +- + deps/cares/src/lib/ares_parse_mx_reply.c | 10 +- + deps/cares/src/lib/ares_parse_naptr_reply.c | 15 +- + deps/cares/src/lib/ares_parse_ns_reply.c | 16 +- + deps/cares/src/lib/ares_parse_ptr_reply.c | 99 ++-- + deps/cares/src/lib/ares_parse_soa_reply.c | 24 +- + deps/cares/src/lib/ares_parse_srv_reply.c | 15 +- + deps/cares/src/lib/ares_parse_txt_reply.c | 10 +- + deps/cares/src/lib/ares_private.h | 6 +- + deps/cares/src/lib/ares_process.c | 11 +- + deps/cares/src/lib/ares_query.c | 10 +- + deps/cares/src/lib/ares_send.c | 10 +- + deps/cares/src/lib/ares_setup.h | 5 +- + deps/cares/src/lib/ares_strsplit.c | 4 + + deps/cares/src/lib/inet_net_pton.c | 10 +- + deps/cares/src/lib/inet_ntop.c | 10 +- + deps/cares/src/lib/nameser.h | 218 -------- + src/cares_wrap.h | 10 +- + 39 files changed, 889 insertions(+), 593 deletions(-) + create mode 100644 deps/cares/src/lib/ares_nameser.h + delete mode 100644 deps/cares/src/lib/nameser.h + +diff --git a/src/cares_wrap.h b/src/cares_wrap.h +index aee46a935b3a..60f99e65edf3 100644 +--- a/src/cares_wrap.h ++++ b/src/cares_wrap.h +@@ -22,15 +22,7 @@ + # include <netdb.h> + #endif // __POSIX__ + +-#if defined(__ANDROID__) || \ +- defined(__MINGW32__) || \ +- defined(__OpenBSD__) || \ +- defined(_MSC_VER) +- +-# include <nameser.h> +-#else +-# include <arpa/nameser.h> +-#endif ++# include <ares_nameser.h> + + namespace node { + namespace cares_wrap {