git: 0bcd1ab06817 - main - net/lavinmq: update to 2.9.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dave Cottlehuber <dch_at_FreeBSD.org>
Date: Mon, 06 Jul 2026 09:28:21 UTC
The branch main has been updated by dch:

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

commit 0bcd1ab06817b85373b86c0d0158382f6d63825f
Author:     Dave Cottlehuber <dch@FreeBSD.org>
AuthorDate: 2026-07-06 09:27:50 +0000
Commit:     Dave Cottlehuber <dch@FreeBSD.org>
CommitDate: 2026-07-06 09:27:50 +0000

    net/lavinmq: update to 2.9.1
    
    - https://github.com/cloudamqp/lavinmq/blob/v2.9.1/CHANGELOG.md
    - Drop surplus JavaScript libraries
    
    Sponsored by:   SkunkWerks, GmbH
---
 net/lavinmq/Makefile         | 47 +++++++++++++++++++++++++++-----------------
 net/lavinmq/distinfo         | 28 +++++++++++---------------
 net/lavinmq/files/lavinmq.in |  2 +-
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/net/lavinmq/Makefile b/net/lavinmq/Makefile
index f9b91a70ff16..d53bec6b0ad9 100644
--- a/net/lavinmq/Makefile
+++ b/net/lavinmq/Makefile
@@ -1,24 +1,19 @@
 PORTNAME=	lavinmq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7.1
+DISTVERSION=	2.9.1
 CATEGORIES=	net
 
 # JavaScripts
 MASTER_SITES+=	https://github.com/chartjs/Chart.js/releases/download/v${_CHARTJS}/:chartjs \
-		https://github.com/cloudamqp/amqp-client.js/releases/download/v${_AMQP_JS}/:amqpclient \
 		https://moment.github.io/luxon/es6/:luxon \
 		https://cdn.jsdelivr.net/npm/chartjs-adapter-luxon@${_LUXON_JS}/dist/:chartjsadapter \
-		https://unpkg.com/@stoplight/elements@${_ELEMENTS}/:elements \
-		https://raw.githubusercontent.com/eclipse-paho/paho.mqtt.javascript/master/src/:paho
+		https://unpkg.com/@stoplight/elements@${_ELEMENTS}/:elements
 
 DISTFILES+=	chart.js-${_CHARTJS}.tgz:chartjs \
-		amqp-websocket-client.mjs:amqpclient \
-		amqp-websocket-client.mjs.map:amqpclient \
 		luxon.js:luxon \
 		chartjs-adapter-luxon.esm.js:chartjsadapter \
 		web-components.min.js:elements \
-		styles.min.css:elements \
-		paho-mqtt.js:paho
+		styles.min.css:elements
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		84codes-lz4.cr-${_LZ4}_GH0.tar.gz \
@@ -29,14 +24,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		chart.js-${_CHARTJS}.tgz
 
 # Crystal library versions
-_AMQP_CLIENT=	1.3.2
-_AMQP_PROTO=	1.1.22
-_LZ4=		96d714f7593c66ca7425872fd26c7b1286806d3d
+_AMQP_CLIENT=	1.3.3
+_AMQP_PROTO=	1.3.0
+_LZ4=		0015e74e0ed0f6bb15de9c25c25034ad4bc7f636
 _MQTT=		0.3.0
-_SYSTEMD=	3.0.0
+_SYSTEMD=	3.0.1
 
 # JavaScript library versions
-_AMQP_JS=		3.1.1
 _CHARTJS=		4.0.1
 _ELEMENTS=		8.2.0
 _LUXON_JS=		1.3.1
@@ -96,6 +90,18 @@ post-extract:
 		-e 's,/tmp/lavinmq-http.sock,/var/run/lavinmq/http.sock,' \
 		-e 's,/tmp/lavinmq.sock,/var/run/lavinmq/amqp.sock,' \
 		${WRKSRC}/extras/lavinmq.ini
