svn commit: r568039 - in branches/2021Q1/www/node: . files

Wed Mar 10 20:16:57 UTC 2021

Author: bhughes
Date: Wed Mar 10 20:16:56 2021
New Revision: 568039
URL: https://svnweb.freebsd.org/changeset/ports/568039

Log:
  MFH: r561964 r563263 r564016 r566506 r567899
  
  www/node: Update 15.5.1 -> 15.6.0
  
  https://nodejs.org/en/blog/release/v15.6.0/
  
  Sponsored by:	Miles AS
  
  www/node: Update 15.6.0 -> 15.7.0
  
  https://nodejs.org/en/blog/release/v15.7.0/
  
  Sponsored by:	Miles AS
  
  www/node: Update 15.7.0 -> 15.8.0
  
  https://nodejs.org/en/blog/release/v15.8.0/
  
  Regenerate patches with `make makepatch` and re-introduce the
  dependency on dns/c-ares now that it is at version 1.17.1 (the
  minimum required version for Node.js).
  
  Sponsored by:	Miles AS
  
  www/node: Update 15.8.0 - 15.9.0
  
  https://nodejs.org/en/blog/release/v15.9.0/
  
  Sponsored by:	Miles AS
  
  www/node: Update 15.9.0 -> 15.10.0
  
  https://nodejs.org/en/blog/release/v15.10.0/
  
  This is a security release. See
  https://nodejs.org/en/blog/vulnerability/february-2021-security-releases/
  
  While here, pet portlint by moving USES.
  
  PR:		254045
  Submitted by:	jlduran at gmail.com
  Security:	2f3cd69e-7dee-11eb-b92e-0022489ad614
  Sponsored by:	Miles AS

Modified:
  branches/2021Q1/www/node/Makefile
  branches/2021Q1/www/node/distinfo
  branches/2021Q1/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi
  branches/2021Q1/www/node/files/patch-node.gypi
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/www/node/Makefile
==============================================================================

--- branches/2021Q1/www/node/Makefile	Wed Mar 10 20:14:28 2021	(r568038)
+++ branches/2021Q1/www/node/Makefile	Wed Mar 10 20:16:56 2021	(r568039)
@@ -2,7 +2,7 @@
 
 PORTNAME=	node
 DISTVERSIONPREFIX=	v
-DISTVERSION=	15.5.1
+DISTVERSION=	15.10.0
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${DISTVERSION}/
 
@@ -16,6 +16,9 @@ BROKEN_SSL=		libressl libressl-devel
 BROKEN_SSL_REASON=	Node.js 15.x requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled
 ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
+USES=		compiler:c++11-lib gmake python:build pkgconfig \
+		localbase shebangfix
+
 OPTIONS_DEFINE=		BUNDLED_SSL DOCS NLS DTRACE
 OPTIONS_DEFAULT=	DTRACE
 OPTIONS_DEFAULT_FreeBSD_11=	BUNDLED_SSL
@@ -39,14 +42,11 @@ BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl --openssl-
 BUNDLED_SSL_RUN_DEPENDS_OFF=	ca_root_nss>=0:security/ca_root_nss
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu
-NLS_BUILD_DEPENDS=	icu>=68.1:devel/icu
+NLS_BUILD_DEPENDS=	icu>=68.2:devel/icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
 DTRACE_CONFIGURE_ON=	--with-dtrace
 
-USES=		compiler:c++11-lib gmake python:build pkgconfig \
-		localbase shebangfix
-
 HAS_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	node10-[0-9]* node12-[0-9]* node14-[0-9]*
@@ -54,6 +54,7 @@ CONFLICTS_INSTALL=	node10-[0-9]* node12-[0-9]* node14-
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--without-npm \
 		--shared-brotli \
+		--shared-cares \
 		--shared-libuv \
 		--shared-nghttp2 \
 		--shared-zlib
@@ -70,10 +71,12 @@ MAKE_ENV+=	CC.host=${CC} CFLAGS.host="${CFLAGS}" \
 		LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}"
 
 BUILD_DEPENDS+=	brotli>=1.0.9,1:archivers/brotli \
-		libuv>=1.40.0:devel/libuv \
-		libnghttp2>=1.41.0:www/libnghttp2 \
+		c-ares>=1.17.1:dns/c-ares \
+		libuv>=1.41.0:devel/libuv \
+		libnghttp2>=1.42.0:www/libnghttp2 \
 		objdump:devel/binutils
 LIB_DEPENDS+=	libbrotlidec.so:archivers/brotli \
+		libcares.so:dns/c-ares \
 		libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2
 

Modified: branches/2021Q1/www/node/distinfo
==============================================================================
--- branches/2021Q1/www/node/distinfo	Wed Mar 10 20:14:28 2021	(r568038)
+++ branches/2021Q1/www/node/distinfo	Wed Mar 10 20:16:56 2021	(r568039)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610308453
-SHA256 (node-v15.5.1.tar.gz) = 9730d3099c051bd8733b3e6d62c54ba9b2d82ec40e6c65ee966ba3f346ff4157
-SIZE (node-v15.5.1.tar.gz) = 62304300
+TIMESTAMP = 1614197688
+SHA256 (node-v15.10.0.tar.gz) = 643f9bbd6ae4c424224c946cad52d11b9379aaab927673b2e3c6c4df9a1a7b0e
+SIZE (node-v15.10.0.tar.gz) = 62153962

Modified: branches/2021Q1/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi
==============================================================================
--- branches/2021Q1/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi	Wed Mar 10 20:14:28 2021	(r568038)
+++ branches/2021Q1/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi	Wed Mar 10 20:16:56 2021	(r568039)
@@ -1,6 +1,6 @@
---- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig	2020-10-20 11:49:49 UTC
+--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig	2021-02-02 17:47:01 UTC
 +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi
-@@ -698,7 +698,7 @@
+@@ -696,7 +696,7 @@
        '-Wall -O3 -fomit-frame-pointer',
      ],
      'openssl_ex_libs_linux-elf': [

Modified: branches/2021Q1/www/node/files/patch-node.gypi
==============================================================================
--- branches/2021Q1/www/node/files/patch-node.gypi	Wed Mar 10 20:14:28 2021	(r568038)
+++ branches/2021Q1/www/node/files/patch-node.gypi	Wed Mar 10 20:16:56 2021	(r568039)
@@ -1,6 +1,6 @@
---- node.gypi.orig	2020-10-20 11:49:51 UTC
+--- node.gypi.orig	2021-02-02 17:47:04 UTC
 +++ node.gypi
-@@ -340,6 +340,9 @@
+@@ -322,6 +322,9 @@
          ['openssl_fips != "" or openssl_is_fips=="true"', {
            'defines': [ 'NODE_FIPS_MODE' ],
          }],
