diff --git a/lang/node/Makefile b/lang/node/Makefile index 91203a17..3c5e11d4 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node ifeq ($(CONFIG_NODEJS_22),y) -PKG_VERSION:=v22.11.0 +PKG_VERSION:=v22.13.1 PKG_RELEASE:=1 -PKG_HASH:=bbf0297761d53aefda9d7855c57c7d2c272b83a7b5bad4fea9cb29006d8e1d35 +PKG_HASH:=cfce282119390f7e0c2220410924428e90dadcb2df1744c0c4a0e7baae387cc2 PATCH_DIR:=./patches/v22.x else ifeq ($(CONFIG_NODEJS_20),y) diff --git a/lang/node/patches/v22.x/003-path.patch b/lang/node/patches/v22.x/003-path.patch index f2000b1e..cfe6da54 100644 --- a/lang/node/patches/v22.x/003-path.patch +++ b/lang/node/patches/v22.x/003-path.patch @@ -1,6 +1,6 @@ --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1779,7 +1779,8 @@ Module._initPaths = function() { +@@ -1789,7 +1789,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); diff --git a/lang/node/patches/v22.x/012-changing-default-npm-settings.patch b/lang/node/patches/v22.x/012-changing-default-npm-settings.patch deleted file mode 100644 index b05aa74e..00000000 --- a/lang/node/patches/v22.x/012-changing-default-npm-settings.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js -+++ b/deps/npm/node_modules/@npmcli/config/lib/definitions/definitions.js -@@ -1212,7 +1212,7 @@ const definitions = { - }, - }), - loglevel: new Definition('loglevel', { -- default: 'notice', -+ default: 'info', - type: [ - 'silent', - 'error', -@@ -1993,7 +1993,7 @@ const definitions = { - flatten, - }), - 'strict-ssl': new Definition('strict-ssl', { -- default: true, -+ default: false, - type: Boolean, - description: ` - Whether or not to do SSL key validation when making requests to the diff --git a/lang/node/patches/v22.x/200-uv_gyp.patch b/lang/node/patches/v22.x/200-uv_gyp.patch index 75bc8f2e..9e396176 100644 --- a/lang/node/patches/v22.x/200-uv_gyp.patch +++ b/lang/node/patches/v22.x/200-uv_gyp.patch @@ -1,6 +1,6 @@ --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp -@@ -155,6 +155,7 @@ +@@ -156,6 +156,7 @@ 'target_name': 'libuv', 'toolsets': ['host', 'target'], 'type': '<(uv_library)', diff --git a/lang/node/patches/v22.x/202-node_gyp.patch b/lang/node/patches/v22.x/202-node_gyp.patch index 84ea6f60..2b72ab12 100644 --- a/lang/node/patches/v22.x/202-node_gyp.patch +++ b/lang/node/patches/v22.x/202-node_gyp.patch @@ -1,10 +1,18 @@ --- a/node.gyp +++ b/node.gyp -@@ -1350,6 +1350,7 @@ - 'dependencies': [ - 'deps/simdutf/simdutf.gyp:simdutf#host', +@@ -1138,6 +1138,7 @@ + 'includes': [ + 'node.gypi' ], + 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ], 'include_dirs': [ + 'src', + 'tools/msvs/genfiles', +@@ -1354,6 +1355,7 @@ 'tools', 'src', + ], ++ 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ], + 'sources': [ + 'tools/js2c.cc', + 'tools/executable_wrapper.h', diff --git a/lang/node/patches/v22.x/204-v8_gyp.patch b/lang/node/patches/v22.x/204-v8_gyp.patch index 8496a7c7..c6f426aa 100644 --- a/lang/node/patches/v22.x/204-v8_gyp.patch +++ b/lang/node/patches/v22.x/204-v8_gyp.patch @@ -28,7 +28,7 @@ 'sources': [ '<(V8_ROOT)/src/init/setup-isolate-full.cc', ], -+ 'include_dirs': [ '::value); - - public: diff --git a/lang/node/patches/v22.x/999-fix_building_with_system_icu_76.patch b/lang/node/patches/v22.x/999-fix_building_with_system_icu_76.patch deleted file mode 100644 index 0d0c2dac..00000000 --- a/lang/node/patches/v22.x/999-fix_building_with_system_icu_76.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 54299ac3a3d4e4520b8604dce43c2584092ccde2 Mon Sep 17 00:00:00 2001 -From: Michael Cho -Date: Sun, 27 Oct 2024 10:08:07 -0400 -Subject: [PATCH] build: fix building with system icu 76 - -ICU 76 decided to reduce overlinking[^1] thus `icu-i18n` will no longer -add `icu-uc` when linking to shared libraries. This results in undefined -symbols/references when trying to build with system ICU 76. - -[^1]: unicode-org/icu@199bc82 ---- - configure.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.py -+++ b/configure.py -@@ -1876,7 +1876,7 @@ def configure_intl(o): - elif with_intl == 'system-icu': - # ICU from pkg-config. - o['variables']['v8_enable_i18n_support'] = 1 -- pkgicu = pkg_config('icu-i18n') -+ pkgicu = pkg_config(['icu-i18n', 'icu-uc']) - if not pkgicu[0]: - error('''Could not load pkg-config data for "icu-i18n". - See above errors or the README.md.''') diff --git a/lang/node/patches/v22.x/999-fix_compile_error_for_ia32.patch b/lang/node/patches/v22.x/999-fix_compile_error_for_ia32.patch deleted file mode 100644 index 194f0500..00000000 --- a/lang/node/patches/v22.x/999-fix_compile_error_for_ia32.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -+++ b/deps/v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -1161,7 +1161,7 @@ template - void VisitAtomicExchange(InstructionSelectorT* selector, - typename Adapter::node_t node, ArchOpcode opcode, - MachineRepresentation rep) { -- using node_t = Adapter::node_t; -+ using node_t = typename Adapter::node_t; - IA32OperandGeneratorT g(selector); - node_t base = selector->input_at(node, 0); - node_t index = selector->input_at(node, 1); -@@ -1732,7 +1732,7 @@ template - void VisitWord32PairShift(InstructionSelectorT* selector, - InstructionCode opcode, - typename Adapter::node_t node) { -- using node_t = Adapter::node_t; -+ using node_t = typename Adapter::node_t; - IA32OperandGeneratorT g(selector); - - node_t shift = selector->input_at(node, 2); -@@ -2507,7 +2507,7 @@ template - void VisitAtomicBinOp(InstructionSelectorT* selector, - typename Adapter::node_t node, ArchOpcode opcode, - MachineRepresentation rep) { -- using node_t = Adapter::node_t; -+ using node_t = typename Adapter::node_t; - AddressingMode addressing_mode; - IA32OperandGeneratorT g(selector); - node_t base = selector->input_at(node, 0); -@@ -2528,7 +2528,7 @@ void VisitAtomicBinOp(InstructionSelecto - template - void VisitPairAtomicBinOp(InstructionSelectorT* selector, - typename Adapter::node_t node, ArchOpcode opcode) { -- using node_t = Adapter::node_t; -+ using node_t = typename Adapter::node_t; - IA32OperandGeneratorT g(selector); - node_t base = selector->input_at(node, 0); - node_t index = selector->input_at(node, 1); diff --git a/lang/node/patches/v22.x/999-localhost-no-addrconfig.patch b/lang/node/patches/v22.x/999-localhost-no-addrconfig.patch index c431370b..05147e1e 100644 --- a/lang/node/patches/v22.x/999-localhost-no-addrconfig.patch +++ b/lang/node/patches/v22.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 -@@ -1342,13 +1343,6 @@ function lookupAndConnect(self, options) +@@ -1368,13 +1369,6 @@ function lookupAndConnect(self, options) hints: options.hints || 0, }; diff --git a/lang/node/patches/v22.x/999-revert_enable_pointer_authentication_on_arm64.patch b/lang/node/patches/v22.x/999-revert_enable_pointer_authentication_on_arm64.patch index 83fd1e02..e281dcb5 100644 --- a/lang/node/patches/v22.x/999-revert_enable_pointer_authentication_on_arm64.patch +++ b/lang/node/patches/v22.x/999-revert_enable_pointer_authentication_on_arm64.patch @@ -1,10 +1,10 @@ --- a/node.gyp +++ b/node.gyp -@@ -1351,6 +1351,7 @@ - 'deps/simdutf/simdutf.gyp:simdutf#host', +@@ -1139,6 +1139,7 @@ + 'node.gypi' ], 'libraries!':[ '-licui18n', '-licuuc', '-licudata', '-lcrypto', '-lssl', '-lz', '-lhttp_parser', '-luv', '-lnghttp2', '-lcares' ], + 'cflags!': ['-mbranch-protection=standard'], 'include_dirs': [ - 'tools', 'src', + 'tools/msvs/genfiles', diff --git a/libs/c-ares/Makefile b/libs/c-ares/Makefile index 4c13927b..eafa3ff0 100644 --- a/libs/c-ares/Makefile +++ b/libs/c-ares/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=c-ares -PKG_VERSION:=1.18.1 +PKG_VERSION:=1.33.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://c-ares.org/download -PKG_HASH:=1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf +PKG_SOURCE_URL:=https://github.com/c-ares/c-ares/releases/download/v$(PKG_VERSION) +PKG_HASH:=06869824094745872fa26efd4c48e622b9bd82a89ef0ce693dc682a23604f415 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE.md @@ -29,7 +29,7 @@ define Package/libcares SECTION:=libs CATEGORY:=Libraries TITLE:=Library for asyncronous DNS Requests (including name resolves) - URL:=http://c-ares.haxx.se/ + URL:=https://c-ares.org/ MAINTAINER:=Karl Palsson endef @@ -42,12 +42,16 @@ Netware, Android and many more operating systems. endef CMAKE_OPTIONS += \ - -DCARES_STATIC=OFF \ - -DCARES_SHARED=ON \ -DCARES_STATIC_PIC=ON \ - -DCARES_BUILD_TESTS=OFF \ -DCARES_BUILD_TOOLS=OFF +define Build/InstallDev + $(call Build/InstallDev/cmake,$(1)) + $(SED) 's,/usr/bin,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libcares.pc + $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libcares.pc + $(SED) 's,/usr/lib,$$$${prefix}/lib,g' $(1)/usr/lib/pkgconfig/libcares.pc +endef + define Package/libcares/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcares.so.* $(1)/usr/lib/