Skip to content

Commit

Permalink
www/onlyoffice-documentserver: Update to 7.4.1.36
Browse files Browse the repository at this point in the history 
While here:
  - Increase default connection limit [1]
  - Add missing command for postgresql 15 users [2]

Changes:
  https://github.com/ONLYOFFICE/DocumentServer/blob/v7.4.1/CHANGELOG.md

PR:		273910 [1]
Reported by: 	Benjamin Connelly [2]
  • Loading branch information
@MikaelUrankar
MikaelUrankar committed Oct 1, 2023
1 parent 26d3304 commit 21df741
Show file tree
Hide file tree
Showing 7 changed files with 195 additions and 59 deletions.
7 changes: 2 additions & 5 deletions www/onlyoffice-documentserver/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= onlyoffice-documentserver
DISTVERSIONPREFIX= v
DISTVERSION= 7.4.0.163
DISTVERSION= 7.4.1.36
CATEGORIES= www
MASTER_SITES+= LOCAL/mikael/v8/:source1 \
LOCAL/mikael/onlyoffice/:source2 \
Expand All @@ -18,8 +18,6 @@ WWW= https://www.onlyoffice.com/
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt

DEPRECATED= Depends on EOL NodeJS 16
EXPIRATION_DATE= 2023-10-30
BROKEN_i386= fails to build

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \
Expand Down Expand Up @@ -230,10 +228,9 @@ do-install:
create-caches-tarball:
# do some cleanup first
${RM} -r ${WRKDIR}/.npm/_logs ${WRKDIR}/.npm/_update-notifier-last-checked ${WRKDIR}/.cache/yarn/v6/.tmp ${WRKDIR}/.cache/node-gyp
${FIND} ${WRKDIR}/.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 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}

cd ${WRKDIR} && \
${TAR} czf ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz .npm .cache .pkg-cache
${TAR} czf ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz .npm .pkg-cache

