diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index a7eb15024ce5..7a361838bc0c 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -1,348 +1,349 @@ PORTNAME= onlyoffice-documentserver DISTVERSIONPREFIX= v DISTVERSION= 9.4.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES+= LOCAL/mikael/v8/:source1 \ https://nodejs.org/dist/v${_PKGFETCH_NODE_VERSION}/:source2 \ https://github.com/fsbruva/onlyoffice-DS-npm-cache/releases/download/${_NPM_CACHE_TAG}/:source3 DISTFILES+= v8-8.9.255.25_all.tar.gz:source1 \ node-v${_PKGFETCH_NODE_VERSION}.tar.gz:source2 \ onlyoffice-DS-npm-cache-${_NPM_CACHE_TAG}.tar.gz:source3 MAINTAINER= fsbruva@yahoo.com COMMENT= Secure office and productivity apps WWW= https://www.onlyoffice.com/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= Upstream only supports amd64 and arm64 # node version used with "npm install" inside ${WRKSRC}/yao-pkg # kept in sync with patch-build__tools_scripts_build__server.py and patch-document-server-package_Makefile _DS_BUILD= 129 -_PKGFETCH_NODE_VERSION= 24.15.0 -_NPM_CACHE_TAG= ${_DS_TAGNAME}-202606140107 +_PKGFETCH_NODE_VERSION= 24.18.0 +_NPM_CACHE_TAG= ${_DS_TAGNAME}-202607080141 # end of cache build config _NODE_DISTFILE= node-v${_PKGFETCH_NODE_VERSION}.tar.gz WRKSRC_npm_cache= ${WRKDIR}/onlyoffice-DS-npm-cache-${_NPM_CACHE_TAG} BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ boost-libs>0:devel/boost-libs \ glib>=2.54:devel/glib20 \ gn:devel/gn \ ninja:devel/ninja \ npm:www/npm-node24 \ optipng:graphics/optipng # Need libvips because npm module sharp requires it on Unix OS's LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libbrotlicommon.so:archivers/brotli \ libbrotlidec.so:archivers/brotli \ libcurl.so:ftp/curl \ libetonyek-0.1.so:graphics/libetonyek01 \ libgumbo.so:devel/gumbo \ libharfbuzz.so:print/harfbuzz \ libheif.so:graphics/libheif \ libicudata.so:devel/icu \ libicuuc.so:devel/icu \ libmd4c-html.so:textproc/md4c \ libmd4c.so:textproc/md4c \ libodfgen-0.1.so:textproc/libodfgen01 \ librevenge-0.0.so:textproc/librevenge \ libvips.so:graphics/vips RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${PY_FLAVOR} \ gsed:textproc/gsed \ nginx:www/nginx \ pwgen:sysutils/pwgen \ webfonts>=0:x11-fonts/webfonts USES= autoreconf:build dos2unix fakeroot gmake gnome iconv:wchar_t \ java:build localbase pkgconfig python:build qt:6 ssl trigger BROKEN_SSL= boringssl libressl libressl-devel BROKEN_SSL_REASON= upstream Node.js requires OpenSSL DOS2UNIX_FILES= document-server-package/common/documentserver/nginx/includes/http-common.conf.m4 USE_GITHUB= yes GH_ACCOUNT= ONLYOFFICE GH_PROJECT= DocumentServer _DS_TAGNAME= ${DISTVERSIONPREFIX}${DISTVERSION}.${_DS_BUILD} GH_TUPLE= ONLYOFFICE:build_tools:${_DS_TAGNAME}:buildtools/build_tools \ ONLYOFFICE:core:${_DS_TAGNAME}:core/core \ ONLYOFFICE:core-fonts:${_DS_TAGNAME}:corefonts/core-fonts \ ONLYOFFICE:dictionaries:${_DS_TAGNAME}:dictionaries/dictionaries \ ONLYOFFICE:document-formats:${_DS_TAGNAME}:df/document-formats \ ONLYOFFICE:document-server-integration:${_DS_TAGNAME}:dsi/document-server-integration \ ONLYOFFICE:document-server-package:${_DS_TAGNAME}:dsp/document-server-package \ ONLYOFFICE:document-templates:${_DS_TAGNAME}:dt/document-templates \ ONLYOFFICE:sdkjs:${_DS_TAGNAME}:sdkjs/sdkjs \ ONLYOFFICE:server:${_DS_TAGNAME}:server/server \ ONLYOFFICE:web-apps:${_DS_TAGNAME}:webapps/web-apps \ ONLYOFFICE:DocumentBuilder:${DISTVERSIONPREFIX}${DISTVERSION}:document_builder/DocumentBuilder \ ONLYOFFICE:onlyoffice.github.io:b26d001664d771df4f663d2d3ba7dd4a188b6cab:sdkjs_plugins_v1/onlyoffice.github.io \ jasenhuang:katana-parser:be6df45:jasenhuang_katana/core/Common/3dParty/html/katana-parser \ hunspell:hyphen:73dd296:hunspell_hyphen/core/Common/3dParty/hyphen/hyphen JAVA_VERSION= 11+ USE_LDCONFIG= yes USE_QT= base:build MAKE_ENV= BUILD_NUMBER=${_DS_BUILD} \ NODE_OPTIONS=--max-old-space-size=3072 \ npm_package_config_node_gyp_nodedir=${LOCALBASE} \ npm_package_config_node_gyp_python=${PYTHON_CMD} \ PKG_BUILD_PATH=${WRKDIR}/.pkg-build \ PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \ PRODUCT_VERSION=${DISTVERSION} \ PYTHON=${PYTHON_CMD} # Don't create __pycache__ directory when executing node-gyp # This is a workaround to avoid filesystem violations during poudriere build MAKE_ENV+= PYTHONDONTWRITEBYTECODE=1 # do not strip docservice, converter, metrics and json STRIP= ETCDIR= ${PREFIX}/etc/onlyoffice WWWDIR= ${PREFIX}/www/onlyoffice BINARY_ALIAS= python=${PYTHON_CMD} strip=true SUB_FILES= onlyoffice.newsyslog.sample pkg-message SUB_LIST= DS_GROUPNAME=${DS_GROUPNAME} \ DS_USERNAME=${DS_USERNAME} \ ETCDIR=${ETCDIR} \ PREFIX=${PREFIX} \ WWWDIR=${WWWDIR} DS_USERNAME= onlyoffice DS_GROUPNAME= onlyoffice USERS= ${DS_USERNAME} GROUPS= ${DS_GROUPNAME} PLIST_SUB= DS_GROUPNAME=${DS_GROUPNAME} \ DS_USERNAME=${DS_USERNAME} \ SHARP_NODE_FILE=${_SHARP_NODE_FILE} OPTIONS_DEFINE_amd64= LLVM_PORTS LLVM_PORTS_DESC= Use LLVM/clang from ports instead of base system .include .if ${ARCH} == aarch64 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-aarch64-clang20 # Map FreeBSD ARCH to the node/sharp platform-arch suffix _SHARP_NODE_ARCH= arm64v8 .else _SHARP_NODE_ARCH= x64 .endif .if ${ARCH} == aarch64 || ${PORT_OPTIONS:MLLVM_PORTS} BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} \ nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} .endif _SHARP_NODE_FILE= sharp-freebsd-${_SHARP_NODE_ARCH}.node _SHARP_INSTALL_DIR= ${WWWDIR}/documentserver/server/DocService/sharp post-extract: @${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8_89 @${LN} -s ${WRKSRC_npm_cache} ${WRKDIR}/.npm @${MKDIR} ${WRKDIR}/.pkg-build @${MKDIR} ${WRKDIR}/.pkg-cache/node @${CP} ${FILESDIR}/extra-patch-pkg-fetch_lib-es5_build.js ${WRKDIR}/ # Copy node tarball to pkg-cache directory, and create sha256sum file @${CP} ${DISTDIR}/${_NODE_DISTFILE} ${WRKDIR}/.pkg-cache/node @${EGREP} '^\s*SHA256[[:space:]]\(${_NODE_DISTFILE}\)' \ ${.CURDIR}/distinfo | \ ${AWK} '{print $$4 " ${_NODE_DISTFILE}"}' \ > ${WRKDIR}/.pkg-cache/node/${_NODE_DISTFILE}.sha256sum @${ECHO_MSG} "===> Created pkg-fetch cache entry for ${_NODE_DISTFILE}" @${MKDIR} ${WRKSRC}/sdkjs-plugins/v1 @${CP} ${WRKSRC}/onlyoffice.github.io/sdkjs-plugins/v1/* ${WRKSRC}/sdkjs-plugins/v1 @${MV} ${WRKSRC}/server/Common/config/production-linux.json ${WRKSRC}/server/Common/config/production-freebsd.json @${MV} ${WRKSRC}/server/Common/config/development-linux.json ${WRKSRC}/server/Common/config/development-freebsd.json # linux has moved to systemd init files, continue to using supervisord for now ${MKDIR} ${WRKSRC}/document-server-package/common/documentserver/supervisor .for i in ds-docservice.conf ds-metrics.conf ds.conf ${CP} ${FILESDIR}/${i} \ ${WRKSRC}/document-server-package/common/documentserver/supervisor .endfor pre-configure: @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/core/Apple/IWork.pro \ ${WRKSRC}/core/Common/3dParty/boost/boost.pri \ ${WRKSRC}/core/Common/3dParty/brotli/brotli.pri \ ${WRKSRC}/core/Common/3dParty/heif/heif.pri \ ${WRKSRC}/core/Common/3dParty/html/gumbo.pri \ ${WRKSRC}/core/Common/3dParty/icu/icu.pri \ ${WRKSRC}/core/Common/3dParty/md/md2html.pri \ ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \ ${WRKSRC}/core/Common/3dParty/v8_89/v8/buildtools/third_party/libc++/BUILD.gn \ ${WRKSRC}/core/DesktopEditor/fontengine/ApplicationFonts.cpp \ ${WRKSRC}/core/X2tConverter/build/Qt/X2tConverter.pri \ ${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-generate-allfonts.sh.m4 \ ${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-jwt-status.sh.m4 \ ${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-pluginsmanager.sh.m4 \ ${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-static-gzip.sh.m4 \ ${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4 \ ${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-docservice.conf \ ${WRKSRC}/document-server-package/common/documentserver/supervisor/ds-metrics.conf \ ${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%CXX%%|${CXX}|' \ ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/toolchain/gcc_toolchain.gni \ ${WRKSRC}/core/Common/base.pri @${REINPLACE_CMD} 's|%%WRKDIR%%|${WRKDIR}|' \ ${WRKSRC}/document-server-package/Makefile @${REINPLACE_CMD} 's|%%WRKSRC%%|${WRKSRC}|' \ ${WRKSRC}/build_tools/scripts/build_js.py \ ${WRKSRC}/build_tools/scripts/build_server.py \ ${WRKSRC}/document-server-package/Makefile @${REINPLACE_CMD} 's|%%PKGFETCH_NODE_MAJOR_VERSION%%|${_PKGFETCH_NODE_VERSION:C/^([0-9]+)\..*/\1/}|' \ ${WRKSRC}/build_tools/scripts/build_server.py \ ${WRKSRC}/document-server-package/Makefile @${REINPLACE_CMD} -e 's|/var/lib|/var/db|' -e 's|/var/www|${LOCALBASE}/www|' \ -e 's|/usr/share|${LOCALBASE}/share|' -e 's|/etc|${LOCALBASE}/etc|' \ ${WRKSRC}/server/Common/config/production-freebsd.json \ ${WRKSRC}/server/Common/config/development-freebsd.json @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' -e 's|%%ETCDIR%%|${ETCDIR}|' \ ${WRKSRC}/document-server-package/common/documentserver/bin/documentserver-flush-cache.sh.m4 \ ${WRKSRC}/document-server-package/Makefile @${REINPLACE_CMD} -e 's|%%OPENSSL_INC%%|${OPENSSLINC}|' -e 's|%%OPENSSL_LIB%%|${OPENSSLLIB}|' \ ${WRKDIR}/extra-patch-pkg-fetch_lib-es5_build.js \ ${WRKSRC}/core/Common/3dParty/openssl/openssl.pri @${REINPLACE_CMD} -e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|' \ -e 's|%%QT_VERSION%%|${QT6_VERSION}|' \ ${WRKSRC}/build_tools/tools/freebsd/automate.py @${RM} ${WRKSRC}/web-apps/build/patches/optipng-bin+5.1.0.patch.orig # Copy new package.json for sdkjs root @${CP} ${WRKSRC_npm_cache}/sdkjs-package.json ${WRKSRC}/sdkjs/package.json @${ECHO_MSG} " Installed: sdkjs/package.json" # Copy optimized shrinkwrap files from cache repo, overwriting upstream @${ECHO_MSG} "Installing optimized npm-shrinkwrap.json files..." @(cd ${WRKSRC_npm_cache}/shrinkwrap && \ ${FIND} . -name npm-shrinkwrap.json | while read shrinkwrap; do \ rel_path=$${shrinkwrap#./}; \ target="${WRKSRC}/$${rel_path}"; \ target_dir=$$(dirname "$$target"); \ ${MKDIR} "$$target_dir"; \ ${CP} "$$shrinkwrap" "$$target"; \ ${ECHO_MSG} " Installed: $${rel_path}"; \ done) @${ECHO} "# Generated from 'DEPS'" > ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni @${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8_89/v8/build/config/gclient_args.gni do-build: ${INSTALL_SCRIPT} ${FILESDIR}/npm ${BINARY_LINKDIR}/npm @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKDIR}/.bin/npm @cd ${WRKSRC}/web-apps/build ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm install --ignore-scripts @cd ${WRKSRC}/web-apps/build ; node_modules/.bin/patch-package @cd ${WRKSRC}/web-apps/build/node_modules/optipng-bin ; ${SETENV} ${MAKE_ENV} npm run postinstall optipng-bin @cd ${WRKSRC}/sdkjs ; ${SETENV} ${MAKE_ENV} npm install # During offline builds the install script doesn't run, and must patch for external native addon @cd ${WRKSRC}/server/DocService ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm install --ignore-scripts @cd ${WRKSRC}/server/DocService ; node_modules/.bin/patch-package @cd ${WRKSRC}/server/DocService/node_modules/sharp ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm run install # Install Metrics dependencies and patch statsd for Node 24 compatibility # (util.log was removed in Node 23; patch replaces it with console.log) @cd ${WRKSRC}/server/Metrics ; ${SETENV} ${MAKE_ENV} NODE_ENV=production npm install --ignore-scripts @cd ${WRKSRC}/server/Metrics ; node_modules/.bin/patch-package @${MKDIR} ${WRKSRC}/yao-pkg @${CP} ${WRKSRC_npm_cache}/yao-pkg-package.json ${WRKSRC}/yao-pkg/package.json @${CP} ${WRKSRC_npm_cache}/yao-pkg-npm-shrinkwrap-${MACHINE_ARCH}.json ${WRKSRC}/yao-pkg/npm-shrinkwrap.json @cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @cd ${WRKSRC} && ${PATCH} -N -s -i ${WRKDIR}/extra-patch-pkg-fetch_lib-es5_build.js @cd ${WRKSRC} && ${PATCH} -N -s -i ${WRKSRC_npm_cache}/extra-patch-pkg-fetch_patches_node.v${_PKGFETCH_NODE_VERSION}.cpp.patch cd ${WRKSRC}/build_tools/tools/freebsd ; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} automate.py cd ${WRKSRC}/document-server-package ; ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd do-install: # install the project # do not strip docservice, converter, metrics and json cd ${WRKSRC}/document-server-package/common/documentserver/home && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/documentserver ${INSTALL_SCRIPT} ${WRKSRC}/document-server-package/common/documentserver/bin/*.sh ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/all* ${STAGEDIR}${WWWDIR}/documentserver/server/tools ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/x2t ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/docbuilder ${STAGEDIR}${WWWDIR}/documentserver/server/FileConverter/bin ${INSTALL_PROGRAM} ${WRKSRC}/document-server-package/common/documentserver/home/server/tools/pluginsmanager ${STAGEDIR}${WWWDIR}/documentserver/server/tools ${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/home/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm ${INSTALL_LIB} ${WRKSRC}/document-server-package/common/documentserver/home/server/FileConverter/bin/*.so ${STAGEDIR}${PREFIX}/lib # install conf ${MKDIR} ${STAGEDIR}${ETCDIR}/documentserver/supervisor \ ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes \ ${STAGEDIR}${ETCDIR}/documentserver/logrotate ${RM} ${WRKSRC}/document-server-package/common/documentserver/config/*-mac.json ${WRKSRC}/document-server-package/common/documentserver/config/*-windows.json cd ${WRKSRC}/document-server-package/common/documentserver/supervisor && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/supervisor "-name *\.conf" cd ${WRKSRC}/document-server-package/common/documentserver/logrotate && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/logrotate "-name *\.conf" ${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/nginx/ds-ssl.conf.tmpl ${WRKSRC}/document-server-package/common/documentserver/nginx/ds-ssl.conf .for f in ds.conf ds-ssl.conf includes/http-common.conf includes/ds-common.conf \ includes/ds-docservice.conf includes/ds-letsencrypt.conf \ includes/ds-mime.types.conf ${INSTALL_DATA} ${WRKSRC}/document-server-package/common/documentserver/nginx/${f} ${STAGEDIR}${ETCDIR}/documentserver/nginx/${f}.sample .endfor @echo "# Production ds-cache.conf is created automatically by documentserver-flush-cache.sh" > ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes/ds-cache.conf.sample cd ${WRKSRC}/document-server-package/common/documentserver/nginx/includes && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes "-name *\.conf" cd ${WRKSRC}/document-server-package/common/documentserver/config && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver ${INSTALL_DATA} ${FILESDIR}/local.json.sample ${STAGEDIR}${ETCDIR}/documentserver ${MKDIR} ${STAGEDIR}/${ETCDIR}/documentserver/newsyslog.conf.d ${INSTALL_DATA} ${WRKDIR}/onlyoffice.newsyslog.sample ${STAGEDIR}/${ETCDIR}/documentserver/newsyslog.conf.d # Install arch-specific sharp native binding adjacent to the docservice # binary. sharp.js resolves this at runtime via path.dirname(process.execPath). @${MKDIR} ${STAGEDIR}${_SHARP_INSTALL_DIR} ${INSTALL_LIB} \ ${WRKSRC}/server/DocService/node_modules/sharp/build/Release/${_SHARP_NODE_FILE} \ ${STAGEDIR}${_SHARP_INSTALL_DIR}/${_SHARP_NODE_FILE} # create missing dir ${MKDIR} ${STAGEDIR}/var/log/onlyoffice/documentserver/docservice \ ${STAGEDIR}/var/log/onlyoffice/documentserver/converter \ ${STAGEDIR}/var/log/onlyoffice/documentserver/metrics \ ${STAGEDIR}/var/db/onlyoffice/documentserver/App_Data/cache/files \ ${STAGEDIR}/var/db/onlyoffice/documentserver/App_Data/docbuilder \ ${STAGEDIR}${WWWDIR}/Data \ ${STAGEDIR}${WWWDIR}/documentserver/fonts post-install: # Remove unwanted files from STAGE ${RM} ${STAGEDIR}${PREFIX}/bin/documentserver-letsencrypt.sh ${RM} ${STAGEDIR}${WWWDIR}/documentserver/server/Common/config/*.bak ${RM} ${STAGEDIR}${WWWDIR}/documentserver/dictionaries/sl_SI/hyph_sl_SI.dic.bak # formats@2.5x.svg is generated by grunt-svg-sprite (web-apps/build/sprites/Gruntfile.js) as # part of the editor-specific deploy phase, which runs after the common deploy step that would # have copied it to staging via its **/*.svg glob. Copy it manually until fixed upstream. ${INSTALL_DATA} ${WRKSRC}/web-apps/apps/common/main/resources/img/doc-formats/formats@2.5x.svg \ ${STAGEDIR}${WWWDIR}/documentserver/web-apps/apps/common/main/resources/img/doc-formats/ .include diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo index abb77ec6b021..92447aca9450 100644 --- a/www/onlyoffice-documentserver/distinfo +++ b/www/onlyoffice-documentserver/distinfo @@ -1,39 +1,39 @@ -TIMESTAMP = 1781400012 +TIMESTAMP = 1783868045 SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80 SIZE (v8-8.9.255.25_all.tar.gz) = 72818814 -SHA256 (node-v24.15.0.tar.gz) = 729de494dd2872e5a3a6c32a1cd156a5413d4aca2772b2d873ee86bb5531bcd9 -SIZE (node-v24.15.0.tar.gz) = 113425441 -SHA256 (onlyoffice-DS-npm-cache-v9.4.0.129-202606140107.tar.gz) = 5232b6ef887832fd90b873bfbf284ae3f8e2a2769599b2fbbc5325a81f3c4381 -SIZE (onlyoffice-DS-npm-cache-v9.4.0.129-202606140107.tar.gz) = 109676613 +SHA256 (node-v24.18.0.tar.gz) = c8348067b41d8739ec69fd4da615cd8995ad6a76eb53e84a7fa7291c8a477eb7 +SIZE (node-v24.18.0.tar.gz) = 114348532 +SHA256 (onlyoffice-DS-npm-cache-v9.4.0.129-202607080141.tar.gz) = 88e54a323fa7fb415bdc40a3cc051889526440bc79d163afedab18aec632de74 +SIZE (onlyoffice-DS-npm-cache-v9.4.0.129-202607080141.tar.gz) = 109697632 SHA256 (ONLYOFFICE-DocumentServer-v9.4.0_GH0.tar.gz) = 678401ead43a1c1325bc6a662bab95494c85c21546f38584cd76597bdeb743f9 SIZE (ONLYOFFICE-DocumentServer-v9.4.0_GH0.tar.gz) = 985804 SHA256 (ONLYOFFICE-build_tools-v9.4.0.129_GH0.tar.gz) = 8f65a62e000e7cc913dd0ee4db5d8dcf6256c16040633dd82f36c104dab52d46 SIZE (ONLYOFFICE-build_tools-v9.4.0.129_GH0.tar.gz) = 6726793 SHA256 (ONLYOFFICE-core-v9.4.0.129_GH0.tar.gz) = 4a76b7d5c0dad1e9022d57618c6961628ddcabafa53cbeb9af0393263e189364 SIZE (ONLYOFFICE-core-v9.4.0.129_GH0.tar.gz) = 220068964 SHA256 (ONLYOFFICE-core-fonts-v9.4.0.129_GH0.tar.gz) = 4d093a8d56a0208e79056493d2a65484136e9f57e04af4691864af4757e588e1 SIZE (ONLYOFFICE-core-fonts-v9.4.0.129_GH0.tar.gz) = 95376491 SHA256 (ONLYOFFICE-dictionaries-v9.4.0.129_GH0.tar.gz) = 073c45f9138855a4a7b3688ce2d4dedcbf19e738b0e6eae777d3eef0a9c3bd9e SIZE (ONLYOFFICE-dictionaries-v9.4.0.129_GH0.tar.gz) = 57973595 SHA256 (ONLYOFFICE-document-formats-v9.4.0.129_GH0.tar.gz) = da9bd77bb35a676400605908804c104cce36191aa913d0b7ac9165341c9ef7aa SIZE (ONLYOFFICE-document-formats-v9.4.0.129_GH0.tar.gz) = 8403 SHA256 (ONLYOFFICE-document-server-integration-v9.4.0.129_GH0.tar.gz) = eccfc459cf18ae54fd3a7e42936a4da9423406c5e29f9c8f255f5389b79aa213 SIZE (ONLYOFFICE-document-server-integration-v9.4.0.129_GH0.tar.gz) = 6032645 SHA256 (ONLYOFFICE-document-server-package-v9.4.0.129_GH0.tar.gz) = 5fa13f7dc6bb85abc079f12da963054840e58311ce3d85cb0a248680796c5c76 SIZE (ONLYOFFICE-document-server-package-v9.4.0.129_GH0.tar.gz) = 201439 SHA256 (ONLYOFFICE-document-templates-v9.4.0.129_GH0.tar.gz) = 82e0893571bfb0cfed416cd94e92fab4e7270782b5cdb682ce3c750ce6007b4e SIZE (ONLYOFFICE-document-templates-v9.4.0.129_GH0.tar.gz) = 3560958 SHA256 (ONLYOFFICE-sdkjs-v9.4.0.129_GH0.tar.gz) = 9df3cc1497b1de0052e90daae7008ae3dd17a4dd7d40c213ce8296b78d4dd623 SIZE (ONLYOFFICE-sdkjs-v9.4.0.129_GH0.tar.gz) = 53340315 SHA256 (ONLYOFFICE-server-v9.4.0.129_GH0.tar.gz) = eff4ba61d4729710d3423a2dcc18becbecc84c782b48ed90ea7bf8a0432f6af4 SIZE (ONLYOFFICE-server-v9.4.0.129_GH0.tar.gz) = 462924 SHA256 (ONLYOFFICE-web-apps-v9.4.0.129_GH0.tar.gz) = ce2e5299f02865aecd6992b69a059cb711714e92efb10121694651bacb40bb28 SIZE (ONLYOFFICE-web-apps-v9.4.0.129_GH0.tar.gz) = 529379944 SHA256 (ONLYOFFICE-DocumentBuilder-v9.4.0_GH0.tar.gz) = 27c46483ea6824c291eaef2f7584bdb45747ed3cc2240ca97aa5f0ac47c80711 SIZE (ONLYOFFICE-DocumentBuilder-v9.4.0_GH0.tar.gz) = 19410 SHA256 (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 347b8f1d3c21b1f61a3f1fcae86f402b27ce4f8b826e18158834251046d83cf5 SIZE (ONLYOFFICE-onlyoffice.github.io-b26d001664d771df4f663d2d3ba7dd4a188b6cab_GH0.tar.gz) = 17009005 SHA256 (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 363ede45ba6d125fdb7323c43d34acd3d0ae9028ac18aec632eb6a623160f09a SIZE (jasenhuang-katana-parser-be6df45_GH0.tar.gz) = 97712 SHA256 (hunspell-hyphen-73dd296_GH0.tar.gz) = 93e80ad69ee7afd507b12f0b58ca34a6a78347dcbb5fe5d9b6f0e19b02397ef7 SIZE (hunspell-hyphen-73dd296_GH0.tar.gz) = 292528 diff --git a/www/onlyoffice-documentserver/files/local.json.sample b/www/onlyoffice-documentserver/files/local.json.sample index 574f913266c6..b7fdf9841f36 100644 --- a/www/onlyoffice-documentserver/files/local.json.sample +++ b/www/onlyoffice-documentserver/files/local.json.sample @@ -1,59 +1,54 @@ { "services": { "CoAuthoring": { - "sql": { - "type": "postgres", - "dbHost": "localhost", - "dbPort": "5432", - "dbName": "onlyoffice", - "dbUser": "onlyoffice", - "dbPass": "onlyoffice" - }, "token": { "enable": { "request": { "inbox": false, "outbox": false }, "browser": false }, "inbox": { "header": "Authorization" }, "outbox": { "header": "Authorization" } }, "secret": { "browser": { "string": "JWTsecretstring" }, "inbox": { "string": "JWTsecretstring" }, "outbox": { "string": "JWTsecretstring" }, "session": { "string": "JWTsecretstring" } } } }, "openpgpjs": { - "_comment": "https://helpcenter.onlyoffice.com/docs/installation/docs-developer-configuring.aspx#openpgpprotocol_block" + "_comment": "https://helpcenter.onlyoffice.com/docs/installation/docs-developer-configuring.aspx#openpgpprotocol_block", "encrypt": { "passwords": ["PGPguardsecretstring"] }, "decrypt": { "passwords": ["PGPguardsecretstring"] } }, "aesEncrypt": { - "_comment": "https://helpcenter.onlyoffice.com/docs/installation/docs-developer-configuring.aspx#aes256gcmalgorithm_block" + "_comment": "https://helpcenter.onlyoffice.com/docs/installation/docs-developer-configuring.aspx#aes256gcmalgorithm_block", "secret": "docpasswordsecretstring" }, - "rabbitmq": { - "url": "amqp://onlyoffice:password@localhost" + "storage": { + "name": "storage-fs", + "fs": { + "secretString": "verysecretstring" + } } } diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_base.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_base.py index ea9b055a6f24..b6dd395f6a70 100644 --- a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_base.py +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_base.py @@ -1,30 +1,57 @@ ---- build_tools/scripts/base.py.orig 2021-11-16 08:07:24 UTC +--- build_tools/scripts/base.py.orig 2026-05-15 19:11:43 UTC +++ build_tools/scripts/base.py -@@ -1375,9 +1376,15 @@ def support_old_versions_plugins(out_dir): +@@ -1152,7 +1152,7 @@ + return + + def correct_bundle_identifier(bundle_identifier): +- return re.sub("[^a-zA-Z0-9\.\-]", "-", bundle_identifier) ++ return re.sub(r"[^a-zA-Z0-9\.\-]", "-", bundle_identifier) + + def get_sdkjs_addons(): + result = {} +@@ -1590,9 +1590,15 @@ def support_old_versions_plugins(out_dir): if is_file(out_dir + "/pluginBase.js"): return - download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.js", out_dir + "/plugins.js") - download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins-ui.js", out_dir + "/plugins-ui.js") - download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.css", out_dir + "/plugins.css") +# download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.js", out_dir + "/plugins.js") +# download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins-ui.js", out_dir + "/plugins-ui.js") +# download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.css", out_dir + "/plugins.css") + git_dir = get_script_dir() + "/../.." + plugins_dir = git_dir + "/sdkjs-plugins" + copy_file(plugins_dir + "/v1/plugins.js", out_dir + "/plugins.js") + copy_file(plugins_dir + "/v1/plugins-ui.js", out_dir + "/plugins-ui.js") + copy_file(plugins_dir + "/v1/plugins.css", out_dir + "/plugins.css") + content_plugin_base = "" with open(get_path(out_dir + "/plugins.js"), "r") as file: content_plugin_base += file.read() -@@ -1520,7 +1527,7 @@ def clone_marketplace_plugin(out_dir, is_name_as_guid= - def clone_marketplace_plugin(out_dir, is_name_as_guid=False, is_replace_paths=False, is_delete_git_dir=True, git_owner=""): +@@ -1650,7 +1656,7 @@ + def find_mac_sdk_version(): + sdk_dir = run_command("xcode-select -print-path")['stdout'] + sdk_dir = os.path.join(sdk_dir, "Platforms/MacOSX.platform/Developer/SDKs") +- sdks = [re.findall('^MacOSX(1\d\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)] ++ sdks = [re.findall(r'^MacOSX(1\d\.\d+)\.sdk$', s) for s in os.listdir(sdk_dir)] + sdks = [s[0] for s in sdks if s] + return sdks[0] + +@@ -1745,7 +1751,7 @@ + def clone_marketplace_plugin(out_dir, is_name_as_guid=False, is_replace_paths=False, is_delete_git_dir=True, git_owner=""): old_cur = os.getcwd() os.chdir(out_dir) - git_update("onlyoffice.github.io", False, True, git_owner) +# git_update("onlyoffice.github.io", False, True, git_owner) os.chdir(old_cur) dst_dir_name = "marketplace" +@@ -1851,7 +1857,7 @@ + if (-1 != old_path.find(origin)): + return + new_path = old_path +- new_path = new_path.replace("$ORIGIN", "\$ORIGIN") ++ new_path = new_path.replace("$ORIGIN", r"\$ORIGIN") + if ("" != new_path): + new_path += ":" + new_path += origin diff --git a/www/onlyoffice-documentserver/files/patch-build__tools_scripts_develop_dependence.py b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_develop_dependence.py new file mode 100644 index 000000000000..10a387998df5 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-build__tools_scripts_develop_dependence.py @@ -0,0 +1,25 @@ +--- build_tools/scripts/develop/dependence.py.orig 2026-05-15 19:11:43 UTC ++++ build_tools/scripts/develop/dependence.py +@@ -687,7 +687,7 @@ + connectionString = postgreLoginSrt + ' -c "SELECT setting FROM pg_settings WHERE name = ' + "'port'" + ';"' + + if (host_platform == 'linux'): +- result = os.system(postgreLoginSrt + ' -c "\q"') ++ result = os.system(postgreLoginSrt + r' -c "\q"') + connectionResult = base.run_command(connectionString) + expected_port = config.option("db-port") + +@@ -744,11 +744,11 @@ + creatdb_path = base.get_script_dir() + "/../../server/schema/postgresql/createdb.sql" + + # Check if user exists +- user_check_result = base.run_command_in_dir(postgre_path_to_bin, postgreLoginRoot + ' -c "\du ' + dbUser + '"') ++ user_check_result = base.run_command_in_dir(postgre_path_to_bin, postgreLoginRoot + r' -c "\du ' + dbUser + '"') + + if (user_check_result['stdout'].find(dbUser) != -1): + # User exists, check password +- if (os.system(postgreLoginDbUser + '-c "\q"') != 0): ++ if (os.system(postgreLoginDbUser + r'-c "\q"') != 0): + print('Invalid user password, changing...') + result = change_userPass(dbUser, dbPass, postgre_path_to_bin) and result + else: diff --git a/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_tools_gen-postmortem-metadata.py b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_tools_gen-postmortem-metadata.py new file mode 100644 index 000000000000..e607f9e2d437 --- /dev/null +++ b/www/onlyoffice-documentserver/files/patch-core_Common_3dParty_v8__89_v8_tools_gen-postmortem-metadata.py @@ -0,0 +1,38 @@ +--- core/Common/3dParty/v8_89/v8/tools/gen-postmortem-metadata.py.orig 2021-04-12 21:00:33 UTC ++++ core/Common/3dParty/v8_89/v8/tools/gen-postmortem-metadata.py +@@ -470,7 +470,7 @@ + # + entries = typestr.split(','); + for entry in entries: +- types[re.sub('\s*=.*', '', entry).lstrip()] = True; ++ types[re.sub(r'\s*=.*', '', entry).lstrip()] = True; + entries = torque_typestr.split('\\') + for entry in entries: + types[re.sub(r' *V\(|\) *', '', entry)] = True +@@ -481,7 +481,7 @@ + continue + idx = entry.find('('); + rest = entry[idx + 1: len(entry) - 1]; +- args = re.split('\s*,\s*', rest); ++ args = re.split(r'\s*,\s*', rest); + typename = args[0] + typeconst = args[1] + types[typeconst] = True +@@ -584,7 +584,7 @@ + idx = call.find('('); + kind = call[0:idx]; + rest = call[idx + 1: len(call) - 1]; +- args = re.split('\s*,\s*', rest); ++ args = re.split(r'\s*,\s*', rest); + + consts = []; + +@@ -685,7 +685,7 @@ + + # Fix up overzealous parses. This could be done inside the + # parsers but as there are several, it's easiest to do it here. +- ws = re.compile('\s+') ++ ws = re.compile(r'\s+') + for const in consts: + name = ws.sub('', const['name']) + value = ws.sub('', str(const['value'])) # Can be a number. diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 index 6d40dfa72b4c..f33d087eb0c7 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-update-securelink.sh.m4 @@ -1,66 +1,70 @@ ---- document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4.orig 2023-06-20 13:50:40 UTC +--- document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4.orig 2026-05-14 16:29:43 UTC +++ document-server-package/common/documentserver/bin/documentserver-update-securelink.sh.m4 @@ -1,24 +1,24 @@ #!/bin/sh -while [ "$1" != "" ]; do +while [ $# -gt 0 ]; do case $1 in - -s | --secure_link_secret ) if [ "$2" != "" ]; then SECURE_LINK_SECRET=$2 shift fi + shift ;; -r | --restart ) - if [ "$2" != "" ]; then + if [ "$2" = "true" ] || [ "$2" = "false" ]; then RESTART_CONDITION=$2 shift fi + shift ;; - - -? | -h | --help ) + -h | --help ) echo " Usage $0 [PARAMETER] [[PARAMETER], ...]" echo " Parameters:" echo " -s, --secure_link_secret setting for secret string " -@@ -26,26 +26,21 @@ while [ "$1" != "" ]; do +@@ -26,26 +26,26 @@ echo exit 0 ;; - esac shift done -NGINX_CONF=/etc/M4_DS_PREFIX/nginx/ds.conf -LOCAL_CONF=/etc/M4_DS_PREFIX/local.json -JSON="/var/www/M4_DS_PREFIX/npm/json -q -f ${LOCAL_CONF}" -+NGINX_CONF=%%LOCALBASE%%/etc/M4_DS_PREFIX/nginx/ds.conf ++NGINX_HTTP_CONF=%%LOCALBASE%%/etc/M4_DS_PREFIX/nginx/ds.conf ++NGINX_SSL_CONF=%%LOCALBASE%%/etc/M4_DS_PREFIX/nginx/ds-ssl.conf +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/null; then - systemctl restart ds-docservice - systemctl restart ds-converter - systemctl reload nginx - elif pgrep -x ""supervisord"" >/dev/null; then + if pgrep -f "supervisord" >/dev/null; then supervisorctl restart ds:docservice - supervisorctl restart ds:converter service nginx reload diff --git a/www/onlyoffice-documentserver/files/pkg-message.in b/www/onlyoffice-documentserver/files/pkg-message.in index 4299eafdbc00..81dab26f7418 100644 --- a/www/onlyoffice-documentserver/files/pkg-message.in +++ b/www/onlyoffice-documentserver/files/pkg-message.in @@ -1,116 +1,128 @@ [ { type: install message: <