diff options
author | fhajny <fhajny@pkgsrc.org> | 2018-05-03 21:19:16 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2018-05-03 21:19:16 +0000 |
commit | de45b8e6271a1c58f7fd5bbb191a607209c4fb69 (patch) | |
tree | 7c689c9da418bc60d540c8b52220b5009a7ead78 /lang/nodejs | |
parent | 310637139677ac984726099d5abd151ca252d837 (diff) | |
download | pkgsrc-de45b8e6271a1c58f7fd5bbb191a607209c4fb69.tar.gz |
lang/nodejs: Update to 10.0.0.
Use bundled OpenSSL until pkgsrc provides the required 1.1.x.
### Notable Changes
- Assert
- Calling `assert.fail()` with more than one argument is deprecated.
- Calling `assert.ok()` with no arguments will now throw.
- Calling `assert.ifError()` will now throw with any argument other
than `undefined` or `null`. Previously the method would throw with
any truthy value.
- The `assert.rejects()` and `assert.doesNotReject()` methods have
been added for working with async functions.
- Async_hooks
- Older experimental async_hooks APIs have been removed.
- Buffer
- Uses of `new Buffer()` and `Buffer()` outside of the
`node_modules` directory will now emit a runtime deprecation
warning.
- `Buffer.isEncoding()` now returns `undefined` for falsy values,
including an empty string.
- `Buffer.fill()` will throw if an attempt is made to fill with an
empty `Buffer`.
- Child Process
- Undefined properties of env are ignored.
- Console
- The `console.table()` method has been added.
- Crypto
- The `crypto.createCipher()` and `crypto.createDecipher()` methods
have been deprecated. Please use `crypto.createCipheriv()` and
`crypto.createDecipheriv()` instead.
- The `decipher.finaltol()` method has been deprecated.
- The `crypto.DEFAULT_ENCODING` property has been deprecated.
- The `ECDH.convertKey()` method has been added.
- The `crypto.fips` property has been deprecated.
- Dependencies
- V8 has been updated to 6.6.
- OpenSSL has been updated to 1.1.0h.
- EventEmitter
- The `EventEmitter.prototype.off()` method has been added as an
alias for `EventEmitter.prototype.removeListener()`.
- File System
- The `fs/promises` API provides experimental promisified versions
of the `fs` functions.
- Invalid path errors are now thrown synchronously.
- The `fs.readFile()` method now partitions reads to avoid thread
pool exhaustion.
- HTTP
- Processing of HTTP Status codes `100`, `102-199` has been
improved.
- Multi-byte characters in URL paths are now forbidden.
- N-API
- The n-api is no longer experimental.
- Net
- The `'close'` event will be emitted after `'end'`.
- Perf_hooks
- The `PerformanceObserver` class is now an `AsyncResource` and can
be monitored using `async_hooks`.
- Trace events are now emitted for performance events.
- The `performance` API has been simplified.
- Performance milestone marks will be emitted as trace events.
- Process
- Using non-string values for `process.env` is deprecated.
- The `process.assert()` method is deprecated.
- REPL
- REPL now experimentally supports top-level await when using the
`--experimental-repl-await` flag.
- The previously deprecated "magic mode" has been removed.
- The previously deprecated `NODE_REPL_HISTORY_FILE` environment
variable has been removed.
- Proxy objects are shown as Proxy objects when inspected.
- Streams
- The `'readable'` event is now always deferred with nextTick.
- A new `pipeline()` method has been provided for building
end-to-data stream pipelines.
- Experimental support for async for-await has been added to
`stream.Readable`.
- Timers
- The `enroll()` and `unenroll()` methods have been deprecated.
- TLS
- The `tls.convertNPNProtocols()` method has been deprecated.
- Support for NPN (next protocol negotiation) has been dropped.
- The `ecdhCurve` default is now `'auto'`.
- Trace Events
- A new `trace_events` top-level module allows trace event
categories to be enabled/disabled at runtime.
- URL
- The WHATWG URL API is now a global.
- Util
- `util.types.is[…]` type checks have been added.
- Support for bigint formatting has been added to `util.inspect()`.
#### Deprecations:
The following APIs have been deprecated in Node.js 10.0.0
- Passing more than one argument to `assert.fail()` will emit a
runtime deprecation warning.
- Previously deprecated legacy async_hooks APIs have reached
end-of-life and have been removed.
- Using `require()` to access several of Node.js' own internal
dependencies will emit a runtime deprecation.
- The `crypto.createCipher()` and `crypto.createDecipher()` methods
have been deprecated in documentation.
- Using the `Decipher.finaltol()` method will emit a runtime
deprecation warning.
- Using the `crypto.DEFAULT_ENCODING` property will emit a runtime
deprecation warning.
- Use by native addons of the `MakeCallback()` variant that passes a
`Domain` will emit a runtime deprecation warning.
- Previously deprecated internal getters/setters on `net.Server` has
reached end-of-life and have been removed.
- Use of non-string values for `process.env` has been deprecated in
documentation.
- Use of `process.assert()` will emit a runtime deprecation warning.
- Previously deprecated `NODE_REPL_HISTORY_FILE` environment variable
has reached end-of-life and has been removed.
- Use of the `timers.enroll()` and `timers.unenroll()` methods will
emit a runtime deprecation warning.
- Use of the `tls.convertNPNProtocols()` method will emit a runtime
deprecation warning. Support for NPN has been removed from Node.js.
- The `crypto.fips` property has been deprecated in documentation.
Diffstat (limited to 'lang/nodejs')
19 files changed, 447 insertions, 68 deletions
diff --git a/lang/nodejs/Makefile b/lang/nodejs/Makefile index ef10b3814ba..ff03f5e6101 100644 --- a/lang/nodejs/Makefile +++ b/lang/nodejs/Makefile @@ -1,14 +1,19 @@ -# $NetBSD: Makefile,v 1.126 2018/05/02 16:33:02 fhajny Exp $ +# $NetBSD: Makefile,v 1.127 2018/05/03 21:19:16 fhajny Exp $ -DISTNAME= node-v9.11.1 +DISTNAME= node-v10.0.0 + +USE_LANGUAGES= c gnu++14 # Stated by the changelog as of 8.2.0 GCC_REQD+= 4.9.4 +.include "../../mk/bsd.prefs.mk" + CONFIGURE_ARGS+= --shared-nghttp2 CONFIGURE_ARGS+= --with-intl=system-icu -PKGREVISION= 3 +CHECK_PORTABILITY_SKIP+= deps/openssl/openssl/.travis-create-release.sh + .include "../../lang/nodejs/Makefile.common" .include "../../textproc/icu/buildlink3.mk" .include "../../www/nghttp2/buildlink3.mk" diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common index 7138a91078a..c7f84050263 100644 --- a/lang/nodejs/Makefile.common +++ b/lang/nodejs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2018/05/02 16:33:02 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.19 2018/05/03 21:19:16 fhajny Exp $ # used by lang/nodejs/Makefile # used by lang/nodejs6/Makefile # used by lang/nodejs8/Makefile @@ -19,9 +19,6 @@ USE_LANGUAGES= c c++ PYTHON_FOR_BUILD_ONLY= yes PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.10.24 -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - GCC_REQD+= 4.8 CONFIG_SHELL= ${PYTHONBIN} diff --git a/lang/nodejs/PLIST b/lang/nodejs/PLIST index 7e8cb7378df..5473c34e8aa 100644 --- a/lang/nodejs/PLIST +++ b/lang/nodejs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.54 2018/05/02 16:33:02 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.55 2018/05/03 21:19:16 fhajny Exp $ bin/node include/node/android-ifaddrs.h include/node/common.gypi @@ -12,6 +12,277 @@ 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/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/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-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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/asn1t.h +${PLIST.openssl}include/node/openssl/async.h +${PLIST.openssl}include/node/openssl/bio.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/buffer.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/comp.h +${PLIST.openssl}include/node/openssl/conf.h +${PLIST.openssl}include/node/openssl/conf_api.h +${PLIST.openssl}include/node/openssl/crypto.h +${PLIST.openssl}include/node/openssl/ct.h +${PLIST.openssl}include/node/openssl/des.h +${PLIST.openssl}include/node/openssl/dh.h +${PLIST.openssl}include/node/openssl/dsa.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/engine.h +${PLIST.openssl}include/node/openssl/err.h +${PLIST.openssl}include/node/openssl/evp.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/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/ocsp.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/pkcs12.h +${PLIST.openssl}include/node/openssl/pkcs7.h +${PLIST.openssl}include/node/openssl/rand.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/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/stack.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/txt_db.h +${PLIST.openssl}include/node/openssl/ui.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/x509v3.h include/node/pthread-barrier.h include/node/stdint-msvc2008.h include/node/tree.h @@ -28,7 +299,6 @@ include/node/uv-unix.h include/node/uv-version.h include/node/uv-win.h include/node/uv.h -include/node/v8-debug.h include/node/v8-inspector-protocol.h include/node/v8-inspector.h include/node/v8-platform.h diff --git a/lang/nodejs/distinfo b/lang/nodejs/distinfo index a975bbed3f2..f462efe6d0b 100644 --- a/lang/nodejs/distinfo +++ b/lang/nodejs/distinfo @@ -1,22 +1,28 @@ -$NetBSD: distinfo,v 1.120 2018/05/02 16:33:02 fhajny Exp $ +$NetBSD: distinfo,v 1.121 2018/05/03 21:19:16 fhajny Exp $ -SHA1 (node-v9.11.1.tar.gz) = 3fc939185a727bff26fc43c09dec44792c8c1869 -RMD160 (node-v9.11.1.tar.gz) = 840e648f6f46786657613801e748d1d5d627a0cf -SHA512 (node-v9.11.1.tar.gz) = 6bdd0afa3bdcc633075bbaf1c3a9b8c1a914a881da2dc942ff1477a2b000930a8777c0498db5edcb1eeaa7f13cff942ab88bf0764e296d49e0d1a9a677a52bb0 -Size (node-v9.11.1.tar.gz) = 31479280 bytes -SHA1 (patch-common.gypi) = 6c4f5c3f82270d5ebadce2ad3228a058634595cb +SHA1 (node-v10.0.0.tar.gz) = 6547649ab1c3d8bb9048d6dfd4f7a00e9e9c5983 +RMD160 (node-v10.0.0.tar.gz) = 8cd5e0353fffc77025d3f0288bb42ea1fc6b665b +SHA512 (node-v10.0.0.tar.gz) = 2f269250f5edd30d6c927c9f8f1e791ac27d2bf93a117c346555e6f095be87ff151f72fd407100f6852822f9fc3aef2fc65581481b0c482d3cbcc25dd8ebb776 +Size (node-v10.0.0.tar.gz) = 35603065 bytes +SHA1 (patch-common.gypi) = de37949f38d9bd39a18b59d59ec74e528bd323ac SHA1 (patch-deps_cares_cares.gyp) = 2235eb44bc984fa2e745fdf1786f1ae6de6ef80f -SHA1 (patch-deps_uv_common.gypi) = ba9caa1f6d9d6df1913d0d72a8d18ea6db0a32ff -SHA1 (patch-deps_uv_src_unix_netbsd.c) = c3c9ee5b6e97ca796973b762365f06d8479befa2 +SHA1 (patch-deps_openssl_config_opensslconf__asm.h) = 7b074ebd5353dff662ac66cf4012926f12dd7b7e +SHA1 (patch-deps_openssl_config_opensslconf__no-asm.h) = 4b2eb51f6369c2acd328421cd896b8471234c0c8 +SHA1 (patch-deps_openssl_openssl-cl__asm.gypi) = a7966d08e45120c55ff5ec62c6f6bf944212af2d +SHA1 (patch-deps_openssl_openssl-cl__no__asm.gypi) = f90a0cbdbe5d2088f892fdc6586d0fe9c612b8d5 +SHA1 (patch-deps_openssl_openssl__asm.gypi) = fef6c4e4a416e967510140463552541d24eb03a4 +SHA1 (patch-deps_openssl_openssl__no__asm.gypi) = 0c3a647a01cdd39417dc7ea00a96cbf244ece9b2 +SHA1 (patch-deps_uv_common.gypi) = d38a9c8d9e3522f15812aec2f5b1e1e636d4bab3 +SHA1 (patch-deps_uv_src_unix_netbsd.c) = c19ff4024f828018364793d9dea013c991cfb93f SHA1 (patch-deps_v8_src_arm_cpu-arm.cc) = d0d11ac474ab109a6f40b26fa457b12d742eb48d SHA1 (patch-deps_v8_src_base_atomicops.h) = 552d2b7781b39b93392fd00043b1cf4cb10802da -SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 686c2054838a25cfeed7fb9870a959e48dc4de35 +SHA1 (patch-deps_v8_src_base_platform_platform-freebsd.cc) = 427c7712fc1c2872fc48e593f7ab491c69ee44e3 SHA1 (patch-deps_v8_src_base_platform_platform-openbsd.cc) = 5e593879dbab095f99e82593272a0de91043f9a8 -SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 368620c2a20538c1e5ff194e72d62f173a7f0c91 +SHA1 (patch-deps_v8_src_base_platform_platform-posix.cc) = 0d80cc6587af9220832de112834e9f50242f819f SHA1 (patch-deps_v8_src_base_platform_semaphore.cc) = aa84bf1dbaac5808529f6b01502d117c88751649 SHA1 (patch-deps_v8_src_compiler_types.h) = 711cc94535200374104c3cd1f0fbbd00994701a6 -SHA1 (patch-deps_v8_src_globals.h) = ec9798befbfbcd432b0c61bc914fe9d6a4bf4a86 -SHA1 (patch-deps_v8_src_log-utils.h) = 32bbf2de2af7a8ab6900a4d5e968dcc1357f6de2 +SHA1 (patch-deps_v8_src_globals.h) = 6695a381000844ad9837bdbc3edbe9040ec4d5ff +SHA1 (patch-deps_v8_src_log-utils.h) = 765e4e4af2cb11e38c033174ac92fbb6ee1fd480 SHA1 (patch-deps_v8_tools_run-llprof.sh) = 39aa3faf77492ef8dd35b411b7b0e4605b469af3 SHA1 (patch-src_cares__wrap.cc) = a26a162f130468cbc0650a33b27b71377d273704 SHA1 (patch-src_inspector__agent.cc) = f6d25964a6446a1cb3c7733b7668c87932efad98 diff --git a/lang/nodejs/nodeversion.mk b/lang/nodejs/nodeversion.mk index 50ff9bdee79..9d7631ac849 100644 --- a/lang/nodejs/nodeversion.mk +++ b/lang/nodejs/nodeversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: nodeversion.mk,v 1.1 2018/05/02 16:33:02 fhajny Exp $ +# $NetBSD: nodeversion.mk,v 1.2 2018/05/03 21:19:16 fhajny Exp $ # This file determins which nodejs version is used as a dependency for # a package. @@ -8,7 +8,7 @@ # NODE_VERSION_DEFAULT # The preferred node version to use. # -# Possible values: 6 8 9 +# Possible values: 6 8 10 # Default: 8 # # === Infrastructure variables === @@ -27,13 +27,13 @@ # is significant; those listed earlier are preferred over those # listed later. # -# Possible values: 6 8 9 -# Default: 8 6 9 +# Possible values: 6 8 10 +# Default: 8 6 10 # # NODE_VERSIONS_INCOMPATIBLE # The node versions that the package *cannot* build against. # -# Possible values: 6 8 9 +# Possible values: 6 8 10 # Default: <empty> # # Keywords: node @@ -58,7 +58,7 @@ BUILD_DEFS+= NODE_VERSION_DEFAULT BUILD_DEFS_EFFECTS+= NODE_PACKAGE NODE_VERSION_DEFAULT?= 8 -NODE_VERSIONS_ACCEPTED?= 8 6 9 +NODE_VERSIONS_ACCEPTED?= 8 6 10 NODE_VERSIONS_INCOMPATIBLE?= # empty # Resolve NODE_VERSIONS_INCOMPATIBLE and generate the _OK vars. @@ -92,8 +92,8 @@ _NODE_VERSION?= none DEPENDS+= nodejs>=8<9:../../lang/nodejs8 .elif ${_NODE_VERSION} == "6" DEPENDS+= nodejs>=6<7:../../lang/nodejs6 -.elif ${_NODE_VERSION} == "9" -DEPENDS+= nodejs>=9:../../lang/nodejs +.elif ${_NODE_VERSION} == "10" +DEPENDS+= nodejs>=10:../../lang/nodejs .else PKG_FAIL_REASON+= "No valid node version found" .endif diff --git a/lang/nodejs/options.mk b/lang/nodejs/options.mk index ec6225b9b89..17821956680 100644 --- a/lang/nodejs/options.mk +++ b/lang/nodejs/options.mk @@ -1,9 +1,11 @@ -# $NetBSD: options.mk,v 1.10 2016/06/02 09:57:32 fhajny Exp $ +# $NetBSD: options.mk,v 1.11 2018/05/03 21:19:16 fhajny 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 @@ -11,7 +13,7 @@ PKG_SUGGESTED_OPTIONS+= dtrace .include "../../mk/bsd.options.mk" -PLIST_VARS+= dtrace +PLIST_VARS+= dtrace openssl .if !empty(PKG_OPTIONS:Mdtrace) CONFIGURE_ARGS+= --with-dtrace @@ -22,13 +24,11 @@ CONFIGURE_ARGS+= --without-dtrace # 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) -BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.2 -.include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --shared-openssl -_WRAP_EXTRA_ARGS.CXX+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -CWRAPPERS_APPEND.cxx+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib +# 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/nodejs/patches/patch-common.gypi b/lang/nodejs/patches/patch-common.gypi index 0ec11244cfb..18440de8caf 100644 --- a/lang/nodejs/patches/patch-common.gypi +++ b/lang/nodejs/patches/patch-common.gypi @@ -1,15 +1,20 @@ -$NetBSD: patch-common.gypi,v 1.6 2018/02/23 19:42:04 fhajny Exp $ +$NetBSD: patch-common.gypi,v 1.7 2018/05/03 21:19:16 fhajny Exp $ Add support for NetBSD. ---- common.gypi.orig 2018-02-23 02:52:51.000000000 +0000 +--- common.gypi.orig 2018-04-24 14:41:15.000000000 +0000 +++ common.gypi -@@ -291,7 +291,7 @@ +@@ -315,11 +315,11 @@ + 'BUILDING_UV_SHARED=1', + ], + }], +- [ 'OS in "linux freebsd openbsd solaris aix"', { ++ [ 'OS in "linux freebsd openbsd netbsd solaris aix"', { 'cflags': [ '-pthread' ], 'ldflags': [ '-pthread' ], }], - [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { -+ [ 'OS in "linux freebsd openbsd netbsd solaris android aix cloudabi"', { ++ [ 'OS in "linux freebsd openbsd netbsd netbsd solaris android aix cloudabi"', { 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], - 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++0x' ], + 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++1y' ], 'ldflags': [ '-rdynamic' ], diff --git a/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h new file mode 100644 index 00000000000..394b758d541 --- /dev/null +++ b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__asm.h @@ -0,0 +1,18 @@ +$NetBSD: patch-deps_openssl_config_opensslconf__asm.h,v 1.1 2018/05/03 21:19:16 fhajny Exp $ + +Add support for NetBSD. + +--- deps/openssl/config/opensslconf_asm.h.orig 2018-04-24 14:41:19.000000000 +0000 ++++ deps/openssl/config/opensslconf_asm.h +@@ -108,9 +108,9 @@ + # 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__) ++#elif (defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)) && 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/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h new file mode 100644 index 00000000000..4731737603c --- /dev/null +++ b/lang/nodejs/patches/patch-deps_openssl_config_opensslconf__no-asm.h @@ -0,0 +1,18 @@ +$NetBSD: patch-deps_openssl_config_opensslconf__no-asm.h,v 1.1 2018/05/03 21:19:16 fhajny Exp $ + +Add support for NetBSD. + +--- deps/openssl/config/opensslconf_no-asm.h.orig 2018-04-24 14:41:19.000000000 +0000 ++++ deps/openssl/config/opensslconf_no-asm.h +@@ -16,9 +16,9 @@ + # include "./archs/VC-WIN32/no-asm/include/openssl/opensslconf.h" + #elif defined(_WIN32) && defined(_M_X64) + # include "./archs/VC-WIN64A/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/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi new file mode 100644 index 00000000000..3cca370a9a5 --- /dev/null +++ b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__asm.gypi @@ -0,0 +1,15 @@ +$NetBSD: patch-deps_openssl_openssl-cl__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $ + +Add support for NetBSD. + +--- deps/openssl/openssl-cl_asm.gypi.orig 2018-04-24 14:41:19.000000000 +0000 ++++ deps/openssl/openssl-cl_asm.gypi +@@ -31,6 +31,8 @@ + '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=="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"', { diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi new file mode 100644 index 00000000000..8e43e95b1db --- /dev/null +++ b/lang/nodejs/patches/patch-deps_openssl_openssl-cl__no__asm.gypi @@ -0,0 +1,15 @@ +$NetBSD: patch-deps_openssl_openssl-cl__no__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $ + +Add support for NetBSD. + +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2018-04-24 14:41:19.000000000 +0000 ++++ deps/openssl/openssl-cl_no_asm.gypi +@@ -31,6 +31,8 @@ + '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=="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"', { diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi new file mode 100644 index 00000000000..0d45e508430 --- /dev/null +++ b/lang/nodejs/patches/patch-deps_openssl_openssl__asm.gypi @@ -0,0 +1,15 @@ +$NetBSD: patch-deps_openssl_openssl__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $ + +Add support for NetBSD. + +--- deps/openssl/openssl_asm.gypi.orig 2018-04-24 14:41:22.000000000 +0000 ++++ deps/openssl/openssl_asm.gypi +@@ -46,6 +46,8 @@ + '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=="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"', { diff --git a/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi b/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi new file mode 100644 index 00000000000..4d7d9d7d597 --- /dev/null +++ b/lang/nodejs/patches/patch-deps_openssl_openssl__no__asm.gypi @@ -0,0 +1,15 @@ +$NetBSD: patch-deps_openssl_openssl__no__asm.gypi,v 1.1 2018/05/03 21:19:16 fhajny Exp $ + +Add support for NetBSD. + +--- deps/openssl/openssl_no_asm.gypi.orig 2018-04-24 14:41:22.000000000 +0000 ++++ deps/openssl/openssl_no_asm.gypi +@@ -32,6 +32,8 @@ + '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=="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"', { diff --git a/lang/nodejs/patches/patch-deps_uv_common.gypi b/lang/nodejs/patches/patch-deps_uv_common.gypi index 94492341223..053263a0eb6 100644 --- a/lang/nodejs/patches/patch-deps_uv_common.gypi +++ b/lang/nodejs/patches/patch-deps_uv_common.gypi @@ -1,15 +1,15 @@ -$NetBSD: patch-deps_uv_common.gypi,v 1.3 2015/09/17 10:42:34 fhajny Exp $ +$NetBSD: patch-deps_uv_common.gypi,v 1.4 2018/05/03 21:19:16 fhajny Exp $ Add support for NetBSD. ---- deps/uv/common.gypi.orig 2015-03-31 22:13:01.000000000 +0000 +--- deps/uv/common.gypi.orig 2018-04-24 14:41:22.000000000 +0000 +++ deps/uv/common.gypi -@@ -128,7 +128,7 @@ +@@ -134,7 +134,7 @@ }] ] }], -- ['OS in "freebsd dragonflybsd linux openbsd solaris android"', { -+ ['OS in "freebsd dragonflybsd linux openbsd solaris android netbsd"', { +- ['OS in "freebsd dragonflybsd linux openbsd solaris android aix"', { ++ ['OS in "freebsd dragonflybsd linux openbsd netbsd solaris android aix"', { 'cflags': [ '-Wall' ], 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ], 'target_conditions': [ diff --git a/lang/nodejs/patches/patch-deps_uv_src_unix_netbsd.c b/lang/nodejs/patches/patch-deps_uv_src_unix_netbsd.c index fc571b61455..4030ef71467 100644 --- a/lang/nodejs/patches/patch-deps_uv_src_unix_netbsd.c +++ b/lang/nodejs/patches/patch-deps_uv_src_unix_netbsd.c @@ -1,8 +1,8 @@ -$NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.8 2018/02/01 19:09:02 fhajny Exp $ +$NetBSD: patch-deps_uv_src_unix_netbsd.c,v 1.9 2018/05/03 21:19:16 fhajny Exp $ Bring back support for NetBSD<8. ---- deps/uv/src/unix/netbsd.c.orig 2018-01-31 21:27:02.000000000 +0000 +--- deps/uv/src/unix/netbsd.c.orig 2018-04-24 14:41:22.000000000 +0000 +++ deps/uv/src/unix/netbsd.c @@ -40,6 +40,11 @@ #include <unistd.h> diff --git a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc index 9dff9f12ab9..25b0b750fd1 100644 --- a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc +++ b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-freebsd.cc @@ -1,11 +1,11 @@ -$NetBSD: patch-deps_v8_src_base_platform_platform-freebsd.cc,v 1.1 2015/08/26 06:57:01 rumko Exp $ +$NetBSD: patch-deps_v8_src_base_platform_platform-freebsd.cc,v 1.2 2018/05/03 21:19:16 fhajny Exp $ Overlapping variables, taken from https://github.com/joyent/node/issues/9175 ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2015-05-23 03:06:54.000000000 +0000 +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2018-04-24 14:41:24.000000000 +0000 +++ deps/v8/src/base/platform/platform-freebsd.cc -@@ -122,10 +122,10 @@ static unsigned StringToLong(char* buffe - +@@ -45,10 +45,10 @@ static unsigned StringToLong(char* buffe + } std::vector<OS::SharedLibraryAddress> OS::GetSharedLibraryAddresses() { - std::vector<SharedLibraryAddress> result; @@ -17,9 +17,9 @@ Overlapping variables, taken from https://github.com/joyent/node/issues/9175 while (true) { char addr_buffer[11]; addr_buffer[0] = '0'; -@@ -156,10 +156,10 @@ std::vector<OS::SharedLibraryAddress> OS +@@ -78,10 +78,10 @@ std::vector<OS::SharedLibraryAddress> OS // There may be no filename in this line. Skip to next. - if (start_of_path == NULL) continue; + if (start_of_path == nullptr) continue; buffer[bytes_read] = 0; - result.push_back(SharedLibraryAddress(start_of_path, start, end)); + address_result.push_back(SharedLibraryAddress(start_of_path, start, end)); @@ -29,4 +29,4 @@ Overlapping variables, taken from https://github.com/joyent/node/issues/9175 + return address_result; } - + void OS::SignalCodeMovingGC() {} diff --git a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc index 515d367c602..7a9ade46f9b 100644 --- a/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc +++ b/lang/nodejs/patches/patch-deps_v8_src_base_platform_platform-posix.cc @@ -1,11 +1,11 @@ -$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.4 2017/10/12 14:12:15 fhajny Exp $ +$NetBSD: patch-deps_v8_src_base_platform_platform-posix.cc,v 1.5 2018/05/03 21:19:16 fhajny Exp $ Use sysconf(_SC_THREAD_STACK_MIN) instead of PTHREAD_STACK_MIN. Cast explicitly. ---- deps/v8/src/base/platform/platform-posix.cc.orig 2017-10-11 12:35:30.000000000 +0000 +--- deps/v8/src/base/platform/platform-posix.cc.orig 2018-04-24 14:41:24.000000000 +0000 +++ deps/v8/src/base/platform/platform-posix.cc -@@ -347,6 +347,8 @@ int OS::GetCurrentThreadId() { +@@ -480,6 +480,8 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); @@ -14,10 +14,10 @@ Cast explicitly. #elif V8_OS_AIX return static_cast<int>(thread_self()); #elif V8_OS_FUCHSIA -@@ -533,8 +535,13 @@ Thread::Thread(const Options& options) +@@ -670,8 +672,13 @@ Thread::Thread(const Options& options) : data_(new PlatformData), stack_size_(options.stack_size()), - start_semaphore_(NULL) { + start_semaphore_(nullptr) { +#if defined(__NetBSD__) + if (stack_size_ > 0 && static_cast<size_t>(stack_size_) < sysconf(_SC_THREAD_STACK_MIN)) { + stack_size_ = sysconf(_SC_THREAD_STACK_MIN); @@ -28,7 +28,7 @@ Cast explicitly. } set_name(options.name()); } -@@ -550,7 +557,7 @@ static void SetThreadName(const char* na +@@ -687,7 +694,7 @@ static void SetThreadName(const char* na pthread_set_name_np(pthread_self(), name); #elif V8_OS_NETBSD STATIC_ASSERT(Thread::kMaxThreadNameLength <= PTHREAD_MAX_NAMELEN_NP); diff --git a/lang/nodejs/patches/patch-deps_v8_src_globals.h b/lang/nodejs/patches/patch-deps_v8_src_globals.h index 624c55fbc6b..ec7bb9445c4 100644 --- a/lang/nodejs/patches/patch-deps_v8_src_globals.h +++ b/lang/nodejs/patches/patch-deps_v8_src_globals.h @@ -1,8 +1,8 @@ -$NetBSD: patch-deps_v8_src_globals.h,v 1.1 2017/06/05 21:14:04 fhajny Exp $ +$NetBSD: patch-deps_v8_src_globals.h,v 1.2 2018/05/03 21:19:16 fhajny Exp $ stdarg.h needed for va_list on at least NetBSD. ---- deps/v8/src/globals.h.orig 2017-05-30 17:31:38.000000000 +0000 +--- deps/v8/src/globals.h.orig 2018-04-24 14:41:26.000000000 +0000 +++ deps/v8/src/globals.h @@ -7,6 +7,7 @@ @@ -10,5 +10,5 @@ stdarg.h needed for va_list on at least NetBSD. #include <stdint.h> +#include <stdarg.h> + #include <limits> #include <ostream> - diff --git a/lang/nodejs/patches/patch-deps_v8_src_log-utils.h b/lang/nodejs/patches/patch-deps_v8_src_log-utils.h index 11e32d9cf24..96c7ae41e50 100644 --- a/lang/nodejs/patches/patch-deps_v8_src_log-utils.h +++ b/lang/nodejs/patches/patch-deps_v8_src_log-utils.h @@ -1,12 +1,12 @@ -$NetBSD: patch-deps_v8_src_log-utils.h,v 1.1 2015/11/09 20:19:35 fhajny Exp $ +$NetBSD: patch-deps_v8_src_log-utils.h,v 1.2 2018/05/03 21:19:16 fhajny Exp $ Need stdarg.h for va_list. ---- deps/v8/src/log-utils.h.orig 2015-10-29 12:22:04.000000000 +0000 +--- deps/v8/src/log-utils.h.orig 2018-04-24 14:41:27.000000000 +0000 +++ deps/v8/src/log-utils.h -@@ -9,6 +9,10 @@ - #include "src/base/platform/mutex.h" +@@ -15,6 +15,10 @@ #include "src/flags.h" + #include "src/ostreams.h" +#if defined(__NetBSD__) +#include <stdarg.h> |