.include <bsd.port.mk>
50 changes: 25 additions & 25 deletions www/onlyoffice-documentserver/distinfo
View file
@@ -1,38 +1,38 @@
TIMESTAMP = 1689842471
TIMESTAMP = 1692624183
SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80
SIZE (v8-8.9.255.25_all.tar.gz) = 72818814
SHA256 (node-v16.13.0.tar.gz) = 9c00e5b6024cfcbc9105f9c58cf160762e78659a345d100c5bd80a7fb38c684f
SIZE (node-v16.13.0.tar.gz) = 63735070
SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
SIZE (optipng-0.7.7.tar.gz) = 2329555
SHA256 (onlyoffice-documentserver-7.4.0.163-npm-cache.tar.gz) = 13c6a5c314a7619473260b2d7fb1161d7d2178e0da3ab6973981b7bfddae82b3
SIZE (onlyoffice-documentserver-7.4.0.163-npm-cache.tar.gz) = 275714693
SHA256 (ONLYOFFICE-DocumentServer-v7.4.0.163-v7.4.0_GH0.tar.gz) = ceaa39fcb9373a22f652c02c760f32961d02c49b14af3acb2412b422972fe0bb
SIZE (ONLYOFFICE-DocumentServer-v7.4.0.163-v7.4.0_GH0.tar.gz) = 65484
SHA256 (ONLYOFFICE-core-v7.4.0.163_GH0.tar.gz) = d6fbd0acd244cfa3e48afe98942720aed0463afb34d12c257bf233f91e919891
SIZE (ONLYOFFICE-core-v7.4.0.163_GH0.tar.gz) = 88380222
SHA256 (ONLYOFFICE-core-fonts-v7.4.0.163_GH0.tar.gz) = dc829e15f7fc7f08be31de53d2eb9842c840a2d5a95afd9d99cd0c482c60d277
SIZE (ONLYOFFICE-core-fonts-v7.4.0.163_GH0.tar.gz) = 95366415
SHA256 (ONLYOFFICE-dictionaries-v7.4.0.163_GH0.tar.gz) = a6247152990493aa5cf43d22c11d754ecdc2d9740b60b26cbdb955fa1938dbaa
SIZE (ONLYOFFICE-dictionaries-v7.4.0.163_GH0.tar.gz) = 41115736
SHA256 (ONLYOFFICE-document-server-integration-v7.4.0.163_GH0.tar.gz) = d57cda65a2c3aa8468c665cd789cc59ccbd833c8c13de2247e811a665adb0ec5
SIZE (ONLYOFFICE-document-server-integration-v7.4.0.163_GH0.tar.gz) = 5118132
SHA256 (ONLYOFFICE-document-templates-v7.4.0.163_GH0.tar.gz) = 41dcff925754f5ac57ac06fa116e3318ac2d6bcb35a38ca866182477caa858eb
SIZE (ONLYOFFICE-document-templates-v7.4.0.163_GH0.tar.gz) = 2538820
SHA256 (ONLYOFFICE-sdkjs-v7.4.0.163_GH0.tar.gz) = 411c2b89d46fa3e0af08b4e081ba79366ddc33f5971df8d5963cd36f8046e364
SIZE (ONLYOFFICE-sdkjs-v7.4.0.163_GH0.tar.gz) = 25997019
SHA256 (ONLYOFFICE-server-v7.4.0.163_GH0.tar.gz) = cd0df0e1745e0d3944b508d1019669a72f748e7da3b0ff3560d58bd855de9cd4
SIZE (ONLYOFFICE-server-v7.4.0.163_GH0.tar.gz) = 267471
SHA256 (ONLYOFFICE-web-apps-v7.4.0.163_GH0.tar.gz) = 74edc2cbeda649251df8f1cf0e34ce48372a1f9a35541abfb70617552a6b18e6
SIZE (ONLYOFFICE-web-apps-v7.4.0.163_GH0.tar.gz) = 348597216
SHA256 (ONLYOFFICE-build_tools-v7.4.0.163_GH0.tar.gz) = 048cc71c124dd27a399feb960e540eed555f3935d5272aeb67bdedc030bbdace
SIZE (ONLYOFFICE-build_tools-v7.4.0.163_GH0.tar.gz) = 6656908
SHA256 (onlyoffice-documentserver-7.4.1.36-npm-cache.tar.gz) = e6dfc40eb2d9d1fb9b851f81ed1d68b542f645f1e85f3f109a925ecd4fed5b10
SIZE (onlyoffice-documentserver-7.4.1.36-npm-cache.tar.gz) = 174928467
SHA256 (ONLYOFFICE-DocumentServer-v7.4.1.36-v7.4.1_GH0.tar.gz) = ffa1241fe661c8682c8bc79ebd3dadab5f10d5e79d11fe554086b658614304b9
SIZE (ONLYOFFICE-DocumentServer-v7.4.1.36-v7.4.1_GH0.tar.gz) = 68488
SHA256 (ONLYOFFICE-core-v7.4.1.36_GH0.tar.gz) = 6c769b7a3787f447e2dfa941428b9823842218256988e37a33c5c6a7e267f5f4
SIZE (ONLYOFFICE-core-v7.4.1.36_GH0.tar.gz) = 88375420
SHA256 (ONLYOFFICE-core-fonts-v7.4.1.36_GH0.tar.gz) = 93cafc38a5e20c4ea131997cff28b89e4e843b42095e08999eea9001e75a8604
SIZE (ONLYOFFICE-core-fonts-v7.4.1.36_GH0.tar.gz) = 95368679
SHA256 (ONLYOFFICE-dictionaries-v7.4.1.36_GH0.tar.gz) = f4af1b203a3c0d2572497879b1928700f9d42297891a690e40b7773c172ede8a
SIZE (ONLYOFFICE-dictionaries-v7.4.1.36_GH0.tar.gz) = 41115629
SHA256 (ONLYOFFICE-document-server-integration-v7.4.1.36_GH0.tar.gz) = 74562791097e7e469bd1c325e4cf2a507c60ba38d8e676ed343dcec1224f5906
SIZE (ONLYOFFICE-document-server-integration-v7.4.1.36_GH0.tar.gz) = 5117960
SHA256 (ONLYOFFICE-document-templates-v7.4.1.36_GH0.tar.gz) = d70fa06194f76a996ce2ec6e63f6d2b035ceff41bd438b5ff48dc1e7aaedc9d4
SIZE (ONLYOFFICE-document-templates-v7.4.1.36_GH0.tar.gz) = 2538786
SHA256 (ONLYOFFICE-sdkjs-v7.4.1.36_GH0.tar.gz) = dc8e9c2220a4c0d60fc09203f3715872e42556e405ea8905428f96b0de8a65e1
SIZE (ONLYOFFICE-sdkjs-v7.4.1.36_GH0.tar.gz) = 26006443
SHA256 (ONLYOFFICE-server-v7.4.1.36_GH0.tar.gz) = 16863d15477c77016318f6aa4271a5f47e5780f0e243f13b5de9142c0dc65f96
SIZE (ONLYOFFICE-server-v7.4.1.36_GH0.tar.gz) = 267465
SHA256 (ONLYOFFICE-web-apps-v7.4.1.36_GH0.tar.gz) = 8a6e490762a4a5900ab5c464591ed25d30028687e46342938b8fce7cb277f3dc
SIZE (ONLYOFFICE-web-apps-v7.4.1.36_GH0.tar.gz) = 349418434
SHA256 (ONLYOFFICE-build_tools-v7.4.1.36_GH0.tar.gz) = aa295c893bfee8a6da36da199bf3621276a269bf78c1da558a768fc5a20b43fd
SIZE (ONLYOFFICE-build_tools-v7.4.1.36_GH0.tar.gz) = 6657130
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-v7.4.0.163_GH0.tar.gz) = d9fb262e19ecbbd9a13bbc9f1e2d40f7fcef1ee1548302f4f09c2410a7abae01
SIZE (ONLYOFFICE-document-server-package-v7.4.0.163_GH0.tar.gz) = 155522
SHA256 (ONLYOFFICE-document-server-package-v7.4.1.36_GH0.tar.gz) = f8d4a6296aa5a86159a020b79f6064cd720c1ce6c39ce4118aa3405e96652452
SIZE (ONLYOFFICE-document-server-package-v7.4.1.36_GH0.tar.gz) = 155635
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
Expand Down
4 changes: 2 additions & 2 deletions www/onlyoffice-documentserver/files/patch-core_DesktopEditor_common_Path.cpp
View file
Expand Up @@ -3,10 +3,10 @@
@@ -34,7 +34,7 @@

