forge/ayaports
1
0
Fork 0
Code Issues 26 Pull requests 10 Projects Releases Packages Wiki Activity Actions

update to 8.0.0

Browse source
This commit is contained in:
Antoine Martin 2024-02-06 14:19:43 -05:00
parent d3a9b2e03a
commit 6bd408087a
Signed by: forge
GPG key ID: D62A472A4AA7D541
3 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
user/onlyoffice-document-server/APKBUILD
View file

@ -2,9 +2,9 @@
# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net> # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
pkgname=onlyoffice-document-server pkgname=onlyoffice-document-server
pkgver=7.3.3 pkgver=8.0.0
_buildno=60 _buildno=105
_webtag=d26dc3f8736709e502e05f4daf50b29f96923b42 _webtag=7baa887e343de1ad6ec2705953ad021f379f86cc
pkgrel=0 pkgrel=0
pkgdesc="ONLYOFFICE Docs is a free collaborative online office suite" pkgdesc="ONLYOFFICE Docs is a free collaborative online office suite"
url="https://github.com/ONLYOFFICE/DocumentServer" url="https://github.com/ONLYOFFICE/DocumentServer"
@ -132,15 +132,15 @@ package() {
sha512sums=" sha512sums="
e4601334830932515e4ba165eeeab935059d80523fcb4888da0b88b5fe6b3a2feff1f9c60166f4dbbaceabe546fe075f253b302eb0a7510c3b7762a06ab38755 onlyoffice-document-server-7.3.3.tar.gz 17ef866cabea16ec759a861a4c353b0bff7e79527fe2e4e10f886507f5f3adc847cd624f916d0ab2f06a86822470922c8b15c229fc62e78955561448e4a4d657 onlyoffice-document-server-8.0.0.tar.gz
8f9833765838803b6ca7abed12b35a791b4f81e5c6d248b773e0c63fda4f3e54a4df60199fd5c9ef0fe9c0444dccad13a01244b947a5af8f91e2c854435f5a54 onlyoffice-document-server-build_tools-7.3.3.60.tar.gz 40dc03b9fa4fb61c0e6881998511349bc265387dd1b836c92f00edde177a1cf90f8b39a4f09e624a1a4acf69fc6d957d495aa979952093308342cc81c6f5d66a onlyoffice-document-server-build_tools-8.0.0.105.tar.gz
ec02da8a8ee92c69ee8089b5f32fb817bc700f65670228a6205ef5afd26c85804931da0dfdc19f7739d5bf6b09732c3a5c5f46a0571b2ee68043c2ce6bf55478 onlyoffice-document-server-document-server-integration-7.3.3.60.tar.gz 876ca2e70dd662f7f8676dbfaa951b3b4c21d2b7ebefe429489c8d446a09faa007f57b8b60c5bfdf6e5f2dbd330a21156d1f8098231a641e85e32487f205215a onlyoffice-document-server-document-server-integration-8.0.0.105.tar.gz
24bda1feadf6b47cb556691fcfe71d60f7c34eb00da293f58ba4713c21754eeb146535befc511608477678cd7bc1fb8cf1a379c25300a43e2a7461d4225ed2e0 onlyoffice-document-server-document-templates-7.3.3.60.tar.gz 56e1e6c17a1eada945042e34e25a6c7d0183f16f76ac03d0ad49577e30b50d271ddff2851cfb7cd33b477eeeb09bfd98a25f96841f39b50b4aea16b8b12b8e27 onlyoffice-document-server-document-templates-8.0.0.105.tar.gz
0144fdd79d1c633fbc54b24fef9bf9e4386fa7d46e67012b05786484dad9a5264e31f7de55eae23067e473483250b678138f86fb00b93aff801e21ddcbded0ad onlyoffice-document-server-onlyoffice-io-d26dc3f8736709e502e05f4daf50b29f96923b42.tar.gz c22ed18e5736cbc037f2cb74c4ad3e5f4913432e5440951c908ee68be969d03ce28dbb759b850e0fe999b5eb6f48415fab25f8438d7ce96921ab59ee80fc80d4 onlyoffice-document-server-onlyoffice-io-7baa887e343de1ad6ec2705953ad021f379f86cc.tar.gz
dce838e901720cf18ccc8035e02b9f8fea0f38a448124321663612027058467de152bfc9c257a3bd14a0ab33a00962f604e1d6c5a7040d7f1b117d260e286839 server_fix-makefile.patch dce838e901720cf18ccc8035e02b9f8fea0f38a448124321663612027058467de152bfc9c257a3bd14a0ab33a00962f604e1d6c5a7040d7f1b117d260e286839 server_fix-makefile.patch
7c70d7392040ed415da0cdce91c71926624c20a36f850ba9affaff3353368830cc172c243cebc608d72051627c7e44de232818c93453b8c7e58314f05e450b2d server_restore-mobile-editing.patch 6eced34e6d0b1452b8c521f0644972ae877eeb4f05c73c1104bb44f5eed0fa036ee05a94d8348252592e1873aa8fb8527ba3337b227a77aa1a5f65d0e387c2a6 server_restore-mobile-editing.patch
814ebde322af9ef468b447cb1989742bf94fe3839c29b7904cc079e5ce1e5d8db307fe546107de610cbfccc6227ae14dfdb3835aeb9f272f5303249f787afac5 core_fix-memory-limitations.patch 814ebde322af9ef468b447cb1989742bf94fe3839c29b7904cc079e5ce1e5d8db307fe546107de610cbfccc6227ae14dfdb3835aeb9f272f5303249f787afac5 core_fix-memory-limitations.patch
5d5758b59c2e8e2b6a31d99efb7e3ad42c60ab035af3641be5f3d84f02a1ea5abf51a380cfc55e403569ebdf3620a9c67c81b8bd0ba4632fc0b5f0506e9cf57e web-apps_restore-mobile-editing.patch 5d5758b59c2e8e2b6a31d99efb7e3ad42c60ab035af3641be5f3d84f02a1ea5abf51a380cfc55e403569ebdf3620a9c67c81b8bd0ba4632fc0b5f0506e9cf57e web-apps_restore-mobile-editing.patch
ad2ebbc5293ff3203b4fd84016910b4074f145febcbae28ba5ff5f8c4514c7da2a7b5b35d80ae37919a3794ff12e93af0bd9787175eda86bb546b13c98d3029e build_tools-untarget-pkg.patch 770c53c7b78e713ef059f3e65a65cb3d635fca2b63ee9f0c534ee0b9762bb0c7f9c944edded3aac79a21a28ff77ee523dd4cf99c4792a433e898a2b3afc3e403 build_tools-untarget-pkg.patch
edf83d229459cba87029cecde2777fdc5b4717eed965fe91a4223475bc85e0c99cbc25b9be8de4497c0b14d96b0fe4bee77dd2174c6f59cc9a82ef6c96a1feae core_fix-musl-build.patch edf83d229459cba87029cecde2777fdc5b4717eed965fe91a4223475bc85e0c99cbc25b9be8de4497c0b14d96b0fe4bee77dd2174c6f59cc9a82ef6c96a1feae core_fix-musl-build.patch
" "

16
user/onlyoffice-document-server/build_tools-untarget-pkg.patch
View file

@ -1,22 +1,22 @@
diff --git a/build_tools/scripts/build_server.py.orig b/build_tools/scripts/build_server.py diff --git a/build_tools/scripts/build_server.py.orig b/build_tools/scripts/build_server.py
index 15a8ff4..e5a8f28 100644 index 0f3cd1d..cfb0faf 100644
--- a/build_tools/scripts/build_server.py.orig --- a/build_tools/scripts/build_server.py.orig
+++ b/build_tools/scripts/build_server.py +++ b/build_tools/scripts/build_server.py
@@ -51,14 +51,9 @@ def make(): @@ -48,14 +48,9 @@ def make():
if ("windows" == base.host_platform()): if ("windows" == base.host_platform()):
pkg_target += "-win" pkg_target += "-win"
- base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"]) - base.cmd_in_dir(server_dir + "/DocService", "pkg", [".", "-t", pkg_target, "--options", "max_old_space_size=4096", "-o", "docservice"])
- base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"]) - base.cmd_in_dir(server_dir + "/FileConverter", "pkg", [".", "-t", pkg_target, "-o", "converter"])
- base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"]) - base.cmd_in_dir(server_dir + "/Metrics", "pkg", [".", "-t", pkg_target, "-o", "metrics"])
- -
- example_dir = base.get_script_dir() + "/../../document-server-integration/web/documentserver-example/nodejs" - example_dir = base.get_script_dir() + "/../../document-server-integration/web/documentserver-example/nodejs"
- base.delete_dir(example_dir + "/node_modules") - base.delete_dir(example_dir + "/node_modules")
- base.cmd_in_dir(example_dir, "npm", ["install"]) - base.cmd_in_dir(example_dir, "npm", ["ci"])
- base.cmd_in_dir(example_dir, "pkg", [".", "-t", pkg_target, "-o", "example"]) - base.cmd_in_dir(example_dir, "pkg", [".", "-t", pkg_target, "-o", "example"])
+ base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "--options", "max_old_space_size=4096", "-o", "docservice"]) + base.cmd_in_dir(server_build_dir + "/DocService", "pkg", [".", "--options", "max_old_space_size=4096", "-o", "docservice"])
+ base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-o", "converter"]) + base.cmd_in_dir(server_build_dir + "/FileConverter", "pkg", [".", "-o", "converter"])
+ base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-o", "metrics"]) + base.cmd_in_dir(server_build_dir + "/Metrics", "pkg", [".", "-o", "metrics"])
def build_server_develop(): def build_server_with_addons():
server_dir = base.get_script_dir() + "/../../server" addons = {}

