Attachment #221132 for bug #252237




# $FreeBSD$

PORTNAME=	mosquitto
PORTVERSION=	2.0.4
CATEGORIES=	net
MASTER_SITES=	http://mosquitto.org/files/source/

PATCH_SITES=	https://github.com/eclipse/mosquitto/commit/
PATCHFILES=	8a4ae28fa926589e9891674ca4424dc703ad2d88.patch:-p1

MAINTAINER=	joe@thrallingpenguin.com
COMMENT=	Open source MQTT broker

LICENSE=	EPL

BUILD_DEPENDS=	xsltproc:textproc/libxslt \
		docbook-xsl>0:textproc/docbook-xsl
LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
		libcjson.so:devel/libcjson
RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss

USES=		cmake ssl
USE_RC_SUBR=	mosquitto
USE_LDCONFIG=	yes
USE_RC_SUBR=	mosquitto
CMAKE_ARGS=	-DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata"

USERS=		nobody

OPTIONS_DEFINE=	CARES WS
OPTIONS_DEFAULT=	CARES

CARES_DESC=	Asynchronous DNS resolution via c-ares
CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
CARES_CMAKE_ON=	-DWITH_SRV:BOOL=ON


Lines 1-5 Link Here

(-)b/net/mosquitto/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1598533546	1	TIMESTAMP = 1609154754
2	SHA256 (mosquitto-1.6.7.tar.gz) = bcd31a8fbbd053fee328986fadd8666d3058357ded56b9782f7d4f19931d178e	2	SHA256 (mosquitto-2.0.4.tar.gz) = ba3126d82533fe40a18cf1a989e61eaea887e81829cd93518149e73553d20f10
3	SIZE (mosquitto-1.6.7.tar.gz) = 591062	3	SIZE (mosquitto-2.0.4.tar.gz) = 751539
4	SHA256 (8a4ae28fa926589e9891674ca4424dc703ad2d88.patch) = a142cb321992b975be27514fc074938098e83e322a87d40279492e75dd3dd74e	4	SHA256 (8a4ae28fa926589e9891674ca4424dc703ad2d88.patch) = a142cb321992b975be27514fc074938098e83e322a87d40279492e75dd3dd74e
5	SIZE (8a4ae28fa926589e9891674ca4424dc703ad2d88.patch) = 1088	5	SIZE (8a4ae28fa926589e9891674ca4424dc703ad2d88.patch) = 1088




--- CMakeLists.txt.orig	2020-12-28 11:28:48 UTC
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -14,6 +14,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cma
 
 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")
