Date: Fri, 16 Aug 2019 22:27:10 +0000 (UTC) From: "Bradley T. Hughes" <bhughes@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509122 - in head/www/node: . files Message-ID: <201908162227.x7GMRABK084420@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bhughes Date: Fri Aug 16 22:27:10 2019 New Revision: 509122 URL: https://svnweb.freebsd.org/changeset/ports/509122 Log: www/node: Update 12.7.0 -> 12.8.0 https://nodejs.org/en/blog/release/v12.8.0/ The bundled OpenSSL configuration now includes BSD-x86, which this port can now use. The build for i386 is still using the no-asm variant for the time being. Assembler errors in BSD-x86/asm-avx2 need to be investigated to be able to enable asm with the bundled OpenSSL. While here, regenerate all remaining patches with `make makepatch`. Sponsored by: Miles AS Deleted: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl-cl.gypi head/www/node/files/patch-deps_openssl_config_archs_linux-elf_asm_openssl.gypi head/www/node/files/patch-deps_openssl_config_bn__conf__asm.h head/www/node/files/patch-deps_openssl_config_bn__conf__no-asm.h head/www/node/files/patch-deps_openssl_config_dso__conf__asm.h head/www/node/files/patch-deps_openssl_config_dso__conf__no-asm.h head/www/node/files/patch-deps_openssl_config_opensslconf__asm.h head/www/node/files/patch-deps_openssl_config_opensslconf__no-asm.h Modified: head/www/node/Makefile head/www/node/distinfo head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc head/www/node/files/patch-node.gypi head/www/node/pkg-plist Modified: head/www/node/Makefile ============================================================================== --- head/www/node/Makefile Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/Makefile Fri Aug 16 22:27:10 2019 (r509122) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 12.7.0 +PORTVERSION= 12.8.0 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ @@ -78,7 +78,7 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\ BROKEN_SSL+= base .endif -.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 && ${ARCH} != i386 +.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 CONFIGURE_ARGS+=--openssl-no-asm .endif Modified: head/www/node/distinfo ============================================================================== --- head/www/node/distinfo Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/distinfo Fri Aug 16 22:27:10 2019 (r509122) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564180594 -SHA256 (node-v12.7.0.tar.gz) = d5e63fd4ee88d539a69b9e71631d03014bd8e98596e741515e3d7aa930f4630a -SIZE (node-v12.7.0.tar.gz) = 49510408 +TIMESTAMP = 1565153521 +SHA256 (node-v12.8.0.tar.gz) = 6f4e4ee7bcb52f782dce5a51d6951ff87151d9504be129d68d7aff469c0f7f36 +SIZE (node-v12.8.0.tar.gz) = 50223727 Modified: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi ============================================================================== --- head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi Fri Aug 16 22:27:10 2019 (r509122) @@ -1,17 +1,11 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2019-01-30 20:43:11 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2019-08-06 20:46:23 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi -@@ -7,12 +7,11 @@ - 'OPENSSL_PIC', +@@ -12,7 +12,7 @@ + '-Wall -O3 -fomit-frame-pointer', ], - 'openssl_cflags_linux-elf': [ -- '-Wall -O3 -fomit-frame-pointer', -+ '-Wall -O3', - '-pthread', -- '-Wall -O3 -fomit-frame-pointer', - ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', -+ '', ++ '-pthread', ], 'openssl_cli_srcs_linux-elf': [ 'openssl/apps/asn1pars.c', Modified: head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi ============================================================================== --- head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi Fri Aug 16 22:27:10 2019 (r509122) @@ -1,17 +1,11 @@ ---- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2019-02-06 21:04:54 UTC +--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2019-08-06 20:46:23 UTC +++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi -@@ -691,12 +691,11 @@ - 'OPENSSL_PIC', +@@ -696,7 +696,7 @@ + '-Wall -O3 -fomit-frame-pointer', ], - 'openssl_cflags_linux-elf': [ -- '-Wall -O3 -fomit-frame-pointer', -+ '-Wall -O3', - '-pthread', -- '-Wall -O3 -fomit-frame-pointer', - ], 'openssl_ex_libs_linux-elf': [ - '-ldl -pthread', -+ '', ++ '-pthread', ], }, 'include_dirs': [ Modified: head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi ============================================================================== --- head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_openssl_openssl-cl__no__asm.gypi Fri Aug 16 22:27:10 2019 (r509122) @@ -1,4 +1,4 @@ ---- deps/openssl/openssl-cl_no_asm.gypi.orig 2019-04-23 12:30:43 UTC +--- deps/openssl/openssl-cl_no_asm.gypi.orig 2019-08-06 20:46:23 UTC +++ deps/openssl/openssl-cl_no_asm.gypi @@ -1,4 +1,5 @@ { @@ -6,8 +6,8 @@ 'conditions': [ ['target_arch=="ppc" and OS=="aix"', { 'includes': ['config/archs/aix-gcc/no-asm/openssl-cl.gypi'], -@@ -43,7 +44,7 @@ - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], +@@ -45,7 +46,7 @@ + 'includes': ['config/archs/linux64-mips64/no-asm/openssl-cl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'], Modified: head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi ============================================================================== --- head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_openssl_openssl__no__asm.gypi Fri Aug 16 22:27:10 2019 (r509122) @@ -1,7 +1,7 @@ ---- deps/openssl/openssl_no_asm.gypi.orig 2019-04-23 12:30:43 UTC +--- deps/openssl/openssl_no_asm.gypi.orig 2019-08-06 20:46:23 UTC +++ deps/openssl/openssl_no_asm.gypi -@@ -44,7 +44,7 @@ - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], +@@ -46,7 +46,7 @@ + 'includes': ['config/archs/linux64-mips64/no-asm/openssl.gypi'], }, { # Other architectures don't use assembly - 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'], Modified: head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc ============================================================================== --- head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_v8_src_arm_cpu-arm.cc Fri Aug 16 22:27:10 2019 (r509122) @@ -1,4 +1,4 @@ ---- deps/v8/src/arm/cpu-arm.cc.orig 2019-04-23 12:30:43 UTC +--- deps/v8/src/arm/cpu-arm.cc.orig 2019-08-06 20:46:23 UTC +++ deps/v8/src/arm/cpu-arm.cc @@ -7,6 +7,9 @@ #ifdef __QNXNTO__ @@ -10,7 +10,7 @@ #else #include <sys/syscall.h> // for cache flushing. #endif -@@ -23,6 +26,9 @@ void CpuFeatures::FlushICache(void* start, size_t size +@@ -26,6 +29,9 @@ __attribute__((noinline)) void CpuFeatures::FlushICach #if !defined(USE_SIMULATOR) #if V8_OS_QNX msync(start, size, MS_SYNC | MS_INVALIDATE_ICACHE); Modified: head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc ============================================================================== --- head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc Fri Aug 16 22:27:10 2019 (r509122) @@ -1,6 +1,6 @@ ---- deps/v8/src/base/platform/platform-freebsd.cc.orig 2019-01-30 20:43:13 UTC +--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2019-08-06 20:46:24 UTC +++ deps/v8/src/base/platform/platform-freebsd.cc -@@ -86,5 +86,47 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib +@@ -86,6 +86,48 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib void OS::SignalCodeMovingGC() {} @@ -46,5 +46,6 @@ + +#endif // def __arm__ + + void OS::AdjustSchedulingParams() {} + } // namespace base - } // namespace v8 Modified: head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc ============================================================================== --- head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-deps_v8_src_libsampler_sampler.cc Fri Aug 16 22:27:10 2019 (r509122) @@ -1,6 +1,6 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2019-04-23 12:30:43 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2019-08-06 20:46:24 UTC +++ deps/v8/src/libsampler/sampler.cc -@@ -466,9 +466,13 @@ void SignalHandler::FillRegisterState(void* context, R +@@ -470,9 +470,13 @@ void SignalHandler::FillRegisterState(void* context, R state->sp = reinterpret_cast<void*>(mcontext.mc_rsp); state->fp = reinterpret_cast<void*>(mcontext.mc_rbp); #elif V8_HOST_ARCH_ARM Modified: head/www/node/files/patch-node.gypi ============================================================================== --- head/www/node/files/patch-node.gypi Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/files/patch-node.gypi Fri Aug 16 22:27:10 2019 (r509122) @@ -1,6 +1,6 @@ ---- node.gypi.orig 2019-04-23 12:30:45 UTC +--- node.gypi.orig 2019-08-06 20:46:25 UTC +++ node.gypi -@@ -315,6 +315,9 @@ +@@ -307,6 +307,9 @@ ['openssl_fips != "" or openssl_is_fips=="true"', { 'defines': [ 'NODE_FIPS_MODE' ], }], Modified: head/www/node/pkg-plist ============================================================================== --- head/www/node/pkg-plist Fri Aug 16 19:44:28 2019 (r509121) +++ head/www/node/pkg-plist Fri Aug 16 22:27:10 2019 (r509122) @@ -12,6 +12,21 @@ include/node/node_api_types.h include/node/node_buffer.h include/node/node_object_wrap.h include/node/node_version.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/crypto/buildinf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/opensslconf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/progs.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/crypto/buildinf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/progs.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/crypto/buildinf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/opensslconf.h +%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/progs.h %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/crypto/buildinf.h %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h %%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908162227.x7GMRABK084420>