41
user/onlyoffice-document-server/server_restore-mobile-editing.patch
View file

@ -1,15 +1,16 @@
diff --git a/server/DocService/sources/server.js b/server/DocService/sources/server.js diff --git a/server/DocService/sources/server.js.orig b/server/DocService/sources/server.js
index 5c744f6..edfb423 100644 index 8809831..3918ed4 100644
--- a/server/DocService/sources/server.js --- a/server/DocService/sources/server.js.orig
+++ b/server/DocService/sources/server.js +++ b/server/DocService/sources/server.js
@@ -110,7 +110,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque @@ -129,7 +129,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
if (!tenantManager.isMultitenantMode()) {
updateLicense();
- fs.watchFile(cfgLicenseFile, updateLicense);
setInterval(updateLicense, 86400000);
} }
updateLicense();
-fs.watchFile(cfgLicenseFile, updateLicense);
setInterval(updateLicense, 86400000);
if (config.has('services.CoAuthoring.server.static_content')) {
diff --git a/server/Makefile b/server/Makefile diff --git a/server/Makefile b/server/Makefile
index e8e1308..23f7e2e 100644 index e8e1308..23f7e2e 100644
--- a/server/Makefile --- a/server/Makefile
@ -24,18 +25,19 @@ index e8e1308..23f7e2e 100644
build-date: $(GRUNT_FILES) build-date: $(GRUNT_FILES)
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS) sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
diff --git a/server/Common/sources/constants.js.orig b/server/Common/sources/constants.js diff --git a/server/Common/sources/constants.js.orig b/server/Common/sources/constants.js
index b9c2906..4124680 100644 index 36471ca..8a3744a 100644
--- a/server/Common/sources/constants.js.orig --- a/server/Common/sources/constants.js.orig
+++ b/server/Common/sources/constants.js +++ b/server/Common/sources/constants.js
@@ -84,7 +84,7 @@ exports.LICENSE_RESULT = { @@ -86,7 +86,7 @@ exports.LICENSE_RESULT = {
UsersViewCountOS: 15 NotBefore: 16
}; };
-exports.LICENSE_CONNECTIONS = 20; -exports.LICENSE_CONNECTIONS = 20;
+exports.LICENSE_CONNECTIONS = 9999; +exports.LICENSE_CONNECTIONS = 9999;
exports.LICENSE_USERS = 3;
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
diff --git a/server/Common/sources/license.js.orig b/server/Common/sources/license.js diff --git a/server/Common/sources/license.js.orig b/server/Common/sources/license.js
index 1b617c6..fc72302 100644 index 1b617c6..fc72302 100644
--- a/server/Common/sources/license.js.orig --- a/server/Common/sources/license.js.orig
@ -77,14 +79,15 @@ index 1b617c6..fc72302 100644
-exports.packageType = constants.PACKAGE_TYPE_OS; -exports.packageType = constants.PACKAGE_TYPE_OS;
+exports.packageType = constants.PACKAGE_TYPE_I; +exports.packageType = constants.PACKAGE_TYPE_I;
diff --git a/server/FileConverter/sources/convertermaster.js.orig b/server/FileConverter/sources/convertermaster.js diff --git a/server/FileConverter/sources/convertermaster.js.orig b/server/FileConverter/sources/convertermaster.js
index 2a0b366..96468f9 100644 index 4661503..52f0bd4 100644
--- a/server/FileConverter/sources/convertermaster.js.orig --- a/server/FileConverter/sources/convertermaster.js.orig
+++ b/server/FileConverter/sources/convertermaster.js +++ b/server/FileConverter/sources/convertermaster.js
@@ -93,7 +93,6 @@ if (cluster.isMaster) { @@ -92,7 +92,6 @@ if (cluster.isMaster) {
updateLicense(); updateLicense();
if (!tenantManager.isMultitenantMode()) { - fs.watchFile(cfgLicenseFile, updateLicense);
- fs.watchFile(cfgLicenseFile, updateLicense); setInterval(updateLicense, 86400000);
setInterval(updateLicense, 86400000);
}
} else { } else {
const converter = require('./converter');