diff options
Diffstat (limited to 'security/bitwarden-cli/files/node')
12 files changed, 21 insertions, 176 deletions
diff --git a/security/bitwarden-cli/files/node/patch-common.gypi b/security/bitwarden-cli/files/node/patch-common.gypi index 5dbb6214c2a1..9bf22808351f 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-10-03 09:20:49 UTC +--- common.gypi.orig 2024-10-16 14:36:50 UTC +++ common.gypi -@@ -489,7 +489,7 @@ +@@ -521,7 +521,7 @@ 'ldflags': [ '-m32' ], }], [ 'host_arch=="ppc64" and OS not in "aix os400"', { @@ -9,7 +9,7 @@ 'ldflags': [ '-m64' ], }], [ 'host_arch=="s390x" and OS=="linux"', { -@@ -513,7 +513,7 @@ +@@ -545,7 +545,7 @@ 'ldflags': [ '-m32' ], }], [ 'target_arch=="ppc64" and OS not in "aix os400"', { diff --git a/security/bitwarden-cli/files/node/patch-configure.py b/security/bitwarden-cli/files/node/patch-configure.py index 7d44850721fc..11a8cdf9caf6 100644 --- a/security/bitwarden-cli/files/node/patch-configure.py +++ b/security/bitwarden-cli/files/node/patch-configure.py @@ -1,6 +1,6 @@ ---- configure.py.orig 2024-10-03 09:20:49 UTC +--- configure.py.orig 2024-10-16 14:36:50 UTC +++ configure.py -@@ -1829,7 +1829,7 @@ def configure_intl(o): +@@ -1876,7 +1876,7 @@ def configure_intl(o): elif with_intl == 'system-icu': # ICU from pkg-config. o['variables']['v8_enable_i18n_support'] = 1 diff --git a/security/bitwarden-cli/files/node/patch-deps_v8_src_base_small-vector.h b/security/bitwarden-cli/files/node/patch-deps_v8_src_base_small-vector.h new file mode 100644 index 000000000000..3d84721f6dcb --- /dev/null +++ b/security/bitwarden-cli/files/node/patch-deps_v8_src_base_small-vector.h @@ -0,0 +1,10 @@ +--- deps/v8/src/base/small-vector.h.orig 2024-10-16 14:36:54 UTC ++++ deps/v8/src/base/small-vector.h +@@ -22,7 +22,6 @@ class SmallVector { + class SmallVector { + // Currently only support trivially copyable and trivially destructible data + // types, as it uses memcpy to copy elements and never calls destructors. +- ASSERT_TRIVIALLY_COPYABLE(T); + static_assert(std::is_trivially_destructible<T>::value); + + public: 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 deleted file mode 100644 index 7e0ccb4b8b4b..000000000000 --- a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index 15c3a6e84068..000000000000 --- a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_string-16.h +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 deleted file mode 100644 index 0598c40f98da..000000000000 --- a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 deleted file mode 100644 index 7395fd13692e..000000000000 --- a/security/bitwarden-cli/files/node/patch-deps_v8_src_inspector_v8-string-conversions.h +++ /dev/null @@ -1,21 +0,0 @@ ---- 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_src_libsampler_sampler.cc b/security/bitwarden-cli/files/node/patch-deps_v8_src_libsampler_sampler.cc index 238c9d32205e..cae51cc50639 100644 --- 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 @@ -1,6 +1,6 @@ ---- deps/v8/src/libsampler/sampler.cc.orig 2024-02-13 21:43:31 UTC +--- deps/v8/src/libsampler/sampler.cc.orig 2024-10-16 14:36:54 UTC +++ deps/v8/src/libsampler/sampler.cc -@@ -511,6 +511,10 @@ void SignalHandler::FillRegisterState(void* context, R +@@ -513,6 +513,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]); 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 deleted file mode 100644 index 810a29c2782a..000000000000 --- a/security/bitwarden-cli/files/node/patch-deps_v8_third__party_inspector__protocol_crdtp_test__platform__v8.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 99e4d1d89cae..fde0e67aec64 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 2024-10-03 09:20:53 UTC +--- node.gypi.orig 2024-10-16 14:36:58 UTC +++ node.gypi -@@ -354,6 +354,9 @@ +@@ -358,6 +358,9 @@ [ 'node_use_openssl=="true"', { 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ 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 deleted file mode 100644 index 69e6fc687aec..000000000000 --- a/security/bitwarden-cli/files/node/patch-src_crypto_crypto__util.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- src/crypto/crypto_util.cc.orig 2024-02-13 21:43:33 UTC -+++ src/crypto/crypto_util.cc -@@ -205,10 +205,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 index aa5e5a520ca7..d857e98f0d0a 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-08-21 12:35:32 UTC +--- tools/v8_gypfiles/v8.gyp.orig 2024-10-16 14:36:59 UTC +++ tools/v8_gypfiles/v8.gyp -@@ -1095,7 +1095,7 @@ +@@ -1245,7 +1245,7 @@ }], # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library # to implement atomic memory access |