diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index a59fd685e388..948a1b6cc1a5 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -1,54 +1,53 @@ PORTNAME= mosquitto -DISTVERSION= 2.0.21 -PORTREVISION= 1 +DISTVERSION= 2.0.22 CATEGORIES= net MASTER_SITES= https://mosquitto.org/files/source/ MAINTAINER= leres@FreeBSD.org COMMENT= Open source MQTT broker WWW= https://mosquitto.org/ LICENSE= EPL BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ xsltproc:textproc/libxslt LIB_DEPENDS= libcjson.so:devel/libcjson \ libuuid.so:misc/libuuid 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" CPE_VENDOR= eclipse USERS= nobody PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= CARES WEBSOCKET OPTIONS_DEFAULT= CARES WEBSOCKET CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON WEBSOCKET_LIB_DEPENDS= libwebsockets.so:net/libwebsockets WEBSOCKET_CMAKE_ON= -DWITH_WEBSOCKETS:BOOL=ON post-patch: @${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \ ${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt post-install: ${SED} -e '/cafile/s,/usr/local,${LOCALBASE},' \ ${STAGEDIR}${ETCDIR}/mosquitto.conf > \ ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/pwfile.example \ ${STAGEDIR}${ETCDIR}/pwfile.sample ${MV} ${STAGEDIR}${ETCDIR}/pskfile.example \ ${STAGEDIR}${ETCDIR}/pskfile.sample ${MV} ${STAGEDIR}${ETCDIR}/aclfile.example \ ${STAGEDIR}${ETCDIR}/aclfile.sample .include diff --git a/net/mosquitto/distinfo b/net/mosquitto/distinfo index bd1058f85e74..8935947337eb 100644 --- a/net/mosquitto/distinfo +++ b/net/mosquitto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749062322 -SHA256 (mosquitto-2.0.21.tar.gz) = 7ad5e84caeb8d2bb6ed0c04614b2a7042def961af82d87f688ba33db857b899d -SIZE (mosquitto-2.0.21.tar.gz) = 804168 +TIMESTAMP = 1753476242 +SHA256 (mosquitto-2.0.22.tar.gz) = 2f752589ef7db40260b633fbdb536e9a04b446a315138d64a7ff3c14e2de6b68 +SIZE (mosquitto-2.0.22.tar.gz) = 805967 diff --git a/net/mosquitto/files/patch-CMakeLists.txt b/net/mosquitto/files/patch-CMakeLists.txt index 960fae8651ba..f9d012481893 100644 --- a/net/mosquitto/files/patch-CMakeLists.txt +++ b/net/mosquitto/files/patch-CMakeLists.txt @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2020-12-28 11:28:48 UTC +--- CMakeLists.txt.orig 2025-07-11 21:32:27 UTC +++ CMakeLists.txt -@@ -14,6 +14,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cma +@@ -13,6 +13,9 @@ add_definitions (-DCMAKE -DVERSION=\"${VERSION}\") add_definitions (-DCMAKE -DVERSION=\"${VERSION}\") +include_directories("/usr/local/include") +link_directories("/usr/local/lib") + if (WIN32) add_definitions("-D_CRT_SECURE_NO_WARNINGS") add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE") diff --git a/net/mosquitto/files/patch-config.mk b/net/mosquitto/files/patch-config.mk index 2dd082af0371..770ab63d9ce1 100644 --- a/net/mosquitto/files/patch-config.mk +++ b/net/mosquitto/files/patch-config.mk @@ -1,11 +1,11 @@ ---- config.mk.orig 2020-12-28 13:24:40 UTC +--- config.mk.orig 2025-07-11 21:32:27 UTC +++ config.mk -@@ -329,7 +329,7 @@ ifeq ($(WITH_WEBSOCKETS),static) +@@ -347,7 +347,7 @@ INSTALL?=install endif INSTALL?=install -prefix?=/usr/local +prefix?=${PREFIX} incdir?=${prefix}/include libdir?=${prefix}/lib${LIB_SUFFIX} localedir?=${prefix}/share/locale diff --git a/net/mosquitto/files/patch-mosquitto.conf b/net/mosquitto/files/patch-mosquitto.conf index d748d5b1171e..b20b04014aa1 100644 --- a/net/mosquitto/files/patch-mosquitto.conf +++ b/net/mosquitto/files/patch-mosquitto.conf @@ -1,29 +1,29 @@ ---- mosquitto.conf.orig 2025-03-06 16:25:31 UTC +--- mosquitto.conf.orig 2025-07-11 21:32:27 UTC +++ mosquitto.conf @@ -167,7 +167,7 @@ # This should be set to /var/run/mosquitto/mosquitto.pid if mosquitto is # being run automatically on boot with an init script and # start-stop-daemon or similar. -#pid_file +pid_file /var/run/mosquitto.pid # Set to true to queue messages with QoS 0 when a persistent client is # disconnected. These messages are included in the limit imposed by @@ -206,7 +206,7 @@ # If run as a non-root user, this setting has no effect. # Note that on Windows this has no effect and so mosquitto should be started by # the user you wish it to run as. -#user mosquitto +user nobody # ================================================================= # Listeners @@ -360,7 +360,7 @@ # certificate files must have ".crt" as the file ending and you must run # "openssl rehash " each time you add/remove a certificate. # capath is not supported for websockets. -#cafile +cafile /usr/local/share/certs/ca-root-nss.crt #capath diff --git a/net/mosquitto/files/patch-src_CMakeLists.txt b/net/mosquitto/files/patch-src_CMakeLists.txt index 7ce42f56b518..8f024918eedc 100644 --- a/net/mosquitto/files/patch-src_CMakeLists.txt +++ b/net/mosquitto/files/patch-src_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/CMakeLists.txt.orig 2024-12-18 09:43:22.511844000 +0200 -+++ src/CMakeLists.txt 2024-12-18 09:45:34.368783000 +0200 -@@ -194,7 +194,7 @@ +--- src/CMakeLists.txt.orig 2025-07-11 21:32:27 UTC ++++ src/CMakeLists.txt +@@ -200,7 +200,7 @@ if (WITH_WEBSOCKETS) if (WITH_WEBSOCKETS) if (STATIC_WEBSOCKETS) - set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) + set (MOSQ_LIBS ${MOSQ_LIBS} websockets) if (WIN32) set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) link_directories(${mosquitto_SOURCE_DIR})