node: bump to v16.15.0
authorHirokazu MORIKAWA <morikw2@gmail.com>
Wed, 1 Jun 2022 03:22:34 +0000 (12:22 +0900)
committerRosen Penev <rosenp@gmail.com>
Wed, 1 Jun 2022 06:14:52 +0000 (23:14 -0700)
Description:
Update from  v16.15.0
Changed handling of host's npm problems due to npm updates.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
lang/node/Makefile
lang/node/patches/003-path.patch
lang/node/patches/999-localhost-no-addrconfig.patch

index 32ddc5d0c109447d9e32644e61d5ec83fd701a18..d10d44943d400da27944997ceb0630d4f603e075 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=node
-PKG_VERSION:=v16.14.2
+PKG_VERSION:=v16.15.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
-PKG_HASH:=e922e215cc68eb5f94d33e8a0b61e2c863b7731cc8600ab955d3822da90ff8d1
+PKG_HASH:=a0f812efc43f78321eca08957960a48f5e6bf97004d5058c8dd3b03c646ea4f7
 
 PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
 PKG_LICENSE:=MIT
@@ -141,7 +141,6 @@ define Package/node/install
 endef
 
 define Package/node-npm/install
-       $(RM) $(1)/usr/lib/node_modules/npm
        $(INSTALL_DIR) $(1)/usr/lib/node_modules/npm
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/npm/{package.json,LICENSE} \
                $(1)/usr/lib/node_modules/npm/
@@ -154,6 +153,11 @@ define Package/node-npm/install
        $(LN) ../lib/node_modules/npm/bin/npx-cli.js $(1)/usr/bin/npx
 endef
 
+define Host/Install
+       $(RM) -rf $(1)/lib/node_modules/npm
+       $(call Host/Install/Default)
+endef
+
 $(eval $(call HostBuild))
 $(eval $(call BuildPackage,node))
 $(eval $(call BuildPackage,node-npm))
index 5330959aa241cd78b2e3477b08728a2cb36295fc..d18af1d73e4aa93e02d217aab6309393f97e80b1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/lib/internal/modules/cjs/loader.js
 +++ b/lib/internal/modules/cjs/loader.js
-@@ -1238,7 +1238,8 @@ Module._initPaths = function() {
+@@ -1240,7 +1240,8 @@ Module._initPaths = function() {
      path.resolve(process.execPath, '..') :
      path.resolve(process.execPath, '..', '..');
  
index c61a35086cbd59775d4381a33f3e52c87765c498..84a906faf076772f7c6ef659896ca93493c25939 100644 (file)
@@ -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
-@@ -1037,13 +1038,6 @@ function lookupAndConnect(self, options)
+@@ -1059,13 +1060,6 @@ function lookupAndConnect(self, options)
      hints: options.hints || 0
    };