diff options
Diffstat (limited to 'www/onlyoffice-documentserver/files')
36 files changed, 137 insertions, 117 deletions
diff --git a/www/onlyoffice-documentserver/files/npm b/www/onlyoffice-documentserver/files/npm index 63b3d2d821f1..303b86ba9102 100644 --- a/www/onlyoffice-documentserver/files/npm +++ b/www/onlyoffice-documentserver/files/npm @@ -1,3 +1,3 @@ #!/bin/sh -exec %%LOCALBASE%%/bin/npm --offline --nodedir=%%LOCALBASE%% "$@" -#exec %%LOCALBASE%%/bin/npm --nodedir=%%LOCALBASE%% "$@" +exec %%LOCALBASE%%/bin/npm --offline "$@" +#exec %%LOCALBASE%%/bin/npm "$@" 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 74dddee61746..4d6a198f38f6 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,8 +1,11 @@ --- 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(): +@@ -39,8 +39,12 @@ + base.copy_file(custom_public_key, server_dir + '/Common/sources') + #node22 packaging has issue https://github.com/yao-pkg/pkg/issues/87 - pkg_target = "node20" +- pkg_target = "node20" ++ pkg_target = "node%%PKGFETCH_NODE_MAJOR_VERSION%%" + if ("freebsd" == base.host_platform()): + pkg_target += "-freebsd" @@ -11,7 +14,7 @@ if ("linux" == base.host_platform()): pkg_target += "-linux" if (-1 != config.option("platform").find("linux_arm64")): -@@ -49,14 +53,15 @@ def make(): +@@ -49,14 +53,15 @@ 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 c1fbe9c44b38..cea340cf686e 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 2025-06-11 12:56:35 UTC +--- build_tools/scripts/core_common/make_common.py.orig 2025-08-05 15:06:08 UTC +++ build_tools/scripts/core_common/make_common.py -@@ -8,21 +8,21 @@ import config +@@ -8,22 +8,22 @@ import config import base import glob @@ -22,6 +22,7 @@ +#import hunspell import glew import harfbuzz + import oo_brotli -import hyphen -import googletest +#import hyphen @@ -29,7 +30,7 @@ import libvlc def check_android_ndk_macos_arm(dir): -@@ -38,19 +38,19 @@ def make(): +@@ -39,19 +39,19 @@ def make(): if base.is_dir(toolchain): check_android_ndk_macos_arm(toolchain + "/prebuilt") @@ -54,6 +55,6 @@ - googletest.make() +# hyphen.make() +# googletest.make() + oo_brotli.make() if config.check_option("build-libvlc", "1"): - libvlc.make() diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py index fc7d27d3fabf..74b86c964128 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_iwork.py @@ -1,5 +1,5 @@ ---- build_tools/scripts/core_common/modules/iwork.py.orig 2025-03-08 16:01:52.467009000 +0100 -+++ build_tools/scripts/core_common/modules/iwork.py 2025-03-08 16:19:57.046228000 +0100 +--- build_tools/scripts/core_common/modules/iwork.py.orig 2025-08-05 15:06:08 UTC ++++ build_tools/scripts/core_common/modules/iwork.py @@ -30,9 +30,9 @@ def make(use_gperf = True): if use_gperf: cmd_args.append("--gperf") diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py index b2204a037714..2b9632e8092f 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8.py @@ -1,14 +1,14 @@ ---- build_tools/scripts/core_common/modules/v8.py.orig 2024-02-07 10:44:24.000000000 +0100 -+++ build_tools/scripts/core_common/modules/v8.py 2024-03-01 10:40:07.626578000 +0100 -@@ -9,6 +9,7 @@ def clean(): +--- build_tools/scripts/core_common/modules/v8.py.orig 2025-08-05 15:06:08 UTC ++++ build_tools/scripts/core_common/modules/v8.py +@@ -9,6 +9,7 @@ import subprocess import v8_89 def clean(): + return if base.is_dir("depot_tools"): - base.delete_dir_with_access_error("depot_tools"); + base.delete_dir_with_access_error("depot_tools") base.delete_dir("depot_tools") -@@ -26,6 +27,8 @@ def is_main_platform(): +@@ -26,6 +27,8 @@ def clean(): def is_main_platform(): if (config.check_option("platform", "win_64") or config.check_option("platform", "win_32")): return True @@ -44,7 +44,7 @@ if not base.is_dir("v8"): @@ -121,8 +109,8 @@ def make(): base.delete_dir_with_access_error("v8/buildtools/win") - base.cmd("git", ["config", "--system", "core.longpaths", "true"]) + base.cmd("git", ["config", "--system", "core.longpaths", "true"], True) base.cmd("gclient", ["sync", "--force"], True) - else: - base.cmd("gclient", ["sync"], True) diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py index 187eb0d78e41..23d05d781124 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_v8__89.py @@ -1,6 +1,6 @@ ---- build_tools/scripts/core_common/modules/v8_89.py.orig 2024-02-07 10:44:24.000000000 +0100 -+++ build_tools/scripts/core_common/modules/v8_89.py 2024-03-01 10:42:06.847661000 +0100 -@@ -115,46 +115,7 @@ def make(): +--- build_tools/scripts/core_common/modules/v8_89.py.orig 2025-08-05 15:06:08 UTC ++++ build_tools/scripts/core_common/modules/v8_89.py +@@ -123,46 +123,7 @@ def make(): base.cmd("git", ["config", "--global", "http.postBuffer", "157286400"], True) os.chdir(base_dir) @@ -47,9 +47,9 @@ os.chdir("v8") gn_args = ["v8_static_library=true", -@@ -163,6 +124,11 @@ def make(): +@@ -170,6 +131,11 @@ def make(): + "v8_monolithic=true", "v8_use_external_startup_data=false", - "use_custom_libcxx=false", "treat_warnings_as_errors=false"] + + if config.check_option("platform", "freebsd_64"): diff --git a/www/onlyoffice-documentserver/files/patch-clang19 b/www/onlyoffice-documentserver/files/patch-clang19 index a17acc4bf5f9..b095611d738d 100644 --- a/www/onlyoffice-documentserver/files/patch-clang19 +++ b/www/onlyoffice-documentserver/files/patch-clang19 @@ -21,9 +21,7 @@ Date: 2023-08-17T13:50:11-07:00 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 ---- core/Common/3dParty/v8_89/v8/src/inspector/string-16.cc +--- core/Common/3dParty/v8_89/v8/src/inspector/string-16.cc.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/string-16.cc @@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) { return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); @@ -34,7 +32,7 @@ index a8b786a8166..6df9963e970 100644 bool* ok = nullptr) { std::vector<char> buffer; buffer.reserve(length + 1); -@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* characters, size_t length, +@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* characters, s String16::String16(const UChar* characters, size_t size) : m_impl(characters, size) {} @@ -43,21 +41,18 @@ index a8b786a8166..6df9963e970 100644 String16::String16(const UChar* characters) : m_impl(characters) {} -@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UChar* stringStart, size_t length) { +@@ -231,6 +233,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 { - return UTF16ToUTF8(m_impl.data(), m_impl.size()); ++String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { ++ return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length); } - -diff --git deps/v8/src/inspector/string-16.h deps/v8/src/inspector/string-16.h -index 1678ffb2e1e..d9f6c466ab1 100644 ---- core/Common/3dParty/v8_89/v8/src/inspector/string-16.h + + std::string String16::utf8() const { +--- core/Common/3dParty/v8_89/v8/src/inspector/string-16.h.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/string-16.h @@ -6,6 +6,7 @@ #define V8_INSPECTOR_STRING_16_H_ @@ -67,7 +62,7 @@ index 1678ffb2e1e..d9f6c466ab1 100644 #include <cctype> #include <climits> #include <cstring> -@@ -17,7 +18,7 @@ namespace v8_inspector { +@@ -17,7 +18,7 @@ namespace v8_inspector { @@ -104,10 +99,7 @@ index 1678ffb2e1e..d9f6c466ab1 100644 size_t length); std::size_t hash() const { - -diff --git deps/v8/src/inspector/v8-string-conversions.cc deps/v8/src/inspector/v8-string-conversions.cc -index 0c75e66b972..8cf19be816c 100644 ---- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.cc +--- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.cc.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.cc @@ -12,7 +12,7 @@ @@ -118,7 +110,7 @@ index 0c75e66b972..8cf19be816c 100644 using UChar32 = uint32_t; bool isASCII(UChar c) { return !(c & ~0x7F); } -@@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* stringStart, size_t length) { +@@ -389,7 +389,7 @@ std::string UTF16ToUTF8(const UChar* stringStart, size std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) { if (!stringStart || !length) return std::basic_string<UChar>(); @@ -127,7 +119,7 @@ index 0c75e66b972..8cf19be816c 100644 UChar* bufferStart = buffer.data(); UChar* bufferCurrent = bufferStart; -@@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) { +@@ -398,7 +398,7 @@ std::basic_string<UChar> UTF8ToUTF16(const char* strin reinterpret_cast<const char*>(stringStart + length), &bufferCurrent, bufferCurrent + buffer.size(), nullptr, true) != conversionOK) @@ -136,9 +128,7 @@ index 0c75e66b972..8cf19be816c 100644 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 ---- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.h +--- core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.h.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/src/inspector/v8-string-conversions.h @@ -5,13 +5,15 @@ #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ @@ -158,7 +148,7 @@ index eb33c6816a5..1126255dac2 100644 } // namespace v8_inspector #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ ---- core/Common/3dParty/v8_89/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc +--- core/Common/3dParty/v8_89/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc.orig 2021-04-12 21:00:33 UTC +++ core/Common/3dParty/v8_89/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc @@ -11,13 +11,16 @@ namespace v8_crdtp { diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp index 3ee3b46a22d5..1ff708a7590b 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.cpp @@ -1,5 +1,5 @@ ---- core/Apple/IWork.cpp.orig 2025-03-08 16:26:16.590289000 +0100 -+++ core/Apple/IWork.cpp 2025-03-08 16:45:14.932729000 +0100 +--- core/Apple/IWork.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/Apple/IWork.cpp @@ -6,7 +6,8 @@ #include <libodfgen/OdtGenerator.hxx> #include <libodfgen/OdsGenerator.hxx> diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro index 49dbd6d80585..ae16f66a185b 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_IWork.pro @@ -1,6 +1,6 @@ ---- core/Apple/IWork.pro.orig 2025-03-08 16:31:03.447633000 +0100 -+++ core/Apple/IWork.pro 2025-03-08 17:07:58.170674000 +0100 -@@ -10,6 +10,14 @@ DEFINES += IWORK_USE_DYNAMIC_LIBRARY +--- core/Apple/IWork.pro.orig 2025-08-02 18:33:34 UTC ++++ core/Apple/IWork.pro +@@ -10,6 +10,14 @@ CONFIG += plugin DEFINES += IWORK_USE_DYNAMIC_LIBRARY @@ -15,7 +15,7 @@ CORE_ROOT_DIR = $$PWD/.. PWD_ROOT_DIR = $$PWD include($$CORE_ROOT_DIR/Common/base.pri) -@@ -38,8 +46,8 @@ include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri +@@ -38,8 +46,8 @@ include($$PWD/../DesktopEditor/xml/build/qt/libxml2.pr include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri) # TEST diff --git a/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx b/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx index 0d72b10783f3..47c1e5bbbbd7 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx +++ b/www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx @@ -1,5 +1,5 @@ ---- 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 +--- core/Apple/StringDocumentHandler.hxx.orig 2025-08-08 19:00:43 UTC ++++ core/Apple/StringDocumentHandler.hxx @@ -0,0 +1,154 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* writerperfect diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_brotli_make.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_brotli_make.py new file mode 100644 index 000000000000..5313593d9366 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_brotli_make.py @@ -0,0 +1,11 @@ +--- core/Common/3dParty/brotli/make.py.orig 2025-08-02 18:33:34 UTC ++++ core/Common/3dParty/brotli/make.py +@@ -10,7 +10,7 @@ def clear_module(): + base.delete_dir_with_access_error("brotli") + return + +-base.check_module_version("1", clear_module) ++#base.check_module_version("1", clear_module) + + # fetch harfbuzz + if not base.is_dir("brotli"): diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri index dc322326cf8e..bdd57c356f17 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_openssl_openssl.pri @@ -1,5 +1,5 @@ ---- core/Common/3dParty/openssl/openssl.pri.orig 2023-06-14 14:31:26.960051000 +0200 -+++ core/Common/3dParty/openssl/openssl.pri 2023-06-14 14:31:00.960232000 +0200 +--- core/Common/3dParty/openssl/openssl.pri.orig 2025-08-02 18:33:34 UTC ++++ core/Common/3dParty/openssl/openssl.pri @@ -32,8 +32,8 @@ core_windows { LIBS += $$OPENSSL_LIBS_DIRECTORY/libssl.lib LIBS += $$OPENSSL_LIBS_DIRECTORY/libcrypto.lib diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn index 179516c183f5..c58ca9dcf1f7 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_build_config_clang_BUILD.gn @@ -1,7 +1,7 @@ Fix build with llvm16 ---- core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn.orig 2023-07-17 10:46:22.246271000 +0200 -+++ core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn 2023-07-17 10:46:59.136940000 +0200 +--- core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn.orig 2022-05-13 11:39:36 UTC ++++ core/Common/3dParty/v8_89/v8/build/config/clang/BUILD.gn @@ -38,5 +38,6 @@ config("extra_warnings") { "-Wstring-conversion", 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 index 156b89cc28f9..2a60db707302 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- core/Common/3dParty/v8_89/v8/src/base/macros.h.orig 2021-04-12 21:00:33 UTC ++++ core/Common/3dParty/v8_89/v8/src/base/macros.h @@ -203,7 +203,8 @@ // base::is_trivially_copyable will differ for these cases. template <typename T> diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn index 6cc129f1398e..121d7547862b 100644 --- a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8_v8_testing_gmock_BUILD.gn @@ -1,5 +1,5 @@ ---- core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn.orig 2022-05-13 18:53:22.198863000 +0200 -+++ core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn 2022-05-13 18:53:05.169357000 +0200 +--- core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn.orig 2022-05-13 20:53:22 UTC ++++ core/Common/3dParty/v8_89/v8/testing/gmock/BUILD.gn @@ -15,12 +15,13 @@ source_set("gmock") { "include/gmock/gmock-matchers.h", "include/gmock/gmock.h", diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp index 8677840d1541..b227bfc3e1fa 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Directory.cpp @@ -45,7 +45,7 @@ BYTE* pUtf8 = NULL; LONG lLen = 0; NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strSrc.c_str(), strSrc.length(), pUtf8, lLen, false); -@@ -495,14 +495,14 @@ namespace NSDirectory +@@ -495,7 +495,7 @@ namespace NSDirectory } #if defined(_WIN32) || defined (_WIN64) if (deleteRoot) RemoveDirectoryW(strDirectory.c_str()); @@ -54,11 +54,3 @@ BYTE* pUtf8 = NULL; LONG lLen = 0; NSFile::CUtf8Converter::GetUtf8StringFromUnicode(strDirectory.c_str(), strDirectory.length(), pUtf8, lLen, false); - rmdir((char*)pUtf8); - delete [] pUtf8; - -- if (deleteRoot = false)CreateDirectory(strDirectory); -+ if (deleteRoot == false)CreateDirectory(strDirectory); - #elif MAC - BYTE* pUtf8 = NULL; - LONG lLen = 0; diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri index fff991f7c095..a04a6f66f14c 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_doctrenderer.pri @@ -1,6 +1,6 @@ ---- ./core/DesktopEditor/doctrenderer/doctrenderer.pri.orig 2025-03-07 15:39:12.468049000 +0100 -+++ ./core/DesktopEditor/doctrenderer/doctrenderer.pri 2025-03-07 15:38:54.771039000 +0100 -@@ -22,6 +22,10 @@ core_android:DEFINES += DISABLE_MEMORY_LIMITATION +--- core/DesktopEditor/doctrenderer/doctrenderer.pri.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/doctrenderer/doctrenderer.pri +@@ -22,6 +22,10 @@ ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, ker #CONFIG += v8_version_60 core_android:DEFINES += DISABLE_MEMORY_LIMITATION diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp index c0d1ba12e105..c3be6a05a0db 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_doctrenderer_hash.cpp @@ -1,5 +1,5 @@ ---- core/DesktopEditor/doctrenderer/hash.cpp.orig 2023-06-14 12:14:26.656325000 +0200 -+++ core/DesktopEditor/doctrenderer/hash.cpp 2023-06-14 14:23:39.149523000 +0200 +--- core/DesktopEditor/doctrenderer/hash.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/doctrenderer/hash.cpp @@ -4,12 +4,12 @@ #include "../common/Base64.h" #endif diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp index c87f8a976e29..41272dabf360 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_TextShaper.cpp @@ -1,5 +1,5 @@ ---- core/DesktopEditor/fontengine/TextShaper.cpp.orig 2022-09-27 21:25:17.640269000 +0200 -+++ core/DesktopEditor/fontengine/TextShaper.cpp 2022-09-27 21:21:12.793630000 +0200 +--- core/DesktopEditor/fontengine/TextShaper.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/fontengine/TextShaper.cpp @@ -649,9 +649,9 @@ namespace NSShaper #ifdef SUPPORT_HARFBUZZ_SHAPER diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp index b25ccec02bb0..7600e5857aae 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_fontengine_js_cpp_text.cpp @@ -1,6 +1,6 @@ ---- core/DesktopEditor/fontengine/js/cpp/text.cpp.orig 2022-09-27 21:25:17.640548000 +0200 -+++ core/DesktopEditor/fontengine/js/cpp/text.cpp 2022-09-27 21:22:11.216341000 +0200 -@@ -532,9 +532,9 @@ WASM_EXPORT unsigned char* ASC_FT_Get_Glyph_Render_Buf +--- core/DesktopEditor/fontengine/js/cpp/text.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/fontengine/js/cpp/text.cpp +@@ -558,9 +558,9 @@ WASM_EXPORT unsigned char* ASC_FT_Get_Glyph_Render_Buf // ------------------------------------------------------------ // HARFBUZZ diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h index a8b84e99b90a..aa02570df4ef 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_freetype-2.10.4_src_autofit_afshaper.h @@ -1,5 +1,5 @@ ---- core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h.orig 2022-09-27 21:25:17.639848000 +0200 -+++ core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h 2022-09-27 21:21:29.147465000 +0200 +--- core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/freetype-2.10.4/src/autofit/afshaper.h @@ -25,9 +25,9 @@ #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ diff --git a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp index 0388d97191e9..2274a7dc29a9 100644 --- a/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_DesktopEditor_pluginsmanager_main.cpp @@ -1,5 +1,5 @@ ---- core/DesktopEditor/pluginsmanager/main.cpp.orig 2023-06-19 10:50:14.262222000 +0200 -+++ core/DesktopEditor/pluginsmanager/main.cpp 2023-06-19 10:50:48.083404000 +0200 +--- core/DesktopEditor/pluginsmanager/main.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/DesktopEditor/pluginsmanager/main.cpp @@ -52,7 +52,7 @@ #undef GetTempPath #endif diff --git a/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h b/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h index 93c92cc9fcba..9e69da74cb0a 100644 --- a/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h +++ b/www/onlyoffice-documentserver/files/patch-core_MsBinaryFile_XlsFile_Format_Logic_Biff__structures_BitMarkedStructs.h @@ -1,5 +1,5 @@ ---- core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h.orig 2023-01-27 21:00:04.000000000 +0100 -+++ core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h 2023-02-13 11:18:01.384933000 +0100 +--- core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h.orig 2025-08-02 18:33:34 UTC ++++ core/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/BitMarkedStructs.h @@ -31,7 +31,7 @@ */ #pragma once diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h b/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h index 8e3814ae3609..e81ae497b6ec 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_Base_Types__32.h @@ -1,5 +1,5 @@ ---- ./core/OOXML/Base/Types_32.h.orig 2023-02-13 11:19:10.378060000 +0100 -+++ ./core/OOXML/Base/Types_32.h 2023-02-13 11:19:35.144374000 +0100 +--- core/OOXML/Base/Types_32.h.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/Base/Types_32.h @@ -38,7 +38,7 @@ typedef unsigned __int16 _UINT16; typedef unsigned __int32 _UINT32; diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp b/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp index 839338642d3b..efc36eda738f 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_Binary_Sheets_Reader_ChartFromToBinary.cpp @@ -1,6 +1,6 @@ ---- core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp.orig 2023-06-14 14:53:55.376306000 +0200 -+++ core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp 2023-06-14 14:54:16.425588000 +0200 -@@ -10010,7 +10010,7 @@ namespace BinXlsxRW +--- core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/Binary/Sheets/Reader/ChartFromToBinary.cpp +@@ -10121,7 +10121,7 @@ namespace BinXlsxRW WriteCT_String(*oVal.m_gapDepth); m_oBcw.WriteItemEnd(nCurPos); } diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp index 3e627ca23ed7..74fa1aabd8e0 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Chart_ChartSerialize.cpp @@ -1,5 +1,5 @@ ---- core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp.orig 2023-06-14 14:33:42.265435000 +0200 -+++ core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp 2023-06-14 14:33:54.354616000 +0200 +--- core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/XlsxFormat/Chart/ChartSerialize.cpp @@ -1282,7 +1282,7 @@ xmlns:c16r2=\"http://schemas.microsoft.com/office/draw { writer.WriteString(L"<"); diff --git a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp index 7ed08a65819b..b56bb6c6e380 100644 --- a/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp +++ b/www/onlyoffice-documentserver/files/patch-core_OOXML_XlsxFormat_Common.cpp @@ -1,5 +1,5 @@ ---- core/OOXML/XlsxFormat/Common.cpp.orig 2023-02-13 11:53:45.780601000 +0100 -+++ core/OOXML/XlsxFormat/Common.cpp 2023-02-13 11:54:15.232608000 +0100 +--- core/OOXML/XlsxFormat/Common.cpp.orig 2025-08-02 18:33:34 UTC ++++ core/OOXML/XlsxFormat/Common.cpp @@ -48,6 +48,10 @@ char* gcvt(double x, int n, char* b) #define _gcvt gcvt #endif 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 index 89f4e678060d..f69125a7034c 100644 --- 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 @@ -1,5 +1,5 @@ ---- 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 +--- core/OfficeUtils/src/zlib-1.2.11/gzguts.h.orig 2025-04-16 08:37:24 UTC ++++ core/OfficeUtils/src/zlib-1.2.11/gzguts.h @@ -33,6 +33,8 @@ #ifdef _WIN32 diff --git a/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro b/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro index 08b3375f3170..5f6e12410a78 100644 --- a/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro +++ b/www/onlyoffice-documentserver/files/patch-core_PdfFile_PdfFile.pro @@ -1,6 +1,6 @@ ---- core/PdfFile/PdfFile.pro.orig 2023-02-13 12:29:53.978119000 +0100 -+++ core/PdfFile/PdfFile.pro 2023-02-13 12:30:22.230355000 +0100 -@@ -113,6 +113,11 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib +--- core/PdfFile/PdfFile.pro.orig 2025-08-02 18:33:34 UTC ++++ core/PdfFile/PdfFile.pro +@@ -110,6 +110,11 @@ DEFINES += CRYPTOPP_DISABLE_ASM \ NOMINMAX LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lCryptoPPLib diff --git a/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h b/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h index 7d9f7fb7ca52..19d91074ad5f 100644 --- a/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h +++ b/www/onlyoffice-documentserver/files/patch-core_PdfFile_SrcWriter_Types.h @@ -1,6 +1,6 @@ ---- core/PdfFile/SrcWriter/Types.h.orig 2023-02-13 11:25:36.702286000 +0100 -+++ core/PdfFile/SrcWriter/Types.h 2023-02-13 11:25:55.342494000 +0100 -@@ -46,7 +46,7 @@ +--- core/PdfFile/SrcWriter/Types.h.orig 2025-08-02 18:33:34 UTC ++++ core/PdfFile/SrcWriter/Types.h +@@ -47,7 +47,7 @@ #include <algorithm> #include <math.h> diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile index ba4ae3c069d7..dba479793706 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_Makefile @@ -1,5 +1,5 @@ ---- document-server-package/Makefile.orig 2024-02-12 13:46:57.000000000 +0100 -+++ document-server-package/Makefile 2024-03-01 10:49:36.212407000 +0100 +--- document-server-package/Makefile.orig 2024-02-12 14:46:57 UTC ++++ document-server-package/Makefile @@ -23,6 +23,7 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) PACKAGE_NAME := $(COMPANY_NAME_LOW)-$(PRODUCT_NAME_LOW) PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) @@ -26,7 +26,7 @@ + DS_FILES := /var/db/$(DS_PREFIX) + DS_EXAMLE := %%LOCALBASE%%/www/$(DS_PREFIX)-example + DEV_NULL := /dev/null -+ PKG_TARGET := node20 ++ PKG_TARGET := node%%PKGFETCH_NODE_MAJOR_VERSION%% + endif ifeq ($(UNAME_S),Linux) PLATFORM := linux diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 index 92cb656f9917..deea13716080 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 @@ -1,6 +1,6 @@ ---- document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4.orig 2024-11-05 14:03:05.897987000 +0100 +--- document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4.orig 2025-07-18 12:53:25 UTC +++ document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4 -@@ -24,18 +24,16 @@ HASH=${HASH:-$(date +'%Y.%m.%d-%H%M' | openssl md5 | a +@@ -24,18 +24,16 @@ done HASH=${HASH:-$(date +'%Y.%m.%d-%H%M' | openssl md5 | awk '{print $2}')} # Save the hash to a variable in the configuration file 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 6386c904077e..0208f79889d0 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,8 @@ 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 +--- document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf.orig 2025-08-08 19:00:44 UTC ++++ document-server-package/common/documentserver/nginx/includes/ds-mime.types.conf @@ -0,0 +1,102 @@ + +types { diff --git a/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_modern-syslog b/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_modern-syslog new file mode 100644 index 000000000000..7a10ecbd0a4e --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-server_Metrics_patches_modern-syslog @@ -0,0 +1,11 @@ +--- server/Metrics/patches/modern-syslog+1.2.0.patch.orig 2025-08-31 16:23:19 UTC ++++ server/Metrics/patches/modern-syslog+1.2.0.patch +@@ -0,0 +1,8 @@ ++diff --git a/node_modules/modern-syslog/Makefile b/node_modules/modern-syslog/Makefile ++index 8d2ec3a..125d526 100644 ++--- a/node_modules/modern-syslog/Makefile +++++ b/node_modules/modern-syslog/Makefile ++@@ -1,2 +1,2 @@ ++ rebuild: ++- node-gyp rebuild +++ node-gyp --nodedir=%%LOCALBASE%% rebuild diff --git a/www/onlyoffice-documentserver/files/patch-server_package.json b/www/onlyoffice-documentserver/files/patch-server_package.json index d1a485701de7..3fa6a4cd95b3 100644 --- a/www/onlyoffice-documentserver/files/patch-server_package.json +++ b/www/onlyoffice-documentserver/files/patch-server_package.json @@ -1,6 +1,6 @@ --- server/package.json.orig 2025-06-16 18:22:18 UTC +++ server/package.json -@@ -4,6 +4,8 @@ +@@ -4,9 +4,11 @@ "homepage": "https://www.onlyoffice.com", "private": true, "dependencies": { @@ -8,8 +8,12 @@ + "grunt-cli": "^1.5.0", "license-downloader": "1.0.8", "license-report": "6.5.0", - "npm-run-all": "4.1.5" -@@ -25,10 +25,10 @@ +- "npm-run-all": "4.1.5" ++ "concurrently": "^9.2.0" + }, + "devDependencies": { + "@jest/globals": "29.7.0", +@@ -23,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", @@ -24,3 +28,11 @@ "3d-party-lic-json:Common": "license-report --output=json --package=./Common/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json", "3d-party-lic-json:DocService": "license-report --output=json --package=./DocService/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json", "3d-party-lic-json:FileConverter": "license-report --output=json --package=./FileConverter/package.json --config ./3d-party-lic-report/license-report-config.json > ./3d-party-lic-report/license-report.json", +@@ -39,6 +41,6 @@ + "3d-party-lic-report:FileConverter": "run-s 3d-party-lic-json:FileConverter 3d-party-lic-downloader 3d-party-lic-md", + "3d-party-lic-report:Metrics": "run-s 3d-party-lic-json:Metrics 3d-party-lic-downloader 3d-party-lic-md", + "3d-party-lic-report": "run-s 3d-party-lic-md-header 3d-party-lic-report:*", +- "build": "run-p install:*" ++ "build": "concurrently \"npm run install:Common\" \"npm run install:DocService\" \"npm run install:FileConverter\" \"npm run install:Metrics\"" + } + } diff --git a/www/onlyoffice-documentserver/files/pkg-message.in b/www/onlyoffice-documentserver/files/pkg-message.in index 9bf36aae43ac..1e04f7732830 100644 --- a/www/onlyoffice-documentserver/files/pkg-message.in +++ b/www/onlyoffice-documentserver/files/pkg-message.in @@ -59,7 +59,7 @@ files = %%ETCDIR%%/documentserver/supervisor/*.conf include %%ETCDIR%%/documentserver/nginx/ds.conf; NOTE: documentserver-update-securelink.sh will only update ./nginx/ds.conf and local.json under %%ETCDIR%%/documentserver/! - - run documentserver-update-securelink.sh once for creationg a verysecretstring + - run documentserver-update-securelink.sh once for creating a verysecretstring - start nginx: # service nginx start |