From nobody Wed Feb 11 23:42:59 2026 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 4fBFNm3gs6z6RlSf for ; Wed, 11 Feb 2026 23:43:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBFNm1XZzz3qQf for ; Wed, 11 Feb 2026 23:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770853384; 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=0vAI9yivLh+SSraOpqUheZ1qAGnfxlKeCaoVKYCxc4M=; b=YpGT/D6ESNKc095HggTQ2MjxE6BnkKH6SxyxYtreZNa2TwnAqUX3FokfvvY1cmZBOB8eii o/lHh5rRNPVcwYlyi/LWfh4vBuMKmjnCLV5gW0wSlIMBsp9LPnHqE+gF2E+2o1+u9ZqXsV ffQ6q1isndYPNW1+TRLtowGlIr6/GmXA1zbseB8hj21xKnohLaYZeOTR4+Kg3zvd9tEpfa ZvjmhoOj3vbaY9iCs67ZUdT+QILQbQrzvd58KuuEUTZi3PBZfD4sKKQ2XRT4JRjlxgfhcj IUecnWTz8gtQi8t7IUawt8k1U0Owqza1s32mKa0EzgXqCmiVQnXZZH30ALED6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770853384; a=rsa-sha256; cv=none; b=K6em58LEQAwHIIq9DcbRzosaSTdFXD0ZNJ7uAEleSTBL5g+rDa6703qIJ2KXVbTC6d3L0h xNZVmpzqqUZ2+ciKwtQTWeMJ11KMfgFSE5Uzw2cd/JMjpzmQtdp3UduOoz37iL/tg3Imd8 kA3BoQobYB2vOYsjN9IgRztvGCZGC4VC0J3aQU1o+Aosa5sjZeEnmgxJsPtXIgdN6dRS4J y4VULUsaz1w4ZFO6NeRguruElyyqM4UVsCyU3QuuQcT91Pzjbmin5JgxCGW0sSR7RuQ9o+ nU+gq2YhorgFo/733R9KOMkGCcxni5VwTOz9jsWgdffAUB12Gwf6yFzn7pXqLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770853384; 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=0vAI9yivLh+SSraOpqUheZ1qAGnfxlKeCaoVKYCxc4M=; b=fudZDH+q75PQjCPCl4Oi0/ZibTVq94vcqdztrOpZhQUgN+Hj6mABXcsuA/aFxKVyEYJ20e v8PYGk3wLWHD9WZ3aQdrkdGQBofAeXTJNXw4s6eMZNppcxzz4JDVnKW2v3pWlKyzWWxa5o jKfU49dLafOEaxdaoBldxhaRxjrQBPrv6wNO9nRpMrcfOATYqFdkjMKvV8sQsJnJPRRXaW m49kJbMhymy2o+ZL2A5FdopBhflMhoG2xSzcoGKq1ANWszmxuhEV/TS1xxjC8G9UQs3hjI wyloX09Q/tlQ2vfU1k7MGxlDh51SWFmbb0hpefRz9R3wi7+3aZ7nZNTY9Qw8pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBFNm17ZFz19rF for ; Wed, 11 Feb 2026 23:43:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33386 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 23:42:59 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Craig Leres Subject: git: 9d696927c024 - main - net/mosquitto: Update to 2.1.2 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: leres X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d696927c02453ee9a4716c2d3dc1a37dd0a1158 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 23:42:59 +0000 Message-Id: <698d1403.33386.44ac3c0c@gitrepo.freebsd.org> The branch main has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d696927c02453ee9a4716c2d3dc1a37dd0a1158 commit 9d696927c02453ee9a4716c2d3dc1a37dd0a1158 Author: Craig Leres AuthorDate: 2026-02-11 23:42:35 +0000 Commit: Craig Leres CommitDate: 2026-02-11 23:42:35 +0000 net/mosquitto: Update to 2.1.2 Building with the ports version of libwebsockets is no longer broken. Changes since 2.1.1: - Forbid running with `persistence true` and with a persistence plugin at the same time. - Build fixes for OpenBSD. - Fix static/shared linking of libwebsockets under cmake. --- net/mosquitto/Makefile | 18 +++++++++--------- net/mosquitto/distinfo | 6 +++--- .../files/patch-apps_mosquitto__ctrl_ctrl__shell.c | 10 ---------- net/mosquitto/files/patch-lib_connect.c | 10 ---------- net/mosquitto/files/patch-lib_mosquitto__internal.h | 10 ---------- net/mosquitto/files/patch-src_proxy__v1.c | 10 ---------- 6 files changed, 12 insertions(+), 52 deletions(-) diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index 9abc01449936..a18c3b430cca 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -1,6 +1,5 @@ PORTNAME= mosquitto -DISTVERSION= 2.1.1 -PORTREVISION= 2 +DISTVERSION= 2.1.2 CATEGORIES= net MASTER_SITES= https://mosquitto.org/files/source/ @@ -20,7 +19,9 @@ RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cmake cpe ssl USE_RC_SUBR= mosquitto USE_LDCONFIG= yes -CMAKE_ARGS= -DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" \ +CMAKE_ARGS= -DCJSON_INCLUDE_DIR:PATH="${PREFIX}/include/json" \ + -DCJSON_LIBRARY:PATH="${PREFIX}/lib/libcjson.so" \ + -DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata" \ -DWITH_TESTS:BOOL=OFF CPE_VENDOR= eclipse @@ -34,16 +35,15 @@ OPTIONS_DEFAULT= CARES WEBSOCKETS WEBSOCKETS_BUILTIN CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON -WEBSOCKETS_DESC= $(WEBSOCKET_DESC) -WEBSOCKETS_CMAKE_OFF= -DWITH_WEBSOCKETS:BOOL=OFF -WEBSOCKETS_BUILTIN_CMAKE_OFF= -DWITH_WEBSOCKETS_BUILTIN:BOOL=OFF -WEBSOCKETS_BUILTIN_DESC= Use bundled version of websockets -WEBSOCKETS_BUILTIN_LIB_DEPENDS_OFF= libwebsockets.so:net/libwebsockets +WEBSOCKETS_DESC= $(WEBSOCKET_DESC) +WEBSOCKETS_CMAKE_OFF= -DWITH_WEBSOCKETS:BOOL=OFF +WEBSOCKETS_BUILTIN_CMAKE_OFF= -DWITH_WEBSOCKETS_BUILTIN:BOOL=OFF +WEBSOCKETS_BUILTIN_DESC= Use bundled version of websockets .include .if ${PORT_OPTIONS:MWEBSOCKETS} && !${PORT_OPTIONS:MWEBSOCKETS_BUILTIN} -BROKEN= building without WEBSOCKETS_BUILTIN fails +LIB_DEPENDS+= libwebsockets.so:net/libwebsockets .endif post-patch: diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo index 75da6f5c211a..1d9c9d04683e 100644 --- a/net/mosquitto/distinfo +++ b/net/mosquitto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770314454 -SHA256 (mosquitto-2.1.1.tar.gz) = d93026a8f8255a32fe146ca77df5e26259b7947745370a3944a68ddb4ec663ff -SIZE (mosquitto-2.1.1.tar.gz) = 2879424 +TIMESTAMP = 1770849685 +SHA256 (mosquitto-2.1.2.tar.gz) = fd905380691ac65ea5a93779e8214941829e3d6e038d5edff9eac5fd74cbed02 +SIZE (mosquitto-2.1.2.tar.gz) = 2882727 diff --git a/net/mosquitto/files/patch-apps_mosquitto__ctrl_ctrl__shell.c b/net/mosquitto/files/patch-apps_mosquitto__ctrl_ctrl__shell.c deleted file mode 100644 index f041f1d4db3e..000000000000 --- a/net/mosquitto/files/patch-apps_mosquitto__ctrl_ctrl__shell.c +++ /dev/null @@ -1,10 +0,0 @@ ---- apps/mosquitto_ctrl/ctrl_shell.c.orig 2026-02-05 18:26:53 UTC -+++ apps/mosquitto_ctrl/ctrl_shell.c -@@ -19,6 +19,7 @@ Contributors: - #include - - #include -+#include - #include - #include - #include diff --git a/net/mosquitto/files/patch-lib_connect.c b/net/mosquitto/files/patch-lib_connect.c deleted file mode 100644 index 9830f16aa418..000000000000 --- a/net/mosquitto/files/patch-lib_connect.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/connect.c.orig 2026-02-04 22:33:13 UTC -+++ lib/connect.c -@@ -26,6 +26,7 @@ Contributors: - #else - # include - #endif -+#include - - #include "callbacks.h" - #include "http_client.h" diff --git a/net/mosquitto/files/patch-lib_mosquitto__internal.h b/net/mosquitto/files/patch-lib_mosquitto__internal.h deleted file mode 100644 index 88ec7d34dd68..000000000000 --- a/net/mosquitto/files/patch-lib_mosquitto__internal.h +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/mosquitto_internal.h.orig 2026-02-05 18:32:43 UTC -+++ lib/mosquitto_internal.h -@@ -22,6 +22,7 @@ Contributors: - - #include "config.h" - -+#include - #ifdef WIN32 - # include - #endif diff --git a/net/mosquitto/files/patch-src_proxy__v1.c b/net/mosquitto/files/patch-src_proxy__v1.c deleted file mode 100644 index 27e9bde5e105..000000000000 --- a/net/mosquitto/files/patch-src_proxy__v1.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/proxy_v1.c.orig 2026-02-04 22:33:13 UTC -+++ src/proxy_v1.c -@@ -4,6 +4,7 @@ - #else - # include - #endif -+#include - #include - #include "mosquitto_broker_internal.h" - #include "mosquitto_internal.h"