@@ -108,9 +111,9 @@ install(FILES mosquitto.conf aclfile.exa
 # ========================================
 
 configure_file(libmosquitto.pc.in libmosquitto.pc @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
 configure_file(libmosquittopp.pc.in libmosquittopp.pc @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
 
 # ========================================
 # Testing

Lines 1-8 Link Here

(-)b/net/mosquitto/files/patch-config.mk (-4 / +2 lines)
1	Index: config.mk	1	--- config.mk.orig 2020-12-28 13:24:40 UTC
2	===================================================================
3	--- config.mk.orig
4	+++ config.mk	2	+++ config.mk
5	@@ -283,7 +283,7 @@ ifeq ($(WITH_WEBSOCKETS),static)	3	@@ -329,7 +329,7 @@ ifeq ($(WITH_WEBSOCKETS),static)
6	endif	4	endif
7		5
8	INSTALL?=install	6	INSTALL?=install




--- mosquitto.conf.orig	2020-12-28 13:22:44 UTC
===================================================================
--- mosquitto.conf.orig
+++ mosquitto.conf
@@ -148,7 +148,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

 
 # Set to true to queue messages with QoS 0 when a persistent client is
 # disconnected. These messages are included in the limit imposed by
@@ -187,7 +187,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
@@ -340,7 +340,7 @@
 #bind_address
 
 # Port to use for the default listener.
-#port 1883
+port 1883
 
 # Bind the listener to a specific interface. This is similar to
 # bind_address above but is useful when an interface has multiple addresses or
@@ -267,7 +267,7 @@
 # containing the CA certificates. For capath to work correctly, the
 # certificate files must have ".crt" as the file ending and you must run
 # "openssl rehash <path to capath>" each time you add/remove a certificate.

+cafile /usr/local/share/certs/ca-root-nss.crt
 #capath
 
 




Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -126,6 +126,7 @@ if (WIN32 OR CYGWIN)
 endif (WIN32 OR CYGWIN)
 
 add_definitions (-DWITH_BROKER)
+add_definitions (-DWITH_THREADING)
 
 if (WITH_DLT)
     message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}")
@@ -149,7 +150,7 @@ if (UNIX)
     elseif(QNX)
         set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
     else(APPLE)
-        set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
+        set (MOSQ_LIBS ${MOSQ_LIBS} m)
         find_library(LIBRT rt)
         if (LIBRT)
             set (MOSQ_LIBS ${MOSQ_LIBS} rt)




Index: src/mosquitto_passwd.c
===================================================================
--- src/mosquitto_passwd.c.orig
+++ src/mosquitto_passwd.c
@@ -141,7 +141,7 @@ int output_new_password(FILE *fptr, cons
 	unsigned char hash[EVP_MAX_MD_SIZE];
 	unsigned int hash_len;
 	const EVP_MD *digest;
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_OPENSSL_OPAQUE_STRUCTS)
 	EVP_MD_CTX context;
 #else
 	EVP_MD_CTX *context;
@@ -168,7 +168,7 @@ int output_new_password(FILE *fptr, cons
 		return 1;
 	}
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_OPENSSL_OPAQUE_STRUCTS)
 	EVP_MD_CTX_init(&context);
 	EVP_DigestInit_ex(&context, digest, NULL);
 	EVP_DigestUpdate(&context, password, strlen(password));

Removed Link Here

(-)a/net/mosquitto/files/patch-src_security__default.c (-11 lines)
1	--- src/security_default.c.orig 2018-10-11 00:28:56 UTC
2	+++ src/security_default.c
3	@@ -18,7 +18,7 @@ Contributors:
4
5	#include <stdio.h>
6	#include <string.h>
7	-
8	+#include <openssl/opensslv.h>
9	#include "mosquitto_broker_internal.h"
10	#include "memory_mosq.h"
11	#include "util_mosq.h"

Lines 1-3 Link Here

(-)b/net/mosquitto/pkg-plist (+5 lines)
		1	bin/mosquitto_ctrl
1	bin/mosquitto_passwd	2	bin/mosquitto_passwd
2	bin/mosquitto_pub	3	bin/mosquitto_pub
3	bin/mosquitto_sub	4	bin/mosquitto_sub
Lines 10-23 include/mosquitto.h Link Here
10	include/mosquitto_broker.h	11	include/mosquitto_broker.h
11	include/mosquitto_plugin.h	12	include/mosquitto_plugin.h
12	include/mosquittopp.h	13	include/mosquittopp.h
		14	include/mqtt_protocol.h
13	lib/libmosquitto.so	15	lib/libmosquitto.so
14	lib/libmosquitto.so.1	16	lib/libmosquitto.so.1
15	lib/libmosquitto.so.%%PORTVERSION%%	17	lib/libmosquitto.so.%%PORTVERSION%%
16	lib/libmosquittopp.so	18	lib/libmosquittopp.so
17	lib/libmosquittopp.so.1	19	lib/libmosquittopp.so.1
18	lib/libmosquittopp.so.%%PORTVERSION%%	20	lib/libmosquittopp.so.%%PORTVERSION%%
		21	lib/mosquitto_dynamic_security.so
19	libdata/pkgconfig/libmosquitto.pc	22	libdata/pkgconfig/libmosquitto.pc
20	libdata/pkgconfig/libmosquittopp.pc	23	libdata/pkgconfig/libmosquittopp.pc
		24	man/man1/mosquitto_ctrl.1.gz
		25	man/man1/mosquitto_ctrl_dynsec.1.gz
21	man/man1/mosquitto_passwd.1.gz	26	man/man1/mosquitto_passwd.1.gz
22	man/man1/mosquitto_pub.1.gz	27	man/man1/mosquitto_pub.1.gz
23	man/man1/mosquitto_rr.1.gz	28	man/man1/mosquitto_rr.1.gz

Return to bug 252237

Lines 2-25 Link Here

(-)b/net/mosquitto/Makefile (-6 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mosquitto	4	PORTNAME= mosquitto
5	PORTVERSION= 1.6.7	5	PORTVERSION= 2.0.4
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://mosquitto.org/files/source/	7	MASTER_SITES= http://mosquitto.org/files/source/
8		8
9	PATCH_SITES= https://github.com/eclipse/mosquitto/commit/
10	PATCHFILES= 8a4ae28fa926589e9891674ca4424dc703ad2d88.patch:-p1
11
12	MAINTAINER= joe@thrallingpenguin.com	9	MAINTAINER= joe@thrallingpenguin.com
13	COMMENT= Open source MQTT broker	10	COMMENT= Open source MQTT broker
14		11
15	LICENSE= EPL	12	LICENSE= EPL
16		13
17	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid	14	BUILD_DEPENDS= xsltproc:textproc/libxslt \
		15	docbook-xsl>0:textproc/docbook-xsl
		16	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
		17	libcjson.so:devel/libcjson
18	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss	18	RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
19		19
20	USES= cmake ssl	20	USES= cmake ssl
21	USE_RC_SUBR= mosquitto
22	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
		22	USE_RC_SUBR= mosquitto
23	CMAKE_ARGS= -DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata"	23	CMAKE_ARGS= -DCMAKE_LIBDATADIR:PATH="${PREFIX}/libdata"
24		24
25	USERS= nobody	25	USERS= nobody
Lines 29-34 PLIST_SUB= PORTVERSION=${PORTVERSION} Link Here
29	OPTIONS_DEFINE= CARES WS	29	OPTIONS_DEFINE= CARES WS
30	OPTIONS_DEFAULT= CARES	30	OPTIONS_DEFAULT= CARES
31		31
		32	CARES_DESC= Asynchronous DNS resolution via c-ares
32	CARES_LIB_DEPENDS= libcares.so:dns/c-ares	33	CARES_LIB_DEPENDS= libcares.so:dns/c-ares
33	CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON	34	CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON
34		35

Lines 1-26 Link Here

(-)b/net/mosquitto/files/patch-CMakeLists.txt (-18 / +4 lines)
1	Index: CMakeLists.txt	1	--- CMakeLists.txt.orig 2020-12-28 11:28:48 UTC
2	===================================================================
3	--- CMakeLists.txt.orig
4	+++ CMakeLists.txt	2	+++ CMakeLists.txt
5	@@ -15,6 +15,9 @@ set (VERSION 1.6.4)	3	@@ -14,6 +14,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cma
6		4
7	add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")	5	add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
8		6
9	+include_directories(/usr/local/include)	7	+include_directories("/usr/local/include")
10	+link_directories(/usr/local/lib)	8	+link_directories("/usr/local/lib")
11	+	9	+
12	if (WIN32)	10	if (WIN32)
13	add_definitions("-D_CRT_SECURE_NO_WARNINGS")	11	add_definitions("-D_CRT_SECURE_NO_WARNINGS")
14	add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE")	12	add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE")
15	@@ -108,9 +111,9 @@ install(FILES mosquitto.conf aclfile.exa
16	# ========================================
17
18	configure_file(libmosquitto.pc.in libmosquitto.pc @ONLY)
19	-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
20	+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
21	configure_file(libmosquittopp.pc.in libmosquittopp.pc @ONLY)
22	-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
23	+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
24
25	# ========================================
26	# Testing

Lines 1-9 Link Here

(-)b/net/mosquitto/files/patch-mosquitto.conf (-20 / +9 lines)
1	Index: mosquitto.conf	1	--- mosquitto.conf.orig 2020-12-28 13:22:44 UTC
2	===================================================================
3	--- mosquitto.conf.orig
4	+++ mosquitto.conf	2	+++ mosquitto.conf
5	@@ -158,7 +158,7 @@	3	@@ -148,7 +148,7 @@
6	# This should be set to /var/run/mosquitto.pid if mosquitto is	4	# This should be set to /var/run/mosquitto/mosquitto.pid if mosquitto is
7	# being run automatically on boot with an init script and	5	# being run automatically on boot with an init script and
8	# start-stop-daemon or similar.	6	# start-stop-daemon or similar.
9	-#pid_file	7	-#pid_file
Lines 11-35 Index: mosquitto.conf Link Here
11		9
12	# Set to true to queue messages with QoS 0 when a persistent client is	10	# Set to true to queue messages with QoS 0 when a persistent client is
13	# disconnected. These messages are included in the limit imposed by	11	# disconnected. These messages are included in the limit imposed by
14	@@ -195,7 +195,7 @@	12	@@ -187,7 +187,7 @@
15	# If run as a non-root user, this setting has no effect.	13	# If run as a non-root user, this setting has no effect.
16	# Note that on Windows this has no effect and so mosquitto should	14	# Note that on Windows this has no effect and so mosquitto should be started by
17	# be started by the user you wish it to run as.	15	# the user you wish it to run as.
18	-#user mosquitto	16	-#user mosquitto
19	+user nobody	17	+user nobody
20		18
21	# =================================================================	19	# =================================================================
22	# Default listener	20	# Listeners
23	@@ -208,7 +208,7 @@	21	@@ -340,7 +340,7 @@
24	#bind_address
25
26	# Port to use for the default listener.
27	-#port 1883
28	+port 1883
29
30	# Bind the listener to a specific interface. This is similar to
31	# bind_address above but is useful when an interface has multiple addresses or
32	@@ -267,7 +267,7 @@
33	# containing the CA certificates. For capath to work correctly, the	22	# containing the CA certificates. For capath to work correctly, the
34	# certificate files must have ".crt" as the file ending and you must run	23	# certificate files must have ".crt" as the file ending and you must run
35	# "openssl rehash <path to capath>" each time you add/remove a certificate.	24	# "openssl rehash <path to capath>" each time you add/remove a certificate.
Lines 37-40 Index: mosquitto.conf Link Here
37	+cafile /usr/local/share/certs/ca-root-nss.crt	26	+cafile /usr/local/share/certs/ca-root-nss.crt
38	#capath	27	#capath
39		28
40	# Path to the PEM encoded server certificate.	29

Removed Link Here

(-)a/net/mosquitto/files/patch-src_CMakeLists.txt (-21 lines)
1	Index: src/CMakeLists.txt
2	===================================================================
3	--- src/CMakeLists.txt.orig
4	+++ src/CMakeLists.txt
5	@@ -126,6 +126,7 @@ if (WIN32 OR CYGWIN)
6	endif (WIN32 OR CYGWIN)
7
8	add_definitions (-DWITH_BROKER)
9	+add_definitions (-DWITH_THREADING)
10
11	if (WITH_DLT)
12	message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}")
13	@@ -149,7 +150,7 @@ if (UNIX)
14	elseif(QNX)
15	set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
16	else(APPLE)
17	- set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
18	+ set (MOSQ_LIBS ${MOSQ_LIBS} m)
19	find_library(LIBRT rt)
20	if (LIBRT)
21	set (MOSQ_LIBS ${MOSQ_LIBS} rt)

Removed Link Here

(-)a/net/mosquitto/files/patch-src_mosquitto__passwd.c (-22 lines)
1	Index: src/mosquitto_passwd.c
2	===================================================================
3	--- src/mosquitto_passwd.c.orig
4	+++ src/mosquitto_passwd.c
5	@@ -141,7 +141,7 @@ int output_new_password(FILE *fptr, cons
6	unsigned char hash[EVP_MAX_MD_SIZE];
7	unsigned int hash_len;
8	const EVP_MD *digest;
9	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
10	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(HAVE_OPENSSL_OPAQUE_STRUCTS)
11	EVP_MD_CTX context;
12	#else
13	EVP_MD_CTX *context;
14	@@ -168,7 +168,7 @@ int output_new_password(FILE *fptr, cons
15	return 1;
16	}
17
18	-#if OPENSSL_VERSION_NUMBER < 0x10100000L
19	+#if OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(HAVE_OPENSSL_OPAQUE_STRUCTS)
20	EVP_MD_CTX_init(&context);
21	EVP_DigestInit_ex(&context, digest, NULL);
22	EVP_DigestUpdate(&context, password, strlen(password));