git: e832a322cd03 - main - www/onlyoffice-documentserver: Bump amqplib and node22 versions

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Mon, 02 Jun 2025 09:04:03 UTC
The branch main has been updated by mikael:

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

commit e832a322cd03d0c57cc32a99b9295febce072b19
Author:     Matt Kempe <fsbruva@yahoo.com>
AuthorDate: 2025-05-29 23:10:34 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2025-06-02 09:03:08 +0000

    www/onlyoffice-documentserver: Bump amqplib and node22 versions
    
    Upgrade node to 22.15.1
    Upgrade port to use yao-pkg 6.5.0
    Backport upstream fix of bumping amqplib to 0.10.7, due to net/rabbitmq upgrade
    
    PR:             287145
---
 www/onlyoffice-documentserver/Makefile                       | 12 ++++++------
 www/onlyoffice-documentserver/distinfo                       | 10 +++++-----
 ...=> extra-patch-pkg-fetch_patches_node.v22.15.1.cpp.patch} |  6 +++---
 .../files/patch-server_Common_package.json                   | 11 +++++++++++
 .../files/patch-web-apps_build_package.json                  |  9 ---------
 5 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
index 19c649754659..efa621b6588f 100644
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	onlyoffice-documentserver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.3.3.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES+=	LOCAL/mikael/v8/:source1 \
 		LOCAL/mikael/onlyoffice/:source2 \
@@ -10,7 +10,7 @@ MASTER_SITES+=	LOCAL/mikael/v8/:source1 \
 DISTFILES+=	v8-8.9.255.25_all.tar.gz:source1 \
 		node-v${NODE_VERSION_PKGFETCH}.tar.gz:source3 \
 		optipng-0.7.8.tar.gz:source4 \