#if defined(_WIN32) || defined (_WIN64)
#include <tchar.h>
#include <tchar.h>
-#elif __linux__ || MAC
+#elif __linux__ || __FreeBSD__ || MAC
#include <libgen.h>
#include <libgen.h>
#endif

@@ -53,7 +53,7 @@ namespace NSSystemPath
Expand Down
19 changes: 0 additions & 19 deletions www/onlyoffice-documentserver/files/patch-core_DesktopEditor_xmlsec_libxmlsec.pro
View file

This file was deleted.

42 changes: 42 additions & 0 deletions www/onlyoffice-documentserver/files/patch-increase_max_connections
View file
@@ -0,0 +1,42 @@
--- server/Common/sources/constants.js.orig 2023-09-07 13:17:16 UTC
+++ server/Common/sources/constants.js
@@ -85,7 +85,7 @@ exports.LICENSE_RESULT = {
NotBefore: 16
};

-exports.LICENSE_CONNECTIONS = 20;
+exports.LICENSE_CONNECTIONS = 2000;
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds

exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
--- web-apps/apps/documenteditor/mobile/src/lib/patch.jsx.orig 2023-09-07 13:14:46 UTC
+++ web-apps/apps/documenteditor/mobile/src/lib/patch.jsx
@@ -4,7 +4,7 @@ const EditorUIController = () => {
};

EditorUIController.isSupportEditFeature = () => {
- return false
+ return true
};

EditorUIController.getToolbarOptions = () => {
--- web-apps/apps/presentationeditor/mobile/src/lib/patch.jsx.orig 2023-09-07 13:15:25 UTC
+++ web-apps/apps/presentationeditor/mobile/src/lib/patch.jsx
@@ -1,6 +1,6 @@

const EditorUIController = () => null;

-EditorUIController.isSupportEditFeature = () => false;
+EditorUIController.isSupportEditFeature = () => true;

export default EditorUIController;
--- web-apps/apps/spreadsheeteditor/mobile/src/lib/patch.jsx.orig 2023-09-07 13:16:07 UTC
+++ web-apps/apps/spreadsheeteditor/mobile/src/lib/patch.jsx
@@ -1,6 +1,6 @@

const EditorUIController = () => null;

-EditorUIController.isSupportEditFeature = () => false;
+EditorUIController.isSupportEditFeature = () => true;

export default EditorUIController;
1 change: 1 addition & 0 deletions www/onlyoffice-documentserver/files/pkg-message.in
View file
Expand Up @@ -25,6 +25,7 @@ upgrade Document Server to a new version and all your changes will be lost.
# psql -U postgres -c "CREATE DATABASE onlyoffice;"
# psql -U postgres -c "CREATE USER onlyoffice WITH password 'onlyoffice';"
# psql -U postgres -c "GRANT ALL privileges ON DATABASE onlyoffice TO onlyoffice;"
# psql -U postgres -c "ALTER DATABASE onlyoffice OWNER to onlyoffice;"
# psql -hlocalhost -Uonlyoffice -d onlyoffice -f %%WWWDIR%%/documentserver/server/schema/postgresql/createdb.sql

Optionally in case of a jail with local IP:
Expand Down

0 comments on commit 21df741

Please sign in to comment.