FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

www/onlyoffice-documentserver: Update to 9.0.3.31

Browse Source 
Upgrade port version to 9.0.3.31
Upgrade port to use yao-pkg 6.6.0
Upgrade port to use node 20.19.4
Fix Apple iwork file conversion error
Minor bugfixes

PR:		288374,287122

Signed-off-by: Matt Kempe <fsbruva@yahoo.com>
This commit is contained in:
Matt Kempe
2025-07-21 23:03:14 -04:00
committed by Mikael Urankar
parent 7c6484f655
commit 623860bda3
12 changed files with 356 additions and 1071 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/onlyoffice-documentserver/Makefile
+9 -9
View File
@@ -1,6 +1,6 @@
PORTNAME= onlyoffice-documentserver
DISTVERSIONPREFIX= v
DISTVERSION= 9.0.2.16
DISTVERSION= 9.0.3.31
CATEGORIES= www
MASTER_SITES+= LOCAL/mikael/v8/:source1 \
https://nodejs.org/dist/v${NODE_VERSION_PKGFETCH}/:source3 \
@@ -66,7 +66,7 @@ GH_TUPLE= ONLYOFFICE:core:v${DISTVERSION}:core/core \
hunspell:hyphen:73dd296:hunspell_hyphen/core/Common/3dParty/hyphen/hyphen \
mity:md4c:481fbfb:mity_md4c/core/Common/3dParty/md/md4c \
fsbruva:onlyoffice-DS-pkg-cache:v${NODE_VERSION_PKGFETCH}:pkg_cache/ \
fsbruva:onlyoffice-DS-npm-cache:v${DISTVERSION}-20250701:npm_cache/
fsbruva:onlyoffice-DS-npm-cache:v${DISTVERSION}-20250721:npm_cache/
OPTIONS_SINGLE= DB
OPTIONS_SINGLE_DB= MYSQL PGSQL
@@ -99,11 +99,11 @@ SUB_LIST= DS_GROUPNAME=${DS_GROUPNAME} \
PREFIX=${PREFIX} \
WWWDIR=${WWWDIR}
# node version used with "npm install @yao-pkg/pkg@6.5.1"
# node version used with "npm install @yao-pkg/pkg@6.6.0"
# keep in sync with patch-build__tools_scripts_build__server.py and patch-document-server-package_Makefile
NODE_VERSION_PKGFETCH= 20.19.1
NODE_VERSION_PKGFETCH= 20.19.4
MAKE_ENV= BUILD_NUMBER="36" \
MAKE_ENV= BUILD_NUMBER="31" \
PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \
PRODUCT_VERSION=${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/} \
BUILD_NUMBER=${DISTVERSION:C/^[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+)/\1/}
@@ -117,7 +117,7 @@ DOS2UNIX_FILES= document-server-package/common/documentserver/nginx/includes/htt
CONFLICTS_BUILD=devel/googletest
.include <bsd.port.pre.mk>
.if ${ARCH} == aarch64
.if ${ARCH} == aarch64 || ${ARCH} == armv7
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@@ -207,7 +207,7 @@ do-build:
@${MKDIR} ${WRKSRC}/yao-pkg
@${CP} ${FILESDIR}/package* ${WRKSRC}/yao-pkg
@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @yao-pkg/pkg@6.5.1
@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @yao-pkg/pkg@6.6.0
@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_lib-es5_build.js || ${TRUE}
@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_patches_node.v${NODE_VERSION_PKGFETCH}.cpp.patch || ${TRUE}
@@ -266,7 +266,7 @@ create-caches-tarball:
${FIND} ${WRKDIR}/.pkg-cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
${FIND} ${WRKDIR}/.pkg-cache -type f -perm 644 -exec file {} \; | ${EGREP} -v "${NODE_VERSION_PKGFETCH}" | ${EGREP} "built-v|node-v" | ${EGREP} "tar.gz|sha256sum" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
cd ${WRKDIR} && \
${TAR} czf ${PORTNAME}-${DISTVERSION}_`date +%Y%m%d`-npm-cache.tar.gz .npm .pkg-cache
# cd ${WRKDIR} && \
# ${TAR} czf ${PORTNAME}-${DISTVERSION}_`date +%Y%m%d`-npm-cache.tar.gz .npm .pkg-cache
.include <bsd.port.post.mk>
www/onlyoffice-documentserver/distinfo
+29 -31
View File
@@ -1,38 +1,36 @@
TIMESTAMP = 1751344944
TIMESTAMP = 1753116846
SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80
SIZE (v8-8.9.255.25_all.tar.gz) = 72818814
SHA256 (node-v20.19.1.tar.gz) = 691011ddb85c9ab86afb7ead2b6db2ddd45592f1c8fd26687d152dcadc182229
SIZE (node-v20.19.1.tar.gz) = 88078477
SHA256 (node-v20.19.4.tar.gz) = cc363c0a90fe5025939175c1c29ab67235f36ebe4b5d78506634da27a73eef5d
SIZE (node-v20.19.4.tar.gz) = 89308973
SHA256 (optipng-0.7.8.tar.gz) = 25a3bd68481f21502ccaa0f4c13f84dcf6b20338e4c4e8c51f2cefbd8513398c
SIZE (optipng-0.7.8.tar.gz) = 3294014
SHA256 (onlyoffice-documentserver-9.0.2.16_20250630-npm-cache.tar.gz) = 11738d912f93adb7bf401ae06cb70d2357a4b35177cae7ceb5915fa5267e3522
SIZE (onlyoffice-documentserver-9.0.2.16_20250630-npm-cache.tar.gz) = 249461250
SHA256 (ONLYOFFICE-DocumentServer-v9.0.2.16-v9.0.2_GH0.tar.gz) = 272dc092623ca12964c09aa0893676aa508bf0900a5ab04215d7086306d2583d
SIZE (ONLYOFFICE-DocumentServer-v9.0.2.16-v9.0.2_GH0.tar.gz) = 972017
SHA256 (ONLYOFFICE-core-v9.0.2.16_GH0.tar.gz) = 79d7aaf8b591017911febef0e141f9c3735faa33d1e68d605e80237082805f14
SIZE (ONLYOFFICE-core-v9.0.2.16_GH0.tar.gz) = 205184118
SHA256 (ONLYOFFICE-core-fonts-v9.0.2.16_GH0.tar.gz) = 56ba5c76d053d2ae625d2f4a01a955ecb2f1d25b9bef896313281588879f676a
SIZE (ONLYOFFICE-core-fonts-v9.0.2.16_GH0.tar.gz) = 95376454
SHA256 (ONLYOFFICE-dictionaries-v9.0.2.16_GH0.tar.gz) = c1665cd8de6a528b255b5d0d200f689a53c72bb36218dbf8ac046c4b04a7fe85
SIZE (ONLYOFFICE-dictionaries-v9.0.2.16_GH0.tar.gz) = 57973827
SHA256 (ONLYOFFICE-document-server-integration-v9.0.2.16_GH0.tar.gz) = 61759413e2c63ca94117b30442e985e2ea5d3e559b1e6d740adfa916e55a6074
SIZE (ONLYOFFICE-document-server-integration-v9.0.2.16_GH0.tar.gz) = 6128854
SHA256 (ONLYOFFICE-document-templates-v9.0.2.16_GH0.tar.gz) = ba8288f4c67ce21d8c4f3ec995b02c5df43464314770805c7c57860b79e31756
SIZE (ONLYOFFICE-document-templates-v9.0.2.16_GH0.tar.gz) = 3914530
SHA256 (ONLYOFFICE-sdkjs-v9.0.2.16_GH0.tar.gz) = ecdb6c32c426e86b1bca71fc129f283430a14abc3e747464b8b9167ba08e264b
SIZE (ONLYOFFICE-sdkjs-v9.0.2.16_GH0.tar.gz) = 37688710
SHA256 (ONLYOFFICE-server-v9.0.2.16_GH0.tar.gz) = 4d1dc02e4be3546bb6c1bbf6547eb4c46262e0554cacf81314ff741ce2ed5027
SIZE (ONLYOFFICE-server-v9.0.2.16_GH0.tar.gz) = 4082601
SHA256 (ONLYOFFICE-web-apps-v9.0.2.16_GH0.tar.gz) = 6befc028e52e4176e2007274915efc3354aa474ef7df6bdad0299204fb1ebf2b
SIZE (ONLYOFFICE-web-apps-v9.0.2.16_GH0.tar.gz) = 443520777
SHA256 (ONLYOFFICE-build_tools-v9.0.2.16_GH0.tar.gz) = fe7b82477a78ed2a272c841d75c8a6383506a194b3893547ee70a86193943f50
SIZE (ONLYOFFICE-build_tools-v9.0.2.16_GH0.tar.gz) = 33870057
SHA256 (ONLYOFFICE-DocumentServer-v9.0.3.31-v9.0.3_GH0.tar.gz) = 9f12f50e2460b1199c24661d4f88ad349385dcc441740291b9f8e110686ef360
SIZE (ONLYOFFICE-DocumentServer-v9.0.3.31-v9.0.3_GH0.tar.gz) = 973386
SHA256 (ONLYOFFICE-core-v9.0.3.31_GH0.tar.gz) = fa6b4b2f729b4dd6d7ac6bf5393fd8ed5a3a821f3f7a376dcff891c81a8a59a4
SIZE (ONLYOFFICE-core-v9.0.3.31_GH0.tar.gz) = 205214176
SHA256 (ONLYOFFICE-core-fonts-v9.0.3.31_GH0.tar.gz) = 48fbe7bac524f21b9b146d8242ec9968cdb94b825aae6171cc30a285b5dd7189
SIZE (ONLYOFFICE-core-fonts-v9.0.3.31_GH0.tar.gz) = 95377304
SHA256 (ONLYOFFICE-dictionaries-v9.0.3.31_GH0.tar.gz) = c23a98195b429d0a8e2ed06d5119c41a3246f585ccf4d1ba5f74af9327e6dec4
SIZE (ONLYOFFICE-dictionaries-v9.0.3.31_GH0.tar.gz) = 57973415
SHA256 (ONLYOFFICE-document-server-integration-v9.0.3.31_GH0.tar.gz) = 2af3f3c324ec434e26649f1fa62fb9f01180b196ba44484d5c2be9b67de602b2
SIZE (ONLYOFFICE-document-server-integration-v9.0.3.31_GH0.tar.gz) = 6129610
SHA256 (ONLYOFFICE-document-templates-v9.0.3.31_GH0.tar.gz) = 5e12565edaf35cd44b8263fcf8182dcd18b84bb8a9a45404bf2a48cc75e3e9a6
SIZE (ONLYOFFICE-document-templates-v9.0.3.31_GH0.tar.gz) = 3914552
SHA256 (ONLYOFFICE-sdkjs-v9.0.3.31_GH0.tar.gz) = c043f08e86218f8b85d3a9e5d9303fa46376959cbcdd9debf02ea74f55fdf886
SIZE (ONLYOFFICE-sdkjs-v9.0.3.31_GH0.tar.gz) = 37755295
SHA256 (ONLYOFFICE-server-v9.0.3.31_GH0.tar.gz) = b398762099b6a0a4006bcfb332de22f09be01a83b25352a9f42cc93ae6429246
SIZE (ONLYOFFICE-server-v9.0.3.31_GH0.tar.gz) = 4082661
SHA256 (ONLYOFFICE-web-apps-v9.0.3.31_GH0.tar.gz) = 40bdf74edc25934b1b0339e08813bbf891b4c7ca3e4fdfe1752d787b3df31bec
SIZE (ONLYOFFICE-web-apps-v9.0.3.31_GH0.tar.gz) = 443570310
SHA256 (ONLYOFFICE-build_tools-v9.0.3.31_GH0.tar.gz) = 04a08acf1317ac14c45efea6af565667a64a3aea873e2e0549f695fc6a4b4374
SIZE (ONLYOFFICE-build_tools-v9.0.3.31_GH0.tar.gz) = 33872416
SHA256 (ONLYOFFICE-DocumentBuilder-626d1e44db3d06ceb8298215a67ef0475912d89a_GH0.tar.gz) = 275c3a8c993528fa56c69aedb11dd74a6fba9c3bd372874004584ae9cbb190b5
SIZE (ONLYOFFICE-DocumentBuilder-626d1e44db3d06ceb8298215a67ef0475912d89a_GH0.tar.gz) = 31659
SHA256 (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 347b8f1d3c21b1f61a3f1fcae86f402b27ce4f8b826e18158834251046d83cf5
SIZE (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 17009005
SHA256 (ONLYOFFICE-document-server-package-v9.0.2.16_GH0.tar.gz) = c3153d922b38362146a209eade7f645e72504e19d5eb760354c57c223c4b637f
SIZE (ONLYOFFICE-document-server-package-v9.0.2.16_GH0.tar.gz) = 186621
SHA256 (ONLYOFFICE-document-server-package-v9.0.3.31_GH0.tar.gz) = 301068c8feb5a50aa7c8c882099dfea0cb0f99ea155784e95b3870dd71635c38
SIZE (ONLYOFFICE-document-server-package-v9.0.3.31_GH0.tar.gz) = 186645
SHA256 (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 363ede45ba6d125fdb7323c43d34acd3d0ae9028ac18aec632eb6a623160f09a
SIZE (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 97712
SHA256 (google-gumbo-parser-aa91b27_GH0.tar.gz) = 1360f85c02fb2573a10f00abcddebc8f1ff277a16f66553439193af93afae335
@@ -41,7 +39,7 @@ SHA256 (hunspell-hyphen-73dd296_GH0.tar.gz) = 93e80ad69ee7afd507b12f0b58ca34a6a7
SIZE (hunspell-hyphen-73dd296_GH0.tar.gz) = 292528
SHA256 (mity-md4c-481fbfb_GH0.tar.gz) = 04e03a69a2783ab5f2449f8864499dabb150092d5f48415a5e423f762a209d54
SIZE (mity-md4c-481fbfb_GH0.tar.gz) = 238753
SHA256 (fsbruva-onlyoffice-DS-pkg-cache-v20.19.1_GH0.tar.gz) = df466a0ea8365d10089d3169b224b079bb0ec409c57f2ff79c4f6048f8c5d29c
SIZE (fsbruva-onlyoffice-DS-pkg-cache-v20.19.1_GH0.tar.gz) = 1288
SHA256 (fsbruva-onlyoffice-DS-npm-cache-v9.0.2.16-20250701_GH0.tar.gz) = c8a355fe7941a29ba6ba51c97c52808ef5cfe3047cb4f31335a2e03cdfd84354
SIZE (fsbruva-onlyoffice-DS-npm-cache-v9.0.2.16-20250701_GH0.tar.gz) = 161979161
SHA256 (fsbruva-onlyoffice-DS-pkg-cache-v20.19.4_GH0.tar.gz) = d3b6a1ad3afdfd53b57809980ae83434ae727d421e9e383ae69c32e37a570918
SIZE (fsbruva-onlyoffice-DS-pkg-cache-v20.19.4_GH0.tar.gz) = 1292
SHA256 (fsbruva-onlyoffice-DS-npm-cache-v9.0.3.31-20250721_GH0.tar.gz) = 7f3f935337e91c1d1d7f8d2b3e0456dbac15b617581ac064ffd322082c488fb7
SIZE (fsbruva-onlyoffice-DS-npm-cache-v9.0.3.31-20250721_GH0.tar.gz) = 162622276
www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.1.cpp.patch
-1014
View File
File diff suppressed because it is too large Load Diff
www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v20.19.4.cpp.patch
+192
View File
@@ -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', ],
+ },
www/onlyoffice-documentserver/files/package-lock.json
Generated
+8 -8
View File
@@ -5,7 +5,7 @@
"packages": {
"": {
"dependencies": {
"@yao-pkg/pkg": "^6.5.1"
"@yao-pkg/pkg": "^6.6.0"
}
},
"node_modules/@babel/generator": {
@@ -118,15 +118,15 @@
}
},
"node_modules/@yao-pkg/pkg": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/@yao-pkg/pkg/-/pkg-6.5.1.tgz",
"integrity": "sha512-z6XlySYfnqfm1AfVlBN8A3yeAQniIwL7TKQfDCGsswYSVYLt2snbRefQYsfQQ3pw5lVXrZdLqgTjzaqID9IkWA==",
"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.23",
"@yao-pkg/pkg-fetch": "3.5.24",
"into-stream": "^6.0.0",
"minimist": "^1.2.6",
"multistream": "^4.1.0",
@@ -147,9 +147,9 @@
}
},
"node_modules/@yao-pkg/pkg-fetch": {
"version": "3.5.23",
"resolved": "https://registry.npmjs.org/@yao-pkg/pkg-fetch/-/pkg-fetch-3.5.23.tgz",
"integrity": "sha512-rn45sqVQSkcJNSBdTnYze3n+kyub4CN8aiWYlPgA9yp9FZeEF+BlpL68kSIm3HaVuANniF+7RBMH5DkC4zlHZA==",
"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": {
"https-proxy-agent": "^5.0.0",
www/onlyoffice-documentserver/files/package.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"dependencies": {
"@yao-pkg/pkg": "^6.5.1"
"@yao-pkg/pkg": "^6.6.0"
}
}
www/onlyoffice-documentserver/files/patch-build__tools_scripts_core__common_modules_html2.py
+1 -1
View File
@@ -5,7 +5,7 @@
old_cur_dir = os.getcwd()
- print("[fetch]: html")
+ print("[path & build]: html")
+ print("[patch & build]: html")
base_dir = base.get_script_dir() + "/../../core/Common/3dParty/html"
www/onlyoffice-documentserver/files/patch-core_Apple_StringDocumentHandler.hxx
+106 -3
View File
@@ -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: */
www/onlyoffice-documentserver/files/patch-core_Common_3dParty_html_fetch.py
+2 -1
View File
@@ -14,9 +14,10 @@
# fix gumbo
base.replaceInFile(base_directory + "/gumbo-parser/src/tag.c", "isspace(*c)", "isspace((unsigned char)*c)")
if not base.is_dir("katana-parser"):
-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"])
www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4
+2 -1
View File
@@ -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:-$(tr -dc A-Za-z0-9 </dev/urandom | head -c 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
www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_nginx_includes_ds-mime.types.conf
+5 -1
View File
@@ -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;
www/onlyoffice-documentserver/pkg-plist
+1 -1
View File
@@ -1156,7 +1156,7 @@ lib/libkernel_network.so
%%WWWDIR%%/documentserver/sdkjs/pdf/src/annotations/stamps/ja-JA.json
%%WWWDIR%%/documentserver/sdkjs/pdf/src/annotations/stamps/pt-BR.json
%%WWWDIR%%/documentserver/sdkjs/pdf/src/annotations/stamps/ru-RU.json
%%WWWDIR%%/documentserver/sdkjs/pdf/src/annotations/stamps/zh-ZH.json
%%WWWDIR%%/documentserver/sdkjs/pdf/src/annotations/stamps/zh-CN.json
%%WWWDIR%%/documentserver/sdkjs/pdf/src/engine/cmap.bin
%%WWWDIR%%/documentserver/sdkjs/pdf/src/engine/drawingfile.js
%%WWWDIR%%/documentserver/sdkjs/pdf/src/engine/drawingfile.wasm