On 2021/05/05 23:06, vl...@tuta.io wrote: > > This updates node to v12.22.1
your mail client has mangled the patch. > Changelog here: > > https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V12.md > > It references several addressed CVEs since v12.16.1 which is currently in > ports. Builds and works fine here. Anyone willing to review and eventually > commit? > > so long, > Volker > Index: Makefile > =================================================================== > RCS file: /cvs/ports/lang/node/Makefile,v > retrieving revision 1.88 > diff -u -p -r1.88 Makefile > --- Makefile 23 Feb 2021 19:39:27 -0000 1.88 > +++ Makefile 5 May 2021 20:37:38 -0000 > @@ -11,7 +11,7 @@ USE_WXNEEDED = Yes > > COMMENT = V8 JavaScript for clients and servers > > -NODE_VERSION = v12.16.1 > +NODE_VERSION = v12.22.1 > PLEDGE_VER = 1.1.2 > DISTFILES = node-pledge-{}${PLEDGE_VER}.tar.gz:0 \ > ${DISTNAME}-headers.tar.gz \ > @@ -25,7 +25,7 @@ MASTER_SITES0 = https://github.com/qbit > > CATEGORIES = lang devel > > -HOMEPAGE = http://nodejs.org <http://nodejs.org/> > +HOMEPAGE = https://nodejs.org <https://nodejs.org/> > > # MIT > PERMIT_PACKAGE = Yes > Index: distinfo > =================================================================== > RCS file: /cvs/ports/lang/node/distinfo,v > retrieving revision 1.53 > diff -u -p -r1.53 distinfo > --- distinfo 4 Apr 2020 16:42:57 -0000 1.53 > +++ distinfo 5 May 2021 20:37:38 -0000 > @@ -1,6 +1,6 @@ > SHA256 (node-pledge-1.1.2.tar.gz) = > zY/JcbZ32mmtqWXXNn3/9aTh7Y3F6fAAaADDA8SYwEk= > -SHA256 (node-v12.16.1-headers.tar.gz) = > gV5zJWG2vhsjibDKxT40tlrRg1pfA1TZiI2ZKkYTlH8= > -SHA256 (node-v12.16.1.tar.gz) = T+jDRU+b7lu+ctRKolzZMYWbMDe3qUcwgbOyvRtGW5U= > +SHA256 (node-v12.22.1-headers.tar.gz) = > k1WgrxAcy6GukMPx89ce2CGTTIdUYqdvi2Wm9+5yk/0= > +SHA256 (node-v12.22.1.tar.gz) = YCPx+PA/l4DHXm7KnTcrhBGoN1fAOJxRuu4cckKv1wI= > SIZE (node-pledge-1.1.2.tar.gz) = 3155 > -SIZE (node-v12.16.1-headers.tar.gz) = 563107 > -SIZE (node-v12.16.1.tar.gz) = 52290732 > +SIZE (node-v12.22.1-headers.tar.gz) = 571403 > +SIZE (node-v12.22.1.tar.gz) = 53277475 > Index: patches/patch-configure_py > =================================================================== > RCS file: patches/patch-configure_py > diff -N patches/patch-configure_py > --- patches/patch-configure_py 31 Jul 2020 21:22:48 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,17 +0,0 @@ > -$OpenBSD: patch-configure_py,v 1.1 2020/07/31 21:22:48 naddy Exp $ > - > -account for CLANG_VENDOR when checking for llvm version > -https://github.com/nodejs/node/commit/7f70c5de7073646b7c7d972ed4704cfcfe83af92 > - > -Index: configure.py > ---- configure.py.orig > -+++ configure.py > -@@ -740,7 +740,7 @@ def get_nasm_version(asm): > - > - def get_llvm_version(cc): > - return get_version_helper( > -- cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)") > -+ cc, r"(^(?:.+ )?clang version|based on LLVM) ([0-9]+\.[0-9]+)") > - > - def get_xcode_version(cc): > - return get_version_helper( > Index: patches/patch-deps_openssl_config_Makefile > =================================================================== > RCS file: /cvs/ports/lang/node/patches/patch-deps_openssl_config_Makefile,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-deps_openssl_config_Makefile > --- patches/patch-deps_openssl_config_Makefile 24 Nov 2019 18:42:28 -0000 1.3 > +++ patches/patch-deps_openssl_config_Makefile 5 May 2021 20:37:38 -0000 > @@ -21,7 +21,7 @@ Index: deps/openssl/config/Makefile > # Supported architecture list > -ASM_ARCHS = aix-gcc aix64-gcc BSD-x86 BSD-x86_64 \ > +ASM_ARCHS = aix-gcc aix64-gcc BSD-x86 BSD-x86-elf BSD-x86_64 \ > - darwin64-x86_64-cc darwin-i386-cc linux-aarch64 \ > + darwin64-x86_64-cc darwin-i386-cc darwin64-arm64-cc linux-aarch64 \ > linux-armv4 linux-elf linux-x32 linux-x86_64 linux-ppc \ > linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\ > @@ -17,7 +17,6 @@ solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN3 > Index: patches/patch-deps_openssl_openssl_no_asm_gypi > =================================================================== > RCS file: > /cvs/ports/lang/node/patches/patch-deps_openssl_openssl_no_asm_gypi,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-deps_openssl_openssl_no_asm_gypi > --- patches/patch-deps_openssl_openssl_no_asm_gypi 21 Jan 2019 23:46:01 -0000 > 1.1 > +++ patches/patch-deps_openssl_openssl_no_asm_gypi 5 May 2021 20:37:38 -0000 > @@ -12,10 +12,10 @@ Index: deps/openssl/openssl_no_asm.gypi > }, 'target_arch=="ia32" and OS=="solaris"', { > 'includes': ['config/archs/solaris-x86-gcc/no-asm/openssl.gypi'], > }, 'target_arch=="ia32" and OS=="win"', { > -@@ -34,6 +36,8 @@ > - 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], > - }, 'target_arch=="x64" and OS=="mac"', { > +@@ -36,6 +38,8 @@ > 'includes': ['config/archs/darwin64-x86_64-cc/no-asm/openssl.gypi'], > + }, 'target_arch=="arm64" and OS=="mac"', { > + 'includes': ['config/archs/darwin64-arm64-cc/no-asm/openssl.gypi'], > + }, 'target_arch=="x64" and OS=="openbsd"', { > + 'includes': ['config/archs/BSD-x86_64/no-asm/openssl.gypi'], > }, 'target_arch=="x64" and OS=="solaris"', { > Index: patches/patch-src_cares_wrap_cc > =================================================================== > RCS file: patches/patch-src_cares_wrap_cc > diff -N patches/patch-src_cares_wrap_cc > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-src_cares_wrap_cc 5 May 2021 20:37:38 -0000 > @@ -0,0 +1,12 @@ > + > +Index: src/cares_wrap.cc > +--- src/cares_wrap.cc.orig > ++++ src/cares_wrap.cc > +@@ -50,6 +50,7 @@ > + #endif > + > + #if defined(__OpenBSD__) > ++# define AI_ALL 0 > + # define AI_V4MAPPED 0 > + #endif >
