From nobody Tue Apr 4 10:26:11 2023 X-Original-To: dev-commits-ports-branches@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 4PrP773mVZz43Ljh; Tue, 4 Apr 2023 10:26:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PrP773K9cz44VQ; Tue, 4 Apr 2023 10:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680603971; 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=q7Eunle7dT9axhXxv+VkBcjei+GsH6HebAzC/TvnSC4=; b=RV1vnTgtilVO1bHrHKWvafTfUYuw8i9DYyB8BfcyhoMzrx0pSotxJhm9H1kFCBvU9mr8AC 98Eeaorb92b48ULOMA2HFcX0FIHkTN7fhdm0WyRq9pLC9wTHw28Pc++TrYgkt0YqXN3LB3 uyHglYtHzAzeKiSDeQUwPIIHiiJNMZLOnyFeucckzH1cfEhmtfDOyL8mvOtIngYEQOE33v 2Ab55zLx01GydKfbAA4pZGt/e4neCvOfGuN7ElzeTEdJ+C6fFM3Rlx/yTQyVH/jLZ2EJtN edEq+3QOmcKaVTr3NANP/tT341RFXUL7nBcORY3GIT8kQ0CUQO80eogP+KTSqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680603971; 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=q7Eunle7dT9axhXxv+VkBcjei+GsH6HebAzC/TvnSC4=; b=B+oCi66rfMwfX0uuJgTAxxZ//21J8jaKrr9UsWeUihsn9CmUHhOxoiy1Kd8HDOuAba2dvY IPDZzaZzt9QzxU1y+QQr3z6bNhhAGAbpRP4UhbcJdLlGC6GaUc9YSR1XdJOh45GdgWljbw AM6H46fN0REWwN1G2pp3WgfQA0bDUJkN9dMviJteh3zLHrzcXYyW3t2Rmb9cH1UzDshNdS l8xCIZuufeVEX8RVMPTJUTpOvolx2IeeZ0IjQw+qC2lBk6sNiw8BGcVQBqSE2byVZSuaJn vw1JslrxkWlagHwxvHLWO0XbjAM91LBdQJUWxumQ/LuAtepvUIbM+kCy1VpZqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680603971; a=rsa-sha256; cv=none; b=xmwi3x8Bi/havy6pwUcsQEHVHsr6JBSZWMujT82UBVx2bT81+XqSDkQ1+NhBipgjep64mr FTBczs82ylzuUKiiX96kuO/m7CiOp2J0XxlQA9c0K/FYJ17eUKCZ75Gr1AfJGPsVnNkJa5 K3aqCJN2A2cS9EDsQoJhziEmGUs9H3+QolbuV01wz7AZ+pOHONmMhL8bMptGSpYM8eZ/OS jIB2TWU3mRMYUlfDwH6AcCsE6PjcZFJayUbzRZJi/uNRNLN4PA/uwhdsr20Gl9uieZHObc HKLodqihbwQhD6lwrzG9nxT7O3pvq6oAyQINf0qCBJlogGaERujLbiYxerz0jg== 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 4PrP7725xQzcKd; Tue, 4 Apr 2023 10:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 334AQBwN004473; Tue, 4 Apr 2023 10:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 334AQB0x004472; Tue, 4 Apr 2023 10:26:11 GMT (envelope-from git) Date: Tue, 4 Apr 2023 10:26:11 GMT Message-Id: <202304041026.334AQB0x004472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: 05a15397fd7d - 2023Q2 - www/onlyoffice-documentserver: do not strip the json binary List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 05a15397fd7da22d54cf5125938db37c15aae4d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=05a15397fd7da22d54cf5125938db37c15aae4d5 commit 05a15397fd7da22d54cf5125938db37c15aae4d5 Author: Mikael Urankar AuthorDate: 2023-04-02 13:24:44 +0000 Commit: Mikael Urankar CommitDate: 2023-04-04 10:25:39 +0000 www/onlyoffice-documentserver: do not strip the json binary binary generated by npm/pkg doesn't work if they are stripped PR: 270591 Reported by: freebsd.org@vollkorn.cryptobitch.de (cherry picked from commit 3661e14f6aec57bf5950af831ea627070a310258) --- www/onlyoffice-documentserver/Makefile | 4 ++-- www/onlyoffice-documentserver/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile index 09834c620b81..f3af86ea8c4a 100644 --- a/www/onlyoffice-documentserver/Makefile +++ b/www/onlyoffice-documentserver/Makefile @@ -197,13 +197,13 @@ do-build: do-install: # install the project -# do not strip docservice, converter and metrics +# 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/npm/json ${STAGEDIR}${WWWDIR}/documentserver/npm + ${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 ${RM} ${STAGEDIR}${PREFIX}/bin/documentserver-letsencrypt.sh diff --git a/www/onlyoffice-documentserver/pkg-plist b/www/onlyoffice-documentserver/pkg-plist index c1aaf2c1f596..f31165223bf7 100644 --- a/www/onlyoffice-documentserver/pkg-plist +++ b/www/onlyoffice-documentserver/pkg-plist @@ -498,7 +498,7 @@ lib/libkernel_network.so %%WWWDIR%%/documentserver/license/jQuery.license %%WWWDIR%%/documentserver/license/less.license %%WWWDIR%%/documentserver/license/requirejs-text.license -%%WWWDIR%%/documentserver/npm/json +@(,,755) %%WWWDIR%%/documentserver/npm/json %%WWWDIR%%/documentserver/npm/package.json %%WWWDIR%%/documentserver/sdkjs-plugins/highlightcode/3rd-Party.txt %%WWWDIR%%/documentserver/sdkjs-plugins/highlightcode/README.md