From 80736c3e77fcb2797f0f4ced4d5664321036c058 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 17 Oct 2024 19:09:39 -0400 Subject: [PATCH] Update patch --- disable-licensing-limits.patch | 134 ++++++++++++++++----------------- 1 file changed, 66 insertions(+), 68 deletions(-) diff --git a/disable-licensing-limits.patch b/disable-licensing-limits.patch index e71c1e8..1dfabf6 100644 --- a/disable-licensing-limits.patch +++ b/disable-licensing-limits.patch @@ -26,61 +26,6 @@ open source. --- -diff --git a/server/Common/sources/constants.js b/server/Common/sources/constants.js -index 3e8e7aaa..aad4d05f 100644 ---- a/server/Common/sources/constants.js -+++ b/server/Common/sources/constants.js -@@ -85,8 +85,8 @@ exports.LICENSE_RESULT = { - NotBefore: 16 - }; - --exports.LICENSE_CONNECTIONS = 20; --exports.LICENSE_USERS = 3; -+exports.LICENSE_CONNECTIONS = 999999; -+exports.LICENSE_USERS = 999999; - 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 b/server/Common/sources/license.js -index 5df8d693..3fd9de14 100644 ---- a/server/Common/sources/license.js -+++ b/server/Common/sources/license.js -@@ -45,24 +45,24 @@ exports.readLicense = function*() { - count: 1, - type: c_LR.Success, - light: false, -- packageType: constants.PACKAGE_TYPE_OS, -+ packageType: constants.PACKAGE_TYPE_I, - mode: constants.LICENSE_MODE.None, -- branding: false, -+ branding: true, - connections: constants.LICENSE_CONNECTIONS, - connectionsView: constants.LICENSE_CONNECTIONS, -- customization: false, -- advancedApi: false, -- usersCount: 0, -- usersViewCount: 0, -+ customization: true, -+ advancedApi: true, -+ usersCount: constants.LICENSE_CONNECTIONS, -+ usersViewCount: constants.LICENSE_CONNECTIONS, - usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, -- hasLicense: false, -- plugins: false, -+ hasLicense: true, -+ plugins: true, - buildDate: oBuildDate, - startDate: startDate, -- endDate: null, -+ endDate: new Date("2099-01-01T23:59:59.000Z"), - customerId: "", -- alias: "" -+ alias: "community" - }, null]; - }; - --exports.packageType = constants.PACKAGE_TYPE_OS; -+exports.packageType = constants.PACKAGE_TYPE_I; diff --git a/server/DocService/sources/server.js b/server/DocService/sources/server.js index 76303af9..9d2e6888 100644 --- a/server/DocService/sources/server.js @@ -95,19 +40,6 @@ index 76303af9..9d2e6888 100644 try { -diff --git a/server/FileConverter/sources/convertermaster.js b/server/FileConverter/sources/convertermaster.js -index 46615032..6ce2d3e6 100644 ---- a/server/FileConverter/sources/convertermaster.js -+++ b/server/FileConverter/sources/convertermaster.js -@@ -92,7 +92,7 @@ if (cluster.isMaster) { - - updateLicense(); - -- fs.watchFile(cfgLicenseFile, updateLicense); -+ // fs.watchFile(cfgLicenseFile, updateLicense); - setInterval(updateLicense, 86400000); - } else { - const converter = require('./converter'); diff --git a/server/Makefile b/server/Makefile index e8e1308f..23f7e2ef 100644 --- a/server/Makefile @@ -158,3 +90,69 @@ index ec7b37a2c..bfd879583 100644 +EditorUIController.isSupportEditFeature = () => true; export default EditorUIController; +diff --git a/server/Common/sources/constants.js.orig b/server/Common/sources/constants.js +index 700696ff..d8bb9178 100644 +--- a/server/Common/sources/constants.js.orig ++++ b/server/Common/sources/constants.js +@@ -87,8 +87,8 @@ exports.LICENSE_RESULT = { + NotBefore: 16 + }; + +-exports.LICENSE_CONNECTIONS = 20; +-exports.LICENSE_USERS = 3; ++exports.LICENSE_CONNECTIONS = 999999; ++exports.LICENSE_USERS = 999999; + exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds + + exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; +diff --git a/server/FileConverter/sources/convertermaster.js.orig b/server/FileConverter/sources/convertermaster.js +index 2209e8c9..feef6247 100644 +--- a/server/FileConverter/sources/convertermaster.js.orig ++++ b/server/FileConverter/sources/convertermaster.js +@@ -90,7 +90,7 @@ if (cluster.isMaster) { + + updateLicense(); + +- fs.watchFile(cfgLicenseFile, updateLicense); ++ // fs.watchFile(cfgLicenseFile, updateLicense); + setInterval(updateLicense, 86400000); + } else { + const converter = require('./converter'); +diff --git a/server/Common/sources/license.js.orig b/server/Common/sources/license.js +index 8813cbac..90177d15 100644 +--- a/server/Common/sources/license.js.orig ++++ b/server/Common/sources/license.js +@@ -44,23 +44,23 @@ exports.readLicense = async function () { + return [{ + count: 1, + type: c_LR.Success, +- packageType: constants.PACKAGE_TYPE_OS, ++ packageType: constants.PACKAGE_TYPE_I, + mode: constants.LICENSE_MODE.None, +- branding: false, ++ branding: true, + connections: constants.LICENSE_CONNECTIONS, + connectionsView: constants.LICENSE_CONNECTIONS, +- customization: false, +- advancedApi: false, +- usersCount: 0, +- usersViewCount: 0, ++ customization: true, ++ advancedApi: true, ++ usersCount: constants.LICENSE_CONNECTIONS, ++ usersViewCount: constants.LICENSE_CONNECTIONS, + usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, +- hasLicense: false, ++ hasLicense: true, + buildDate: oBuildDate, + startDate: startDate, +- endDate: null, ++ endDate: new Date("2099-01-01T23:59:59.000Z"), + customerId: "", +- alias: "" ++ alias: "community" + }, null]; + }; + +-exports.packageType = constants.PACKAGE_TYPE_OS; ++exports.packageType = constants.PACKAGE_TYPE_I;