summaryrefslogtreecommitdiff
path: root/security/bitwarden-cli/files/node
diff options
context:
space:
mode:
authorHiroki Tagato <tagattie@FreeBSD.org>2024-01-16 12:58:24 +0900
committerHiroki Tagato <tagattie@FreeBSD.org>2024-01-16 13:00:58 +0900
commit43b9a30a5c25ddef5490032bdd5bb35bf70c6dc2 (patch)
tree7ec041391b6339940647b8f91767b45f50a08000 /security/bitwarden-cli/files/node
parentdatabases/R-cran-DBI: Update to 1.2.1 (diff)
security/bitwarden-cli: update to 2024.1.0
While here, modify and host FreeBSD node patch files so that they can be cleanly applied to node 18.15.0, which is needed by this port. Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2024.1.0 Reported by: GitHub (watch releases)
Diffstat (limited to 'security/bitwarden-cli/files/node')
-rw-r--r--security/bitwarden-cli/files/node/patch-common.gypi11
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi11
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi11
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_openssl_openssl-cl__no__asm.gypi17
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_openssl_openssl__no__asm.gypi11
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_base_platform_platform-freebsd.cc13
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_arm_cpu-arm.cc18
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_ppc_constants-ppc.h20
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_libsampler_sampler.cc13
-rw-r--r--security/bitwarden-cli/files/node/patch-node.gypi12
-rw-r--r--security/bitwarden-cli/files/node/patch-src_cares__wrap.h11
-rw-r--r--security/bitwarden-cli/files/node/patch-src_crypto_crypto__util.cc15
-rw-r--r--security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp11
13 files changed, 174 insertions, 0 deletions
diff --git a/security/bitwarden-cli/files/node/patch-common.gypi b/security/bitwarden-cli/files/node/patch-common.gypi
new file mode 100644
index 000000000000..8b2e183fe78a
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-common.gypi
@@ -0,0 +1,11 @@
+--- common.gypi.orig 2023-03-05 06:42:51 UTC
++++ common.gypi
+@@ -426,7 +426,7 @@
+ 'ldflags': [ '-m32' ],
+ }],
+ [ 'target_arch=="ppc64" and OS!="aix"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'target_arch=="s390x" and OS=="linux"', {
diff --git a/security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi b/security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi
new file mode 100644
index 000000000000..00f9e88c1723
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl-cl.gypi
@@ -0,0 +1,11 @@
+--- deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2023-03-05 06:42:52 UTC
++++ deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi
+@@ -13,7 +13,7 @@
+ '-Wall -O3 -fomit-frame-pointer',
+ ],
+ 'openssl_ex_libs_linux-elf': [
+- '-ldl -pthread',
++ '-pthread',
+ ],
+ 'openssl_cli_srcs_linux-elf': [
+ 'openssl/apps/lib/cmp_mock_srv.c',
diff --git a/security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi b/security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi
new file mode 100644
index 000000000000..b1b6da616bda
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_openssl_config_archs_linux-elf_no-asm_openssl.gypi
@@ -0,0 +1,11 @@
+--- deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-03-05 06:42:52 UTC
++++ deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi
+@@ -977,7 +977,7 @@
+ '-Wall -O3 -fomit-frame-pointer',
+ ],
+ 'openssl_ex_libs_linux-elf': [
+- '-ldl -pthread',
++ '-pthread',
+ ],
+ },
+ 'include_dirs': [
diff --git a/security/bitwarden-cli/files/node/patch-deps_openssl_openssl-cl__no__asm.gypi b/security/bitwarden-cli/files/node/patch-deps_openssl_openssl-cl__no__asm.gypi
new file mode 100644
index 000000000000..332406f6182a
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_openssl_openssl-cl__no__asm.gypi
@@ -0,0 +1,17 @@
+--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-03-05 06:42:52 UTC
++++ deps/openssl/openssl-cl_no_asm.gypi
+@@ -1,4 +1,5 @@
+ {
++ 'defines': ['OPENSSL_NO_ASM'],
+ 'conditions': [
+ ['target_arch=="ppc64" and OS=="aix"', {
+ 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'],
+@@ -43,7 +44,7 @@
+ 'includes': ['config/archs/linux64-riscv64/no-asm/openssl-cl.gypi'],
+ }, {
+ # Other architectures don't use assembly
+- 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
++ 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
+ }],
+ ],
+ }
diff --git a/security/bitwarden-cli/files/node/patch-deps_openssl_openssl__no__asm.gypi b/security/bitwarden-cli/files/node/patch-deps_openssl_openssl__no__asm.gypi
new file mode 100644
index 000000000000..0ddf35d5dd37
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_openssl_openssl__no__asm.gypi
@@ -0,0 +1,11 @@
+--- deps/openssl/openssl_no_asm.gypi.orig 2023-03-05 06:42:52 UTC
++++ deps/openssl/openssl_no_asm.gypi
+@@ -44,7 +44,7 @@
+ 'includes': ['config/archs/linux64-riscv64/no-asm/openssl.gypi'],
+ }, {
+ # Other architectures don't use assembly
+- 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
++ 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
+ }],
+ ],
+ }
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_base_platform_platform-freebsd.cc b/security/bitwarden-cli/files/node/patch-deps_v8_src_base_platform_platform-freebsd.cc
new file mode 100644
index 000000000000..ab72bf609259
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_base_platform_platform-freebsd.cc
@@ -0,0 +1,13 @@
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-03-05 06:42:53 UTC
++++ deps/v8/src/base/platform/platform-freebsd.cc
+@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
+ lib_name = std::string(path);
+ }
+ result.push_back(SharedLibraryAddress(
+- lib_name, reinterpret_cast<uintptr_t>(map->kve_start),
+- reinterpret_cast<uintptr_t>(map->kve_end)));
++ lib_name, static_cast<uintptr_t>(map->kve_start),
++ static_cast<uintptr_t>(map->kve_end)));
+ }
+
+ start += ssize;
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_arm_cpu-arm.cc b/security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_arm_cpu-arm.cc
new file mode 100644
index 000000000000..0984a1727804
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_arm_cpu-arm.cc
@@ -0,0 +1,18 @@
+--- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-03-05 06:42:53 UTC
++++ deps/v8/src/codegen/arm/cpu-arm.cc
+@@ -2,12 +2,15 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include "include/v8config.h"
++
+ // CPU specific code for arm independent of OS goes here.
+ #ifdef __arm__
+ #ifdef __QNXNTO__
+ #include <sys/mman.h> // for cache flushing.
+ #undef MAP_TYPE
+ #elif V8_OS_FREEBSD
++#include <sys/cdefs.h>
+ #include <machine/sysarch.h> // for cache flushing
+ #include <sys/types.h>
+ #elif V8_OS_STARBOARD
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_ppc_constants-ppc.h b/security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_ppc_constants-ppc.h
new file mode 100644
index 000000000000..8837fc763a60
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_codegen_ppc_constants-ppc.h
@@ -0,0 +1,20 @@
+--- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2023-03-05 06:42:53 UTC
++++ deps/v8/src/codegen/ppc/constants-ppc.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if !(V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) || !V8_TARGET_ARCH_PPC64 || \
+- V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)
++ (defined(_CALL_ELF) && _CALL_ELF == 2)
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
+@@ -44,7 +44,7 @@
+
+ #if !(V8_HOST_ARCH_PPC || V8_HOST_ARCH_PPC64) || \
+ (V8_TARGET_ARCH_PPC64 && \
+- (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
++ (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_libsampler_sampler.cc b/security/bitwarden-cli/files/node/patch-deps_v8_src_libsampler_sampler.cc
new file mode 100644
index 000000000000..5868ddd10288
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_libsampler_sampler.cc
@@ -0,0 +1,13 @@
+--- deps/v8/src/libsampler/sampler.cc.orig 2023-03-05 06:42:53 UTC
++++ deps/v8/src/libsampler/sampler.cc
+@@ -497,6 +497,10 @@ void SignalHandler::FillRegisterState(void* context, R
+ state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
+ state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
+ state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
++#elif V8_TARGET_ARCH_PPC64
++ state->pc = reinterpret_cast<void*>(mcontext.mc_srr0);
++ state->sp = reinterpret_cast<void*>(mcontext.mc_frame[1]);
++ state->fp = reinterpret_cast<void*>(mcontext.mc_frame[31]);
+ #endif // V8_HOST_ARCH_*
+ #elif V8_OS_NETBSD
+ #if V8_HOST_ARCH_IA32
diff --git a/security/bitwarden-cli/files/node/patch-node.gypi b/security/bitwarden-cli/files/node/patch-node.gypi
new file mode 100644
index 000000000000..e0656b099ab8
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-node.gypi
@@ -0,0 +1,12 @@
+--- node.gypi.orig 2023-03-05 06:42:54 UTC
++++ node.gypi
+@@ -349,6 +349,9 @@
+ [ 'node_use_openssl=="true"', {
+ 'defines': [ 'HAVE_OPENSSL=1' ],
+ 'conditions': [
++ ['openssl_no_asm==1', {
++ 'defines': [ 'OPENSSL_NO_ASM' ],
++ }],
+ [ 'node_shared_openssl=="false"', {
+ 'defines': [ 'OPENSSL_API_COMPAT=0x10100000L', ],
+ 'dependencies': [
diff --git a/security/bitwarden-cli/files/node/patch-src_cares__wrap.h b/security/bitwarden-cli/files/node/patch-src_cares__wrap.h
new file mode 100644
index 000000000000..bd57f265e511
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-src_cares__wrap.h
@@ -0,0 +1,11 @@
+--- src/cares_wrap.h.orig 2023-03-05 06:42:54 UTC
++++ src/cares_wrap.h
+@@ -23,7 +23,7 @@
+ # include <netdb.h>
+ #endif // __POSIX__
+
+-# include <ares_nameser.h>
++# include <arpa/nameser.h>
+
+ namespace node {
+ namespace cares_wrap {
diff --git a/security/bitwarden-cli/files/node/patch-src_crypto_crypto__util.cc b/security/bitwarden-cli/files/node/patch-src_crypto_crypto__util.cc
new file mode 100644
index 000000000000..7fba74345cd6
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-src_crypto_crypto__util.cc
@@ -0,0 +1,15 @@
+--- src/crypto/crypto_util.cc.orig 2023-03-05 06:42:54 UTC
++++ src/crypto/crypto_util.cc
+@@ -194,10 +194,12 @@ void InitCryptoOnce() {
+ // No-op with OPENSSL_NO_COMP builds of OpenSSL.
+ sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
+
++#if OPENSSL_VERSION_MAJOR < 3
+ #ifndef OPENSSL_NO_ENGINE
+ ERR_load_ENGINE_strings();
+ ENGINE_load_builtin_engines();
+ #endif // !OPENSSL_NO_ENGINE
++#endif
+ }
+
+ void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
diff --git a/security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp b/security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp
new file mode 100644
index 000000000000..7e3a0f6a0460
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp
@@ -0,0 +1,11 @@
+--- tools/v8_gypfiles/v8.gyp.orig 2023-03-05 06:42:55 UTC
++++ tools/v8_gypfiles/v8.gyp
+@@ -977,7 +977,7 @@
+ }],
+ # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
+ # to implement atomic memory access
+- ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', {
++ ['v8_current_cpu in ["mips", "mipsel", "mips64", "mips64el", "ppc", "riscv64", "loong64"]', {
+ 'link_settings': {
+ 'libraries': ['-latomic', ],
+ },