diff options
| author | adam <adam@pkgsrc.org> | 2020-01-24 18:57:09 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2020-01-24 18:57:09 +0000 |
| commit | 318d7a85070dda8d60f9547f696a31bf8b8a5151 (patch) | |
| tree | 272b2c17ddbf4140d5b8d4e75cf809350d33a1d2 /lang/nodejs10 | |
| parent | c0c91aa7edf446d1d6356ab1eb0be022b95f6130 (diff) | |
| download | pkgsrc-318d7a85070dda8d60f9547f696a31bf8b8a5151.tar.gz | |
nodejs10: updated to 10.18.1
Version 10.18.1 'Dubnium':
Notable changes
http2: fix session memory accounting after pausing
n-api: correct bug in napi_get_last_error
tools: update tzdata to 2019c
Diffstat (limited to 'lang/nodejs10')
19 files changed, 23 insertions, 861 deletions
diff --git a/lang/nodejs10/Makefile b/lang/nodejs10/Makefile index 2acfcaa7d7d..373fe58d5e3 100644 --- a/lang/nodejs10/Makefile +++ b/lang/nodejs10/Makefile @@ -1,15 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2019/12/29 15:40:00 adam Exp $ +# $NetBSD: Makefile,v 1.3 2020/01/24 18:57:09 adam Exp $ -DISTNAME= node-v10.18.0 +DISTNAME= node-v10.18.1 USE_LANGUAGES= c gnu++14 -# Stated by the changelog as of 8.2.0 -GCC_REQD+= 4.9.4 - -# Stated by the changelog -BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 - # Requires http_parser_set_max_header_size BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 @@ -18,15 +12,14 @@ BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 # XXX: figure out a way to add rpaths to torque MAKE_ENV+= LD_LIBRARY_PATH=${PREFIX}/lib -# Optional OpenSSL support in nghttp2 conflicts with OpenSSL 1.1.x -# bundled and built by lang/nodejs. -# Uncomment when we switch to openssl>=1.1 -# CONFIGURE_ARGS+= --shared-nghttp2 -CONFIGURE_ARGS+= --with-intl=system-icu CONFIGURE_ARGS+= --shared-http-parser +CONFIGURE_ARGS+= --shared-nghttp2 +CONFIGURE_ARGS+= --with-intl=system-icu CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh +PYTHON_VERSIONS_ACCEPTED= 27 + .if ${MACHINE_ARCH} == "i386" # 64 bit atomic ops are required CXXFLAGS+= -march=i586 @@ -34,11 +27,10 @@ CXXFLAGS+= -march=i586 CXXFLAGS+= -mstackrealign .endif -.include "options.mk" +.include "../../lang/nodejs/options.mk" .include "../../lang/nodejs/Makefile.common" .include "../../textproc/icu/buildlink3.mk" .include "../../www/http-parser/buildlink3.mk" -# Uncomment when we switch to openssl>=1.1 -# .include "../../www/nghttp2/buildlink3.mk" +.include "../../www/nghttp2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/nodejs10/PLIST b/lang/nodejs10/PLIST index 0f738f8fe34..1286830f921 100644 --- a/lang/nodejs10/PLIST +++ b/lang/nodejs10/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2019/12/09 20:05:40 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/01/24 18:57:09 adam Exp $ bin/node include/node/common.gypi include/node/config.gypi @@ -11,408 +11,6 @@ include/node/node_api_types.h include/node/node_buffer.h include/node/node_object_wrap.h include/node/node_version.h -${PLIST.openssl}include/node/openssl/aes.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/BSD-x86_64/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN32/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/VC-WIN64A/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/aix-gcc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/aix64-gcc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/darwin-i386-cc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-aarch64/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-armv4/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-elf/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-ppc64le/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-x32/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux-x86_64/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux32-s390x/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/linux64-s390x/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/solaris-x86-gcc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/progs.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/bn_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/dso_conf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/progs.h -${PLIST.openssl}include/node/openssl/asn1.h -${PLIST.openssl}include/node/openssl/asn1_mac.h -${PLIST.openssl}include/node/openssl/asn1err.h -${PLIST.openssl}include/node/openssl/asn1t.h -${PLIST.openssl}include/node/openssl/async.h -${PLIST.openssl}include/node/openssl/asyncerr.h -${PLIST.openssl}include/node/openssl/bio.h -${PLIST.openssl}include/node/openssl/bioerr.h -${PLIST.openssl}include/node/openssl/blowfish.h -${PLIST.openssl}include/node/openssl/bn.h -${PLIST.openssl}include/node/openssl/bn_conf.h -${PLIST.openssl}include/node/openssl/bn_conf_asm.h -${PLIST.openssl}include/node/openssl/bn_conf_no-asm.h -${PLIST.openssl}include/node/openssl/bnerr.h -${PLIST.openssl}include/node/openssl/buffer.h -${PLIST.openssl}include/node/openssl/buffererr.h -${PLIST.openssl}include/node/openssl/camellia.h -${PLIST.openssl}include/node/openssl/cast.h -${PLIST.openssl}include/node/openssl/cmac.h -${PLIST.openssl}include/node/openssl/cms.h -${PLIST.openssl}include/node/openssl/cmserr.h -${PLIST.openssl}include/node/openssl/comp.h -${PLIST.openssl}include/node/openssl/comperr.h -${PLIST.openssl}include/node/openssl/conf.h -${PLIST.openssl}include/node/openssl/conf_api.h -${PLIST.openssl}include/node/openssl/conferr.h -${PLIST.openssl}include/node/openssl/crypto.h -${PLIST.openssl}include/node/openssl/cryptoerr.h -${PLIST.openssl}include/node/openssl/ct.h -${PLIST.openssl}include/node/openssl/cterr.h -${PLIST.openssl}include/node/openssl/des.h -${PLIST.openssl}include/node/openssl/dh.h -${PLIST.openssl}include/node/openssl/dherr.h -${PLIST.openssl}include/node/openssl/dsa.h -${PLIST.openssl}include/node/openssl/dsaerr.h -${PLIST.openssl}include/node/openssl/dso_conf.h -${PLIST.openssl}include/node/openssl/dso_conf_asm.h -${PLIST.openssl}include/node/openssl/dso_conf_no-asm.h -${PLIST.openssl}include/node/openssl/dtls1.h -${PLIST.openssl}include/node/openssl/e_os2.h -${PLIST.openssl}include/node/openssl/ebcdic.h -${PLIST.openssl}include/node/openssl/ec.h -${PLIST.openssl}include/node/openssl/ecdh.h -${PLIST.openssl}include/node/openssl/ecdsa.h -${PLIST.openssl}include/node/openssl/ecerr.h -${PLIST.openssl}include/node/openssl/engine.h -${PLIST.openssl}include/node/openssl/engineerr.h -${PLIST.openssl}include/node/openssl/err.h -${PLIST.openssl}include/node/openssl/evp.h -${PLIST.openssl}include/node/openssl/evperr.h -${PLIST.openssl}include/node/openssl/hmac.h -${PLIST.openssl}include/node/openssl/idea.h -${PLIST.openssl}include/node/openssl/kdf.h -${PLIST.openssl}include/node/openssl/kdferr.h -${PLIST.openssl}include/node/openssl/lhash.h -${PLIST.openssl}include/node/openssl/md2.h -${PLIST.openssl}include/node/openssl/md4.h -${PLIST.openssl}include/node/openssl/md5.h -${PLIST.openssl}include/node/openssl/mdc2.h -${PLIST.openssl}include/node/openssl/modes.h -${PLIST.openssl}include/node/openssl/obj_mac.h -${PLIST.openssl}include/node/openssl/objects.h -${PLIST.openssl}include/node/openssl/objectserr.h -${PLIST.openssl}include/node/openssl/ocsp.h -${PLIST.openssl}include/node/openssl/ocsperr.h -${PLIST.openssl}include/node/openssl/opensslconf.h -${PLIST.openssl}include/node/openssl/opensslconf_asm.h -${PLIST.openssl}include/node/openssl/opensslconf_no-asm.h -${PLIST.openssl}include/node/openssl/opensslv.h -${PLIST.openssl}include/node/openssl/ossl_typ.h -${PLIST.openssl}include/node/openssl/pem.h -${PLIST.openssl}include/node/openssl/pem2.h -${PLIST.openssl}include/node/openssl/pemerr.h -${PLIST.openssl}include/node/openssl/pkcs12.h -${PLIST.openssl}include/node/openssl/pkcs12err.h -${PLIST.openssl}include/node/openssl/pkcs7.h -${PLIST.openssl}include/node/openssl/pkcs7err.h -${PLIST.openssl}include/node/openssl/rand.h -${PLIST.openssl}include/node/openssl/rand_drbg.h -${PLIST.openssl}include/node/openssl/randerr.h -${PLIST.openssl}include/node/openssl/rc2.h -${PLIST.openssl}include/node/openssl/rc4.h -${PLIST.openssl}include/node/openssl/rc5.h -${PLIST.openssl}include/node/openssl/ripemd.h -${PLIST.openssl}include/node/openssl/rsa.h -${PLIST.openssl}include/node/openssl/rsaerr.h -${PLIST.openssl}include/node/openssl/safestack.h -${PLIST.openssl}include/node/openssl/seed.h -${PLIST.openssl}include/node/openssl/sha.h -${PLIST.openssl}include/node/openssl/srp.h -${PLIST.openssl}include/node/openssl/srtp.h -${PLIST.openssl}include/node/openssl/ssl.h -${PLIST.openssl}include/node/openssl/ssl2.h -${PLIST.openssl}include/node/openssl/ssl3.h -${PLIST.openssl}include/node/openssl/sslerr.h -${PLIST.openssl}include/node/openssl/stack.h -${PLIST.openssl}include/node/openssl/store.h -${PLIST.openssl}include/node/openssl/storeerr.h -${PLIST.openssl}include/node/openssl/symhacks.h -${PLIST.openssl}include/node/openssl/tls1.h -${PLIST.openssl}include/node/openssl/ts.h -${PLIST.openssl}include/node/openssl/tserr.h -${PLIST.openssl}include/node/openssl/txt_db.h -${PLIST.openssl}include/node/openssl/ui.h -${PLIST.openssl}include/node/openssl/uierr.h -${PLIST.openssl}include/node/openssl/whrlpool.h -${PLIST.openssl}include/node/openssl/x509.h -${PLIST.openssl}include/node/openssl/x509_vfy.h -${PLIST.openssl}include/node/openssl/x509err.h -${PLIST.openssl}include/node/openssl/x509v3.h -${PLIST.openssl}include/node/openssl/x509v3err.h include/node/v8-inspector-protocol.h include/node/v8-inspector.h include/node/v8-platform.h diff --git a/lang/nodejs10/buildlink3.mk b/lang/nodejs10/buildlink3.mk index 01b55e8b1d8..e7340a0c696 100644 --- a/lang/nodejs10/buildlink3.mk +++ b/lang/nodejs10/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2019/12/09 20:05:40 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2020/01/24 18:57:09 adam Exp $ BUILDLINK_TREE+= nodejs @@ -23,17 +23,15 @@ BUILDLINK_API_DEPENDS.libuv+= libuv>=1.23 # Requires http_parser_set_max_header_size BUILDLINK_API_DEPENDS.http-parser+= http-parser>=2.9.0 .include "../../www/http-parser/buildlink3.mk" -# Uncomment when we switch to openssl>=1.1 -# .include "../../www/nghttp2/buildlink3.mk" +.include "../../www/nghttp2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" pkgbase := nodejs .include "../../mk/pkg-build-options.mk" -# Enable when we start using pkgsrc openssl-1.1.x -#.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl) -#. include "../../security/openssl/buildlink3.mk" -#.endif +.if !empty(PKG_BUILD_OPTIONS.nodejs:Mopenssl) +. include "../../security/openssl/buildlink3.mk" +.endif .endif # NODEJS_BUILDLINK3_MK diff --git a/lang/nodejs10/distinfo b/lang/nodejs10/distinfo index b6a9e9edf59..a760f58e921 100644 --- a/lang/nodejs10/distinfo +++ b/lang/nodejs10/distinfo @@ -1,26 +1,13 @@ -$NetBSD: distinfo,v 1.2 2019/12/29 15:40:00 adam Exp $ +$NetBSD: distinfo,v 1.3 2020/01/24 18:57:09 adam Exp $ -SHA1 (node-v10.18.0.tar.gz) = 0fe2c7c4e29e6273e52153cae48eac5cf3718ecc -RMD160 (node-v10.18.0.tar.gz) = 861599c7de610e28775fdcdf1b13bc9fe7dfc00b -SHA512 (node-v10.18.0.tar.gz) = 8f74129220871cc7f93ccec79722e85e16b51f60a8d867a8516498a95e7ec8bdfc5111405240cb00cb87039601af3b6b1da25b9aa8ede81de8c82aa09b850b6b -Size (node-v10.18.0.tar.gz) = 46993617 bytes +SHA1 (node-v10.18.1.tar.gz) = 272a6c0377e8cf6759407af14f9f39de393cdb51 +RMD160 (node-v10.18.1.tar.gz) = 6b03617ef1df6962e455311bae3c3b93cecc1dc7 +SHA512 (node-v10.18.1.tar.gz) = df8f1e58c645c457b6a271f3ed532020bc2420c97b80cb60dffcef9d1fd45a59234820d730b7ccb9d1fa764b1d3e68c69cafd415a5505de806677a91765b8176 +Size (node-v10.18.1.tar.gz) = 46995278 bytes SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac -SHA1 (patch-configure.py) = be2c737866b193f95c4e6fb1ffa4bda454b42110 +SHA1 (patch-configure.py) = 0d5c5fb3b4f2618c15f96080b590baf6bde66391 SHA1 (patch-deps_cares_cares.gyp) = 22b44f2ac59963f694dfe4f4585e08960b3dec32 -SHA1 (patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi) = 12c91ca27ced24cabd714902fad9c9eb0ba40f9b -SHA1 (patch-deps_openssl_config_bn__conf__asm.h) = a4cf4f0771c96fb09a00b76b25d35000d65ef92f -SHA1 (patch-deps_openssl_config_bn__conf__no-asm.h) = c13b305c7a93b7adf61186d50ac637a6d180fa18 -SHA1 (patch-deps_openssl_config_dso__conf__asm.h) = ae8285306fd165dc881fd8c6783cf0977d73371a -SHA1 (patch-deps_openssl_config_dso__conf__no-asm.h) = 78fe6bf2251940ad27913a624abdfb892e69f438 -SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = e9bb26b66431595d13d4173d3ed5f3e583bd009f -SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 63c493a4e2b98fb630a094908aa5c4b629181d15 -SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = addb5837ea7b8ea2732cd2f5aaa8a24289b1199f -SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = 73368f336dbe500e45f0ba6bbb7656416a27b294 -SHA1 (patch-deps_openssl_openssl__asm.gypi) = b85e1f5a9f862d469afcb36ff6e1ad202bea704a -SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = b549ea34f51e26669a41a64da0db10e92f0d0a99 -SHA1 (patch-deps_openssl_openssl_crypto_rand_rand__unix.c) = ba8d4602c3386801ad8d3c33c757c69ad3d25a34 SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3 -SHA1 (patch-deps_uv_src_unix_netbsd.c) = 76b27ae86aa80582554ee824146ee7c42c33883b SHA1 (patch-deps_v8_src_arm_assembler-arm-inl.h) = 56a5d6539d31e19673ef61cc91f003109c69dc29 SHA1 (patch-deps_v8_src_arm_assembler-arm.cc) = f32d5d2a1096f822c813eaf6d02b9348564213f6 SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d diff --git a/lang/nodejs10/options.mk b/lang/nodejs10/options.mk deleted file mode 100644 index e8fd2bf36ab..00000000000 --- a/lang/nodejs10/options.mk +++ /dev/null @@ -1,34 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2019/12/09 20:05:40 adam Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.node -PKG_SUPPORTED_OPTIONS= openssl dtrace -PKG_SUGGESTED_OPTIONS= openssl - -.include "../../mk/bsd.prefs.mk" - -.if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") \ - && exists(/usr/sbin/dtrace) -PKG_SUGGESTED_OPTIONS+= dtrace -.endif - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= dtrace openssl - -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --with-dtrace -PLIST.dtrace= yes -.else -CONFIGURE_ARGS+= --without-dtrace -.endif - -# print-PLIST helper -PRINT_PLIST_AWK+= {if ($$0 ~ /lib\/dtrace/) {$$0 = "$${PLIST.dtrace}" $$0;}} -PRINT_PLIST_AWK+= {if ($$0 ~ /include\/node\/openssl/) {$$0 = "$${PLIST.openssl}" $$0;}} - -.if !empty(PKG_OPTIONS:Mopenssl) -# nodejs 10.x requires OpenSSL 1.1.x. Use embedded source until we have such. -PLIST.openssl= yes -.else -CONFIGURE_ARGS+= --without-ssl -.endif diff --git a/lang/nodejs10/patches/patch-configure.py b/lang/nodejs10/patches/patch-configure.py index ab1ab8580de..0912a329ac9 100644 --- a/lang/nodejs10/patches/patch-configure.py +++ b/lang/nodejs10/patches/patch-configure.py @@ -1,11 +1,11 @@ -$NetBSD: patch-configure.py,v 1.2 2019/12/29 15:40:00 adam Exp $ +$NetBSD: patch-configure.py,v 1.3 2020/01/24 18:57:09 adam Exp $ Support Clang/LLVM 10+ https://github.com/nodejs/node/issues/29536 ---- configure.py.orig 2019-08-15 19:20:03.000000000 +0000 +--- configure.py.orig 2020-01-09 20:45:57.000000000 +0000 +++ configure.py -@@ -705,11 +705,11 @@ def get_nasm_version(asm): +@@ -705,7 +705,7 @@ def get_nasm_version(asm): def get_llvm_version(cc): return get_version_helper( @@ -14,8 +14,3 @@ https://github.com/nodejs/node/issues/29536 def get_xcode_version(cc): return get_version_helper( -- cc, r"(^Apple LLVM version) ([0-9]+\.[0-9]+)") -+ cc, r"(^Apple (?:clang|LLVM) version) ([0-9]+\.[0-9]+)") - - def get_gas_version(cc): - try: diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi b/lang/nodejs10/patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi deleted file mode 100644 index bb75c142d73..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi,v 1.1 2019/12/09 20:05:40 adam Exp $ - ---- deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi.orig 2019-05-28 21:32:15.000000000 +0000 -+++ deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi -@@ -30,8 +30,16 @@ - '-pthread', - '-Wall -O3 -fomit-frame-pointer', - ], -- 'openssl_ex_libs_linux-elf': [ -- '-ldl -pthread', -+ 'conditions': [ -+ ['OS=="linux"', { -+ 'openssl_ex_libs_linux-elf': [ -+ '-ldl -pthread', -+ ], -+ }, { -+ 'openssl_ex_libs_linux-elf': [ -+ '', -+ ], -+ }], - ], - 'openssl_cli_srcs_linux-elf': [ - 'openssl/apps/asn1pars.c', diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_bn__conf__asm.h b/lang/nodejs10/patches/patch-deps_openssl_config_bn__conf__asm.h deleted file mode 100644 index 43a3388cc63..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_bn__conf__asm.h +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-deps_openssl_config_bn__conf__asm.h,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - ---- deps/openssl/config/bn_conf_asm.h.orig 2019-01-29 16:20:45.000000000 +0900 -+++ deps/openssl/config/bn_conf_asm.h 2019-02-24 10:23:14.508941933 +0900 -@@ -9,9 +9,9 @@ - # include "./archs/linux-x32/asm/crypto/include/internal/bn_conf.h" - #elif defined(OPENSSL_LINUX) && defined(__x86_64__) - # include "./archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__arm__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) - # include "./archs/linux-armv4/asm/crypto/include/internal/bn_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__) - # include "./archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h" - #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) - # include "./archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h" -@@ -21,9 +21,10 @@ - # include "./archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h" - #elif defined(_WIN32) && defined(_M_X64) - # include "./archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) --# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -+// XXX missing -+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__) -+//# include "./archs/BSD-x86/asm/crypto/include/internal/bn_conf.h" -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) - # include "./archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h" - #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h" diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_bn__conf__no-asm.h b/lang/nodejs10/patches/patch-deps_openssl_config_bn__conf__no-asm.h deleted file mode 100644 index 08a37b93f12..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_bn__conf__no-asm.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-deps_openssl_config_bn__conf__no-asm.h,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - ---- deps/openssl/config/bn_conf_no-asm.h.orig 2019-05-28 21:32:16.000000000 +0000 -+++ deps/openssl/config/bn_conf_no-asm.h -@@ -9,9 +9,9 @@ - # include "./archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h" - #elif defined(OPENSSL_LINUX) && defined(__x86_64__) - # include "./archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__arm__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) - # include "./archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__) - # include "./archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h" - #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) - # include "./archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h" -@@ -23,9 +23,9 @@ - # include "./archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h" - #elif defined(_WIN32) && defined(_M_ARM64) - # include "./archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__) - # include "./archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) - # include "./archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h" - #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h" diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_dso__conf__asm.h b/lang/nodejs10/patches/patch-deps_openssl_config_dso__conf__asm.h deleted file mode 100644 index cce3538f854..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_dso__conf__asm.h +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-deps_openssl_config_dso__conf__asm.h,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - ---- deps/openssl/config/dso_conf_asm.h.orig 2019-02-24 10:37:55.875191472 +0900 -+++ deps/openssl/config/dso_conf_asm.h 2019-02-24 10:24:24.895671320 +0900 -@@ -9,9 +9,9 @@ - # include "./archs/linux-x32/asm/crypto/include/internal/dso_conf.h" - #elif defined(OPENSSL_LINUX) && defined(__x86_64__) - # include "./archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__arm__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) - # include "./archs/linux-armv4/asm/crypto/include/internal/dso_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__) - # include "./archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h" - #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) - # include "./archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h" -@@ -21,9 +21,10 @@ - # include "./archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h" - #elif defined(_WIN32) && defined(_M_X64) - # include "./archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) --# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -+// XXX missing -+//#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__) -+//# include "./archs/BSD-x86/asm/crypto/include/internal/dso_conf.h" -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) - # include "./archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h" - #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h" diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_dso__conf__no-asm.h b/lang/nodejs10/patches/patch-deps_openssl_config_dso__conf__no-asm.h deleted file mode 100644 index 6b8a7561648..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_dso__conf__no-asm.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-deps_openssl_config_dso__conf__no-asm.h,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - ---- deps/openssl/config/dso_conf_no-asm.h.orig 2019-05-28 21:32:16.000000000 +0000 -+++ deps/openssl/config/dso_conf_no-asm.h -@@ -9,9 +9,9 @@ - # include "./archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h" - #elif defined(OPENSSL_LINUX) && defined(__x86_64__) - # include "./archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__arm__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) - # include "./archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h" --#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__) - # include "./archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h" - #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) - # include "./archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h" -@@ -23,9 +23,9 @@ - # include "./archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h" - #elif defined(_WIN32) && defined(_M_ARM64) - # include "./archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__) - # include "./archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) - # include "./archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h" - #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h" diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_opensslconf__asm.h b/lang/nodejs10/patches/patch-deps_openssl_config_opensslconf__asm.h deleted file mode 100644 index a154a6bac19..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_opensslconf__asm.h +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - ---- deps/openssl/config/opensslconf_asm.h.orig 2019-01-29 16:20:45.000000000 +0900 -+++ deps/openssl/config/opensslconf_asm.h 2019-02-24 09:05:18.803688546 +0900 -@@ -96,9 +96,9 @@ - # include "./archs/linux-x32/asm/include/openssl/opensslconf.h" - #elif defined(OPENSSL_LINUX) && defined(__x86_64__) - # include "./archs/linux-x86_64/asm/include/openssl/opensslconf.h" --#elif defined(OPENSSL_LINUX) && defined(__arm__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) - # include "./archs/linux-armv4/asm/include/openssl/opensslconf.h" --#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__) - # include "./archs/linux-aarch64/asm/include/openssl/opensslconf.h" - #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) - # include "./archs/darwin-i386-cc/asm/include/openssl/opensslconf.h" -@@ -108,9 +108,7 @@ - # include "./archs/VC-WIN32/asm/include/openssl/opensslconf.h" - #elif defined(_WIN32) && defined(_M_X64) - # include "./archs/VC-WIN64A/asm/include/openssl/opensslconf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) --# include "./archs/BSD-x86/asm/include/openssl/opensslconf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) - # include "./archs/BSD-x86_64/asm/include/openssl/opensslconf.h" - #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h" diff --git a/lang/nodejs10/patches/patch-deps_openssl_config_opensslconf__no-asm.h b/lang/nodejs10/patches/patch-deps_openssl_config_opensslconf__no-asm.h deleted file mode 100644 index 4687a73a406..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_config_opensslconf__no-asm.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - ---- deps/openssl/config/opensslconf_no-asm.h.orig 2019-05-28 21:32:16.000000000 +0000 -+++ deps/openssl/config/opensslconf_no-asm.h -@@ -4,9 +4,9 @@ - # include "./archs/linux-x32/no-asm/include/openssl/opensslconf.h" - #elif defined(OPENSSL_LINUX) && defined(__x86_64__) - # include "./archs/linux-x86_64/no-asm/include/openssl/opensslconf.h" --#elif defined(OPENSSL_LINUX) && defined(__arm__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__arm__) - # include "./archs/linux-armv4/no-asm/include/openssl/opensslconf.h" --#elif defined(OPENSSL_LINUX) && defined(__aarch64__) -+#elif (defined(OPENSSL_LINUX) || defined(__NetBSD__)) && defined(__aarch64__) - # include "./archs/linux-aarch64/no-asm/include/openssl/opensslconf.h" - #elif defined(__APPLE__) && defined(__MACH__) && defined(__i386__) - # include "./archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h" -@@ -18,9 +18,9 @@ - # include "./archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h" - #elif defined(_WIN32) && defined(_M_ARM64) - # include "./archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__i386__) - # include "./archs/BSD-x86/no-asm/include/openssl/opensslconf.h" --#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__) -+#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__x86_64__) - # include "./archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h" - #elif defined(__sun) && defined(__i386__) - # include "./archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h" diff --git a/lang/nodejs10/patches/patch-deps_openssl_openssl-cl__asm.gypi b/lang/nodejs10/patches/patch-deps_openssl_openssl-cl__asm.gypi deleted file mode 100644 index 8712e722682..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_openssl-cl__asm.gypi +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - -XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports) - ---- deps/openssl/openssl-cl_asm.gypi.orig 2019-01-29 16:20:45.000000000 +0900 -+++ deps/openssl/openssl-cl_asm.gypi 2019-02-24 10:28:36.290301337 +0900 -@@ -31,6 +31,12 @@ - 'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="freebsd"', { - 'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'], -+ }, 'target_arch=="arm" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-armv4/asm/openssl-cl.gypi'], -+ }, 'target_arch=="arm64" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-aarch64/asm/openssl-cl.gypi'], -+ }, 'target_arch=="x64" and OS=="netbsd"', { -+ 'includes': ['config/archs/BSD-x86_64/asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="mac"', { - 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="solaris"', { -@@ -41,7 +47,7 @@ - 'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'], - }, { - # Other architectures don't use assembly -- 'includes': ['config/archs/linux-x86_64/asm/openssl-cl.gypi'], -+ 'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'], - }], - ], - } diff --git a/lang/nodejs10/patches/patch-deps_openssl_openssl-cl__no__asm.gypi b/lang/nodejs10/patches/patch-deps_openssl_openssl-cl__no__asm.gypi deleted file mode 100644 index b9ac4519fc7..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_openssl-cl__no__asm.gypi +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - -XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports) - ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2019-01-29 16:20:45.000000000 +0900 -+++ deps/openssl/openssl-cl_no_asm.gypi 2019-02-24 10:28:59.344517509 +0900 -@@ -1,4 +1,5 @@ - { -+ 'defines': ['OPENSSL_NO_ASM'], - 'conditions': [ - ['target_arch=="ppc" and OS=="aix"', { - 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], -@@ -31,6 +32,12 @@ - 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="freebsd"', { - 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'], -+ }, 'target_arch=="arm" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'], -+ }, 'target_arch=="arm64" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'], -+ }, 'target_arch=="x64" and OS=="netbsd"', { -+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="mac"', { - 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl-cl.gypi'], - }, 'target_arch=="x64" and OS=="solaris"', { -@@ -41,7 +48,7 @@ - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], - }, { - # Other architectures don't use assembly -- 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], -+ 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'], - }], - ], - } diff --git a/lang/nodejs10/patches/patch-deps_openssl_openssl__asm.gypi b/lang/nodejs10/patches/patch-deps_openssl_openssl__asm.gypi deleted file mode 100644 index 85146a3fbf6..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_openssl__asm.gypi +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - -XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports) - ---- deps/openssl/openssl_asm.gypi.orig 2019-01-29 16:20:46.000000000 +0900 -+++ deps/openssl/openssl_asm.gypi 2019-02-24 12:11:23.696088048 +0900 -@@ -46,6 +46,12 @@ - 'includes': ['config/archs/linux-elf/asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="freebsd"', { - 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'], -+ }, 'target_arch=="arm" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-armv4/asm/openssl.gypi'], -+ }, 'target_arch=="arm64" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-aarch64/asm/openssl.gypi'], -+ }, 'target_arch=="x64" and OS=="netbsd"', { -+ 'includes': ['config/archs/BSD-x86_64/asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="mac"', { - 'includes': ['config/archs/darwin64-x86_64-cc/asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="solaris"', { -@@ -75,7 +81,7 @@ - 'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'], - }, { - # Other architectures don't use assembly -- 'includes': ['config/archs/linux-x86_64/asm/openssl.gypi'], -+ 'includes': ['config/archs/linux-elf/asm/openssl.gypi'], - }], - ], - } diff --git a/lang/nodejs10/patches/patch-deps_openssl_openssl__no__asm.gypi b/lang/nodejs10/patches/patch-deps_openssl_openssl__no__asm.gypi deleted file mode 100644 index ebe65d520f3..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_openssl__no__asm.gypi +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Support NetBSD/arm,aarch64,i386,amd64 (and hopefully other ILP32 archs) - -XXX Change default to linux-elf instead of linux-x86_64 (from FreeBSD ports) - ---- deps/openssl/openssl_no_asm.gypi.orig 2019-01-29 16:20:46.000000000 +0900 -+++ deps/openssl/openssl_no_asm.gypi 2019-02-24 10:29:47.246812244 +0900 -@@ -32,6 +32,12 @@ - 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="freebsd"', { - 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], -+ }, 'target_arch=="arm" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'], -+ }, 'target_arch=="arm64" and OS=="netbsd"', { -+ 'includes': ['config/archs/linux-aarch64/no-asm/openssl.gypi'], -+ }, 'target_arch=="x64" and OS=="netbsd"', { -+ 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="mac"', { - 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'], - }, 'target_arch=="x64" and OS=="solaris"', { -@@ -42,7 +48,7 @@ - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], - }, { - # Other architectures don't use assembly -- 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], -+ 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'], - }], - ], - } diff --git a/lang/nodejs10/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c b/lang/nodejs10/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c deleted file mode 100644 index 71be2459e1a..00000000000 --- a/lang/nodejs10/patches/patch-deps_openssl_openssl_crypto_rand_rand__unix.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-deps_openssl_openssl_crypto_rand_rand__unix.c,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Don't try to automatically call getentropy(3C) on SunOS, it fails if -built on a platform that doesn't have it. - ---- deps/openssl/openssl/crypto/rand/rand_unix.c.orig 2019-05-28 21:32:16.000000000 +0000 -+++ deps/openssl/openssl/crypto/rand/rand_unix.c -@@ -301,7 +301,7 @@ static ssize_t syscall_random(void *buf, - * - Linux since 3.17 with glibc 2.25 - * - FreeBSD since 12.0 (1200061) - */ --# if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux) -+# if defined(__GNUC__) && __GNUC__>=2 && defined(__ELF__) && !defined(__hpux) && !defined(__sun) - extern int getentropy(void *buffer, size_t length) __attribute__((weak)); - - if (getentropy != NULL) diff --git a/lang/nodejs10/patches/patch-deps_uv_src_unix_netbsd.c b/lang/nodejs10/patches/patch-deps_uv_src_unix_netbsd.c deleted file mode 100644 index cbbf0e672a0..00000000000 --- a/lang/nodejs10/patches/patch-deps_uv_src_unix_netbsd.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.1 2019/12/09 20:05:40 adam Exp $ - -Bring back support for NetBSD<8. - ---- deps/uv/src/unix/netbsd.c.orig 2019-05-28 21:32:17.000000000 +0000 -+++ deps/uv/src/unix/netbsd.c -@@ -32,6 +32,7 @@ - #include <stdlib.h> - #include <fcntl.h> - -+#include <sys/param.h> - #include <sys/resource.h> - #include <sys/types.h> - #include <sys/sysctl.h> -@@ -78,7 +79,11 @@ int uv_exepath(char* buffer, size_t* siz - mib[0] = CTL_KERN; - mib[1] = KERN_PROC_ARGS; - mib[2] = -1; -+#if __NetBSD_Version__ >= 799000000 - mib[3] = KERN_PROC_PATHNAME; -+#else -+ mib[3] = KERN_PROC_ARGV; -+#endif - int_size = ARRAY_SIZE(int_buf); - - if (sysctl(mib, 4, int_buf, &int_size, NULL, 0)) |