From 6123fd1582d1a25784ca41672a2fa6d466829a28 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 23 Jul 2023 15:40:29 +0800 Subject: [PATCH] Node.js: sync with upstream source Signed-off-by: Tianling Shen (cherry picked from commit e0de3910b6d465ff6c64147f6671b8d6c85d56e5) --- lang/node-aws-crt/Makefile | 4 ++-- lang/node-aws-iot-device-sdk-v2/Makefile | 4 ++-- .../patches/000-remove_depends.patch | 4 ++-- lang/node-aws-sdk/Makefile | 4 ++-- lang/node-azure-iothub/Makefile | 4 ++-- lang/node-clean-modules/Makefile | 8 ++++---- lang/node-homebridge-config-ui-x/Makefile | 4 ++-- lang/node-npm-check-updates/Makefile | 4 ++-- lang/node-red/Makefile | 4 ++-- lang/node-twilio/Makefile | 4 ++-- lang/node-zigbee2mqtt/Makefile | 10 +++++----- lang/node-zwave-js/Makefile | 4 ++-- .../node-zwave-js/patches/000-remove_depends.patch | 14 +++++++------- lang/node/Makefile | 12 ++++++------ .../v18.x/012-changing-default-npm-settings.patch | 4 ++-- ...te_unnecessary_libraries_for_host_execute.patch | 14 +++++++------- lang/node/patches/v18.x/991-v8_zlib_support.patch | 4 ++-- .../patches/v18.x/992-v8_add_include_dirs.patch | 2 +- .../v18.x/999-localhost-no-addrconfig.patch | 2 +- ...rt_enable_pointer_authentication_on_arm64.patch | 2 +- lang/node/patches/v20.x/003-path.patch | 2 +- lang/node/patches/v20.x/004-musl_support.patch | 2 +- .../v20.x/012-changing-default-npm-settings.patch | 8 ++++---- lang/node/patches/v20.x/200-uv_gyp.patch | 2 +- lang/node/patches/v20.x/202-node_gyp.patch | 2 +- .../v20.x/999-localhost-no-addrconfig.patch | 2 +- 26 files changed, 65 insertions(+), 65 deletions(-) diff --git a/lang/node-aws-crt/Makefile b/lang/node-aws-crt/Makefile index 30aa0ac653..16174265f8 100644 --- a/lang/node-aws-crt/Makefile +++ b/lang/node-aws-crt/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=aws-crt PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=1.15.18 +PKG_VERSION:=1.15.22 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:=27b08faa8b3293db630047bd53cf339527e83b39305fcc11f91fff330c267308 +PKG_HASH:=26e1f2ba2193a76e3fca67f0b18133d9f11ca14ed248d8835974f47886307058 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-aws-iot-device-sdk-v2/Makefile b/lang/node-aws-iot-device-sdk-v2/Makefile index 7f60f96aad..aa6154ea15 100644 --- a/lang/node-aws-iot-device-sdk-v2/Makefile +++ b/lang/node-aws-iot-device-sdk-v2/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=aws-iot-device-sdk-v2 PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=1.13.3 +PKG_VERSION:=1.14.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:=851a3fdf386bc6f8fabca48d1130f154b0b540c74a18cb6a3f47dced68517163 +PKG_HASH:=bfe6cb334a5e17f02f1fd479156b249d8cdca67d297f76459353ca8c5a94c4bc PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-aws-iot-device-sdk-v2/patches/000-remove_depends.patch b/lang/node-aws-iot-device-sdk-v2/patches/000-remove_depends.patch index 8f08eb00a2..9fec849757 100644 --- a/lang/node-aws-iot-device-sdk-v2/patches/000-remove_depends.patch +++ b/lang/node-aws-iot-device-sdk-v2/patches/000-remove_depends.patch @@ -1,11 +1,11 @@ --- a/package.json +++ b/package.json -@@ -41,7 +41,6 @@ +@@ -42,7 +42,6 @@ "typescript": "^4.7.4" }, "dependencies": { - "@aws-sdk/util-utf8-browser": "^3.109.0", -- "aws-crt": "^1.15.18" +- "aws-crt": "^1.15.20" + "@aws-sdk/util-utf8-browser": "^3.109.0" } } diff --git a/lang/node-aws-sdk/Makefile b/lang/node-aws-sdk/Makefile index de4921a9a7..e532430e46 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.1408.0 +PKG_VERSION:=2.1418.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:=1faf05b87bfaf4587b7b43a69a90d044880e4f357f56c3c3d39d8ce3a760020e +PKG_HASH:=b4425be56be91e27030eae48dc66838e381e23f98368cc5ce4147973b6e6bc3d PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-azure-iothub/Makefile b/lang/node-azure-iothub/Makefile index e6905503f3..b93a145fe9 100644 --- a/lang/node-azure-iothub/Makefile +++ b/lang/node-azure-iothub/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=azure-iothub PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=1.16.3 +PKG_VERSION:=1.16.4 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:=153591cd8ee4da0453cb55de014a245d444e7c68d0535a531dadfb72f4908fa7 +PKG_HASH:=856ddb25528ef22b04fe4be5f70db24f9dc474fe049160040a014646c24e41f9 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-clean-modules/Makefile b/lang/node-clean-modules/Makefile index d084368769..9294d28a51 100644 --- a/lang/node-clean-modules/Makefile +++ b/lang/node-clean-modules/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=clean-modules PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=2.0.6 +PKG_VERSION:=3.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:=c01e72d3ae53f9ded9efb3a748b4bf9fc1fb868464079c9e6f7345b007d5d110 +PKG_HASH:=fe4b86da35b1f155bc286e4f3fd34af05244cdccf184d817bde5f32319cb5b03 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=ISC @@ -70,7 +70,7 @@ define Package/node-clean-modules/install $(1)/usr/lib/node/$(PKG_NPM_NAME)/ $(CP) $(PKG_BUILD_DIR)/{README.md,.cleanmodules-default} \ $(1)/usr/lib/node/$(PKG_NPM_NAME)/ - $(CP) $(PKG_BUILD_DIR)/{node_modules,bin,lib} \ + $(CP) $(PKG_BUILD_DIR)/{node_modules,bin,dist} \ $(1)/usr/lib/node/$(PKG_NPM_NAME)/ $(INSTALL_DIR) $(1)/usr/bin $(LN) ../lib/node/$(PKG_NPM_NAME)/bin/cli.js $(1)/usr/bin/clean-modules @@ -101,7 +101,7 @@ define Host/Install $(1)/lib/node_modules/$(PKG_NPM_NAME)/ $(CP) $(HOST_BUILD_DIR)/{README.md,.cleanmodules-default} \ $(1)/lib/node_modules/$(PKG_NPM_NAME)/ - $(CP) $(HOST_BUILD_DIR)/{node_modules,bin,lib} \ + $(CP) $(HOST_BUILD_DIR)/{node_modules,bin,dist} \ $(1)/lib/node_modules/$(PKG_NPM_NAME)/ $(INSTALL_DIR) $(1)/bin $(LN) ../lib/node_modules/$(PKG_NPM_NAME)/bin/cli.js $(1)/bin/clean-modules diff --git a/lang/node-homebridge-config-ui-x/Makefile b/lang/node-homebridge-config-ui-x/Makefile index 2cf4f33a92..fce015b4fb 100644 --- a/lang/node-homebridge-config-ui-x/Makefile +++ b/lang/node-homebridge-config-ui-x/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=homebridge-config-ui-x PKG_NAME:=node-$(PKG_NPM_NAME) PKG_VERSION:=4.50.4 -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)/-/ \ @@ -86,7 +86,7 @@ define Build/Compile rm -rf $(PKG_BUILD_DIR)/node_modules/node-schedule/node_modules/moment/min rm -rf $(PKG_BUILD_DIR)/node_modules/node-schedule/node_modules/moment/src rm -rf $(PKG_BUILD_DIR)/node_modules/node-schedule/node_modules/moment/locale - clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.png" "**/example/" "**/examples/" + clean-modules -y -D $(PKG_BUILD_DIR)/node_modules "!**/*.png" "!**/example/" "!**/examples/" endef define Package/node-homebridge-config-ui-x/install diff --git a/lang/node-npm-check-updates/Makefile b/lang/node-npm-check-updates/Makefile index c7c4bb8f2c..f6776f9261 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.10.13 +PKG_VERSION:=16.10.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:=5721b2a367917fa0a3f60ab5159dc7f4622e2e249658530f8c388718946fd684 +PKG_HASH:=7ce228c0ca50bad3f6e3efa82d3fb48a51fa21b9884eb0ce8f96340f487f2d01 PKG_MAINTAINER:=Hirokazu MORIKAWA , Patrik Laszlo PKG_LICENSE:=Apache-2.0 diff --git a/lang/node-red/Makefile b/lang/node-red/Makefile index cfbcd628a3..a18b9763f8 100644 --- a/lang/node-red/Makefile +++ b/lang/node-red/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=node-red PKG_NAME:=$(PKG_NPM_NAME) PKG_VERSION:=3.0.2 -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)/-/ \ @@ -58,7 +58,7 @@ define Build/Compile 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 --omit=optional --no-optional --prefer-dedupe - clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.png" "**/example/" "**/examples/" + clean-modules -y -D $(PKG_BUILD_DIR)/node_modules "!**/*.png" "!**/example/" "!**/examples/" 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 -delete || true diff --git a/lang/node-twilio/Makefile b/lang/node-twilio/Makefile index 2b610cfd2b..3be846e115 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.13.0 +PKG_VERSION:=4.14.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:=00992a86aad09edbf80fff66710cf5ca5b94f081067d1a0ddd0e362899e79a71 +PKG_HASH:=838a4d360f9e71e69b64873cb3fbd6e4cec1c7546e3dfa3fe7dfea3af8da0dab PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-zigbee2mqtt/Makefile b/lang/node-zigbee2mqtt/Makefile index b850aab745..4fd05249bd 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.31.2 -PKG_RELEASE:=1 +PKG_VERSION:=1.32.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:=7e86f133c42b6005c3d7cb71b91db9b6b38dae4510a886a7b58e7d3ba6efd42c +PKG_HASH:=ac227a6c63794f913f679ec8009e4035168d470cfc824c3ff24c9ae2a85ddb92 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=GPL-3.0 @@ -68,8 +68,8 @@ define Build/Compile rm -rf $(PKG_BUILD_DIR)/node_modules/moment/min rm -rf $(PKG_BUILD_DIR)/node_modules/moment/src rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale - clean-modules -y -D $(PKG_BUILD_DIR)/node_modules --exclude "**/*.map.js" "**/*.png" \ - "**/example/" "**/examples/" --include "**/npm-shrinkwrap.json" "**/.babelrc.js" \ + clean-modules -y -D $(PKG_BUILD_DIR)/node_modules "!**/*.map.js" "!**/*.png" \ + "!**/example/" "!**/examples/" "**/npm-shrinkwrap.json" "**/.babelrc.js" \ "**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile" endef diff --git a/lang/node-zwave-js/Makefile b/lang/node-zwave-js/Makefile index 6d8e636b53..f386eecfa3 100644 --- a/lang/node-zwave-js/Makefile +++ b/lang/node-zwave-js/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NPM_NAME:=zwave-js PKG_NAME:=node-$(PKG_NPM_NAME) -PKG_VERSION:=11.1.0 +PKG_VERSION:=11.5.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:=5b31f2694e4ffdc98c266ada4f744cf5a48ce968a837c09ee069c14e8ce42922 +PKG_HASH:=af666db6e2ab6ac3b96889464139cd30c62ff1cf67cbf13a69b69a95b14596e2 PKG_MAINTAINER:=Hirokazu MORIKAWA PKG_LICENSE:=MIT diff --git a/lang/node-zwave-js/patches/000-remove_depends.patch b/lang/node-zwave-js/patches/000-remove_depends.patch index ad9dabb81e..2ae980e836 100644 --- a/lang/node-zwave-js/patches/000-remove_depends.patch +++ b/lang/node-zwave-js/patches/000-remove_depends.patch @@ -1,20 +1,20 @@ --- a/package.json +++ b/package.json -@@ -111,25 +111,5 @@ - "xstate": "4.29.0" +@@ -112,25 +112,5 @@ + "xstate": "4.38.0" }, "devDependencies": { -- "@microsoft/api-extractor": "^7.35.0", +- "@microsoft/api-extractor": "^7.36.0", - "@types/fs-extra": "^9.0.13", -- "@types/node": "^14.18.47", +- "@types/node": "^14.18.52", - "@types/proper-lockfile": "^4.1.2", - "@types/proxyquire": "^1.3.28", - "@types/semver": "^7.3.13", - "@types/sinon": "^10.0.14", - "@types/source-map-support": "^0.5.6", - "@xstate/test": "^0.5.1", -- "@zwave-js/maintenance": "11.1.0", -- "@zwave-js/transformers": "11.0.0", +- "@zwave-js/maintenance": "11.5.2", +- "@zwave-js/transformers": "11.3.0", - "ava": "^4.3.3", - "del-cli": "^5.0.0", - "esbuild": "0.15.18", @@ -23,7 +23,7 @@ - "prettier": "^2.8.8", - "proxyquire": "^2.1.3", - "sinon": "^14.0.2", -- "typescript": "5.0.4" +- "typescript": "5.1.6" } -} \ No newline at end of file diff --git a/lang/node/Makefile b/lang/node/Makefile index 30ddeb2f73..ebe81f4113 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -14,17 +14,17 @@ PATCH_DIR:=./patches/v16.x NODEJS_BIN_SUM:=b6c60e1e106ad7d8881e83945a5208c1b1d1b63e6901c04b9dafa607aff3a154 else ifeq ($(CONFIG_NODEJS_20),y) -PKG_VERSION:=v20.3.1 +PKG_VERSION:=v20.5.0 PKG_RELEASE:=1 -PKG_HASH:=12a82db306697959b4389b351a5f97848986b1313f9901b0e0b3d8cf4f3f9991 +PKG_HASH:=cb32756958def1c04e069a79b71b52ca61ed1590c17f2cfa1ee3af641f72e058 PATCH_DIR:=./patches/v20.x -NODEJS_BIN_SUM:=a9f94435763f9c0128a8b6282ccbeefd0413a96e78e4427cfb7831d150c50334 +NODEJS_BIN_SUM:=c12ee9efe21f3ff9909fbf5d7d3780f16c86fad411f13d715016646c766e8213 else -PKG_VERSION:=v18.16.1 +PKG_VERSION:=v18.17.0 PKG_RELEASE:=1 -PKG_HASH:=e8404f8c8d89fdfdf7e95bbbc6066bd0e571acba58f54492599b615fbeefe272 +PKG_HASH:=80c0faadf5ea39c213ccb9aa5c2432977a0f1b5a0b766852abd0de06f2770406 PATCH_DIR:=./patches/v18.x -NODEJS_BIN_SUM:=ecfe263dbd9c239f37b5adca823b60be1bb57feabbccd25db785e647ebc5ff5e +NODEJS_BIN_SUM:=f36facda28c4d5ce76b3a1b4344e688d29d9254943a47f2f1909b1a10acb1959 endif endif diff --git a/lang/node/patches/v18.x/012-changing-default-npm-settings.patch b/lang/node/patches/v18.x/012-changing-default-npm-settings.patch index e8c4578ae8..09fc491d17 100644 --- a/lang/node/patches/v18.x/012-changing-default-npm-settings.patch +++ b/lang/node/patches/v18.x/012-changing-default-npm-settings.patch @@ -1,6 +1,6 @@ --- a/deps/npm/lib/utils/config/definitions.js +++ b/deps/npm/lib/utils/config/definitions.js -@@ -1266,7 +1266,7 @@ define('lockfile-version', { +@@ -1269,7 +1269,7 @@ define('lockfile-version', { }) define('loglevel', { @@ -9,7 +9,7 @@ type: [ 'silent', 'error', -@@ -2045,7 +2045,7 @@ define('strict-peer-deps', { +@@ -2049,7 +2049,7 @@ define('strict-peer-deps', { }) define('strict-ssl', { diff --git a/lang/node/patches/v18.x/990-delete_unnecessary_libraries_for_host_execute.patch b/lang/node/patches/v18.x/990-delete_unnecessary_libraries_for_host_execute.patch index d9b5b6889f..c8004f4635 100644 --- a/lang/node/patches/v18.x/990-delete_unnecessary_libraries_for_host_execute.patch +++ b/lang/node/patches/v18.x/990-delete_unnecessary_libraries_for_host_execute.patch @@ -8,7 +8,7 @@ 'dependencies': [ 'icutools', 'icu_implementation' ], 'sources': [ '<@(icu_src_genrb)' -@@ -434,6 +435,7 @@ +@@ -440,6 +441,7 @@ 'target_name': 'iculslocs', 'toolsets': [ 'host' ], 'type': 'executable', @@ -16,7 +16,7 @@ 'dependencies': [ 'icutools' ], 'sources': [ 'iculslocs.cc', -@@ -446,6 +448,7 @@ +@@ -458,6 +460,7 @@ 'target_name': 'icupkg', 'toolsets': [ 'host' ], 'type': 'executable', @@ -24,7 +24,7 @@ 'dependencies': [ 'icutools' ], 'sources': [ '<@(icu_src_icupkg)', -@@ -457,6 +460,7 @@ +@@ -475,6 +478,7 @@ 'target_name': 'genccode', 'toolsets': [ 'host' ], 'type': 'executable', @@ -42,7 +42,7 @@ 'conditions': [ ['want_separate_host_toolset', { 'toolsets': ['host'], -@@ -1421,6 +1422,8 @@ +@@ -1425,6 +1426,8 @@ { 'target_name': 'mksnapshot', 'type': 'executable', @@ -51,7 +51,7 @@ 'dependencies': [ 'v8_base_without_compiler', 'v8_compiler_for_mksnapshot', -@@ -1450,6 +1453,7 @@ +@@ -1458,6 +1461,7 @@ { 'target_name': 'torque', 'type': 'executable', @@ -59,7 +59,7 @@ 'dependencies': [ 'torque_base', # "build/win:default_exe_manifest", -@@ -1488,6 +1492,7 @@ +@@ -1500,6 +1504,7 @@ { 'target_name': 'torque-language-server', 'type': 'executable', @@ -67,7 +67,7 @@ 'conditions': [ ['want_separate_host_toolset', { 'toolsets': ['host'], -@@ -1515,6 +1520,8 @@ +@@ -1531,6 +1536,8 @@ { 'target_name': 'gen-regexp-special-case', 'type': 'executable', diff --git a/lang/node/patches/v18.x/991-v8_zlib_support.patch b/lang/node/patches/v18.x/991-v8_zlib_support.patch index cc400a36ed..2f298ba9c3 100644 --- a/lang/node/patches/v18.x/991-v8_zlib_support.patch +++ b/lang/node/patches/v18.x/991-v8_zlib_support.patch @@ -62,7 +62,7 @@ 'include_dirs': [ '<(V8_ROOT)/include', ], -@@ -1737,6 +1744,7 @@ +@@ -1761,6 +1768,7 @@ }], ], 'direct_dependent_settings': { @@ -70,7 +70,7 @@ 'include_dirs': [ '<(V8_ROOT)/include', ], -@@ -1917,15 +1925,19 @@ +@@ -1941,15 +1949,19 @@ }], ], 'direct_dependent_settings': { diff --git a/lang/node/patches/v18.x/992-v8_add_include_dirs.patch b/lang/node/patches/v18.x/992-v8_add_include_dirs.patch index 8588621d29..fba1aed60d 100644 --- a/lang/node/patches/v18.x/992-v8_add_include_dirs.patch +++ b/lang/node/patches/v18.x/992-v8_add_include_dirs.patch @@ -16,7 +16,7 @@ 'conditions': [ ['OS=="win"', { 'msvs_precompiled_header': '<(V8_ROOT)/../../tools/msvs/pch/v8_pch.h', -@@ -1431,6 +1433,7 @@ +@@ -1435,6 +1437,7 @@ 'type': 'executable', 'libraries!':[ '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ], 'library_dirs':[ '../../../../staging_dir/hostpkg/share/icu/current/lib' ], diff --git a/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch b/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch index a11ce086c3..54b1a3a001 100644 --- a/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch +++ b/lang/node/patches/v18.x/999-localhost-no-addrconfig.patch @@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816 // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the -@@ -1265,13 +1266,6 @@ function lookupAndConnect(self, options) +@@ -1266,13 +1267,6 @@ function lookupAndConnect(self, options) hints: options.hints || 0, }; diff --git a/lang/node/patches/v18.x/999-revert_enable_pointer_authentication_on_arm64.patch b/lang/node/patches/v18.x/999-revert_enable_pointer_authentication_on_arm64.patch index 2d2035618f..44fc715fe9 100644 --- a/lang/node/patches/v18.x/999-revert_enable_pointer_authentication_on_arm64.patch +++ b/lang/node/patches/v18.x/999-revert_enable_pointer_authentication_on_arm64.patch @@ -1,6 +1,6 @@ --- a/configure.py +++ b/configure.py -@@ -1296,7 +1296,6 @@ def configure_node(o): +@@ -1291,7 +1291,6 @@ def configure_node(o): # Enable branch protection for arm64 if target_arch == 'arm64': diff --git a/lang/node/patches/v20.x/003-path.patch b/lang/node/patches/v20.x/003-path.patch index e37fa42368..f63e2246cf 100644 --- a/lang/node/patches/v20.x/003-path.patch +++ b/lang/node/patches/v20.x/003-path.patch @@ -1,6 +1,6 @@ --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1394,7 +1394,8 @@ Module._initPaths = function() { +@@ -1370,7 +1370,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); diff --git a/lang/node/patches/v20.x/004-musl_support.patch b/lang/node/patches/v20.x/004-musl_support.patch index e7cd07927a..b0f950315f 100644 --- a/lang/node/patches/v20.x/004-musl_support.patch +++ b/lang/node/patches/v20.x/004-musl_support.patch @@ -20,7 +20,7 @@ result = clock_gettime(CLOCK_MONOTONIC, &ts); --- a/deps/v8/src/base/platform/platform-posix.cc +++ b/deps/v8/src/base/platform/platform-posix.cc -@@ -1141,7 +1141,7 @@ bool Thread::Start() { +@@ -1147,7 +1147,7 @@ bool Thread::Start() { #if V8_OS_DARWIN // Default on Mac OS X is 512kB -- bump up to 1MB stack_size = 1 * 1024 * 1024; diff --git a/lang/node/patches/v20.x/012-changing-default-npm-settings.patch b/lang/node/patches/v20.x/012-changing-default-npm-settings.patch index 09fc491d17..caa933a4f2 100644 --- a/lang/node/patches/v20.x/012-changing-default-npm-settings.patch +++ b/lang/node/patches/v20.x/012-changing-default-npm-settings.patch @@ -1,6 +1,6 @@ ---- a/deps/npm/lib/utils/config/definitions.js -+++ b/deps/npm/lib/utils/config/definitions.js -@@ -1269,7 +1269,7 @@ define('lockfile-version', { +--- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js ++++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js +@@ -1266,7 +1266,7 @@ define('lockfile-version', { }) define('loglevel', { @@ -9,7 +9,7 @@ type: [ 'silent', 'error', -@@ -2049,7 +2049,7 @@ define('strict-peer-deps', { +@@ -2066,7 +2066,7 @@ define('strict-peer-deps', { }) define('strict-ssl', { diff --git a/lang/node/patches/v20.x/200-uv_gyp.patch b/lang/node/patches/v20.x/200-uv_gyp.patch index 557a5bac68..75bc8f2e5b 100644 --- a/lang/node/patches/v20.x/200-uv_gyp.patch +++ b/lang/node/patches/v20.x/200-uv_gyp.patch @@ -1,6 +1,6 @@ --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp -@@ -157,6 +157,7 @@ +@@ -155,6 +155,7 @@ 'target_name': 'libuv', 'toolsets': ['host', 'target'], 'type': '<(uv_library)', diff --git a/lang/node/patches/v20.x/202-node_gyp.patch b/lang/node/patches/v20.x/202-node_gyp.patch index d3334b860d..63529dd883 100644 --- a/lang/node/patches/v20.x/202-node_gyp.patch +++ b/lang/node/patches/v20.x/202-node_gyp.patch @@ -1,6 +1,6 @@ --- a/node.gyp +++ b/node.gyp -@@ -1186,6 +1186,7 @@ +@@ -1190,6 +1190,7 @@ 'dependencies': [ 'deps/simdutf/simdutf.gyp:simdutf#host', ], diff --git a/lang/node/patches/v20.x/999-localhost-no-addrconfig.patch b/lang/node/patches/v20.x/999-localhost-no-addrconfig.patch index a4d8f111b6..092dc0de3b 100644 --- a/lang/node/patches/v20.x/999-localhost-no-addrconfig.patch +++ b/lang/node/patches/v20.x/999-localhost-no-addrconfig.patch @@ -13,7 +13,7 @@ Forwarded: https://github.com/nodejs/node/issues/33816 // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the -@@ -1309,13 +1310,6 @@ function lookupAndConnect(self, options) +@@ -1330,13 +1331,6 @@ function lookupAndConnect(self, options) hints: options.hints || 0, };