+	@${ECHO} "control_unix_path = /var/run/lavinmq/lavinmqctl.sock" \
+		>> ${WRKSRC}/extras/lavinmq.ini
+# fix compiled-in defaults for FreeBSD hier(7) paths
+	@${REINPLACE_CMD} \
+		-e 's,/var/lib/lavinmq,/var/db/lavinmq,' \
+		${WRKSRC}/src/lavinmq/config/options.cr
+	@${REINPLACE_CMD} \
+		-e 's,/tmp/lavinmqctl.sock,/var/run/lavinmq/lavinmqctl.sock,' \
+		${WRKSRC}/src/lavinmq/http/constants.cr
+	@${REINPLACE_CMD} \
+		-e 's,/etc/lavinmq,${PREFIX}/etc/lavinmq,' \
+		${WRKSRC}/src/lavinmq/config.cr
 # setup javaScript directories
 	${MKDIR} ${WRKSRC}/static/js/lib \
 		${WRKSRC}/static/js/lib/chunks
@@ -104,9 +110,6 @@ post-extract:
 		> ${WRKSRC}/static/js/lib/chart.js
 	${TAR} -xOf ${DISTDIR}/chart.js-${_CHARTJS}.tgz package/dist/chunks/helpers.segment.js \
 		> ${WRKSRC}/static/js/lib/chunks/helpers.segment.js
-# copy AMQP WebSocket client files
-	${CP} ${DISTDIR}/amqp-websocket-client.mjs ${WRKSRC}/static/js/lib/
-	${CP} ${DISTDIR}/amqp-websocket-client.mjs.map ${WRKSRC}/static/js/lib/
 # copy luxon and Chart.js adapter
 	${CP} ${DISTDIR}/luxon.js ${WRKSRC}/static/js/lib/
 	${CP} ${DISTDIR}/chartjs-adapter-luxon.esm.js ${WRKSRC}/static/js/lib/
@@ -116,8 +119,16 @@ post-extract:
 # copy stoplight Elements files
 	${CP} ${DISTDIR}/web-components.min.js ${WRKSRC}/static/js/lib/elements-${_ELEMENTS}.js
 	${CP} ${DISTDIR}/styles.min.css ${WRKSRC}/static/js/lib/elements-${_ELEMENTS}.css
-# copy paho MQTT
-	${CP} ${DISTDIR}/paho-mqtt.js ${WRKSRC}/static/js/lib/
+
+pre-build:
+# render .shtml views into static .html (baked into binary at compile time)
+.for v in 401 404 channel channels connection connections consumers \
+	exchange exchanges federation login logs nodes operator-policies \
+	overview policies queue queues shovels stream unacked user users \
+	vhost vhosts
+	${WRKSRC}/views/render.sh ${WRKSRC}/views/${v}.shtml \
+		"${DISTVERSION}" > ${WRKSRC}/static/${v}.html
+.endfor
 
 do-build:
 	${MKDIR} ${WRKDIR}/man1
diff --git a/net/lavinmq/distinfo b/net/lavinmq/distinfo
index a9728e9bcbb9..aa1ca03a69ec 100644
--- a/net/lavinmq/distinfo
+++ b/net/lavinmq/distinfo
@@ -1,10 +1,6 @@
-TIMESTAMP = 1777205890
+TIMESTAMP = 1782984691
 SHA256 (chart.js-4.0.1.tgz) = 461dae2edc0eda7beeb16c7030ab630ab5129aedd3fc6de9a036f6dfe488556f
 SIZE (chart.js-4.0.1.tgz) = 793292
-SHA256 (amqp-websocket-client.mjs) = a779d8417536e31e44eaceeef5ae745e5f0b95f16cf13a45e6ac5dcaadfd1c47
-SIZE (amqp-websocket-client.mjs) = 82795
-SHA256 (amqp-websocket-client.mjs.map) = 797db087b848af4427e5632d3205fb2ceede7379cb049a2b37c8d2d408b2eec9
-SIZE (amqp-websocket-client.mjs.map) = 86911
 SHA256 (luxon.js) = b83748173e228de065fae3256042d88ce656d6cabf6c4eedaa4703a8cf09a730
 SIZE (luxon.js) = 256400
 SHA256 (chartjs-adapter-luxon.esm.js) = fa02364f717191a48067215aaf9ff93b54ff52e2de64704270742e1d15d1b6df
@@ -13,17 +9,15 @@ SHA256 (web-components.min.js) = 598862da6d551769ebad9d61d4e3037535de573a13d3e0b
 SIZE (web-components.min.js) = 1942514
 SHA256 (styles.min.css) = 119784e23ffc39b6fa3fdb3df93f391f8250e8af141b78dfc3b6bed86079f93b
 SIZE (styles.min.css) = 296065
