git: f7218859cc68 - main - www/onlyoffice-documentserver: Update to 7.1.0.215

From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Tue, 24 May 2022 19:17:44 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f7218859cc689323064adc4426f93ab12acbd93a

commit f7218859cc689323064adc4426f93ab12acbd93a
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2022-05-24 19:15:31 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2022-05-24 19:17:41 +0000

    www/onlyoffice-documentserver: Update to 7.1.0.215
    
      - Update v8 to 8.9.255.25, the bug with 8.7.220.31 is fixed so we can
        compile v8 again.
      - Remove ONLY_FOR_ARCHS as v8 may builds on all archs.
      - Fix a few hardcoded /usr/local
      - Fix mysql instructions in pkg-message.in
      - Add upgrade procedure in pkg-message.in
---
 www/onlyoffice-documentserver/Makefile             |   29 +-
 www/onlyoffice-documentserver/distinfo             |  102 +-
 ...patch-pkg-fetch_patches_node.v16.13.0.cpp.patch |    4 +
 .../packagejsons/server/Common/package-lock.json   | 1574 +++++-
 .../files/packagejsons/server/package-lock.json    | 5450 ++++++++++++++++++--
 .../patch-build__tools_scripts_build__server.py    |    7 +-
 .../files/patch-build__tools_scripts_config.py     |   10 +-
 ...build__tools_scripts_core__common_modules_v8.py |   24 +-
 .../patch-build__tools_scripts_deploy__server.py   |    9 -
 ...lsFile2_source_XlsFormat_Auxiliary_HelpFunc.cpp |   11 -
 .../files/patch-core_Common_3dParty_v8_v8.pri      |    8 +-
 .../files/patch-core_Common_3dParty_v8_v8_BUILD.gn |   32 +
 ...core_Common_3dParty_v8_v8_build_config_BUILD.gn |   30 +
 ...ommon_3dParty_v8_v8_build_config_BUILDCONFIG.gn |   48 +
 ...on_3dParty_v8_v8_build_config_compiler_BUILD.gn |   88 +
 ...dParty_v8_v8_build_config_compiler_compiler.gni |   11 +
 ..._Common_3dParty_v8_v8_build_config_features.gni |   11 +
 ...dParty_v8_v8_build_config_freetype_freetype.gni |    9 +
 ...ommon_3dParty_v8_v8_build_config_linux_BUILD.gn |   11 +
 ..._3dParty_v8_v8_build_config_linux_pkg-config.py |   26 +
 ...e_Common_3dParty_v8_v8_build_config_sysroot.gni |   14 +
 ...ommon_3dParty_v8_v8_build_detect__host__arch.py |   11 +
 ...e_Common_3dParty_v8_v8_build_gn__run__binary.py |   11 +
 ...ore_Common_3dParty_v8_v8_build_linux_chrome.map |   29 +
 ...ommon_3dParty_v8_v8_build_linux_libpci_BUILD.gn |   53 +
 ...on_3dParty_v8_v8_build_linux_unbundle_libusb.gn |   27 +
 ...8_v8_build_linux_unbundle_replace__gn__files.py |   10 +
 ...dParty_v8_v8_build_toolchain_gcc__toolchain.gni |   45 +
 ...v8_v8_build_toolchain_get__concurrent__links.py |   17 +
 ...y_v8_v8_buildtools_third__party_libc++_BUILD.gn |   11 +
 ...ch-core_Common_3dParty_v8_v8_include_v8config.h |   21 +
 .../patch-core_Common_3dParty_v8_v8_src_api_api.cc |   11 +
 ...patch-core_Common_3dParty_v8_v8_src_base_cpu.cc |   18 +
 ...rty_v8_v8_src_base_platform_platform-freebsd.cc |   13 +
 ...Party_v8_v8_src_base_platform_platform-posix.cc |   24 +
 ...ch-core_Common_3dParty_v8_v8_src_d8_d8-posix.cc |   19 +
 ...ore_Common_3dParty_v8_v8_testing_gmock_BUILD.gn |   22 +
 ...Common_3dParty_v8_v8_third__party_zlib_BUILD.gn |   11 +
 ...3dParty_v8_v8_third__party_zlib_cpu__features.c |   48 +
 ...pEditor_Qt__build_graphics_project_graphics.pri |   15 -
 ..._Qt__build_graphics_project_graphics__fonts.pri |   14 -
 ...topEditor_agg-2.4_include_agg__span__gradient.h |    6 +-
 ...e_DesktopEditor_fontengine_ApplicationFonts.cpp |   22 +-
 .../patch-core_DjVuFile_libdjvu_DjVuDocument.cpp   |    6 +-
 ...tch-core_X2tConverter_build_Qt_X2tConverter.pri |    3 +-
 .../files/patch-document-server-package_Makefile   |   71 +-
 ...ocumentserver_nginx_includes_ds-mime.types.conf |  104 +
 .../files/patch-server_package.json                |   16 +-
 www/onlyoffice-documentserver/files/pkg-message.in |   15 +-
 www/onlyoffice-documentserver/pkg-plist            |   74 +-
 50 files changed, 7314 insertions(+), 941 deletions(-)

diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
index 3e04b2b2649b..ff9cfe09a257 100644
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -1,20 +1,17 @@
 PORTNAME=	onlyoffice-documentserver
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.0.1.50
-PORTREVISION=	5
+DISTVERSION=	7.1.0.215
 CATEGORIES=	www
 MASTER_SITES+=	LOCAL/mikael/v8/:source1 \
 		LOCAL/mikael/onlyoffice/:source2 \
 		https://nodejs.org/dist/v${NODE_VERSION_PKGFETCH}/:source3 \
 		https://nodejs.org/dist/v${NODE_VERSION_PORTS}/:source3 \
 		SF/optipng/OptiPNG/optipng-0.7.7/:source4
-DISTFILES+=	v8-6.8.275.32_all.tar.gz:source1 \
-		v8-6.8.275.32_122aarch64.tar.gz:source1 \
-		v8-6.8.275.32_122amd64.tar.gz:source1 \
+DISTFILES+=	v8-8.9.255.25_all.tar.gz:source1 \
 		node-v${NODE_VERSION_PKGFETCH}.tar.gz:source3 \
 		node-v${NODE_VERSION_PORTS}.tar.gz:source3 \
 		optipng-0.7.7.tar.gz:source4 \
-		onlyoffice-${DISTVERSION}-npm-cache.tar.gz:source2 \
+		onlyoffice-${DISTVERSION}-npm-cache.tar.gz:source2
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Secure office and productivity apps
@@ -22,12 +19,12 @@ COMMENT=	Secure office and productivity apps
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-ONLY_FOR_ARCHS=	aarch64 amd64
-ONLY_FOR_ARCHS_REASON=	uses aarch64 or amd64 binaries
-
-BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
+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 \
 		java:java/openjdk11 \
+		ninja:devel/ninja \
 		npm:www/npm-node16
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
@@ -45,7 +42,7 @@ USE_QT=		qmake_build
 USE_GITHUB=	yes
 GH_ACCOUNT=	ONLYOFFICE
 GH_PROJECT=	DocumentServer
-GH_TAGNAME=	v7.0.1
+GH_TAGNAME=	v7.1.0
 GH_TUPLE=	ONLYOFFICE:core:v${DISTVERSION}:core/core \
 		ONLYOFFICE:core-fonts:v${DISTVERSION}:corefonts/core-fonts \
 		ONLYOFFICE:dictionaries:v${DISTVERSION}:dictionaries/dictionaries \
@@ -118,8 +115,6 @@ CONFLICTS_BUILD=devel/googletest
 
 post-extract:
 	@${MV} ${WRKDIR}/v8 ${WRKSRC}/core/Common/3dParty/v8
-	@${MKDIR} ${WRKSRC}/core/Common/3dParty/v8/v8/out.gn/freebsd_64
-	@${MV} ${WRKDIR}/v8_obj_122${ARCH}/obj ${WRKSRC}/core/Common/3dParty/v8/v8/out.gn/freebsd_64
 
 	@${MKDIR} ${WRKDIR}/.pkg-cache/node
 	@${CP} ${DISTDIR}/node-v${NODE_VERSION_PKGFETCH}.tar.gz ${DISTDIR}/node-v${NODE_VERSION_PORTS}.tar.gz \
