summaryrefslogtreecommitdiff
path: root/security/bitwarden-cli/files/node
diff options
context:
space:
mode:
authorHiroki Tagato <tagattie@FreeBSD.org>2024-10-23 22:31:04 +0900
committerHiroki Tagato <tagattie@FreeBSD.org>2024-10-23 22:32:53 +0900
commited3b2f2ee48141f746176b5025bb8dca84fb5fc1 (patch)
treeccf7c4f9c28937aea65d244a33861603067517ce /security/bitwarden-cli/files/node
parentfinance/electrum: Update to 4.5.8 (diff)
security/bitwarden-cli: update to 2024.10.0
Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2024.10.0 Reported by: GitHub (watch releases)
Diffstat (limited to 'security/bitwarden-cli/files/node')
-rw-r--r--security/bitwarden-cli/files/node/patch-common.gypi6
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.cc31
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.h47
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.cc29
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.h21
-rw-r--r--security/bitwarden-cli/files/node/patch-deps_v8_third__party_inspector__protocol_crdtp_test__platform__v8.cc22
-rw-r--r--security/bitwarden-cli/files/node/patch-node.gypi4
-rw-r--r--security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp4
8 files changed, 157 insertions, 7 deletions
diff --git a/security/bitwarden-cli/files/node/patch-common.gypi b/security/bitwarden-cli/files/node/patch-common.gypi
index aab7b33a2120..2d0b58bf8092 100644
--- a/security/bitwarden-cli/files/node/patch-common.gypi
+++ b/security/bitwarden-cli/files/node/patch-common.gypi
@@ -1,6 +1,6 @@
---- common.gypi.orig 2024-02-13 21:43:28 UTC
+--- common.gypi.orig 2024-08-21 12:35:22 UTC
+++ common.gypi
-@@ -466,7 +466,7 @@
+@@ -491,7 +491,7 @@
'ldflags': [ '-m32' ],
}],
[ 'host_arch=="ppc64" and OS not in "aix os400"', {
@@ -9,7 +9,7 @@
'ldflags': [ '-m64' ],
}],
[ 'host_arch=="s390x" and OS=="linux"', {
-@@ -490,7 +490,7 @@
+@@ -515,7 +515,7 @@
'ldflags': [ '-m32' ],
}],
[ 'target_arch=="ppc64" and OS not in "aix os400"', {
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.cc b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.cc
new file mode 100644
index 000000000000..7e0ccb4b8b4b
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.cc
@@ -0,0 +1,31 @@
+--- deps/v8/src/inspector/string-16.cc.orig 2024-08-21 12:35:26 UTC
++++ deps/v8/src/inspector/string-16.cc
+@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) {
+ return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9));
+ }
+
+-int64_t charactersToInteger(const UChar* characters, size_t length,
++int64_t charactersToInteger(const uint16_t* characters, size_t length,
+ bool* ok = nullptr) {
+ std::vector<char> buffer;
+ buffer.reserve(length + 1);
+@@ -50,6 +50,8 @@ String16::String16(const UChar* characters, size_t siz
+
+ String16::String16(const UChar* characters, size_t size)
+ : m_impl(characters, size) {}
++String16::String16(const uint16_t* characters, size_t size)
++ : m_impl(reinterpret_cast<const UChar*>(characters), size) {}
+
+ String16::String16(const UChar* characters) : m_impl(characters) {}
+
+@@ -239,6 +241,10 @@ String16 String16::fromUTF16LE(const UChar* stringStar
+ // No need to do anything on little endian machines.
+ return String16(stringStart, length);
+ #endif // V8_TARGET_BIG_ENDIAN
++}
++
++String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) {
++ return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length);
+ }
+
+ std::string String16::utf8() const {
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.h b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.h
new file mode 100644
index 000000000000..15c3a6e84068
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.h
@@ -0,0 +1,47 @@
+--- deps/v8/src/inspector/string-16.h.orig 2024-08-21 12:35:26 UTC
++++ deps/v8/src/inspector/string-16.h
+@@ -6,6 +6,7 @@
+ #define V8_INSPECTOR_STRING_16_H_
+
+ #include <stdint.h>
++#include <uchar.h>
+
+ #include <cctype>
+ #include <climits>
+@@ -17,7 +18,7 @@ namespace v8_inspector {
+
+ namespace v8_inspector {
+
+-using UChar = uint16_t;
++using UChar = char16_t;
+
+ class String16 {
+ public:
+@@ -27,6 +28,7 @@ class String16 {
+ String16(const String16&) V8_NOEXCEPT = default;
+ String16(String16&&) V8_NOEXCEPT = default;
+ String16(const UChar* characters, size_t size);
++ String16(const uint16_t* characters, size_t size);
+ V8_EXPORT String16(const UChar* characters);
+ V8_EXPORT String16(const char* characters);
+ String16(const char* characters, size_t size);
+@@ -48,7 +50,9 @@ class String16 {
+ int toInteger(bool* ok = nullptr) const;
+ std::pair<size_t, size_t> getTrimmedOffsetAndLength() const;
+ String16 stripWhiteSpace() const;
+- const UChar* characters16() const { return m_impl.c_str(); }
++ const uint16_t* characters16() const {
++ return reinterpret_cast<const uint16_t*>(m_impl.c_str());
++ }
+ size_t length() const { return m_impl.length(); }
+ bool isEmpty() const { return !m_impl.length(); }
+ UChar operator[](size_t index) const { return m_impl[index]; }
+@@ -77,6 +81,8 @@ class String16 {
+ // Instantiates a String16 in native endianness from UTF16 LE.
+ // On Big endian architectures, byte order needs to be flipped.
+ V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart,
++ size_t length);
++ V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart,
+ size_t length);
+
+ std::size_t hash() const {
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.cc b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.cc
new file mode 100644
index 000000000000..0598c40f98da
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.cc
@@ -0,0 +1,29 @@
+--- deps/v8/src/inspector/v8-string-conversions.cc.orig 2024-08-21 12:35:26 UTC
++++ deps/v8/src/inspector/v8-string-conversions.cc
+@@ -12,7 +12,7 @@ namespace {
+
+ namespace v8_inspector {
+ namespace {
+-using UChar = uint16_t;
++using UChar = char16_t;
+ using UChar32 = uint32_t;
+
+ bool isASCII(UChar c) { return !(c & ~0x7F); }
+@@ -386,7 +386,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* strin
+
+ std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) {
+ if (!stringStart || !length) return std::basic_string<UChar>();
+- std::vector<uint16_t> buffer(length);
++ std::vector<UChar> buffer(length);
+ UChar* bufferStart = buffer.data();
+
+ UChar* bufferCurrent = bufferStart;
+@@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* strin
+ reinterpret_cast<const char*>(stringStart + length),
+ &bufferCurrent, bufferCurrent + buffer.size(), nullptr,
+ true) != conversionOK)
+- return std::basic_string<uint16_t>();
++ return std::basic_string<UChar>();
+ size_t utf16Length = bufferCurrent - bufferStart;
+ return std::basic_string<UChar>(bufferStart, bufferStart + utf16Length);
+ }
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.h b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.h
new file mode 100644
index 000000000000..7395fd13692e
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.h
@@ -0,0 +1,21 @@
+--- deps/v8/src/inspector/v8-string-conversions.h.orig 2024-08-21 12:35:26 UTC
++++ deps/v8/src/inspector/v8-string-conversions.h
+@@ -5,14 +5,16 @@
+ #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+ #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
+
++#include <uchar.h>
++
+ #include <cstdint>
+ #include <string>
+
+ // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
+ // want to use string-16.h directly rather than these.
+ namespace v8_inspector {
+-std::basic_string<uint16_t> UTF8ToUTF16(const char* stringStart, size_t length);
+-std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length);
++std::basic_string<char16_t> UTF8ToUTF16(const char* stringStart, size_t length);
++std::string UTF16ToUTF8(const char16_t* stringStart, size_t length);
+ } // namespace v8_inspector
+
+ #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_
diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_third__party_inspector__protocol_crdtp_test__platform__v8.cc b/security/bitwarden-cli/files/node/patch-deps_v8_third__party_inspector__protocol_crdtp_test__platform__v8.cc
new file mode 100644
index 000000000000..810a29c2782a
--- /dev/null
+++ b/security/bitwarden-cli/files/node/patch-deps_v8_third__party_inspector__protocol_crdtp_test__platform__v8.cc
@@ -0,0 +1,22 @@
+--- deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc.orig 2024-08-21 12:35:28 UTC
++++ deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc
+@@ -11,13 +11,16 @@ std::string UTF16ToUTF8(span<uint16_t> in) {
+ namespace v8_crdtp {
+
+ std::string UTF16ToUTF8(span<uint16_t> in) {
+- return v8_inspector::UTF16ToUTF8(in.data(), in.size());
++ return v8_inspector::UTF16ToUTF8(reinterpret_cast<const char16_t*>(in.data()),
++ in.size());
+ }
+
+ std::vector<uint16_t> UTF8ToUTF16(span<uint8_t> in) {
+- std::basic_string<uint16_t> utf16 = v8_inspector::UTF8ToUTF16(
++ std::basic_string<char16_t> utf16 = v8_inspector::UTF8ToUTF16(
+ reinterpret_cast<const char*>(in.data()), in.size());
+- return std::vector<uint16_t>(utf16.begin(), utf16.end());
++ return std::vector<uint16_t>(
++ reinterpret_cast<const uint16_t*>(utf16.data()),
++ reinterpret_cast<const uint16_t*>(utf16.data()) + utf16.size());
+ }
+
+ } // namespace v8_crdtp
diff --git a/security/bitwarden-cli/files/node/patch-node.gypi b/security/bitwarden-cli/files/node/patch-node.gypi
index e0656b099ab8..a338b6ed81ef 100644
--- a/security/bitwarden-cli/files/node/patch-node.gypi
+++ b/security/bitwarden-cli/files/node/patch-node.gypi
@@ -1,6 +1,6 @@
---- node.gypi.orig 2023-03-05 06:42:54 UTC
+--- node.gypi.orig 2024-08-21 12:35:29 UTC
+++ node.gypi
-@@ -349,6 +349,9 @@
+@@ -350,6 +350,9 @@
[ 'node_use_openssl=="true"', {
'defines': [ 'HAVE_OPENSSL=1' ],
'conditions': [
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
index 3e711aedc53d..aa5e5a520ca7 100644
--- a/security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp
+++ b/security/bitwarden-cli/files/node/patch-tools_v8__gypfiles_v8.gyp
@@ -1,6 +1,6 @@
---- tools/v8_gypfiles/v8.gyp.orig 2024-02-13 21:43:34 UTC
+--- tools/v8_gypfiles/v8.gyp.orig 2024-08-21 12:35:32 UTC
+++ tools/v8_gypfiles/v8.gyp
-@@ -1083,7 +1083,7 @@
+@@ -1095,7 +1095,7 @@
}],
# Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library
# to implement atomic memory access