From nobody Wed Nov 13 11:57:23 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XpMGX0dKFz5dXY2; Wed, 13 Nov 2024 11:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XpMGX01RGz4Z2Q; Wed, 13 Nov 2024 11:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731499044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9KBV8yCFsqm2RazWIWh0O2knnM0TBftrre2gNLKA08=; b=nTeRa4wS/zzrngMV7grAap0pxeDUumgfGBfyblk9XGki79DRblvlL00kVvojiZJwuEClDQ Y56/ynxcmegLD1m4LcOwd2aV2RO7rj3mL4Sgmw2wjnf5w6uBOAFDAAhc5lq5kd6nlEDiCX mwfvL4J/ieHbHvc6EFBrFUY6rke4PaIQZ9/wco2Yrzwm2N5CGLUEzgoTgGO/og4tLAQc8G P8VtTOStG8l8Ac53Yr+Fnq0zB1RoqM1wCVLG2Jq9eplMEGngzwGoud84doVEE+BkoCLke3 gEreUptwKzF2rCYLhzagbSFovM45GuTpaKSMnkXwRO4o1zYKnCceCrNvJ5b8xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731499044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9KBV8yCFsqm2RazWIWh0O2knnM0TBftrre2gNLKA08=; b=SJNhZ+0Uy0zjeMBR/nEbg5V5MXX+e84hZvreeBmiwMRYEKN7R4lU5MoC81JdbIOW5OzgU0 D4umb6MR0GM5ZSgeax0Hqjqf/MYDjYvh6Jh+H5UhHOdwwqxVBitgI0+AmYpnVgM4ptS6nh BKvjKbL6tEp04NX1jV+4/yJkwYPCzD/cgGANE86CcwpfDZTZAbHU/naSt0huSlBS+CynTO uVp+aTmXT3q2ZOvf/SQxaM33+4zYnG4oigRF63Sy/VMCecALfh9bYU7zkGxdlDRKTrnOO9 XycSGe4wxhd8Ij8exEVi1ksoN0uNTyoONmQhPUfvmnXC6JBNEXzsiB9hXEPPfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731499044; a=rsa-sha256; cv=none; b=SUTuMasZYJDBhFT5jZjlKFgz0HmXvmpGZ53NcmYmM8hKxIuricZ1dwVH2D3fKW0ai4hawh jwOWcwKrP7LEb2zR2K1ddVmRCT8oPeNv8LrMlLGdWpfCFMyFUU8fkuYn9kqPC2x3l0Lym7 w2ETyu9pHWY0/Njzv0CQkOeEZfesgZqx9k23CAXC0C8/Hd+1znjrFsMD2MqdmaYePmlflB AbvYFNZ5cIod3kkX610cBRK+drXv+a3wTkF8yUjBXjQGOImIK/c1qS4rowCXBxtceRYOuJ opvOKQcykSEx4b++n/krUr3wMOX4STpeLwXgzufzi69czi4FhXO1k/WA0Tl6sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XpMGW6Pn0ztGY; Wed, 13 Nov 2024 11:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ADBvNt8095803; Wed, 13 Nov 2024 11:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ADBvNvD095800; Wed, 13 Nov 2024 11:57:23 GMT (envelope-from git) Date: Wed, 13 Nov 2024 11:57:23 GMT Message-Id: <202411131157.4ADBvNvD095800@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 29abb996b472 - main - www/onlyoffice-documentserver: Various fixes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29abb996b4728af244f46a187d834c7154f736bc Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=29abb996b4728af244f46a187d834c7154f736bc commit 29abb996b4728af244f46a187d834c7154f736bc Author: Mikael Urankar AuthorDate: 2024-11-13 11:52:01 +0000 Commit: Mikael Urankar CommitDate: 2024-11-13 11:57:17 +0000 www/onlyoffice-documentserver: Various fixes - Fix nginx ds-cache.conf location in documentserver-flush-cache.sh - Fix sed invocation in documentserver-flush-cache.sh - Remove extra whitespace in documentserver-generate-allfonts.sh - Remove todo list in Makefile PR: 282724 --- www/onlyoffice-documentserver/Makefile | 7 +------ ...common_documentserver_bin_documentserver-flush-cache.sh.m4 | 5 +++-- ..._documentserver_bin_documentserver-generate-allfonts.sh.m4 | 11 +++++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index bb1ea81874f2..ddbf63e93b4e 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -1,12 +1,7 @@ -# todo rm -# work/stage/usr/local/www/onlyoffice/documentserver/server/Common/config/production-freebsd.json.bak -# work/stage/usr/local/www/onlyoffice/documentserver/server/Common/config/development-freebsd.json.bak -# work/stage/usr/local/www/onlyoffice/documentserver/dictionaries/sl_SI/hyph_sl_SI.dic.bak - - PORTNAME= onlyoffice-documentserver DISTVERSIONPREFIX= v DISTVERSION= 8.2.0.143 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES+= LOCAL/mikael/v8/:source1 \ LOCAL/mikael/onlyoffice/:source2 \ diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 index d06f8d9b839e..9328f2d98079 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-flush-cache.sh.m4 @@ -5,13 +5,14 @@ # Save the hash to a variable in the configuration file -echo "set \$cache_tag \"$HASH\";" > /etc/nginx/includes/ds-cache.conf -+echo "set \$cache_tag \"$HASH\";" > %%LOCALBASE%%/etc/nginx/includes/ds-cache.conf ++echo "set \$cache_tag \"$HASH\";" > %%ETCDIR%%/etc/nginx/includes/ds-cache.conf -API_PATH="/var/www/M4_DS_PREFIX/web-apps/apps/api/documents/api.js" +API_PATH="%%LOCALBASE%%/www/M4_DS_PREFIX/web-apps/apps/api/documents/api.js" cp -f ${API_PATH}.tpl ${API_PATH} - sed -i "s/{{HASH_POSTFIX}}/${HASH}/g" ${API_PATH} +-sed -i "s/{{HASH_POSTFIX}}/${HASH}/g" ${API_PATH} -chown ds:ds ${API_PATH} ++sed -i '' "s/{{HASH_POSTFIX}}/${HASH}/g" ${API_PATH} +chown onlyoffice:onlyoffice ${API_PATH} rm -f ${API_PATH}.gz diff --git a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 index 6b4405573867..60005e0dd275 100644 --- a/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 +++ b/www/onlyoffice-documentserver/files/patch-document-server-package_common_documentserver_bin_documentserver-generate-allfonts.sh.m4 @@ -7,9 +7,9 @@ -DIR="/var/www/M4_DS_PREFIX" +DIR="%%LOCALBASE%%/www/M4_DS_PREFIX" - #Start generate AllFonts.js, font thumbnails and font_selection.bin - echo -n Generating AllFonts.js, please wait... -@@ -49,11 +49,6 @@ echo Done + export LD_LIBRARY_PATH=/var/www/M4_DS_PREFIX/server/FileConverter/bin:$LD_LIBRARY_PATH + +@@ -52,24 +52,16 @@ echo Done echo Done @@ -21,7 +21,10 @@ #Remove gzipped files rm -f \ $DIR/fonts/*.gz \ -@@ -62,10 +57,7 @@ if [ "$ONLYOFFICE_DATA_CONTAINER" != "true" ]; then + $DIR/sdkjs/common/AllFonts.js.gz \ +- $DIR/sdkjs/common/Images/*.gz \ ++ $DIR/sdkjs/common/Images/*.gz \ + $DIR/sdkjs/slide/themes/themes.js.gz #Restart web-site and converter if [ "$ONLYOFFICE_DATA_CONTAINER" != "true" ]; then