@@ -139,8 +134,11 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/core/Common/3dParty/icu/icu.pri \
+		${WRKSRC}/core/Common/3dParty/v8/v8/build/toolchain/gcc_toolchain.gni \
+		${WRKSRC}/core/Common/3dParty/v8/v8/buildtools/third_party/libc++/BUILD.gn \
 		${WRKSRC}/core/DesktopEditor/fontengine/ApplicationFonts.cpp
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|' -e 's|%%CXX%%|${CXX}|' \
+		${WRKSRC}/core/Common/3dParty/v8/v8/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/core/Common/base.pri
 	@${REINPLACE_CMD} 's|%%WRKDIR%%|${WRKDIR}|' \
 		${WRKSRC}/document-server-package/Makefile
@@ -175,6 +173,9 @@ post-patch:
 
 	@${FIND} ${WRKSRC}/server -type f -name npm-shrinkwrap.json -delete
 
+	@${ECHO} "# Generated from 'DEPS'" > ${WRKSRC}/core/Common/3dParty/v8/v8/build/config/gclient_args.gni
+	@${ECHO} "checkout_google_benchmark = false" >> ${WRKSRC}/core/Common/3dParty/v8/v8/build/config/gclient_args.gni
+
 do-build:
 	@${CP} ${FILESDIR}/packagejsons/server/package-lock.json ${WRKSRC}/server
 	@${CP} ${FILESDIR}/packagejsons/server/Common/package-lock.json ${WRKSRC}/server/Common
