summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-devtools/nodejs
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-11-04 21:24:47 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-11-04 21:25:03 +0300
commit868407c65d79e82e83c37f7c32bef9a2e2bc4cd5 (patch)
tree35d9b3bc06052f49f917c2ef3b5442b21dc8d3e3 /meta-openembedded/meta-oe/recipes-devtools/nodejs
parent82cb3b68c99815725fb1fe32a3f6e13d9413e752 (diff)
downloadopenbmc-868407c65d79e82e83c37f7c32bef9a2e2bc4cd5.tar.xz
meta-openembedded: subtree update:c986cbed93..e0daf6f8e0
Adrian Bunk (19): lldpd: Upgrade 1.0.3 -> 1.0.4 usrsctp: Upgrade to a more recent git snapshot cim-schema: Remove duplicate file dovecot: Upgrade 2.2.36.3 -> 2.2.36.4 flashrom: Upgrade 1.0 -> 1.1 doxygen: Upgrade 1.8.15 -> 1.8.16 nodejs: Upgrade 10.16.3 -> 10.17.0 php: Upgrade 7.3.9 -> 7.3.11 libdivecomputer: Upgrade to 0.6.0 libnss-nisplus: Upgrade to the latest upstream git pegtl: Upgrade 2.1.4 -> 2.8.1 openwsman: Upgrade 2.6.9 -> 2.6.11 cgdb: Upgrade 0.6.8 -> 0.7.1 packagegroup-meta-networking: Exclude nonbuilding recipes with musl xf86-input-tslib: Upgrade 0.0.6 -> 0.0.7 libmicrohttpd: Upgrade 0.9.66 -> 0.9.67 poco: Upgrade 1.9.0 -> 1.9.4 libgphoto2: Remove obsolete HAL files mdns: Mark as incompatible with musl Andreas Müller (5): unicode-ucd: initial add 12.1.0 unicode-ucd: Set correct SUMMARY and HOMEPAGE colord: initial add 1.4.4 colord-gtk: initial add 0.2.0 ibus: initial add 1.5.21 André Draszik (3): nodejs: allow use of system c-ares (and make default) libuv: update to 1.33.1 nodejs: allow use of system libuv (and make default) Carlos Rafael Giani (1): opencv: Enable pkg-config .pc file generation Khem Raj (5): miniupnpd: Update to 2.1.20191006 miniupnpd: Build config.h before full build poco: Fix build on risc-v python-docutils: Upgrade to 0.15.2 iwd: Use python3 variant of docutils during build Luca Boccassi (1): dbus-broker: build with libaudit if selinux is enabled Martin Siegumfeldt (1): libiio: add python3 packageconfig Paul Eggleton (1): python3-pillow: update to 6.2.1 Slater, Joseph (2): syslog-ng: add volatile directory init for systemd syslog-ng: change conf files to version 3.19 Trevor Gamblin (4): python-priority: add recipe python-h2: add recipe python-hyperframe: add recipe python-hpack: add recipe Yi Zhao (1): freeradius: set CLEANBROKEN Zang Ruochen (22): poppler: upgrade 0.80.0 -> 0.82.0 gmime: upgrade 3.2.3 -> 3.2.4 autofs: upgrade 5.1.5 -> 5.1.6 python-simplejson: enable native and nativesdk python-dnspython: upgrade 1.15.0 -> 1.16.0 python-engineio: upgrade 3.9.3 -> 3.10.0 python-evdev: upgrade 0.7.0 -> 1.2.0 python-future: upgrade 0.16.0 -> 0.18.2 python-intervals: upgrade 1.5.4 -> 1.10.0 python-isort: upgrade 4.3.4 -> 4.3.21 python-javaobj-py3: upgrade 0.2.4 -> 0.3.0 python-lazy-object-proxy: upgrade 1.3.1 -> 1.4.3 python-parse: upgrade 1.8.4 -> 1.12.1 python-pathlib2: upgrade 2.3.4 -> 2.3.5 python-periphery: upgrade 1.1.1 -> 2.0.0 python-pint: upgrade 0.8.1 -> 0.9 python-progress: upgrade 1.4 -> 1.5 python-prompt-toolkit: upgrade 2.0.4 -> 2.0.10 python-pybind11: upgrade 2.2.3 -> 2.4.3 python-pycryptodome: upgrade 3.4.11 -> 3.9.0 python-pyexpect: upgrade 1.0.17 -> 1.0.19 python-pyfirmata: upgrade 1.0.3 -> 1.1.0 Zheng Ruoqin (23): pure-ftpd: upgrade 1.0.47 -> 1.0.49 grpc: upgrade 1.24.1 -> 1.24.3 corosync: upgrade 2.4.4 -> 2.4.5 dhcpcd: upgrade 8.0.2 -> 8.1.1 iscsi-initiator-utils: upgrade 2.0.877 -> 2.0.878 znc: upgrade 1.7.4 -> 1.7.5 babeld: upgrade 1.8.4 -> 1.9.1 htpdate: upgrade 1.2.1 -> 1.2.2 nbd: upgrade 3.19 -> 3.20 unbound: upgrade 1.9.2 -> 1.9.4 wireshark: upgrade 3.0.3 -> 3.0.6 mtr: upgrade 0.92 -> 0.93 libowfat: upgrade 0.31 -> 0.32 iozone3: upgrade 484 -> 487 libhugetlbfs: upgrade 2.21 -> 2.22 phoronix-test-suite: upgrade 8.8.1 -> 9.0.1 lmsensors: upgrade 3.5.0 -> 3.6.0 paho-mqtt-c: upgrade 1.3.0 -> 1.3.1 rtorrent: upgrade 0.9.7 -> 0.9.8 zabbix: upgrade 4.2.6 -> 4.2.7 iwd: upgrade 0.20 -> 0.23 libtorrent: upgrade 0.13.7 -> 0.13.8 ledmon: upgrade to 0.93 Change-Id: I66f0f395da9087e46899cf882e36d9cc50718c62 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/nodejs')
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch122
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb)11
2 files changed, 6 insertions, 127 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
deleted file mode 100644
index ed3bac39b..000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
-From: Anna Henningsen <anna@addaleax.net>
-Date: Sat, 20 Oct 2018 05:24:54 +0200
-Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Using the non-indexed variant of `std::get<>` broke Travis CI.
-Also, this allows us to be a bit more concise when returning
-from `SignFinal()` due to some error condition.
-
-Refs: https://github.com/nodejs/node/pull/23427
-
-PR-URL: https://github.com/nodejs/node/pull/23779
-Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
-Reviewed-By: Tobias Nießen <tniessen@tnie.de>
-Reviewed-By: Refael Ackermann <refack@gmail.com>
-Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
----
- src/node_crypto.cc | 23 +++++++++++------------
- src/node_crypto.h | 12 +++++++++++-
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/src/node_crypto.cc b/src/node_crypto.cc
-index bd8d9e032554..ec7d4f2bb5be 100644
---- a/src/node_crypto.cc
-+++ b/src/node_crypto.cc
-@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
- return MallocedBuffer<unsigned char>();
- }
-
--std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
-+Sign::SignResult Sign::SignFinal(
- const char* key_pem,
- int key_pem_len,
- const char* passphrase,
- int padding,
- int salt_len) {
-- MallocedBuffer<unsigned char> buffer;
--
- if (!mdctx_)
-- return std::make_pair(kSignNotInitialised, std::move(buffer));
-+ return SignResult(kSignNotInitialised);
-
- EVPMDPointer mdctx = std::move(mdctx_);
-
- BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
- if (!bp)
-- return std::make_pair(kSignPrivateKey, std::move(buffer));
-+ return SignResult(kSignPrivateKey);
-
- EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
- nullptr,
-@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
- // without `pkey` being set to nullptr;
- // cf. the test of `test_bad_rsa_privkey.pem` for an example.
- if (!pkey || 0 != ERR_peek_error())
-- return std::make_pair(kSignPrivateKey, std::move(buffer));
-+ return SignResult(kSignPrivateKey);
-
- #ifdef NODE_FIPS_MODE
- /* Validate DSA2 parameters from FIPS 186-4 */
-@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
- }
- #endif // NODE_FIPS_MODE
-
-- buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
-+ MallocedBuffer<unsigned char> buffer =
-+ Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
- Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
-- return std::make_pair(error, std::move(buffer));
-+ return SignResult(error, std::move(buffer));
- }
-
-
-@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
-
- ClearErrorOnReturn clear_error_on_return;
-
-- std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
-+ SignResult ret = sign->SignFinal(
- buf,
- buf_len,
- len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
- padding,
- salt_len);
-
-- if (std::get<Error>(ret) != kSignOk)
-- return sign->CheckThrow(std::get<Error>(ret));
-+ if (ret.error != kSignOk)
-+ return sign->CheckThrow(ret.error);
-
- MallocedBuffer<unsigned char> sig =
-- std::move(std::get<MallocedBuffer<unsigned char>>(ret));
-+ std::move(ret.signature);
-
- Local<Object> rc =
- Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
-diff --git a/src/node_crypto.h b/src/node_crypto.h
-index 6fcf737f6c43..0c26c1f6ff1d 100644
---- a/src/node_crypto.h
-+++ b/src/node_crypto.h
-@@ -518,7 +518,17 @@ class Sign : public SignBase {
- public:
- static void Initialize(Environment* env, v8::Local<v8::Object> target);
-
-- std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
-+ struct SignResult {
-+ Error error;
-+ MallocedBuffer<unsigned char> signature;
-+
-+ explicit SignResult(
-+ Error err,
-+ MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
-+ : error(err), signature(std::move(sig)) {}
-+ };
-+
-+ SignResult SignFinal(
- const char* key_pem,
- int key_pem_len,
- const char* passphrase,
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index a978eebe4..4afe341f9 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -17,7 +17,6 @@ COMPATIBLE_HOST_riscv32 = "null"
SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
- file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
file://0004-Make-compatibility-with-gcc-4.8.patch \
file://0005-Link-atomic-library.patch \
file://0006-Use-target-ldflags.patch \
@@ -26,8 +25,8 @@ SRC_URI_append_class-target = " \
file://0002-Using-native-torque.patch \
"
-SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f"
-SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd"
+SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3"
+SRC_URI[sha256sum] = "412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e"
S = "${WORKDIR}/node-v${PV}"
@@ -52,9 +51,11 @@ ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '-
GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
ARCHFLAGS ?= ""
-PACKAGECONFIG ??= "zlib icu"
-PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+PACKAGECONFIG ??= "ares icu libuv zlib"
+PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
+PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
# Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
do_configure () {