-SHA256 (paho-mqtt.js) = a0c734a00a2172d579ca1ff4f92fb366bccb40974005bdad5ea7a2f0326ac158
-SIZE (paho-mqtt.js) = 90293
-SHA256 (cloudamqp-lavinmq-v2.7.1_GH0.tar.gz) = e071943c001d07d0876e6da02248b7226ad65f28bb75062e3cd5fa05de2773da
-SIZE (cloudamqp-lavinmq-v2.7.1_GH0.tar.gz) = 1242917
-SHA256 (84codes-lz4.cr-96d714f7593c66ca7425872fd26c7b1286806d3d_GH0.tar.gz) = 6a851169d1382a35aecff253d24f6acbaaa92b906a24b5edd903637bd212f380
-SIZE (84codes-lz4.cr-96d714f7593c66ca7425872fd26c7b1286806d3d_GH0.tar.gz) = 7298
-SHA256 (84codes-systemd.cr-v3.0.0_GH0.tar.gz) = be484d1c09dd610974adacd0ccd6b8f09ae57510bb92f8f3af9f31870236bb0e
-SIZE (84codes-systemd.cr-v3.0.0_GH0.tar.gz) = 8153
-SHA256 (cloudamqp-amq-protocol.cr-v1.1.22_GH0.tar.gz) = 16bfaf3193612d50952149750a2c81194e6aaa673d3f1c6f67e38488e9125027
-SIZE (cloudamqp-amq-protocol.cr-v1.1.22_GH0.tar.gz) = 22538
-SHA256 (cloudamqp-amqp-client.cr-v1.3.2_GH0.tar.gz) = b87a36549a66bdaf625bd9f167643a359ef549d60f6173c688f12a318604abff
-SIZE (cloudamqp-amqp-client.cr-v1.3.2_GH0.tar.gz) = 24636
+SHA256 (cloudamqp-lavinmq-v2.9.1_GH0.tar.gz) = b9efc1df449904e4be99c86127a9d821720fc93e7c1ebc8765d826809bb652ca
+SIZE (cloudamqp-lavinmq-v2.9.1_GH0.tar.gz) = 1416101
+SHA256 (84codes-lz4.cr-0015e74e0ed0f6bb15de9c25c25034ad4bc7f636_GH0.tar.gz) = 154a447ba927eeca1bcb413662e4df82ed692690c79fd843c47efe545261cf58
+SIZE (84codes-lz4.cr-0015e74e0ed0f6bb15de9c25c25034ad4bc7f636_GH0.tar.gz) = 7301
+SHA256 (84codes-systemd.cr-v3.0.1_GH0.tar.gz) = b1a3a6bec0c3af48d5f7abb0b013fb5b77a8febd5d8a02aeaba597ca3cb9c472
+SIZE (84codes-systemd.cr-v3.0.1_GH0.tar.gz) = 8185
+SHA256 (cloudamqp-amq-protocol.cr-v1.3.0_GH0.tar.gz) = 17431a66be584132fab3400175e0bc91cf9af5b1f818025a8b38f0e9bfb57a49
+SIZE (cloudamqp-amq-protocol.cr-v1.3.0_GH0.tar.gz) = 26041
+SHA256 (cloudamqp-amqp-client.cr-v1.3.3_GH0.tar.gz) = 388a451e94e97a0e45a554a49787e65ebee15ed89552babcab407506f1fa6b24
+SIZE (cloudamqp-amqp-client.cr-v1.3.3_GH0.tar.gz) = 25756
 SHA256 (84codes-mqtt-protocol.cr-v0.3.0_GH0.tar.gz) = 2edc2311ffa4d191fb4cef63ed52d7ff810b045a961ac0cc7117233192852c2f
 SIZE (84codes-mqtt-protocol.cr-v0.3.0_GH0.tar.gz) = 17970
diff --git a/net/lavinmq/files/lavinmq.in b/net/lavinmq/files/lavinmq.in
index 3b65c08c50ae..d20d9db15a00 100644
--- a/net/lavinmq/files/lavinmq.in
+++ b/net/lavinmq/files/lavinmq.in
@@ -88,7 +88,7 @@ lavinmq_startprecmd()
         fi
 
         # remove stray sockets that can block startup
-        rm -rf ${lavinmq_run}/*.sock /tmp/lavinmq
+        rm -f ${lavinmq_run}/*.sock
 }
 
 run_rc_command "$1"