@@ -216,7 +217,7 @@ do-install:
 	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"
 	@${CP} ${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
+.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
 	cd ${WRKSRC}/document-server-package/common/documentserver/nginx/includes && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/documentserver/nginx/includes "-name *\.conf"
diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo
index c5100056b982..d696f2ba3ef6 100644
--- a/www/onlyoffice-documentserver/distinfo
+++ b/www/onlyoffice-documentserver/distinfo
@@ -1,64 +1,60 @@
-TIMESTAMP = 1649399300
-SHA256 (v8-6.8.275.32_all.tar.gz) = 9a62989b8965970c0cc67aef911b4937b822fe91a41e9d6977e797ed1326504b
-SIZE (v8-6.8.275.32_all.tar.gz) = 65333304
-SHA256 (v8-6.8.275.32_122aarch64.tar.gz) = c7311440b3d97a0caa41406de43fd77fc45f1c0f627cea8c54466a7ab78ca69a
-SIZE (v8-6.8.275.32_122aarch64.tar.gz) = 10239298
-SHA256 (v8-6.8.275.32_122amd64.tar.gz) = 78d13788f4e3608a7b6765621353aa9f334f54985358936f3e214dfcca23ae57
-SIZE (v8-6.8.275.32_122amd64.tar.gz) = 10328115
+TIMESTAMP = 1652544698
+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 (node-v16.14.2.tar.gz) = 082170f362c4da0e97f3a1899e3f5e4c998bbc245b803c77c6ab113a2b5cbd5f
 SIZE (node-v16.14.2.tar.gz) = 64999385
 SHA256 (optipng-0.7.7.tar.gz) = 4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452
 SIZE (optipng-0.7.7.tar.gz) = 2329555
-SHA256 (onlyoffice-7.0.1.50-npm-cache.tar.gz) = 48824b1116f38aae29fe9a80ea495aba398d658555e55460d3774491028f4c19
-SIZE (onlyoffice-7.0.1.50-npm-cache.tar.gz) = 212890771
-SHA256 (ONLYOFFICE-DocumentServer-v7.0.1.50-v7.0.1_GH0.tar.gz) = 1b5a529bc53c3e3d2c1502a610aa7670d9b2a470b41bc195964507b48726fc7d
-SIZE (ONLYOFFICE-DocumentServer-v7.0.1.50-v7.0.1_GH0.tar.gz) = 52186
-SHA256 (ONLYOFFICE-core-v7.0.1.50_GH0.tar.gz) = d4f0ba20e92e1e9286e43ccb48c540f324c540398720200a9eb9de875ac3794b
-SIZE (ONLYOFFICE-core-v7.0.1.50_GH0.tar.gz) = 83969143
-SHA256 (ONLYOFFICE-core-fonts-v7.0.1.50_GH0.tar.gz) = 182e4c8b797ffdd1e2e85602074e1c1ea0e27a1b181297d36db8ff9759e8eeac
-SIZE (ONLYOFFICE-core-fonts-v7.0.1.50_GH0.tar.gz) = 95257795
-SHA256 (ONLYOFFICE-dictionaries-v7.0.1.50_GH0.tar.gz) = f0809bcb3541216ebaca5500376e5f541b13c7456eace70f3c8f71a3945c0010
-SIZE (ONLYOFFICE-dictionaries-v7.0.1.50_GH0.tar.gz) = 41048395
-SHA256 (ONLYOFFICE-document-server-integration-v7.0.1.50_GH0.tar.gz) = 28d77ca1c925391fe934c05ddf84850f8c0dd495ebeae5f12dcb06b3630e6759
-SIZE (ONLYOFFICE-document-server-integration-v7.0.1.50_GH0.tar.gz) = 5246757
-SHA256 (ONLYOFFICE-document-templates-v7.0.1.50_GH0.tar.gz) = 72c613cd4da5406c784a7557b3e4f71447cb7064b866fc91632d15f5f28a4d95
-SIZE (ONLYOFFICE-document-templates-v7.0.1.50_GH0.tar.gz) = 2152341
-SHA256 (ONLYOFFICE-sdkjs-v7.0.1.50_GH0.tar.gz) = cf30f4a82e06f0a5d58200df749112ab9b61319f6aa21f340f544606d5965edf
-SIZE (ONLYOFFICE-sdkjs-v7.0.1.50_GH0.tar.gz) = 11799701
-SHA256 (ONLYOFFICE-server-v7.0.1.50_GH0.tar.gz) = 85d81d960745b5c2ca721dbf7ee3601014c07fd42720c09a4507a5ef6dc743e8
-SIZE (ONLYOFFICE-server-v7.0.1.50_GH0.tar.gz) = 251287
-SHA256 (ONLYOFFICE-web-apps-v7.0.1.50_GH0.tar.gz) = add54fd48a4df1bc995c4db3841ebfcc65e9bcfdb989028db399d135f610741a
-SIZE (ONLYOFFICE-web-apps-v7.0.1.50_GH0.tar.gz) = 256706099
-SHA256 (ONLYOFFICE-plugin-highlightcode-v7.0.1.50_GH0.tar.gz) = ac954a25f7e4e2d1dd6d06ff28a605ce3ddc71461ca01649696fd118089814a5
-SIZE (ONLYOFFICE-plugin-highlightcode-v7.0.1.50_GH0.tar.gz) = 245216
-SHA256 (ONLYOFFICE-plugin-macros-v7.0.1.50_GH0.tar.gz) = 6a23f3a68e018bb8c7c87e524c3e0eaae2a4c57a508c128bc04670d313162dab
-SIZE (ONLYOFFICE-plugin-macros-v7.0.1.50_GH0.tar.gz) = 2646822
-SHA256 (ONLYOFFICE-plugin-mendeley-v7.0.1.50_GH0.tar.gz) = 200a36e4595c1dc2be26ed3d9ca113aacb6fb6878ed185a6e45a05ca69c88e92
-SIZE (ONLYOFFICE-plugin-mendeley-v7.0.1.50_GH0.tar.gz) = 417646
-SHA256 (ONLYOFFICE-plugin-ocr-v7.0.1.50_GH0.tar.gz) = 9bde090945d5c879c2c93eac26874a4ad114aacb502e29690ca3aa1edbaf784f
-SIZE (ONLYOFFICE-plugin-ocr-v7.0.1.50_GH0.tar.gz) = 169530
-SHA256 (ONLYOFFICE-plugin-photoeditor-v7.0.1.50_GH0.tar.gz) = cf278fc18d239e462efd9acfe0f2a777c2fe28ab701eecafb9d6e6ab8095d2e0
-SIZE (ONLYOFFICE-plugin-photoeditor-v7.0.1.50_GH0.tar.gz) = 201064
-SHA256 (ONLYOFFICE-plugin-speech-v7.0.1.50_GH0.tar.gz) = 0b84e8a73bd1ad2d4990b1a3fad858aef348f5ff23d5f605df9af7695c289b10
-SIZE (ONLYOFFICE-plugin-speech-v7.0.1.50_GH0.tar.gz) = 68212
-SHA256 (ONLYOFFICE-plugin-thesaurus-v7.0.1.50_GH0.tar.gz) = e57cc0bc93aaeea7d484b16b5a6a638a7c2c7447fbc43092bb9a4b764255e197
-SIZE (ONLYOFFICE-plugin-thesaurus-v7.0.1.50_GH0.tar.gz) = 42915
-SHA256 (ONLYOFFICE-plugin-translator-v7.0.1.50_GH0.tar.gz) = 56e31d9bbcfd38922a532c33f8a4e26a757485dd86c6530b0c5b17f456a08dde
-SIZE (ONLYOFFICE-plugin-translator-v7.0.1.50_GH0.tar.gz) = 140899
-SHA256 (ONLYOFFICE-plugin-youtube-v7.0.1.50_GH0.tar.gz) = 64997e6f3e029313287377eef60b837721553efaa704b6a2db4272042c9b3564
-SIZE (ONLYOFFICE-plugin-youtube-v7.0.1.50_GH0.tar.gz) = 11652
-SHA256 (ONLYOFFICE-plugin-zotero-v7.0.1.50_GH0.tar.gz) = 793a16650815428b612444208735933a82e73d49662e521bda6c3e31c382bb0f
-SIZE (ONLYOFFICE-plugin-zotero-v7.0.1.50_GH0.tar.gz) = 33815
-SHA256 (ONLYOFFICE-build_tools-v7.0.1.50_GH0.tar.gz) = 57864c0dfb85b6632cd7e30b17dccbf878432d16d319c43b6bc3092710f25a8c
-SIZE (ONLYOFFICE-build_tools-v7.0.1.50_GH0.tar.gz) = 4091890
-SHA256 (ONLYOFFICE-DocumentBuilder-v7.0.1.50_GH0.tar.gz) = ce9d0923518930360d020a51ab8dd71abbbfabaa5d50cf40ba53bc06718169d5
-SIZE (ONLYOFFICE-DocumentBuilder-v7.0.1.50_GH0.tar.gz) = 1271121
+SHA256 (onlyoffice-7.1.0.215-npm-cache.tar.gz) = c2d8ea76b36b239965ba227e4578ea239cbebcb80c2c68920a05e242dacafe87
+SIZE (onlyoffice-7.1.0.215-npm-cache.tar.gz) = 200308637
+SHA256 (ONLYOFFICE-DocumentServer-v7.1.0.215-v7.1.0_GH0.tar.gz) = 4802bac870c34c672bc1a4bccd4ef6935ea52b9d8ba614da9f6e3f6d46bdf38a
+SIZE (ONLYOFFICE-DocumentServer-v7.1.0.215-v7.1.0_GH0.tar.gz) = 52959
+SHA256 (ONLYOFFICE-core-v7.1.0.215_GH0.tar.gz) = bb4a91a525670cadc5f3dcb22fac222147a3e0b592b5f617693a03b5e5bdfefa
+SIZE (ONLYOFFICE-core-v7.1.0.215_GH0.tar.gz) = 85338891
+SHA256 (ONLYOFFICE-core-fonts-v7.1.0.215_GH0.tar.gz) = bd20983ad785ade8aadcb0b4c295bde1482a3a952af02215ac2ec063f141def9
+SIZE (ONLYOFFICE-core-fonts-v7.1.0.215_GH0.tar.gz) = 95254403
+SHA256 (ONLYOFFICE-dictionaries-v7.1.0.215_GH0.tar.gz) = 16726b32531b63306a76f6c7d43f9c3201819f255fa95f7d5e10a4b8fe6607fc
+SIZE (ONLYOFFICE-dictionaries-v7.1.0.215_GH0.tar.gz) = 41040929
+SHA256 (ONLYOFFICE-document-server-integration-v7.1.0.215_GH0.tar.gz) = 4b155fb8085a2ac92495884ceadc48a6abe0de310a9b6a01d2f7ba88cb86c815
+SIZE (ONLYOFFICE-document-server-integration-v7.1.0.215_GH0.tar.gz) = 5263861
+SHA256 (ONLYOFFICE-document-templates-v7.1.0.215_GH0.tar.gz) = 8d411fe299db0a18e50fcaca2a290630be60bca09be8f06af0e0b79d981da5c3
+SIZE (ONLYOFFICE-document-templates-v7.1.0.215_GH0.tar.gz) = 2152351
+SHA256 (ONLYOFFICE-sdkjs-v7.1.0.215_GH0.tar.gz) = dda0e0d37c9afcfe59a9f78118add243d45dc1f7faf47e5eb8288cab8b726131
+SIZE (ONLYOFFICE-sdkjs-v7.1.0.215_GH0.tar.gz) = 19010866
+SHA256 (ONLYOFFICE-server-v7.1.0.215_GH0.tar.gz) = 669c40049bcb32fe7856e8a51897d148f8d0ebc3a6c825fb787c1955378cd31a
+SIZE (ONLYOFFICE-server-v7.1.0.215_GH0.tar.gz) = 257878
+SHA256 (ONLYOFFICE-web-apps-v7.1.0.215_GH0.tar.gz) = 13c81dbc5e1e48fd75d32b99bfac948080c6af2dee036c8fd07120b1c207a472
+SIZE (ONLYOFFICE-web-apps-v7.1.0.215_GH0.tar.gz) = 258284619
+SHA256 (ONLYOFFICE-plugin-highlightcode-v7.1.0.215_GH0.tar.gz) = 37f984608ee82cbe961705837d5ecb60b7b81387f8be137a2baa8f738e40b9a6
+SIZE (ONLYOFFICE-plugin-highlightcode-v7.1.0.215_GH0.tar.gz) = 245238
+SHA256 (ONLYOFFICE-plugin-macros-v7.1.0.215_GH0.tar.gz) = cde9f67ebb9aad3abf2ac1ef597c32f34d00ec4957a5c2b495c58fa78b8c82c5
+SIZE (ONLYOFFICE-plugin-macros-v7.1.0.215_GH0.tar.gz) = 2646784
+SHA256 (ONLYOFFICE-plugin-mendeley-v7.1.0.215_GH0.tar.gz) = 52a02b90a330a9260053cf01347f14730cb93b3e35cbc9aa36dfd0c2957cfb51
+SIZE (ONLYOFFICE-plugin-mendeley-v7.1.0.215_GH0.tar.gz) = 417672
+SHA256 (ONLYOFFICE-plugin-ocr-v7.1.0.215_GH0.tar.gz) = fd4f079b273d09afb361de1cc6e3675ad2968d1006b0cc9a9c236ffd83553b97
+SIZE (ONLYOFFICE-plugin-ocr-v7.1.0.215_GH0.tar.gz) = 169528
+SHA256 (ONLYOFFICE-plugin-photoeditor-v7.1.0.215_GH0.tar.gz) = 6fe7d3140ff495c8bcaba40e6098a2c262e3111db575daf4c5b388ad83819d3a
+SIZE (ONLYOFFICE-plugin-photoeditor-v7.1.0.215_GH0.tar.gz) = 201064
+SHA256 (ONLYOFFICE-plugin-speech-v7.1.0.215_GH0.tar.gz) = c7ea1a802a99665feb3defcde8866d9625bf5ad1390e5d8210d872328d2fcc81
+SIZE (ONLYOFFICE-plugin-speech-v7.1.0.215_GH0.tar.gz) = 184747
+SHA256 (ONLYOFFICE-plugin-thesaurus-v7.1.0.215_GH0.tar.gz) = 3630b6c2e67690ec7f2d148052e3b1c3e0b71f0a6d38dc7c98601e1b04cd712a
+SIZE (ONLYOFFICE-plugin-thesaurus-v7.1.0.215_GH0.tar.gz) = 42915
+SHA256 (ONLYOFFICE-plugin-translator-v7.1.0.215_GH0.tar.gz) = 07edcfeec65dc95778d8d61c509b49bde101c6f9e058485bdc96f3e31a701dcc
+SIZE (ONLYOFFICE-plugin-translator-v7.1.0.215_GH0.tar.gz) = 141319
+SHA256 (ONLYOFFICE-plugin-youtube-v7.1.0.215_GH0.tar.gz) = dac35c6fe7c735974ce7567b5d5bc46d36397bf1bdca23675d29838e5987eefe
+SIZE (ONLYOFFICE-plugin-youtube-v7.1.0.215_GH0.tar.gz) = 11570
+SHA256 (ONLYOFFICE-plugin-zotero-v7.1.0.215_GH0.tar.gz) = e92ed3cc4f59da2234707235cdae5835d944ea51bb425eb0a1ba772c8badb9be
+SIZE (ONLYOFFICE-plugin-zotero-v7.1.0.215_GH0.tar.gz) = 33818
+SHA256 (ONLYOFFICE-build_tools-v7.1.0.215_GH0.tar.gz) = 86c59217fdc09ad607388d1a523b29303dd5f690b79715a4b0ce69d8f7aa14a0
+SIZE (ONLYOFFICE-build_tools-v7.1.0.215_GH0.tar.gz) = 4093372
+SHA256 (ONLYOFFICE-DocumentBuilder-v7.1.0.215_GH0.tar.gz) = 3e9b086ee7e5d6e985ed971fa90e52143b46f36899633f0cd52f10a68591bd14
+SIZE (ONLYOFFICE-DocumentBuilder-v7.1.0.215_GH0.tar.gz) = 1271565
 SHA256 (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 20a58e72bb2e3eaede5acbeaa6284769d9ec4606f39869da8b7edcc1aefc9e63
 SIZE (ONLYOFFICE-onlyoffice.github.io-342e8f66_GH0.tar.gz) = 13283
-SHA256 (ONLYOFFICE-document-server-package-v7.0.1.50_GH0.tar.gz) = 1faf0a02e14db2fcfb45c733bbfbf33ca39675dbc02c3e32ef8ea46b68889825
-SIZE (ONLYOFFICE-document-server-package-v7.0.1.50_GH0.tar.gz) = 171919
+SHA256 (ONLYOFFICE-document-server-package-v7.1.0.215_GH0.tar.gz) = ac4ae9efc8f3567b3e6205b34593da5227b8bcbd22fdfa72714e2ac5e41b1088
+SIZE (ONLYOFFICE-document-server-package-v7.1.0.215_GH0.tar.gz) = 145161
 SHA256 (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = ed83020cbe07877c7323d475491803797fac12ce4086966011c81023b9852c4b
 SIZE (hackers-painters-katana-parser-499118d3_GH0.tar.gz) = 97209
 SHA256 (google-gumbo-parser-aa91b27_GH0.tar.gz) = 1360f85c02fb2573a10f00abcddebc8f1ff277a16f66553439193af93afae335
diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v16.13.0.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v16.13.0.cpp.patch
index 123dd5c3a4c9..01ce59579ca7 100644
--- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v16.13.0.cpp.patch
+++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v16.13.0.cpp.patch
@@ -1,3 +1,7 @@
+https://github.com/vercel/pkg-fetch/blob/main/patches/node.v16.14.2.cpp.patch
++ local FreeBSD patches
+
+
 --- server/node_modules/pkg-fetch/patches/node.v16.13.0.cpp.patch.orig	2021-12-30 20:04:18.203959000 +0100
 +++ server/node_modules/pkg-fetch/patches/node.v16.13.0.cpp.patch	2021-12-30 20:09:53.210319000 +0100
 @@ -521,3 +521,171 @@ index 0000000000..fb2d47f52b
diff --git a/www/onlyoffice-documentserver/files/packagejsons/server/Common/package-lock.json b/www/onlyoffice-documentserver/files/packagejsons/server/Common/package-lock.json
index a65460f327f7..aa454c5b883a 100644
--- a/www/onlyoffice-documentserver/files/packagejsons/server/Common/package-lock.json
+++ b/www/onlyoffice-documentserver/files/packagejsons/server/Common/package-lock.json
@@ -1,8 +1,1285 @@
 {
   "name": "common",
   "version": "1.0.1",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "common",
+      "version": "1.0.1",
+      "dependencies": {
+        "amqplib": "^0.8.0",
+        "aws-sdk": "^2.1074.0",
+        "co": "^4.6.0",
+        "config": "^2.0.1",
+        "content-disposition": "^0.5.3",
+        "dnscache": "^1.0.1",
+        "escape-string-regexp": "^1.0.5",
+        "forwarded": "^0.1.2",
+        "fs-extra": "^7.0.0",
+        "ipaddr.js": "^1.8.1",
+        "jsonwebtoken": "^8.3.0",
+        "log4js": "^6.4.1",
+        "mime": "^2.3.1",
+        "mkdirp": "^0.5.1",
+        "ms": "^2.1.1",
+        "node-cache": "^4.2.1",
+        "node-statsd": "^0.1.1",
+        "openpgp": "^4.10.8",
+        "request": "^2.88.0",
+        "request-filtering-agent": "^1.0.5",
+        "rhea": "^0.3.9",
+        "uri-js": "^4.2.2",
+        "win-ca": "^3.5.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/amqplib": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.8.0.tgz",
+      "integrity": "sha512-icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA==",
+      "dependencies": {
+        "bitsyntax": "~0.1.0",
+        "bluebird": "^3.7.2",
+        "buffer-more-ints": "~1.0.0",
+        "readable-stream": "1.x >=1.1.9",
+        "safe-buffer": "~5.2.1",
+        "url-parse": "~1.5.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "node_modules/aws-sdk": {
+      "version": "2.1134.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1134.0.tgz",
+      "integrity": "sha512-CvIcPSDzKFn4LRmk6GcQZYWtCxD/FwbbC1yaslvmpOYP8CndCmdz1MHMOPy/QyUyrH2WnUrVTAP2WdWqq6oCjQ==",
+      "dependencies": {
+        "buffer": "4.9.2",
+        "events": "1.1.1",
+        "ieee754": "1.1.13",
+        "jmespath": "0.16.0",
+        "querystring": "0.2.0",
+        "sax": "1.2.1",
+        "url": "0.10.3",
+        "uuid": "3.3.2",
+        "xml2js": "0.4.19"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/bitsyntax": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.1.0.tgz",
+      "integrity": "sha512-ikAdCnrloKmFOugAfxWws89/fPc+nw0OOG1IzIE72uSOg/A3cYptKCjSUhDTuj7fhsJtzkzlv7l3b8PzRHLN0Q==",
+      "dependencies": {
+        "buffer-more-ints": "~1.0.0",
+        "debug": "~2.6.9",
+        "safe-buffer": "~5.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/bitsyntax/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
+    "node_modules/buffer": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk="
+    },
+    "node_modules/buffer-more-ints": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz",
+      "integrity": "sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg=="
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/config": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/config/-/config-2.0.2.tgz",
+      "integrity": "sha512-duIbkKb0gls0bOtGwd1vaD4236MwepQlZcrMheOGrn3/9Px7oYFh8G4LB3ylGOlPr5wGoJRm8Grb2RihJZxuHQ==",
+      "dependencies": {
+        "json5": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/date-format": {
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.9.tgz",
+      "integrity": "sha512-+8J+BOUpSrlKLQLeF8xJJVTxS8QfRSuJgwxSVvslzgO3E6khbI0F5mMEPf5mTYhCCm4h99knYP6H3W9n3BQFrg==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/dnscache": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/dnscache/-/dnscache-1.0.2.tgz",
+      "integrity": "sha512-2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==",
+      "dependencies": {
+        "asap": "^2.0.6",
+        "lodash.clone": "^4.5.0"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/flatted": {
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=6 <7 || >=8"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
+    },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-electron": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-electron/-/is-electron-2.2.1.tgz",
+      "integrity": "sha512-r8EEQQsqT+Gn0aXFx7lTFygYQhILLCB+wn0WCDL5LZRINeLH/Rvw1j2oKodELLXYNImQ3CRlVsY8wW4cGOsyuw=="
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "node_modules/jmespath": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz",
+      "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "node_modules/json5": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=4",
+        "npm": ">=1.4.28"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+      "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.4.0",
+        "verror": "1.10.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y="
+    },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+    },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+    },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+    },
+    "node_modules/log4js": {
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.6.tgz",
+      "integrity": "sha512-1XMtRBZszmVZqPAOOWczH+Q94AI42mtNWjvjA5RduKTSWjEc56uOBbyM1CJnfN4Ym0wSd8cQ43zOojlSHgRDAw==",
+      "dependencies": {
+        "date-format": "^4.0.9",
+        "debug": "^4.3.4",
+        "flatted": "^3.2.5",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.0.8"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/log4js/node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
*** 8964 LINES SKIPPED ***