-		${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz:source2
+		${PORTNAME}-${DISTVERSION}_${PORTREVISION}-npm-cache.tar.gz:source2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure office and productivity apps
@@ -99,9 +99,9 @@ SUB_LIST=	DS_GROUPNAME=${DS_GROUPNAME} \
 		PREFIX=${PREFIX} \
 		WWWDIR=${WWWDIR}
 
-# node version used with "npm install @yao-pkg/pkg@6.4.0"
+# node version used with "npm install @yao-pkg/pkg@6.5.0"
 # keep in sync with patch-build__tools_scripts_build__server.py and patch-document-server-package_Makefile
-NODE_VERSION_PKGFETCH=	22.14.0
+NODE_VERSION_PKGFETCH=	22.15.1
 
 MAKE_ENV=	BUILD_NUMBER="36" \
 		PKG_CACHE_PATH=${WRKDIR}/.pkg-cache \
@@ -205,7 +205,7 @@ do-build:
 
 	@${MKDIR} ${WRKSRC}/yao-pkg
 	@${CP} ${FILESDIR}/package* ${WRKSRC}/yao-pkg
-	@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @yao-pkg/pkg@6.4.0
+	@cd ${WRKSRC}/yao-pkg ; ${SETENV} ${MAKE_ENV} npm install @yao-pkg/pkg@6.5.0
 
 	@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_lib-es5_build.js || ${TRUE}
 	@cd ${WRKSRC} && ${PATCH} -N -s -i ${FILESDIR}/extra-patch-pkg-fetch_patches_node.v${NODE_VERSION_PKGFETCH}.cpp.patch || ${TRUE}
@@ -264,6 +264,6 @@ create-caches-tarball:
 	${FIND} ${WRKDIR}/.pkg-cache -type f -perm 755 -exec file {} \; | ${EGREP} "ELF|PE32+|Mach-O" | ${AWK} -F ':' '{print $$1}' | ${XARGS} ${RM}
 
 	cd ${WRKDIR} && \
-		${TAR} czf ${PORTNAME}-${DISTVERSION}-npm-cache.tar.gz .npm .pkg-cache
+		${TAR} czf ${PORTNAME}-${DISTVERSION}_${PORTREVISION:}-npm-cache.tar.gz .npm .pkg-cache
 
 .include <bsd.port.post.mk>
diff --git a/www/onlyoffice-documentserver/distinfo b/www/onlyoffice-documentserver/distinfo
index a8e2dd331853..06ef5eeb7387 100644
--- a/www/onlyoffice-documentserver/distinfo
+++ b/www/onlyoffice-documentserver/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1746611736
+TIMESTAMP = 1748528476
 SHA256 (v8-8.9.255.25_all.tar.gz) = 54853ef93accc063a82a0dc29457b25c9b6d88315431d62e06ab1f84797c5f80
 SIZE (v8-8.9.255.25_all.tar.gz) = 72818814
-SHA256 (node-v22.14.0.tar.gz) = 6c4e31ed5702dc45cfd8c435af56a36a474427e1bd7afe74c346136060beba8a
-SIZE (node-v22.14.0.tar.gz) = 99021705
+SHA256 (node-v22.15.1.tar.gz) = 38aea029f8818f7783f273fbc70dcf930f9ef54bdd49c5f90c0152caec7a57be
+SIZE (node-v22.15.1.tar.gz) = 100310295
 SHA256 (optipng-0.7.8.tar.gz) = 25a3bd68481f21502ccaa0f4c13f84dcf6b20338e4c4e8c51f2cefbd8513398c
 SIZE (optipng-0.7.8.tar.gz) = 3294014
-SHA256 (onlyoffice-documentserver-8.3.3.23-npm-cache.tar.gz) = a0b3de1ab4a1c81953a53f73715ca3bc110f524bcdfdb67b86d24e801b5397b9
-SIZE (onlyoffice-documentserver-8.3.3.23-npm-cache.tar.gz) = 262582628
+SHA256 (onlyoffice-documentserver-8.3.3.23_1-npm-cache.tar.gz) = 8b3b8f5e885516de5cf4b70ad39be58cdf529e79dc21da9b110386ab183c59b5
+SIZE (onlyoffice-documentserver-8.3.3.23_1-npm-cache.tar.gz) = 261836699
 SHA256 (ONLYOFFICE-DocumentServer-v8.3.3.23-v8.3.3_GH0.tar.gz) = 4d59be06a010524d47d2be5329a7b25330bc42c3b9ba8447c83cedbee4ec2421
 SIZE (ONLYOFFICE-DocumentServer-v8.3.3.23-v8.3.3_GH0.tar.gz) = 93087
 SHA256 (ONLYOFFICE-core-v8.3.3.23_GH0.tar.gz) = 44827fbc88a0faaf26de37989187056d0f9c8f7c5f9d9007b7c2e0b9e00c926d
diff --git a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v22.14.0.cpp.patch b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v22.15.1.cpp.patch
similarity index 96%
rename from www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v22.14.0.cpp.patch
rename to www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v22.15.1.cpp.patch
index e72d89148f6e..b9df879aa213 100644
--- a/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v22.14.0.cpp.patch
+++ b/www/onlyoffice-documentserver/files/extra-patch-pkg-fetch_patches_node.v22.15.1.cpp.patch
@@ -1,8 +1,8 @@
-https://github.com/yao-pkg/pkg-fetch/raw/refs/tags/v3.5.21/patches/node.v22.14.0.cpp.patch
+https://github.com/yao-pkg/pkg-fetch/raw/refs/tags/v3.5.23/patches/node.v22.15.1.cpp.patch
 + local FreeBSD patches
 
---- yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v22.14.0.cpp.patch	2025-04-28 21:32:13.877330000 +0000
-+++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v22.14.0.cpp.patch
+--- yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v22.15.1.cpp.patch	2025-04-28 21:32:13.877330000 +0000
++++ yao-pkg/node_modules/@yao-pkg/pkg-fetch/patches/node.v22.15.1.cpp.patch
 @@ -11,6 +11,15 @@
               }],
             ],
diff --git a/www/onlyoffice-documentserver/files/patch-server_Common_package.json b/www/onlyoffice-documentserver/files/patch-server_Common_package.json
new file mode 100644
index 000000000000..33895354240a
--- /dev/null
+++ b/www/onlyoffice-documentserver/files/patch-server_Common_package.json
@@ -0,0 +1,11 @@
+--- server/Common/package.json.orig	2025-04-08 14:57:41 UTC
++++ server/Common/package.json
+@@ -7,7 +7,7 @@
+     "@aws-sdk/client-s3": "3.637.0",
+     "@aws-sdk/node-http-handler": "3.374.0",
+     "@aws-sdk/s3-request-presigner": "3.370.0",
+-    "amqplib": "0.8.0",
++    "amqplib": "0.10.7",
+     "co": "4.6.0",
+     "config": "2.0.1",
+     "content-disposition": "0.5.3",
diff --git a/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json b/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json
index 3085bbea1a80..1c5a7729a173 100644
--- a/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json
+++ b/www/onlyoffice-documentserver/files/patch-web-apps_build_package.json
@@ -1,14 +1,5 @@
 --- web-apps/build/package.json.orig	2025-02-24 09:04:41 UTC
 +++ web-apps/build/package.json
-@@ -29,6 +29,8 @@
-     "iconv-lite": "^0.6.3",
-     "less-plugin-clean-css": "1.5.1",
-     "lodash": "^4.17.21",
-+    "optipng-bin": "^9.0.0",
-+    "patch-package": "^8.0.0",
-     "terser": "^5.20.0",
-     "vinyl-fs": "^4.0.0"
-   },
 @@ -44,8 +46,9 @@
      }
    },