From 6421aee2a754c63c6ef6303bb0a166b77f0c24f0 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 9 Dec 2023 01:08:33 +0800 Subject: [PATCH] Node.js: sync with upstream source Signed-off-by: Tianling Shen --- lang/node-aminya-node-gyp-build/Makefile | 114 ++++++++++++++++++ lang/node-aws-sdk/Makefile | 4 +- lang/node-cross-env/Makefile | 109 +++++++++++++++++ lang/node-gyp-build/Makefile | 8 +- lang/node-hid/Makefile | 4 +- lang/node-homebridge-config-ui-x/Makefile | 4 +- .../patches/000-remove_depends.patch | 10 +- lang/node-homebridge-hue/Makefile | 4 +- .../Makefile | 4 +- lang/node-homebridge/Makefile | 2 +- lang/node-homebridge/files/homebridge.init | 2 +- lang/node-lambda/Makefile | 4 +- lang/node-modbus-serial/Makefile | 4 +- .../patches/000-remove_depends.patch | 10 +- lang/node-mqtt/Makefile | 4 +- .../patches/000-remove_depends.patch | 6 +- lang/node-npm-check-updates/Makefile | 4 +- lang/node-red-dashboard/Makefile | 4 +- lang/node-red-node-arduino/Makefile | 10 +- .../patches/000-remove_depends.patch | 18 ++- lang/node-red-node-serialport/Makefile | 4 +- .../patches/000-remove_depends.patch | 4 +- lang/node-red/Makefile | 4 +- lang/node-red/files/node-red.init | 2 +- lang/node-twilio/Makefile | 4 +- lang/node-typescript/Makefile | 4 +- lang/node-vonage-server-sdk/Makefile | 4 +- lang/node-zeromq/Makefile | 12 +- .../000-modify_compile_options_for_ts.patch | 104 ++++++++++++++++ .../patches/000-revert_build_script.patch | 11 ++ .../node-zeromq/patches/002-shelljs_bug.patch | 38 ++++++ lang/node-zigbee2mqtt/Makefile | 6 +- lang/node-zigbee2mqtt/files/zigbee2mqtt.init | 4 +- lang/node-zwave-js-ui/Makefile | 9 +- lang/node-zwave-js-ui/files/zwave-js-ui.init | 2 +- lang/node/Makefile | 6 +- lang/node/patches/v21.x/204-v8_gyp.patch | 24 ++-- ...able_pointer_authentication_on_arm64.patch | 2 +- 38 files changed, 474 insertions(+), 99 deletions(-) create mode 100644 lang/node-aminya-node-gyp-build/Makefile create mode 100644 lang/node-cross-env/Makefile mode change 100644 => 100755 lang/node-homebridge/files/homebridge.init create mode 100644 lang/node-zeromq/patches/000-modify_compile_options_for_ts.patch create mode 100644 lang/node-zeromq/patches/000-revert_build_script.patch create mode 100644 lang/node-zeromq/patches/002-shelljs_bug.patch mode change 100644 => 100755 lang/node-zigbee2mqtt/files/zigbee2mqtt.init diff --git a/lang/node-aminya-node-gyp-build/Makefile b/lang/node-aminya-node-gyp-build/Makefile new file mode 100644 index 0000000000..5a1f2f8c28 --- /dev/null +++ b/lang/node-aminya-node-gyp-build/Makefile @@ -0,0 +1,114 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NPM_SCOPE:=aminya +PKG_NPM_NAME:=node-gyp-build +PKG_NAME:=node-$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME) +PKG_VERSION:=4.5.0-aminya.5 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL_FILE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://registry.npmjs.org/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/-/ +PKG_HASH:=b442a2bc27c07e2d904459ebde8027e268901e3a3a6faf3bac02bb6d7b1e23f7 + +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +HOST_BUILD_DEPENDS:=node/host +HOST_BUILD_PARALLEL:=1 + +PKG_BUILD_DEPENDS:=node/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/node-aminya-node-gyp-build + SUBMENU:=Node.js + SECTION:=lang + CATEGORY:=Languages + TITLE:=Build tool and bindings loader for node-gyp that supports prebuilds + URL:=https://www.npmjs.com/package/@aminya/node-gyp-build + DEPENDS:=+node +node-gyp +endef + +define Package/node-aminya-node-gyp-build/description + Build tool and bindings loader for node-gyp that supports prebuilds + Fork created because of https://github.com/prebuild/node-gyp-build/pull/55 +endef + +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) +HOSTTMPNPM:=$(shell mktemp -u XXXXXXXXXX) +NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) + +TARGET_CFLAGS+=$(FPIC) +TARGET_CPPFLAGS+=$(FPIC) + +define Build/Compile + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) + rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json + find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Package/node-aminya-node-gyp-build/install + $(INSTALL_DIR) $(1)/usr/lib/node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME) + $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \ + $(1)/usr/lib/node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{*.js,*.md} \ + $(1)/usr/lib/node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) ../lib/node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/bin.js $(1)/usr/bin/aminya-node-gyp-build + $(LN) ../lib/node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/optional.js $(1)/usr/bin/aminya-node-gyp-build-optional + $(LN) ../lib/node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/build-test.js $(1)/usr/bin/aminya-node-gyp-build-test + $(INSTALL_DIR) $(1)/usr/lib/node_modules/@$(PKG_NPM_SCOPE) + $(LN) ../../node/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME) \ + $(1)/usr/lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME) +endef + +define Package/node-aminya-node-gyp-build/postrm +#!/bin/sh +rm /usr/lib/node_modules/@aminya/node-gyp-build || true +rm -rf /usr/lib/node/@aminya/node-gyp-build || true +endef + +define Host/Compile + cd $(HOST_BUILD_DIR); \ + $(HOST_MAKE_VARS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/host-npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(HOSTTMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(HOSTTMPNPM) + rm -f $(HOST_BUILD_DIR)/node_modules/.package-lock.json + find $(HOST_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Host/Install + $(INSTALL_DIR) $(1)/lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME) + $(CP) $(HOST_BUILD_DIR)/{package.json,LICENSE} \ + $(1)/lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/ + $(CP) $(HOST_BUILD_DIR)/{*.js,*.md} \ + $(1)/lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/bin + $(LN) ../lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/bin.js $(1)/bin/aminya-node-gyp-build + $(LN) ../lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/optional.js $(1)/bin/aminya-node-gyp-build-optional + $(LN) ../lib/node_modules/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/build-test.js $(1)/bin/aminya-node-gyp-build-test +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,node-aminya-node-gyp-build)) diff --git a/lang/node-aws-sdk/Makefile b/lang/node-aws-sdk/Makefile index 45503ce20a..e13c7ee8a6 100644 --- a/lang/node-aws-sdk/Makefile +++ b/lang/node-aws-sdk/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=aws-sdk PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=2.1496.0 +PKG_VERSION:=2.1514.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=1ae2403ce31af5a7a148e26a04d1d7599bf47b680b8385948a7878193add9a57 +PKG_HASH:=33a8e8aa228df702ae26cb4131050397aa24eb753d58895a915d00403c6b64d5 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-cross-env/Makefile b/lang/node-cross-env/Makefile new file mode 100644 index 0000000000..d77bce6ea4 --- /dev/null +++ b/lang/node-cross-env/Makefile @@ -0,0 +1,109 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NPM_NAME:=cross-env +PKG_NAME:=node-$(PKG_NPM_NAME) +PKG_VERSION:=7.0.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ + https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ +PKG_HASH:=d44ad3b6925ff024f64fc4eec88a7da8b8291dd66de858c34866be611ad3c5de + +PKG_MAINTAINER:=Hirokazu MORIKAWA +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +HOST_BUILD_DEPENDS:=node/host +HOST_BUILD_PARALLEL:=1 + +PKG_BUILD_DEPENDS:=node/host +PKG_BUILD_PARALLEL:=1 +PKG_BUILD_FLAGS:=no-mips16 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/node-cross-env + SUBMENU:=Node.js + SECTION:=lang + CATEGORY:=Languages + TITLE:=Run scripts that set and use environment variables across platforms + URL:=https://www.npmjs.com/package/cross-env + DEPENDS:=+node +endef + +define Package/node-cross-env/description + Run scripts that set and use environment variables across platforms +endef + +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst i386,ia32,$(ARCH))))) +TMPNPM:=$(shell mktemp -u XXXXXXXXXX) +HOSTTMPNPM:=$(shell mktemp -u XXXXXXXXXX) +NPM_CACHE_DIR:=$(if $(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(call qstrip,$(CONFIG_NODEJS_NPM_CACHE_DIR)),$(TMP_DIR)) + +TARGET_CFLAGS+=$(FPIC) +TARGET_CPPFLAGS+=$(FPIC) + +define Build/Compile + cd $(PKG_BUILD_DIR); \ + $(MAKE_VARS) \ + $(MAKE_FLAGS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM) + rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json + find $(PKG_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Package/node-cross-env/install + $(INSTALL_DIR) $(1)/usr/lib/node/$(PKG_NPM_NAME) + $(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE,*.md} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(CP) $(PKG_BUILD_DIR)/{src,node_modules} \ + $(1)/usr/lib/node/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/usr/bin + $(LN) ../lib/node/$(PKG_NPM_NAME)/src/bin/cross-env.js $(1)/usr/bin/cross-env + $(LN) ../lib/node/$(PKG_NPM_NAME)/src/bin/cross-env-shell.js $(1)/usr/bin/cross-env-shell + $(INSTALL_DIR) $(1)/usr/lib/node_modules + $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) +endef + +define Package/node-cross-env/postrm +#!/bin/sh +rm /usr/lib/node_modules/cross-env || true +rm -rf /usr/lib/node/cross-env || true +endef + +define Host/Compile + cd $(HOST_BUILD_DIR); \ + $(HOST_MAKE_VARS) \ + npm_config_nodedir=$(STAGING_DIR)/usr/ \ + $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/host-npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(HOSTTMPNPM)) \ + npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --ignore-scripts + rm -rf $(TMP_DIR)/npm-cache-$(HOSTTMPNPM) + rm -f $(HOST_BUILD_DIR)/node_modules/.package-lock.json + find $(HOST_BUILD_DIR)/node_modules -type d -empty -print0 | xargs -0 rmdir || true +endef + +define Host/Install + $(INSTALL_DIR) $(1)/lib/node_modules/$(PKG_NPM_NAME) + $(CP) $(HOST_BUILD_DIR)/{package.json,LICENSE,*.md} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(CP) $(HOST_BUILD_DIR)/{src,node_modules} \ + $(1)/lib/node_modules/$(PKG_NPM_NAME)/ + $(INSTALL_DIR) $(1)/bin + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/src/bin/cross-env.js $(1)/bin/cross-env + $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/src/bin/cross-env-shell.js $(1)/bin/cross-env-shell +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,node-cross-env)) diff --git a/lang/node-gyp-build/Makefile b/lang/node-gyp-build/Makefile index 303b750178..5fa237e3aa 100644 --- a/lang/node-gyp-build/Makefile +++ b/lang/node-gyp-build/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-gyp-build PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=4.6.1 -PKG_RELEASE:=1 +PKG_VERSION:=4.7.1 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=b34dddd54327fe46e3e868b79cbce6b57988c735f4986201e11ca1c7656140bf +PKG_HASH:=8a1c2c9eaa79ae9362e4ac8c8100bcceebd5f4d0767d7dcede1d10b9e6c5dd47 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT @@ -34,7 +34,7 @@ define Package/node-gyp-build CATEGORY:=Languages TITLE:=Build tool and bindings loader for node-gyp that supports prebuilds URL:=https://www.npmjs.com/package/node-gyp-build - DEPENDS:=+node + DEPENDS:=+node +node-gyp endef define Package/node-gyp-build/description diff --git a/lang/node-hid/Makefile b/lang/node-hid/Makefile index 5bb4340c9e..bf78604d91 100644 --- a/lang/node-hid/Makefile +++ b/lang/node-hid/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-hid PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=2.1.2 +PKG_VERSION:=3.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=a10c108bb98146af5419eedf5a3a288b14bc94258c126e11939d5b8caa814505 +PKG_HASH:=251c1cb8f81fd7c778f7db52c71dc47de63ff31f0d817ca566594f4fd05e2fee PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT OR X11 diff --git a/lang/node-homebridge-config-ui-x/Makefile b/lang/node-homebridge-config-ui-x/Makefile index 2a02a0cfcf..4573385af2 100644 --- a/lang/node-homebridge-config-ui-x/Makefile +++ b/lang/node-homebridge-config-ui-x/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=homebridge-config-ui-x PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=4.52.3 +PKG_VERSION:=4.54.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=01e5c010af08dc544cc2f639a2e83f4bd7d5a82870a7e8ce732a4a78bcce2312 +PKG_HASH:=fb823874572f6abd710b2d12ebe33f6c3f642d81eaf3c24787c7a05942195b17 PKG_BUILD_DEPENDS:=node/host node-clean-modules/host PKG_BUILD_FLAGS:=no-mips16 diff --git a/lang/node-homebridge-config-ui-x/patches/000-remove_depends.patch b/lang/node-homebridge-config-ui-x/patches/000-remove_depends.patch index 000ac25e4e..c16feb1753 100644 --- a/lang/node-homebridge-config-ui-x/patches/000-remove_depends.patch +++ b/lang/node-homebridge-config-ui-x/patches/000-remove_depends.patch @@ -1,10 +1,10 @@ --- a/package.json +++ b/package.json -@@ -56,7 +56,6 @@ +@@ -57,7 +57,6 @@ + "@fastify/helmet": "11.1.1", "@fastify/multipart": "8.0.0", "@fastify/static": "6.12.0", - "@fastify/swagger": "8.12.0", -- "@homebridge/node-pty-prebuilt-multiarch": "0.11.10", +- "@homebridge/node-pty-prebuilt-multiarch": "0.11.12", "@nestjs/axios": "3.0.1", - "@nestjs/common": "10.2.8", - "@nestjs/core": "10.2.8", + "@nestjs/common": "10.2.10", + "@nestjs/core": "10.2.10", diff --git a/lang/node-homebridge-hue/Makefile b/lang/node-homebridge-hue/Makefile index 853ba2febc..b8151ade6d 100644 --- a/lang/node-homebridge-hue/Makefile +++ b/lang/node-homebridge-hue/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=homebridge-hue PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=0.13.68 +PKG_VERSION:=0.13.69 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=5a0d07c387fbea849c003fbf9840a81624a6f33e54d5165d0d7c79444f723306 +PKG_HASH:=65fa9168e069a8b331291c02a55d817b4fa982b6e50a013a10720d417125bc2e PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-homebridge-node-pty-prebuilt-multiarch/Makefile b/lang/node-homebridge-node-pty-prebuilt-multiarch/Makefile index 6591bcdecf..8e07472fbb 100644 --- a/lang/node-homebridge-node-pty-prebuilt-multiarch/Makefile +++ b/lang/node-homebridge-node-pty-prebuilt-multiarch/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_SCOPE:=homebridge PKG_NPM_NAME:=node-pty-prebuilt-multiarch PKG_NAME:=node-$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME) -PKG_VERSION:=0.11.11 +PKG_VERSION:=0.11.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL_FILE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://registry.npmjs.org/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/-/ -PKG_HASH:=5c6742cc3f478b8a0dd12b4b015208340d12ea531bb5dbaaa08936af82b70752 +PKG_HASH:=ee575002d843ff8cd8ab620909c075473c3f81e4bea43e07af64c5972c127568 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-homebridge/Makefile b/lang/node-homebridge/Makefile index 892af77c3b..914f764e15 100644 --- a/lang/node-homebridge/Makefile +++ b/lang/node-homebridge/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=homebridge PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=1.7.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ diff --git a/lang/node-homebridge/files/homebridge.init b/lang/node-homebridge/files/homebridge.init old mode 100644 new mode 100755 index 0f8ab2f571..1b8bd3dd85 --- a/lang/node-homebridge/files/homebridge.init +++ b/lang/node-homebridge/files/homebridge.init @@ -11,7 +11,7 @@ start_service() { } procd_open_instance procd_set_param env HOME=/usr/share/homebridge - procd_set_param command /usr/bin/homebridge -U /usr/share/homebridge + procd_set_param command /usr/bin/node --optimize_for_size --max_old_space_size=128 --gc_interval=100 /usr/bin/homebridge -U /usr/share/homebridge procd_set_param user homebridge procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/lang/node-lambda/Makefile b/lang/node-lambda/Makefile index b7e318f281..78bc8fc969 100644 --- a/lang/node-lambda/Makefile +++ b/lang/node-lambda/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-lambda PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=1.2.0 +PKG_VERSION:=1.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=d59b907104f05eaaf13d08931a02097cd3c7dceae6d803cc4afba3fa45072eac +PKG_HASH:=56da1b3497f054f03caa24716e35a9082e861e1bbbfb658a9a9d8250531bb527 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=BSD-2-Clause diff --git a/lang/node-modbus-serial/Makefile b/lang/node-modbus-serial/Makefile index 3adacbd07b..ab67afb037 100644 --- a/lang/node-modbus-serial/Makefile +++ b/lang/node-modbus-serial/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=modbus-serial PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=8.0.13 +PKG_VERSION:=8.0.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=ab2e4e644c89b4115ab53a7d5d30a88fb6712c0824cc2e5217d403114d81b2af +PKG_HASH:=16927b135021e37b5f39156e658eb127b8305d36db5721ce9272328da4c3c90d PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=ISC diff --git a/lang/node-modbus-serial/patches/000-remove_depends.patch b/lang/node-modbus-serial/patches/000-remove_depends.patch index 0dc449a106..855a51a459 100644 --- a/lang/node-modbus-serial/patches/000-remove_depends.patch +++ b/lang/node-modbus-serial/patches/000-remove_depends.patch @@ -1,11 +1,11 @@ --- a/package.json +++ b/package.json -@@ -40,7 +40,6 @@ - "webbluetooth": "^2.1.0" +@@ -41,7 +41,6 @@ + "webbluetooth": "^3.1.0" }, "dependencies": { -- "debug": "^4.1.1", -- "serialport": "^11.0.0" -+ "debug": "^4.1.1" +- "debug": "^4.3.1", +- "serialport": "^12.0.0" ++ "debug": "^4.3.1" } } diff --git a/lang/node-mqtt/Makefile b/lang/node-mqtt/Makefile index 1314cea1dd..f4dd0e06c4 100644 --- a/lang/node-mqtt/Makefile +++ b/lang/node-mqtt/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=mqtt PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=5.2.2 +PKG_VERSION:=5.3.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=e7c309d7d23f2af6a1d93e8adeae2402b7ef9ce85f35d803c92758a12ea63a38 +PKG_HASH:=d3db78ef7cabde3e81a9618834fa1cbcb8d53dd7406bd50012b7c6fc891cb910 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-mqtt/patches/000-remove_depends.patch b/lang/node-mqtt/patches/000-remove_depends.patch index b811d1d407..bb341e9e0b 100644 --- a/lang/node-mqtt/patches/000-remove_depends.patch +++ b/lang/node-mqtt/patches/000-remove_depends.patch @@ -1,12 +1,12 @@ --- a/package.json +++ b/package.json @@ -123,8 +123,7 @@ - "readable-stream": "^4.4.2", "reinterval": "^1.1.0", "rfdc": "^1.3.0", -- "split2": "^4.2.0", + "split2": "^4.2.0", +- "worker-timers": "^7.0.78", - "ws": "^8.14.2" -+ "split2": "^4.2.0" ++ "worker-timers": "^7.0.78" }, "devDependencies": { "@esm-bundle/chai": "^4.3.4-fix.0", diff --git a/lang/node-npm-check-updates/Makefile b/lang/node-npm-check-updates/Makefile index 076a937584..262e0b6df1 100644 --- a/lang/node-npm-check-updates/Makefile +++ b/lang/node-npm-check-updates/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=npm-check-updates PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=16.14.6 +PKG_VERSION:=16.14.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=9901e83de993408266d3bd09af5717d54d7fdf74e4997f663c88a09b1bb732bf +PKG_HASH:=fd9c2b8ba8b55c444d3fef668196ea710095c3b56aeb646376d881269feec9cb PKG_MAINTAINER:=Hirokazu MORIKAWA , Patrik Laszlo PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red-dashboard/Makefile b/lang/node-red-dashboard/Makefile index 94ff22de46..b3087494ca 100644 --- a/lang/node-red-dashboard/Makefile +++ b/lang/node-red-dashboard/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red-dashboard PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=3.6.1 +PKG_VERSION:=3.6.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=ccdcf102ae0669709448915daa697780ba837410079af67e59ab7f3014f4d931 +PKG_HASH:=b129f8839e66025cbab5433cf8f6b4431feeb645c7cc2286668ce86c8a92b9e9 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red-node-arduino/Makefile b/lang/node-red-node-arduino/Makefile index 31e4d8e240..fb4afb7221 100644 --- a/lang/node-red-node-arduino/Makefile +++ b/lang/node-red-node-arduino/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red-node-arduino PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=0.3.1 -PKG_RELEASE:=3 +PKG_VERSION:=1.0.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=b23feef3796b6253695235fb492c28c4f53f89e026daa6b3d5cb0d05c1d6d57c +PKG_HASH:=ed4400fcf9570e1300ac879ea4b7e929a0766cea8dcd0762bf73af8bde163ba5 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 @@ -30,7 +30,7 @@ define Package/node-red-node-arduino CATEGORY:=Languages TITLE:=node to talk to an Arduino running firmata URL:=https://flows.nodered.org/node/node-red-node-arduino - DEPENDS:=+node +node-red +node-firmata + DEPENDS:=+node +node-red +node-serialport endef define Package/node-red-node-arduino/description @@ -65,7 +65,7 @@ define Package/node-red-node-arduino/install $(1)/usr/lib/node/$(PKG_NPM_NAME)/ $(CP) $(PKG_BUILD_DIR)/{*.js,*.html,LICENSE} \ $(1)/usr/lib/node/$(PKG_NPM_NAME)/ - $(CP) $(PKG_BUILD_DIR)/locales \ + $(CP) $(PKG_BUILD_DIR)/{lib,locales} \ $(1)/usr/lib/node/$(PKG_NPM_NAME)/ $(INSTALL_DIR) $(1)/usr/lib/node_modules $(LN) ../node/$(PKG_NPM_NAME) $(1)/usr/lib/node_modules/$(PKG_NPM_NAME) diff --git a/lang/node-red-node-arduino/patches/000-remove_depends.patch b/lang/node-red-node-arduino/patches/000-remove_depends.patch index 80f4e0bbdb..5d50deb238 100644 --- a/lang/node-red-node-arduino/patches/000-remove_depends.patch +++ b/lang/node-red-node-arduino/patches/000-remove_depends.patch @@ -1,12 +1,10 @@ --- a/package.json +++ b/package.json -@@ -2,9 +2,6 @@ - "name" : "node-red-node-arduino", - "version" : "0.3.1", - "description" : "A Node-RED node to talk to an Arduino running firmata", -- "dependencies" : { -- "firmata" : "^2.0.0" -- }, - "repository" : { - "type":"git", - "url":"https://github.com/node-red/node-red-nodes/tree/master/hardware/Arduino" +@@ -3,7 +3,6 @@ + "version": "1.0.0", + "description": "A Node-RED node to talk to an Arduino running firmata", + "dependencies": { +- "serialport": "^12.0.0" + }, + "repository": { + "type": "git", diff --git a/lang/node-red-node-serialport/Makefile b/lang/node-red-node-serialport/Makefile index 2e3edef0e2..3dbe3c01c1 100644 --- a/lang/node-red-node-serialport/Makefile +++ b/lang/node-red-node-serialport/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red-node-serialport PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=1.0.4 +PKG_VERSION:=2.0.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=12685d761e94a8051f2f8b64c0e3e74eb034543701a0218e1a9883375b791ed9 +PKG_HASH:=f1f33c2d49c8959848777c1044a3cfa7d152b759a3b07ce49866ec8fbaf3ddc2 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red-node-serialport/patches/000-remove_depends.patch b/lang/node-red-node-serialport/patches/000-remove_depends.patch index bd305e03e8..7ed20037c3 100644 --- a/lang/node-red-node-serialport/patches/000-remove_depends.patch +++ b/lang/node-red-node-serialport/patches/000-remove_depends.patch @@ -2,10 +2,10 @@ +++ b/package.json @@ -2,9 +2,6 @@ "name" : "node-red-node-serialport", - "version" : "1.0.4", + "version" : "2.0.2", "description" : "Node-RED nodes to talk to serial ports", - "dependencies" : { -- "serialport" : "^11.0.0" +- "serialport" : "^12.0.0" - }, "repository" : { "type":"git", diff --git a/lang/node-red/Makefile b/lang/node-red/Makefile index 2693735d54..57509776d2 100644 --- a/lang/node-red/Makefile +++ b/lang/node-red/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red PKG_NAME:=$(PKG_NPM_NAME) -PKG_VERSION:=3.1.0 +PKG_VERSION:=3.1.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=3b981ef1f3c65f54a58ecac0cbe37468f032f959e5aa3fb164c6a535ccf4e31c +PKG_HASH:=98f0468fe78d98564473591f36f99b66ea4d67a519865e4ede6ec07f2cc293f4 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red/files/node-red.init b/lang/node-red/files/node-red.init index cc81e9d522..b1cb0c833f 100755 --- a/lang/node-red/files/node-red.init +++ b/lang/node-red/files/node-red.init @@ -16,7 +16,7 @@ start_service() { procd_open_instance procd_set_param env HOME=/root - procd_set_param command /usr/bin/node-red + procd_set_param command /usr/bin/node --optimize_for_size --max_old_space_size=128 --gc_interval=100 /usr/bin/node-red procd_append_param command --port "$port" [ "$verbose" = "1" ] && procd_append_param command --verbose procd_set_param stdout "$log_stdout" diff --git a/lang/node-twilio/Makefile b/lang/node-twilio/Makefile index eec78587f7..ea2029d862 100644 --- a/lang/node-twilio/Makefile +++ b/lang/node-twilio/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=twilio PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=4.19.0 +PKG_VERSION:=4.19.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=726e55ae58278aff9b3c59e164e6b7b04577a6a4a9954ff21f567c5ab088082e +PKG_HASH:=545dae2e03e2717279567694e61efd3cd073566ed40b75dbdcac766469d2a20f PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-typescript/Makefile b/lang/node-typescript/Makefile index 88154656d7..da4560ccc7 100644 --- a/lang/node-typescript/Makefile +++ b/lang/node-typescript/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=typescript PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=5.2.2 +PKG_VERSION:=5.3.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=52e30f921a2fb921adb594c61904e18762174d668bbc159a112cda98ef6ada0c +PKG_HASH:=e5335c28f1e86b747bcca820e8445f6f9421bc8ba16a9c3547064ead8fb81c56 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-vonage-server-sdk/Makefile b/lang/node-vonage-server-sdk/Makefile index ab0ec1ac29..1e37f1772e 100644 --- a/lang/node-vonage-server-sdk/Makefile +++ b/lang/node-vonage-server-sdk/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_SCOPE:=vonage PKG_NPM_NAME:=server-sdk PKG_NAME:=node-$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME) -PKG_VERSION:=3.10.0 +PKG_VERSION:=3.10.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_SCOPE)-$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL_FILE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://registry.npmjs.org/@$(PKG_NPM_SCOPE)/$(PKG_NPM_NAME)/-/ -PKG_HASH:=4bfe557cdb7599bc224eef18b5b7346d41182aec118f313879c0b3fd2bbaf8ae +PKG_HASH:=7ae3f1bba3aeff4e8c7fe2c7e50d914ec74ccd0c577f3e9dfec473d88a67f693 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-zeromq/Makefile b/lang/node-zeromq/Makefile index a349338c2c..7bcd813124 100644 --- a/lang/node-zeromq/Makefile +++ b/lang/node-zeromq/Makefile @@ -6,19 +6,19 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=zeromq PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=6.0.0-beta.18 -PKG_RELEASE:=1 +PKG_VERSION:=6.0.0-beta.19 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=6a0e87b5cc1df1b0cee8e01ba6dc004cfc72ed830934456f1095f38393f7900a +PKG_HASH:=3d73e0f48ce306a35d30485020e1f6537c6776673ce459bbe3231fd90eba5dfd PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE -PKG_BUILD_DEPENDS:=node/host node-shx/host node-npm-run-all2/host node-gyp-build/host +PKG_BUILD_DEPENDS:=node/host node-gyp-build/host node-gyp/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 @@ -60,7 +60,7 @@ define Build/Compile $(MAKE_FLAGS) \ npm_config_nodedir=$(STAGING_DIR)/usr/ \ $(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \ - npm install --prefer-offline --no-audit --no-save --no-package-lock --ignore-scripts + npm install --prefer-offline --no-audit --no-package-lock --include=dev --ignore-scripts cd $(PKG_BUILD_DIR); \ $(MAKE_VARS) \ $(MAKE_FLAGS) \ @@ -102,7 +102,7 @@ define Build/Compile CMAKE_SYSROOT="$(STAGING_DIR_ROOT)" \ CROSS_COMPILE="$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-" \ TARGET_CROSS="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)" \ - npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) + npm install --prefer-offline --no-audit --no-package-lock --include=dev --build-from-source --target_arch=$(NODEJS_CPU) rm -rf $(PKG_BUILD_DIR)/node_modules cd $(PKG_BUILD_DIR); \ $(MAKE_VARS) \ diff --git a/lang/node-zeromq/patches/000-modify_compile_options_for_ts.patch b/lang/node-zeromq/patches/000-modify_compile_options_for_ts.patch new file mode 100644 index 0000000000..7d8a392cdb --- /dev/null +++ b/lang/node-zeromq/patches/000-modify_compile_options_for_ts.patch @@ -0,0 +1,104 @@ +--- a/script/build.ts ++++ b/script/build.ts +@@ -1,13 +1,14 @@ + import {dirname} from "path" + import {existsSync, writeFileSync} from "fs" + import {mkdir, cd, exec, find, mv} from "shelljs" ++import {execSync} from "child_process" + + const root = dirname(__dirname) + + function main() { + const zmq_rev = + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing, @typescript-eslint/strict-boolean-expressions +- process.env.ZMQ_VERSION || "20de92ac0a2b2b9a1869782a429df68f93c3625e" ++ process.env.ZMQ_VERSION || "622fc6dde99ee172ebaa9c8628d85a7a1995a21d" + const src_url = `https://github.com/zeromq/libzmq/archive/${zmq_rev}.tar.gz` + + const libzmq_build_prefix = `${root}/build/libzmq-staging` +@@ -34,14 +35,6 @@ function main() { + } + } + +- build_options += archCMakeOptions() +- +- if (process.platform === "darwin") { +- const MACOSX_DEPLOYMENT_TARGET = "10.15" +- process.env.MACOSX_DEPLOYMENT_TARGET = MACOSX_DEPLOYMENT_TARGET +- build_options += ` -DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}` +- } +- + mkdir("-p", libzmq_build_prefix) + cd(libzmq_build_prefix) + +@@ -58,11 +51,13 @@ function main() { + console.log("Found libzmq source; skipping download...") + } else { + console.log(`Downloading libzmq source from ${src_url}`) +- exec(`curl "${src_url}" -fsSL -o "${tarball}"`, execOptions) ++ const execCommand = `curl "${src_url}" -fsSL -o "${tarball}"` ++ execSync(execCommand) + } + + if (!existsSync(src_dir)) { +- exec(`tar xzf "${tarball}"`, execOptions) ++ const extractTarball = `tar xzf "${tarball}"` ++ execSync(extractTarball) + } + + if (process.env.ZMQ_DRAFT === "true") { +@@ -78,13 +73,52 @@ function main() { + writeFileSync(clang_format_file, "") + } + ++ build_options += " -DCMAKE_CROSSCOMPILING=true" ++ build_options += " -DCMAKE_SYSTEM_NAME=" + process.env.CMAKE_SYSTEM_NAME ++ build_options += " -DCMAKE_SYSTEM_VERSION=" + process.env.CMAKE_SYSTEM_VERSION ++ build_options += " -DCMAKE_SYSTEM_PROCESSOR=" + process.env.CMAKE_SYSTEM_PROCESSOR ++ build_options += " -DCMAKE_BUILD_TYPE=" + process.env.CMAKE_BUILD_TYPE ++ build_options += " -DCMAKE_C_FLAGS_RELEASE=\"" + process.env.CMAKE_C_FLAGS_RELEASE + "\"" ++ build_options += " -DCMAKE_CXX_FLAGS_RELEASE=\"" + process.env.CMAKE_CXX_FLAGS_RELEASE + "\"" ++ build_options += " -DCMAKE_C_COMPILER_LAUNCHER=" + process.env.CMAKE_C_COMPILER_LAUNCHER ++ build_options += " -DCMAKE_C_COMPILER=" + process.env.CMAKE_C_COMPILER ++ build_options += " -DCMAKE_C_COMPILER_ARG1=" + process.env.CMAKE_C_COMPILER_ARG1 ++ build_options += " -DCMAKE_CXX_COMPILER_LAUNCHER=" + process.env.CMAKE_CXX_COMPILER_LAUNCHER ++ build_options += " -DCMAKE_CXX_COMPILER=" + process.env.CMAKE_CXX_COMPILER ++ build_options += " -DCMAKE_CXX_COMPILER_ARG1=" + process.env.CMAKE_CXX_COMPILER_ARG1 ++ build_options += " -DCMAKE_ASM_COMPILER=" + process.env.CMAKE_ASM_COMPILER ++ build_options += " -DCMAKE_EXE_LINKER_FLAGS=\"" + process.env.CMAKE_EXE_LINKER_FLAGS + "\"" ++ build_options += " -DCMAKE_MODULE_LINKER_FLAGS=\"" + process.env.CMAKE_MODULE_LINKER_FLAGS + "\"" ++ build_options += " -DCMAKE_SHARED_LINKER_FLAGS=\"" + process.env.CMAKE_SHARED_LINKER_FLAGS + "\"" ++ build_options += " -DCMAKE_AR=" + process.env.CMAKE_AR ++ build_options += " -DCMAKE_NM=" + process.env.CMAKE_NM ++ build_options += " -DCMAKE_RANLIB=" + process.env.CMAKE_RANLIB ++ build_options += " -DCMAKE_FIND_ROOT_PATH=\"" + process.env.CMAKE_FIND_ROOT_PATH + "\"" ++ build_options += " -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=" + process.env.CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ++ build_options += " -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=" + process.env.CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ++ build_options += " -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=" + process.env.CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ++ build_options += " -DDL_LIBRARY=\"" + process.env.DL_LIBRARY + "\"" ++ build_options += " -DCMAKE_SKIP_RPATH=" + process.env.CMAKE_SKIP_RPATH ++ build_options += " -DCMAKE_EXPORT_PACKAGE_REGISTRY=" + process.env.CMAKE_EXPORT_PACKAGE_REGISTRY ++ build_options += " -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=" + process.env.CMAKE_EXPORT_NO_PACKAGE_REGISTRY ++ build_options += " -DCMAKE_FIND_USE_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_USE_PACKAGE_REGISTRY ++ build_options += " -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY ++ build_options += " -DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY ++ build_options += " -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=" + process.env.CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ++ build_options += " -DCMAKE_SYSROOT=" + process.env.CMAKE_SYSROOT ++ build_options += " -DCROSS_COMPILE=" + process.env.CROSS_COMPILE ++ build_options += " -DCMAKE_OBJCOPY=" + process.env.TARGET_CROSS + "objcopy" ++ build_options += " -DCMAKE_STRIP=" + process.env.TARGET_CROSS + "strip" ++ build_options += " -DCMAKE_DISABLE_FIND_BSD=ON" ++ build_options += " -DWITH_LIBBSD=OFF" ++ + const cmake_configure = `cmake -S "${src_dir}" -B ./build ${build_options} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${libzmq_install_prefix}" -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_STATIC=ON -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF -DWITH_DOCS=OFF -DWITH_LIBSODIUM=OFF` + console.log(cmake_configure) +- exec(cmake_configure, execOptions) ++ execSync(cmake_configure) + + const cmake_build = `cmake --build ./build --config ${CMAKE_BUILD_TYPE} --target install` + console.log(cmake_build) +- exec(cmake_build, execOptions) ++ execSync(cmake_build) + + if (process.platform === "win32") { + // rename libzmq-v143-mt-s-4_3_4.lib to libzmq.lib diff --git a/lang/node-zeromq/patches/000-revert_build_script.patch b/lang/node-zeromq/patches/000-revert_build_script.patch new file mode 100644 index 0000000000..b27f103bf1 --- /dev/null +++ b/lang/node-zeromq/patches/000-revert_build_script.patch @@ -0,0 +1,11 @@ +--- a/package.json ++++ b/package.json +@@ -92,7 +92,7 @@ + "license": "MIT", + "author": "Rolf Timmermans ", + "scripts": { +- "install": "(shx test -f ./script/build.js || run-s build.js) && cross-env npm_config_build_from_source=true aminya-node-gyp-build", ++ "install": "node-gyp-build", + "clean": "shx rm -rf ./build ./lib/ ./prebuilds ./script/*.js ./script/*.js.map ./script/*.d.ts ./script/*.tsbuildinfo", + "clean.temp": "shx rm -rf ./tmp && shx mkdir -p ./tmp && shx touch ./tmp/.gitkeep", + "build.library.compat": "shx rm -rf ./lib/ts3.7 && downlevel-dts ./lib ./lib/ts3.7 --to=3.7", diff --git a/lang/node-zeromq/patches/002-shelljs_bug.patch b/lang/node-zeromq/patches/002-shelljs_bug.patch new file mode 100644 index 0000000000..30be0a237a --- /dev/null +++ b/lang/node-zeromq/patches/002-shelljs_bug.patch @@ -0,0 +1,38 @@ +--- a/script/build.js ++++ b/script/build.js +@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModu + const path_1 = require("path"); + const fs_1 = require("fs"); + const shelljs_1 = require("shelljs"); ++const { execSync } = require('child_process') + const root = (0, path_1.dirname)(__dirname); + function main() { + const zmq_rev = +@@ -44,10 +45,12 @@ function main() { + } + else { + console.log(`Downloading libzmq source from ${src_url}`); +- (0, shelljs_1.exec)(`curl "${src_url}" -fsSL -o "${tarball}"`, execOptions); ++ const execCommand = `curl "${src_url}" -fsSL -o "${tarball}"`; ++ (0, execSync)(execCommand); + } + if (!(0, fs_1.existsSync)(src_dir)) { +- (0, shelljs_1.exec)(`tar xzf "${tarball}"`, execOptions); ++ const extractTarball = `tar xzf "${tarball}"`; ++ (0, execSync)(extractTarball); + } + if (process.env.ZMQ_DRAFT === "true") { + console.log("Enabling draft support"); +@@ -101,10 +104,10 @@ function main() { + + const cmake_configure = `cmake -S "${src_dir}" -B ./build ${build_options} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${libzmq_install_prefix}" -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_STATIC=ON -DBUILD_TESTS=OFF -DBUILD_SHARED=OFF -DWITH_DOCS=OFF -DWITH_LIBSODIUM=OFF`; + console.log(cmake_configure); +- (0, shelljs_1.exec)(cmake_configure, execOptions); ++ (0, execSync)(cmake_configure); + const cmake_build = `cmake --build ./build --config ${CMAKE_BUILD_TYPE} --target install`; + console.log(cmake_build); +- (0, shelljs_1.exec)(cmake_build, execOptions); ++ (0, execSync)(cmake_build); + if (process.platform === "win32") { + // rename libzmq-v143-mt-s-4_3_4.lib to libzmq.lib + const build_file = (0, shelljs_1.find)(`${libzmq_install_prefix}/lib/*.lib`)[0]; diff --git a/lang/node-zigbee2mqtt/Makefile b/lang/node-zigbee2mqtt/Makefile index cc408a15f8..07faded319 100644 --- a/lang/node-zigbee2mqtt/Makefile +++ b/lang/node-zigbee2mqtt/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=zigbee2mqtt PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=1.33.2 -PKG_RELEASE:=1 +PKG_VERSION:=1.34.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=a4eb1adbeb99870df343107ceec878023241d684ce1a9024a86f67fde29a1891 +PKG_HASH:=8ffa270913d70b80b5951c52d5a885d541051c7d0a0818ca753889872f6ae4c3 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=GPL-3.0 diff --git a/lang/node-zigbee2mqtt/files/zigbee2mqtt.init b/lang/node-zigbee2mqtt/files/zigbee2mqtt.init old mode 100644 new mode 100755 index 87905c3d67..31b37bac0f --- a/lang/node-zigbee2mqtt/files/zigbee2mqtt.init +++ b/lang/node-zigbee2mqtt/files/zigbee2mqtt.init @@ -7,10 +7,10 @@ start_service() { procd_open_instance procd_set_param env HOME=/root ZIGBEE2MQTT_DATA=/etc/zigbee2mqtt/ NODE_PATH=/opt/zigbee2mqtt/node_modules/winston/node_modules:/opt/zigbee2mqtt/node_modules/zigbee-herdsman/node_modules - #procd_set_param command /usr/bin/npm start --prefix /opt/zigbee2mqtt - procd_set_param command /usr/bin/node /opt/zigbee2mqtt/index.js + procd_set_param command /usr/bin/node --optimize_for_size --max_old_space_size=128 --gc_interval=100 /opt/zigbee2mqtt/index.js procd_set_param respawn procd_set_param stdout 1 procd_set_param stderr 1 + procd_set_param term_timeout 30 procd_close_instance } diff --git a/lang/node-zwave-js-ui/Makefile b/lang/node-zwave-js-ui/Makefile index 4f5616939d..82bce86f57 100644 --- a/lang/node-zwave-js-ui/Makefile +++ b/lang/node-zwave-js-ui/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=zwave-js-ui PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=9.4.1 -PKG_RELEASE:=4 +PKG_VERSION:=9.5.1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ -PKG_HASH:=ea45b51074f5f25bdfe00542fdc49e3b482f62fc0e7608be6a2d07235121d802 +PKG_HASH:=489769de78ad0f494eac4fb2c0ff66d52857f095437932078e3997fd1b20baaa PKG_MAINTAINER:=David Woodhouse PKG_LICENSE:=MIT @@ -74,7 +74,8 @@ define Build/Compile clean-modules -y -D $(PKG_BUILD_DIR)/node_modules "!**/*.png" "!**/@zwave-js/core/build/test/" \ "**/*.d.ts" "**/@types/**" "**/obj.target/" "**/config.gypi" \ "**/.nvmrc" "**/.devcontainer/" "**/.bowerrc" "**/.airtap.yml" "**/.test/" \ - "**/.notags" "**/.releaserc" "**/.dprint.jsonc" "**/.eslintrc" \ + "**/.notags" "**/.releaserc" "**/.dprint.jsonc" "**/.eslintrc" "**/locales/" \ + "**/esm/" "**/esm-debug/" "**/esm-browser/" "**/esm-node/" "**/*.esm.*" "**/esm.*" \ "**/binding.Makefile" "**/.deps/" "**/Makefile" "**/binding.gyp" endef diff --git a/lang/node-zwave-js-ui/files/zwave-js-ui.init b/lang/node-zwave-js-ui/files/zwave-js-ui.init index 73882c5324..78036db9e4 100755 --- a/lang/node-zwave-js-ui/files/zwave-js-ui.init +++ b/lang/node-zwave-js-ui/files/zwave-js-ui.init @@ -7,7 +7,7 @@ start_service() { procd_open_instance procd_set_param env HOME=/root NODE_PATH=/usr/lib/node/zwave-js-ui/node_modules/zwave-js/node_modules STORE_DIR=/etc/zwave-js-ui ZWAVEJS_EXTERNAL_CONFIG=/etc/zwave-js-ui/config-db - procd_set_param command /usr/bin/zwave-js-ui + procd_set_param command /usr/bin/node --optimize_for_size --max_old_space_size=128 --gc_interval=100 /usr/bin/zwave-js-ui procd_set_param respawn procd_set_param stdout 1 procd_set_param stderr 1 diff --git a/lang/node/Makefile b/lang/node/Makefile index 0c17438d55..9a82d63916 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node ifeq ($(CONFIG_NODEJS_21),y) -PKG_VERSION:=v21.2.0 +PKG_VERSION:=v21.4.0 PKG_RELEASE:=1 -PKG_HASH:=d57c9cea394764fa1d9af51e52c7449f71193e9d44c4a81fbedec653ec827707 +PKG_HASH:=7a80f6527654602d7358c5be2eefc4f80a64c8901630a83977b073c34f25479c PATCH_DIR:=./patches/v21.x -NODEJS_BIN_SUM:=828da17da3278ff7a0c89b176f1945259808939ce6b713254dc9e9a67a51e307 +NODEJS_BIN_SUM:=9f3b4447a689c1c0f6c08f61967f2a8e50d2c8187805e85ad67701ef84c0095c NODE_MODULE_VERSION:=120 else ifeq ($(CONFIG_NODEJS_18),y) diff --git a/lang/node/patches/v21.x/204-v8_gyp.patch b/lang/node/patches/v21.x/204-v8_gyp.patch index f34217660e..e1c1c40491 100644 --- a/lang/node/patches/v21.x/204-v8_gyp.patch +++ b/lang/node/patches/v21.x/204-v8_gyp.patch @@ -44,7 +44,7 @@ ], 'sources': [ '