diff options
Diffstat (limited to 'www/onlyoffice-documentserver/files')
20 files changed, 685 insertions, 826 deletions
diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch deleted file mode 100644 index a42f98ec9f12..000000000000 --- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v18.18.2.cpp.patch +++ /dev/null @@ -1,388 +0,0 @@ -https://raw.githubusercontent.com/yao-pkg/pkg-fetch/refs/tags/v3.5.7/patches/node.v18.18.2.cpp.patch -+ local FreeBSD patches - - ---- yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v18.18.2.cpp.patch 2021-12-30 20:04:18.203959000 +0100 -+++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v18.18.2.cpp.patch -@@ -11,6 +11,15 @@ + 'lto': ' -flto=4 -ffat-lto-objects ', # - }, { - 'lto': ' -flto ', # Clang - }], -+@@ -399,7 +399,7 @@ -+ }], -+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', { -+ 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], -+- 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17' ], -++ 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++17', '-Wno-error=enum-constexpr-conversion' ], -+ 'defines': [ '__STDC_FORMAT_MACROS' ], -+ 'ldflags': [ '-rdynamic' ], -+ 'target_conditions': [ - diff --git node/configure.py node/configure.py - index 7006ee6581..12fb2ac8d1 100755 - --- node/configure.py -@@ -25,6 +34,15 @@ - o['cflags']+=['-msign-return-address=all'] - o['variables']['arm_fpu'] = options.arm_fpu or 'neon' - - if options.node_snapshot_main is not None: -+@@ -1829,7 +1829,7 @@ def configure_intl(o): -+ elif with_intl == 'system-icu': -+ # ICU from pkg-config. -+ o['variables']['v8_enable_i18n_support'] = 1 -+- pkgicu = pkg_config('icu-i18n') -++ pkgicu = pkg_config(['icu-i18n', 'icu-uc']) -+ if not pkgicu[0]: -+ error('''Could not load pkg-config data for "icu-i18n". -+ See above errors or the README.md.''') - diff --git node/deps/v8/include/v8-initialization.h node/deps/v8/include/v8-initialization.h - index 3d59c73f7c..00b2de4524 100644 - --- node/deps/v8/include/v8-initialization.h -@@ -580,3 +599,349 @@ + 'cflags_cc': [ '-frtti', '-fno-lto' ], - 'cflags_cc!': [ '-fno-rtti' ], - }], - [ 'OS == "mac" or OS == "ios"', { -+--- nodes/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2023-04-12 04:09:13 UTC -++++ nodes/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', -+--- nodes/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-04-12 04:09:13 UTC -++++ nodes/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': [ -+--- nodes/deps/openssl/openssl_no_asm.gypi.orig 2023-04-12 04:09:14 UTC -++++ nodes/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'], -+ }], -+ ], -+ } -+--- nodes/deps/openssl/openssl-cl_no_asm.gypi.orig 2023-04-12 04:09:13 UTC -++++ nodes/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'], -+ }], -+ ], -+ } -+--- nodes/deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-04-12 04:09:14 UTC -++++ nodes/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; -+--- nodes/deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-04-12 04:09:15 UTC -++++ nodes/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 -+--- nodes/deps/v8/src/codegen/ppc/constants-ppc.h.orig 2023-04-12 04:09:15 UTC -++++ nodes/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 -+--- nodes/deps/v8/src/libsampler/sampler.cc.orig 2023-04-12 04:09:15 UTC -++++ nodes/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 -+--- nodes/node.gypi.orig 2023-04-12 04:09:19 UTC -++++ nodes/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': [ -+--- nodes/src/crypto/crypto_util.cc.orig 2023-04-12 04:09:19 UTC -++++ nodes/src/crypto/crypto_util.cc -+@@ -195,10 +195,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) { -+--- nodes/src/cares_wrap.h.orig 2023-04-12 04:09:19 UTC -++++ nodes/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 { -+--- nodes/tools/v8_gypfiles/v8.gyp.orig 2023-04-12 04:09:21 UTC -++++ nodes/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', ], -+ }, -+commit 182d9c05e78b1ddb1cb8242cd3628a7855a0336f -+Author: Andrey Kosyakov <caseq@chromium.org> -+Date: 2023-08-17T13:50:11-07:00 -+ -+ Define UChar as char16_t -+ -+ We used to have UChar defined as uint16_t which does not go along -+ with STL these days if you try to have an std::basic_string<> of it, -+ as there are no standard std::char_traits<> specialization for uint16_t. -+ -+ This switches UChar to char16_t where practical, introducing a few -+ compatibility shims to keep CL size small, as (1) this would likely -+ have to be back-ported and (2) crdtp extensively uses uint16_t for -+ wide chars. -+ -+ Bug: b:296390693 -+ Change-Id: I66a32d8f0050915225b187de56896c26dd76163d -+ Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4789966 -+ Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> -+ Commit-Queue: Jaroslav Sevcik <jarin@chromium.org> -+ Auto-Submit: Andrey Kosyakov <caseq@chromium.org> -+ Cr-Commit-Position: refs/heads/main@{#89559} -+ -+diff --git deps/v8/src/inspector/string-16.cc deps/v8/src/inspector/string-16.cc -+index a8b786a8166..6df9963e970 100644 -+--- node/deps/v8/src/inspector/string-16.cc -++++ node/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 @@ int64_t charactersToInteger(const UChar* characters, size_t length, -+ -+ 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) {} -+ -+@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UChar* stringStart, size_t 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 { -+ return UTF16ToUTF8(m_impl.data(), m_impl.size()); -+ } -+ -+diff --git deps/v8/src/inspector/string-16.h deps/v8/src/inspector/string-16.h -+index 1678ffb2e1e..d9f6c466ab1 100644 -+--- node/deps/v8/src/inspector/string-16.h -++++ node/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); -+@@ -47,7 +49,9 @@ class String16 { -+ uint64_t toUInt64(bool* ok = nullptr) const; -+ int toInteger(bool* ok = nullptr) 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]; } -+@@ -76,6 +80,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 { -+ -+--- node/deps/v8/src/inspector/v8-string-conversions.cc -++++ node/deps/v8/src/inspector/v8-string-conversions.cc -+@@ -12,7 +12,7 @@ -+ -+ 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::string UTF16ToUTF8(const UChar* stringStart, size_t length) { -+ -+ 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* stringStart, size_t length) { -+ 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 deps/v8/src/inspector/v8-string-conversions.h deps/v8/src/inspector/v8-string-conversions.h -+index eb33c6816a5..1126255dac2 100644 -+--- node/deps/v8/src/inspector/v8-string-conversions.h.orig 2024-11-03 17:30:05.387600000 +0100 -++++ node/deps/v8/src/inspector/v8-string-conversions.h 2024-11-03 17:30:27.156398000 +0100 -+@@ -5,14 +5,15 @@ -+ #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_ -+ -+ -+ -+--- node/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc -++++ node/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc -+@@ -11,13 +11,16 @@ -+ 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/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.4.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.4.cpp.patch new file mode 100644 index 000000000000..0940e6667edd --- /dev/null +++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.4.cpp.patch @@ -0,0 +1,192 @@ +https://github.com/yao-pkg/pkg-fetch/raw/refs/tags/v3.5.24/patches/node.v20.19.4.cpp.patch ++ local FreeBSD patches + +--- yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v20.19.4.cpp.patch ++++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v20.19.4.cpp.patch +@@ -600,3 +600,186 @@ index 2655b9e694..1d951571c7 100644 + 'cflags_cc!': [ '-fno-rtti' ], + }], + [ 'OS == "mac" or OS == "ios"', { ++--- node/common.gypi.orig 2023-07-20 18:27:37 UTC +++++ node/common.gypi ++@@ -426,7 +426,7 @@ ++ 'ldflags': [ '-m32' ], ++ }], ++ [ 'host_arch=="ppc64" and OS not in "aix os400"', { ++- 'cflags': [ '-m64', '-mminimal-toc' ], +++ 'cflags': [ '-m64' ], ++ 'ldflags': [ '-m64' ], ++ }], ++ [ 'host_arch=="s390x" and OS=="linux"', { ++@@ -450,7 +450,7 @@ ++ 'ldflags': [ '-m32' ], ++ }], ++ [ 'target_arch=="ppc64" and OS not in "aix os400"', { ++- 'cflags': [ '-m64', '-mminimal-toc' ], +++ 'cflags': [ '-m64' ], ++ 'ldflags': [ '-m64' ], ++ }], ++ [ 'target_arch=="s390x" and OS=="linux"', { ++--- node/deps/openssl/config/archs/linux-elf/no-asm/openssl-cl.gypi.orig 2023-05-16 06:58:19 UTC +++++ node/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', ++--- node/deps/openssl/config/archs/linux-elf/no-asm/openssl.gypi.orig 2023-05-16 06:58:19 UTC +++++ node/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': [ ++--- node/deps/openssl/openssl-cl_no_asm.gypi.orig 2023-11-22 10:13:54 UTC +++++ node/deps/openssl/openssl-cl_no_asm.gypi ++@@ -1,4 +1,5 @@ ++ { +++ 'defines': ['OPENSSL_NO_ASM'], ++ 'conditions': [ ++ ['target_arch=="ppc64" and OS in ("aix", "os400")', { ++ 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'], ++@@ -45,7 +46,7 @@ ++ 'includes': ['config/archs/linux64-loongarch64/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'], ++ }], ++ ], ++ } ++--- node/deps/openssl/openssl_no_asm.gypi.orig 2023-05-16 06:58:20 UTC +++++ node/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'], ++ }], ++ ], ++ } ++--- node/deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-05-16 06:58:20 UTC +++++ node/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; ++--- node/deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-05-16 06:58:20 UTC +++++ node/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 ++--- node/deps/v8/src/codegen/ppc/constants-ppc.h.orig 2023-05-16 06:58:20 UTC +++++ node/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 ++--- node/deps/v8/src/libsampler/sampler.cc.orig 2023-05-16 06:58:20 UTC +++++ node/deps/v8/src/libsampler/sampler.cc ++@@ -511,6 +511,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 ++--- node.gypi.orig 2023-05-16 06:58:21 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': [ ++--- node/src/crypto/crypto_util.cc.orig 2023-05-16 06:58:21 UTC +++++ node/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) { ++--- node/src/cares_wrap.h.orig 2023-05-16 06:58:21 UTC +++++ node/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 { ++--- node/tools/v8_gypfiles/v8.gyp.orig 2023-05-16 06:58:22 UTC +++++ node/tools/v8_gypfiles/v8.gyp ++@@ -1091,7 +1091,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 ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { +++ ['v8_current_cpu in ["mips64", "mips64el", "ppc", "riscv64", "loong64"]', { ++ 'link_settings': { ++ 'libraries': ['-latomic', ], ++ }, diff --git a/www/onlyoffice-documentserver/files/package-lock.json b/www/onlyoffice-documentserver/files/package-lock.json index 3d8a8d49a3ef..59035f286384 100644 --- a/www/onlyoffice-documentserver/files/package-lock.json +++ b/www/onlyoffice-documentserver/files/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@yao-pkg/pkg": "^5.11.1" + "@yao-pkg/pkg": "^6.6.0" } }, "node_modules/@babel/generator": { @@ -62,6 +62,18 @@ "node": ">=6.9.0" } }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "license": "ISC", + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", @@ -105,71 +117,44 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@yao-pkg/pkg": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/@yao-pkg/pkg/-/pkg-5.11.1.tgz", - "integrity": "sha512-y++Kd/kMZcp0UeI2GWB9+55WsDqZp3XCjHGzC4Nsao0tlGjhnNOB+TPhZhLTOCL1V4ApaKkH8zzPcpaTCtvM8g==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/@yao-pkg/pkg/-/pkg-6.6.0.tgz", + "integrity": "sha512-3/oiaSm7fS0Fc7dzp22r9B7vFaguGhO9vERgEReRYj2EUzdi5ssyYhe1uYJG4ec/dmo2GG6RRHOUAT8savl79Q==", + "license": "MIT", "dependencies": { - "@babel/generator": "7.23.0", - "@babel/parser": "7.23.0", - "@babel/types": "7.23.0", - "@yao-pkg/pkg-fetch": "3.5.7", - "chalk": "^4.1.2", - "fs-extra": "^9.1.0", - "globby": "^11.1.0", + "@babel/generator": "^7.23.0", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", + "@yao-pkg/pkg-fetch": "3.5.24", "into-stream": "^6.0.0", - "is-core-module": "2.9.0", "minimist": "^1.2.6", "multistream": "^4.1.0", - "prebuild-install": "7.1.1", - "resolve": "^1.22.0", - "stream-meter": "^1.0.4" + "picocolors": "^1.1.0", + "picomatch": "^4.0.2", + "prebuild-install": "^7.1.1", + "resolve": "^1.22.10", + "stream-meter": "^1.0.4", + "tar": "^7.4.3", + "tinyglobby": "^0.2.11", + "unzipper": "^0.12.3" }, "bin": { "pkg": "lib-es5/bin.js" + }, + "engines": { + "node": ">=18.0.0" } }, "node_modules/@yao-pkg/pkg-fetch": { - "version": "3.5.7", - "resolved": "https://registry.npmjs.org/@yao-pkg/pkg-fetch/-/pkg-fetch-3.5.7.tgz", - "integrity": "sha512-DhuvjBZsdrUrkXC+eYZljxCxZ8QrjPQRGhJEA8+hUsKhmPyg+FUn6ebOfN6B7ioiJg7GsVpUJt57hALBCj9epA==", + "version": "3.5.24", + "resolved": "https://registry.npmjs.org/@yao-pkg/pkg-fetch/-/pkg-fetch-3.5.24.tgz", + "integrity": "sha512-FPESCH1uXCYui6jeDp2aayWuFHR39w+uU1r88nI6JWRvPYOU64cHPUV/p6GSFoQdpna7ip92HnrZKbBC60l0gA==", + "license": "MIT", "dependencies": { - "chalk": "^4.1.2", - "fs-extra": "^9.1.0", "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.6", + "picocolors": "^1.1.0", "progress": "^2.0.3", "semver": "^7.3.5", "tar-fs": "^2.1.1", @@ -183,6 +168,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", "dependencies": { "debug": "4" }, @@ -194,6 +180,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -202,6 +189,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -212,22 +200,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "engines": { - "node": ">=8" - } - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -270,16 +242,11 @@ "node": ">= 6" } }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "license": "MIT" }, "node_modules/buffer": { "version": "5.7.1", @@ -304,21 +271,6 @@ "ieee754": "^1.1.13" } }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/chownr": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", @@ -328,6 +280,7 @@ "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -338,6 +291,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -348,7 +302,8 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/core-util-is": { "version": "1.0.3", @@ -356,11 +311,12 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", + "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -401,21 +357,20 @@ "node": ">=8" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "node_modules/duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", + "license": "BSD-3-Clause", "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" + "readable-stream": "^2.0.2" } }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/end-of-stream": { "version": "1.4.4", @@ -426,9 +381,10 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -441,38 +397,18 @@ "node": ">=6" } }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dependencies": { - "to-regex-range": "^5.0.1" + "node_modules/fdir": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", + "license": "MIT", + "peerDependencies": { + "picomatch": "^3 || ^4" }, - "engines": { - "node": ">=8" + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } } }, "node_modules/from2": { @@ -490,23 +426,24 @@ "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "license": "MIT", "dependencies": { - "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" }, "engines": { - "node": ">=10" + "node": ">=14.14" } }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -515,6 +452,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -524,61 +462,17 @@ "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", "integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==" }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/has": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", - "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "engines": { - "node": ">=8" - } + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "license": "ISC" }, "node_modules/hasown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", - "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -590,6 +484,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", "dependencies": { "agent-base": "6", "debug": "4" @@ -617,14 +512,6 @@ } ] }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "engines": { - "node": ">= 4" - } - }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", @@ -651,51 +538,29 @@ } }, "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", + "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "engines": { - "node": ">=0.12.0" - } - }, "node_modules/isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -716,6 +581,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "license": "MIT", "dependencies": { "universalify": "^2.0.0" }, @@ -734,26 +600,6 @@ "node": ">=10" } }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/mimic-response": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", @@ -773,15 +619,52 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/minizlib": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", + "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==", + "license": "MIT", + "dependencies": { + "minipass": "^7.1.2" + }, + "engines": { + "node": ">= 18" + } + }, + "node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "license": "MIT", + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/mkdirp-classic": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" }, "node_modules/multistream": { "version": "4.1.0", @@ -839,6 +722,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -854,6 +738,12 @@ } } }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "license": "MIT" + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -873,22 +763,22 @@ "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "license": "MIT" }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "engines": { - "node": ">=8" - } + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -928,6 +818,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -941,25 +832,6 @@ "once": "^1.3.1" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -992,68 +864,31 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "license": "MIT", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve/node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dependencies": { - "hasown": "^2.0.0" + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1116,14 +951,6 @@ "simple-concat": "^1.0.0" } }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "engines": { - "node": ">=8" - } - }, "node_modules/stream-meter": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz", @@ -1144,6 +971,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1157,6 +985,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1172,21 +1001,11 @@ "node": ">=0.10.0" } }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -1194,6 +1013,23 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "license": "ISC", + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/tar-fs": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz", @@ -1233,29 +1069,53 @@ "node": ">= 6" } }, - "node_modules/to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "node_modules/tar/node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "license": "BlueOak-1.0.0", "engines": { - "node": ">=4" + "node": ">=18" } }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "node_modules/tar/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "license": "MIT", "dependencies": { - "is-number": "^7.0.0" + "fdir": "^6.4.4", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "engines": { - "node": ">=8.0" + "node": ">=4" } }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "license": "MIT" }, "node_modules/tunnel-agent": { "version": "0.6.0", @@ -1272,10 +1132,24 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "license": "MIT", "engines": { "node": ">= 10.0.0" } }, + "node_modules/unzipper": { + "version": "0.12.3", + "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.12.3.tgz", + "integrity": "sha512-PZ8hTS+AqcGxsaQntl3IRBw65QrBI6lxzqDEL7IAo/XCEqRTKGfOX56Vea5TH9SZczRVxuzk1re04z/YjuYCJA==", + "license": "MIT", + "dependencies": { + "bluebird": "~3.7.2", + "duplexer2": "~0.1.4", + "fs-extra": "^11.2.0", + "graceful-fs": "^4.2.2", + "node-int64": "^0.4.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -1284,12 +1158,14 @@ "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause" }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "license": "MIT", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -1299,6 +1175,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1320,6 +1197,7 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", "engines": { "node": ">=10" } @@ -1333,6 +1211,7 @@ "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -1350,6 +1229,7 @@ "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "license": "ISC", "engines": { "node": ">=10" } diff --git a/www/onlyoffice-documentserver/files/package.json b/www/onlyoffice-documentserver/files/package.json index 17e3ef105d83..9251e320859a 100644 --- a/www/onlyoffice-documentserver/files/package.json +++ b/www/onlyoffice-documentserver/files/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "@yao-pkg/pkg": "^5.11.1" + "@yao-pkg/pkg": "^6.6.0" } } diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py index 392eeaa6b401..74dddee61746 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_build__server.py @@ -1,11 +1,8 @@ ---- build_tools/scripts/build_server.py.orig 2024-02-07 10:44:24.000000000 +0100 -+++ build_tools/scripts/build_server.py 2024-03-01 10:53:21.550159000 +0100 -@@ -38,8 +38,12 @@ def make(): - if(base.is_exist(custom_public_key)): - base.copy_file(custom_public_key, server_dir + '/Common/sources') - -- pkg_target = "node16" -+ pkg_target = "node18" +--- build_tools/scripts/build_server.py.orig 2025-06-11 12:56:35 UTC ++++ build_tools/scripts/build_server.py +@@ -41,6 +41,10 @@ def make(): + #node22 packaging has issue https://github.com/yao-pkg/pkg/issues/87 + pkg_target = "node20" + if ("freebsd" == base.host_platform()): + pkg_target += "-freebsd" @@ -14,7 +11,7 @@ if ("linux" == base.host_platform()): pkg_target += "-linux" if (-1 != config.option("platform").find("linux_arm64")): -@@ -48,14 +52,15 @@ def make(): +@@ -49,14 +53,15 @@ def make(): if ("windows" == base.host_platform()): pkg_target += "-win" diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py index b01a4c04efbb..c1fbe9c44b38 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_make__common.py @@ -1,6 +1,6 @@ ---- build_tools/scripts/core_common/make_common.py.orig 2021-11-16 07:07:24 UTC +--- build_tools/scripts/core_common/make_common.py.orig 2025-06-11 12:56:35 UTC +++ build_tools/scripts/core_common/make_common.py -@@ -8,20 +8,20 @@ import glob +@@ -8,21 +8,21 @@ import config import base import glob @@ -17,6 +17,7 @@ import v8 import html2 import iwork + import md -import hunspell +#import hunspell import glew @@ -28,7 +29,7 @@ import libvlc def check_android_ndk_macos_arm(dir): -@@ -37,18 +37,18 @@ def make(): +@@ -38,19 +38,19 @@ def make(): if base.is_dir(toolchain): check_android_ndk_macos_arm(toolchain + "/prebuilt") @@ -43,6 +44,7 @@ v8.make() html2.make() iwork.make(False) + md.make() - hunspell.make(False) - harfbuzz.make() +# hunspell.make(False) diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_html2.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_html2.py new file mode 100644 index 000000000000..f7392a57031b --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_html2.py @@ -0,0 +1,20 @@ +--- build_tools/scripts/core_common/modules/html2.py.orig 2025-04-14 10:11:35 UTC ++++ build_tools/scripts/core_common/modules/html2.py +@@ -17,13 +17,13 @@ def clear_module(): + def make(): + old_cur_dir = os.getcwd() + +- print("[fetch]: html") ++ print("[patch & build]: html") + + base_dir = base.get_script_dir() + "/../../core/Common/3dParty/html" + +- os.chdir(base_dir) +- base.check_module_version("2", clear_module) +- os.chdir(old_cur_dir) ++# os.chdir(base_dir) ++# base.check_module_version("2", clear_module) ++# os.chdir(old_cur_dir) + + base.cmd_in_dir(base_dir, "python", ["fetch.py"]) + return diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx b/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx index 2ba2e7398244..0d72b10783f3 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx @@ -1,6 +1,6 @@ ---- core/Apple/StringDocumentHandler.hxx.orig 2025-03-08 17:38:58.104116000 +0100 -+++ core/Apple/StringDocumentHandler.hxx 2025-03-08 16:45:03.144938000 +0100 -@@ -0,0 +1,51 @@ +--- core/Apple/StringDocumentHandler.hxx.orig 2025-07-21 00:30:34.163412000 +0000 ++++ core/Apple/StringDocumentHandler.hxx 2025-07-21 03:02:42.802399000 +0000 +@@ -0,0 +1,154 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* writerperfect + * Version: MPL 2.0 / LGPLv2.1+ @@ -52,3 +52,106 @@ +#endif + +/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ ++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* writerperfect ++ * Version: MPL 2.0 / LGPLv2.1+ ++ * ++ * This Source Code Form is subject to the terms of the Mozilla Public ++ * License, v. 2.0. If a copy of the MPL was not distributed with this ++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ * ++ * Major Contributor(s): ++ * Copyright (C) 2002-2004 William Lachance (wrlach@gmail.com) ++ * Copyright (C) 2004-2006 Fridrich Strba (fridrich.strba@bluewin.ch) ++ * ++ * For minor contributions see the git repository. ++ * ++ * Alternatively, the contents of this file may be used under the terms ++ * of the GNU Lesser General Public License Version 2.1 or later ++ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are ++ * applicable instead of those above. ++ * ++ * For further information visit http://libwpd.sourceforge.net ++ */ ++ ++#include <string.h> ++ ++ ++StringDocumentHandler::StringDocumentHandler() : m_data(""), m_isTagOpened(false), m_openedTagName("") ++{ ++ m_data.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); ++} ++ ++void StringDocumentHandler::endDocument() ++{ ++ if (!m_isTagOpened) return; ++ m_data.append(">"); ++ m_isTagOpened = false; ++} ++ ++void StringDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList) ++{ ++ if (m_isTagOpened) ++ { ++ m_data.append(">"); ++ m_isTagOpened = false; ++ } ++ m_data.append("<"); ++ m_data.append(psName); ++ librevenge::RVNGPropertyList::Iter i(xPropList); ++ for (i.rewind(); i.next();) ++ { ++ // filter out librevenge elements ++ if (!strncmp(i.key(), "librevenge:", 11)) continue; ++ ++ m_data.append(" "); ++ m_data.append(i.key()); ++ m_data.append("=\""); ++ if (i()->getStr().len()>0) ++ m_data.append(i()->getStr().cstr()); ++ m_data.append("\""); ++ } ++ m_isTagOpened = true; ++ m_openedTagName.sprintf("%s", psName); ++} ++void StringDocumentHandler::endElement(const char *psName) ++{ ++ if (m_isTagOpened) ++ { ++ if (m_openedTagName == psName) ++ { ++ m_data.append("/>"); ++ m_isTagOpened = false; ++ } ++ else // should not happen, but handle it ++ { ++ m_data.append(">"); ++ m_data.append("</"); ++ m_data.append(psName); ++ m_data.append(">"); ++ m_isTagOpened = false; ++ } ++ } ++ else ++ { ++ m_data.append("</"); ++ m_data.append(psName); ++ m_data.append(">"); ++ m_isTagOpened = false; ++ } ++} ++ ++void StringDocumentHandler::characters(const librevenge::RVNGString &sCharacters) ++{ ++ if (m_isTagOpened) ++ { ++ m_data.append(">"); ++ m_isTagOpened = false; ++ } ++ librevenge::RVNGString sEscapedCharacters; ++ sEscapedCharacters.appendEscapedXML(sCharacters); ++ if (sEscapedCharacters.len() > 0) ++ m_data.append(sEscapedCharacters.cstr()); ++} ++ ++/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */ diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_html_fetch.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_html_fetch.py new file mode 100644 index 000000000000..bc0ee48515bc --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_html_fetch.py @@ -0,0 +1,25 @@ +--- core/Common/3dParty/html/fetch.py.orig 2025-04-16 08:37:24 UTC ++++ core/Common/3dParty/html/fetch.py +@@ -8,16 +8,16 @@ import os + + base_directory = os.getcwd() + +-if not base.is_dir("gumbo-parser"): +- base.cmd("git", ["clone", "https://github.com/google/gumbo-parser.git"]) +- base.cmd_in_dir("gumbo-parser", "git", ["checkout", "aa91b27b02c0c80c482e24348a457ed7c3c088e0"]) ++if base.is_dir("gumbo-parser"): ++# base.cmd("git", ["clone", "https://github.com/google/gumbo-parser.git"]) ++# base.cmd_in_dir("gumbo-parser", "git", ["checkout", "aa91b27b02c0c80c482e24348a457ed7c3c088e0"]) + + # fix gumbo + base.replaceInFile(base_directory + "/gumbo-parser/src/tag.c", "isspace(*c)", "isspace((unsigned char)*c)") + +-if not base.is_dir("katana-parser"): +- base.cmd("git", ["clone", "https://github.com/jasenhuang/katana-parser.git"]) +- base.cmd_in_dir("katana-parser", "git", ["checkout", "be6df458d4540eee375c513958dcb862a391cdd1"]) ++if base.is_dir("katana-parser"): ++# base.cmd("git", ["clone", "https://github.com/jasenhuang/katana-parser.git"]) ++# base.cmd_in_dir("katana-parser", "git", ["checkout", "be6df458d4540eee375c513958dcb862a391cdd1"]) + + # fix katana + base.replaceInFileUtf8(base_directory + "/katana-parser/src/tokenizer.c", "static inline bool katana_is_html_space(char c);", "static inline bool2 katana_is_html_space(char c);") diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn index cf77653a481b..42e4830a4c7a 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn.orig 2022-04-04 20:12:27 UTC +--- core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn.orig 2022-05-13 11:39:36 UTC +++ core/Common/3dParty/v8_89/v8/build/config/compiler/BUILD.gn @@ -132,7 +132,7 @@ declare_args() { # @@ -27,7 +27,18 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] cflags += [ -@@ -799,7 +799,7 @@ config("compiler_cpu_abi") { +@@ -785,10 +785,6 @@ config("compiler_cpu_abi") { + ] + } + } else if (current_cpu == "arm") { +- if (is_clang && !is_android && !is_nacl) { +- cflags += [ "--target=arm-linux-gnueabihf" ] +- ldflags += [ "--target=arm-linux-gnueabihf" ] +- } + if (!is_nacl) { + cflags += [ + "-march=$arm_arch", +@@ -799,7 +795,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -36,7 +47,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1149,7 +1149,7 @@ config("compiler_deterministic") { +@@ -1149,7 +1145,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -45,7 +56,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1177,7 +1177,7 @@ config("clang_revision") { +@@ -1177,7 +1173,7 @@ config("clang_revision") { } config("clang_revision") { @@ -54,7 +65,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1526,7 +1526,7 @@ config("default_warnings") { +@@ -1526,7 +1522,7 @@ config("default_warnings") { "-Wno-undefined-var-template", ] @@ -63,7 +74,7 @@ # TODO(thakis): https://crbug.com/617318 # Currently goma can not handle case sensitiveness for windows well. cflags += [ "-Wno-nonportable-include-path" ] -@@ -1780,7 +1780,7 @@ config("thin_archive") { +@@ -1780,7 +1776,7 @@ config("thin_archive") { config("thin_archive") { # The macOS and iOS default linker ld64 does not support reading thin # archives. @@ -72,7 +83,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2321,11 +2321,11 @@ config("symbols") { +@@ -2321,11 +2317,11 @@ config("symbols") { # flag, so we can use use -g1 for pnacl and nacl-clang compiles. # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. if (!is_nacl || is_clang) { diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h new file mode 100644 index 000000000000..156b89cc28f9 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_src_base_macros.h @@ -0,0 +1,12 @@ +--- core/Common/3dParty/v8_89/v8/src/base/macros.h.orig 2021-04-12 21:00:33.000000000 +0000 ++++ core/Common/3dParty/v8_89/v8/src/base/macros.h 2025-06-20 09:42:18.838769000 +0000 +@@ -203,7 +203,8 @@ + // base::is_trivially_copyable will differ for these cases. + template <typename T> + struct is_trivially_copyable { +-#if V8_CC_MSVC ++#if V8_CC_MSVC || (__GNUC__ == 12 && __GNUC_MINOR__ <= 2) || \ ++ (defined(__clang__) && __clang_major__ <= 17) + // Unfortunately, MSVC 2015 is broken in that std::is_trivially_copyable can + // be false even though it should be true according to the standard. + // (status at 2018-02-26, observed on the msvc waterfall bot). diff --git a/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h b/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h new file mode 100644 index 000000000000..89f4e678060d --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_OfficeUtils_src_zlib-1.2.11_gzguts.h @@ -0,0 +1,12 @@ +--- core/OfficeUtils/src/zlib-1.2.11/gzguts.h.orig 2025-04-16 08:37:24.000000000 +0000 ++++ core/OfficeUtils/src/zlib-1.2.11/gzguts.h 2025-06-19 20:31:01.755367000 +0000 +@@ -33,6 +33,8 @@ + + #ifdef _WIN32 + # include <stddef.h> ++#else ++# include <unistd.h> + #endif + + #if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32) + diff --git a/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfEditor.cpp b/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfEditor.cpp new file mode 100644 index 000000000000..9af6739ab2af --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfEditor.cpp @@ -0,0 +1,11 @@ +--- core/PdfFile/PdfEditor.cpp.orig 2025-06-17 15:35:44 UTC ++++ core/PdfFile/PdfEditor.cpp +@@ -1391,7 +1391,7 @@ bool CPdfEditor::EditPage(int _nPageIndex, bool bSet, + PDFDoc* pPDFDocument = NULL; + int nPageIndex = m_pReader->GetPageIndex(_nPageIndex, &pPDFDocument); + if (nPageIndex < 0 || !pPDFDocument) +- return NULL; ++ return 0; + + PdfWriter::CDocument* pDoc = m_pWriter->GetDocument(); + if (!pPDFDocument || !pDoc) diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile index 69807f92636e..ba4ae3c069d7 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile @@ -26,7 +26,7 @@ + DS_FILES := /var/db/$(DS_PREFIX) + DS_EXAMLE := %%LOCALBASE%%/www/$(DS_PREFIX)-example + DEV_NULL := /dev/null -+ PKG_TARGET := node18 ++ PKG_TARGET := node20 + endif ifeq ($(UNAME_S),Linux) PLATFORM := linux diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 index c6b60908149a..6d40dfa72b4c 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 @@ -46,7 +46,8 @@ +LOCAL_CONF=%%LOCALBASE%%/etc/M4_DS_PREFIX/local.json +JSON="%%LOCALBASE%%/www/M4_DS_PREFIX/npm/json -q -f ${LOCAL_CONF}" - SECURE_LINK_SECRET=${SECURE_LINK_SECRET:-$(pwgen -s 20)} +-SECURE_LINK_SECRET=${SECURE_LINK_SECRET:-$(tr -dc A-Za-z0-9 </dev/urandom | head -c 20)} ++SECURE_LINK_SECRET=${SECURE_LINK_SECRET:-$(pwgen -s 20)} -sed "s,\(set \+\$secure_link_secret\).*,\1 "${SECURE_LINK_SECRET}";," -i ${NGINX_CONF} -${JSON} -I -e 'this.storage={fs: {secretString: "'${SECURE_LINK_SECRET}'" }}' && chown ds:ds $LOCAL_CONF diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf index c8a9eedfa80e..6386c904077e 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf @@ -1,8 +1,9 @@ https://raw.githubusercontent.com/nginx/nginx/master/conf/mime.types ++ IWork filetypes --- document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf.orig 2022-05-15 11:09:53.906141000 +0200 +++ document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf 2022-05-15 11:10:02.802873000 +0200 -@@ -0,0 +1,99 @@ +@@ -0,0 +1,102 @@ + +types { + text/html html htm shtml; @@ -40,6 +41,9 @@ https://raw.githubusercontent.com/nginx/nginx/master/conf/mime.types + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; ++ application/vnd.apple.keynote key kth; ++ application/vnd.apple.pages pages template; ++ application/vnd.apple.numbers numbers nmbtemplate; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; diff --git a/www/onlyoffice-documentserver/files/patch-server_FileConverter_package.json b/www/onlyoffice-documentserver/files/patch-server_FileConverter_package.json deleted file mode 100644 index 8fce54082464..000000000000 --- a/www/onlyoffice-documentserver/files/patch-server_FileConverter_package.json +++ /dev/null @@ -1,12 +0,0 @@ ---- server/FileConverter/package.json.orig 2024-03-16 10:12:52.171482000 +0100 -+++ server/FileConverter/package.json 2024-03-16 10:13:07.708291000 +0100 -@@ -9,7 +9,8 @@ - "bytes": "3.0.0", - "co": "4.6.0", - "config": "2.0.1", -- "lcid": "3.1.1" -+ "lcid": "3.1.1", -+ "ms": "2.1.1" - }, - "pkg": { - "scripts": [ diff --git a/www/onlyoffice-documentserver/files/patch-server_package.json b/www/onlyoffice-documentserver/files/patch-server_package.json index 984b76c3bcb0..d1a485701de7 100644 --- a/www/onlyoffice-documentserver/files/patch-server_package.json +++ b/www/onlyoffice-documentserver/files/patch-server_package.json @@ -1,38 +1,18 @@ ---- server/package.json.orig 2024-01-30 12:30:03.000000000 +0100 -+++ server/package.json 2024-03-01 10:57:21.937036000 +0100 -@@ -9,7 +9,7 @@ - "expand": true, - "src": [ - "./**/sources/*.js", -- "./Common/package.json", -+ "./Common/*.json", - "./DocService/package.json", - "./DocService/public/healthcheck.docx", - "./FileConverter/package.json", -@@ -34,6 +34,7 @@ - "mkdir": { - "server": { - "options": { -+ "mode": "0755", - "create": [ - "./build/server" - ] -@@ -54,9 +55,10 @@ - "./build/server/Metrics" - ], +--- server/package.json.orig 2025-06-16 18:22:18 UTC ++++ server/package.json +@@ -4,6 +4,8 @@ + "homepage": "https://www.onlyoffice.com", + "private": true, "dependencies": { -- "grunt": "1.5.3", + "grunt": "^1.6.1", - "grunt-banner": "0.6.0", - "grunt-check-dependencies": "1.0.0", + "grunt-cli": "^1.5.0", - "grunt-contrib-clean": "2.0.0", - "grunt-contrib-copy": "1.0.0", - "grunt-mkdir": "1.1.0", -@@ -78,10 +80,10 @@ - "integration tests with server instance": "cd ./DocService && jest integration/withServerInstance --inject-globals=false --config=../tests/jest.config.js", + "license-downloader": "1.0.8", + "license-report": "6.5.0", + "npm-run-all": "4.1.5" +@@ -25,10 +25,10 @@ "integration database tests": "cd ./DocService && jest integration/databaseTests --inject-globals=false --config=../tests/jest.config.js", "tests": "cd ./DocService && jest --inject-globals=false --config=../tests/jest.config.js", + "tests:dev": "cd ./DocService && jest --inject-globals=false --config=../tests/jest.config.js --watch", - "install:Common": "npm ci --prefix ./Common", - "install:DocService": "npm ci --prefix ./DocService", - "install:FileConverter": "npm ci --prefix ./FileConverter", diff --git a/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json b/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json index 50a7a8392908..a29bc7311c2d 100644 --- a/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json +++ b/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json @@ -1,6 +1,15 @@ ---- web-apps/build/package.json.orig 2023-02-13 11:28:45.073468000 +0100 -+++ web-apps/build/package.json 2023-02-13 11:29:43.714855000 +0100 -@@ -40,8 +40,9 @@ +--- web-apps/build/package.json.orig 2025-06-18 20:13:18 UTC ++++ web-apps/build/package.json +@@ -29,6 +29,8 @@ + "iconv-lite": "^0.6.3", + "less-plugin-clean-css": "1.5.1", + "lodash": "^4.17.21", ++ "optipng-bin": "^5.1.0", ++ "patch-package": "^8.0.0", + "terser": "^5.20.0", + "vinyl-fs": "^4.0.0" + }, +@@ -44,8 +46,9 @@ } }, "devDependencies": { diff --git a/www/onlyoffice-documentserver/files/patch-web-apps_build_patches_optipng-bin b/www/onlyoffice-documentserver/files/patch-web-apps_build_patches_optipng-bin index bdf6acd188c9..562eda5b7660 100644 --- a/www/onlyoffice-documentserver/files/patch-web-apps_build_patches_optipng-bin +++ b/www/onlyoffice-documentserver/files/patch-web-apps_build_patches_optipng-bin @@ -11,7 +11,7 @@ + +- binBuild.url('https://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.7/optipng-0.7.7.tar.gz', [ +- `./configure --with-system-zlib --prefix="${bin.dest()}" --bindir="${bin.dest()}"`, -++ binBuild.file('%%DISTDIR%%/optipng-0.7.7.tar.gz', [ +++ binBuild.file('%%DISTDIR%%/optipng-0.7.8.tar.gz', [ ++ `./configure --with-system-zlib --with-system-libpng --prefix="${bin.dest()}" --bindir="${bin.dest()}"`, + 'make install' + ]).then(() => { |