Attachment #206348 for bug #239675

View | Details | Raw Unified | Return to bug 239675
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/net/mosquitto/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mosquitto	4	PORTNAME= mosquitto
5	PORTVERSION= 1.5.8	5	PORTVERSION= 1.6.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

Lines 1-3 Link Here

(-)b/net/mosquitto/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551386128	1	TIMESTAMP = 1565197492
2	SHA256 (mosquitto-1.5.8.tar.gz) = 78d7e70c3794dc3a1d484b4f2f8d3addebe9c2da3f5a1cebe557f7d13beb0da4	2	SHA256 (mosquitto-1.6.4.tar.gz) = a3d5822c249f6a6e13311b1b09eff6807ea01608a5a77934e1769842e9d146ef
3	SIZE (mosquitto-1.5.8.tar.gz) = 442834	3	SIZE (mosquitto-1.6.4.tar.gz) = 576040




Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -15,6 +15,9 @@ set (VERSION 1.6.4)
 
 add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
 

+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
 # ========================================
 	set (INCLUDEDIR include)
 	set (DATAROOTDIR share)
-	set (MANDIR "${DATAROOTDIR}/man")
+	set (MANDIR "man")
 	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
-	set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
+	set (PKGCONFIGDIR "${CMAKE_LIBDATADIR}/pkgconfig")
 endif (WIN32)
 
 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-6 Link Here

(-)b/net/mosquitto/files/patch-config.mk (-2 / +4 lines)
1	--- config.mk.orig 2018-09-25 15:27:43 UTC	1	Index: config.mk
		2	===================================================================
		3	--- config.mk.orig
2	+++ config.mk	4	+++ config.mk
3	@@ -275,7 +275,7 @@ ifeq ($(WITH_WEBSOCKETS),static)	5	@@ -283,7 +283,7 @@ ifeq ($(WITH_WEBSOCKETS),static)
4	endif	6	endif
5		7
6	INSTALL?=install	8	INSTALL?=install




--- lib/mosquitto_internal.h.orig	2018-09-25 15:27:43 UTC
+++ lib/mosquitto_internal.h
@@ -31,11 +31,7 @@ Contributors:
 #endif
 #include <stdlib.h>
 
-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
-#  include <pthread.h>
-#else
-#  include <dummypthread.h>
-#endif
+#include <pthread.h>
 
 #ifdef WITH_SRV
 #  include <ares.h>
@@ -194,7 +190,7 @@ struct mosquitto {
 #endif
 	bool want_write;
 	bool want_connect;
-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
+
 	pthread_mutex_t callback_mutex;
 	pthread_mutex_t log_callback_mutex;
 	pthread_mutex_t msgtime_mutex;
@@ -205,7 +201,7 @@ struct mosquitto {
 	pthread_mutex_t out_message_mutex;
 	pthread_mutex_t mid_mutex;
 	pthread_t thread_id;
-#endif
+
 	bool clean_session;
 #ifdef WITH_BROKER
 	char *old_id; /* for when a duplicate client connects, but we still want to




Index: mosquitto.conf
===================================================================
--- mosquitto.conf.orig
+++ mosquitto.conf
@@ -158,7 +158,7 @@
 # This should be set to /var/run/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
@@ -195,7 +195,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
 
 # =================================================================
 # Default listener
@@ -208,7 +208,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.




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)

         find_library(LIBRT rt)
         if (LIBRT)
             set (MOSQ_LIBS ${MOSQ_LIBS} rt)
@@ -186,7 +187,6 @@
 endif (${WITH_TLS} STREQUAL ON)
 
 if (UNIX AND NOT APPLE)
-	install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
 endif (UNIX AND NOT APPLE)
 
 

Lines 1-6 Link Here

(-)b/net/mosquitto/files/patch-src_mosquitto__passwd.c (-3 / +5 lines)
1	--- src/mosquitto_passwd.c.orig 2019-02-28 17:18:59 UTC	1	Index: src/mosquitto_passwd.c
		2	===================================================================
		3	--- src/mosquitto_passwd.c.orig
2	+++ src/mosquitto_passwd.c	4	+++ src/mosquitto_passwd.c
3	@@ -100,7 +100,7 @@ int output_new_password(FILE fptr, const char userna	5	@@ -141,7 +141,7 @@ int output_new_password(FILE *fptr, cons
4	unsigned char hash[EVP_MAX_MD_SIZE];	6	unsigned char hash[EVP_MAX_MD_SIZE];
5	unsigned int hash_len;	7	unsigned int hash_len;
6	const EVP_MD *digest;	8	const EVP_MD *digest;
Lines 9-15 Link Here
9	EVP_MD_CTX context;	11	EVP_MD_CTX context;
10	#else	12	#else
11	EVP_MD_CTX *context;	13	EVP_MD_CTX *context;
12	@@ -127,7 +127,7 @@ int output_new_password(FILE fptr, const char userna	14	@@ -168,7 +168,7 @@ int output_new_password(FILE *fptr, cons
13	return 1;	15	return 1;
14	}	16	}
15		17

Lines 1-6 Link Here

(-)b/net/mosquitto/pkg-plist (+2 lines)
1	bin/mosquitto_passwd	1	bin/mosquitto_passwd
2	bin/mosquitto_pub	2	bin/mosquitto_pub
3	bin/mosquitto_sub	3	bin/mosquitto_sub
		4	bin/mosquitto_rr
4	@sample %%ETCDIR%%/aclfile.sample	5	@sample %%ETCDIR%%/aclfile.sample
5	@sample %%ETCDIR%%/mosquitto.conf.sample	6	@sample %%ETCDIR%%/mosquitto.conf.sample
6	@sample %%ETCDIR%%/pskfile.sample	7	@sample %%ETCDIR%%/pskfile.sample
Lines 19-24 libdata/pkgconfig/libmosquitto.pc Link Here
19	libdata/pkgconfig/libmosquittopp.pc	20	libdata/pkgconfig/libmosquittopp.pc
20	man/man1/mosquitto_passwd.1.gz	21	man/man1/mosquitto_passwd.1.gz
21	man/man1/mosquitto_pub.1.gz	22	man/man1/mosquitto_pub.1.gz
		23	man/man1/mosquitto_rr.1.gz
22	man/man1/mosquitto_sub.1.gz	24	man/man1/mosquitto_sub.1.gz
23	man/man3/libmosquitto.3.gz	25	man/man3/libmosquitto.3.gz
24	man/man5/mosquitto.conf.5.gz	26	man/man5/mosquitto.conf.5.gz

Return to bug 239675

Lines 1-6 Link Here

(-)b/net/mosquitto/files/patch-CMakeLists.txt (-15 / +17 lines)
1	--- CMakeLists.txt.orig 2018-09-25 15:27:43 UTC	1	Index: CMakeLists.txt
		2	===================================================================
		3	--- CMakeLists.txt.orig
2	+++ CMakeLists.txt	4	+++ CMakeLists.txt
3	@@ -15,6 +15,9 @@ set (VERSION 1.5.3)	5	@@ -15,6 +15,9 @@ set (VERSION 1.6.4)
4		6
5	add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")	7	add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
6		8
Lines 8-24 Link Here
8	+link_directories(/usr/local/lib)	10	+link_directories(/usr/local/lib)
9	+	11	+
10	if (WIN32)	12	if (WIN32)
11	set (BINDIR .)	13	add_definitions("-D_CRT_SECURE_NO_WARNINGS")
12	set (SBINDIR .)	14	add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE")
13	@@ -40,9 +43,9 @@ else (WIN32)	15	@@ -108,9 +111,9 @@ install(FILES mosquitto.conf aclfile.exa
14	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")	16	# ========================================
15	set (INCLUDEDIR include)
16	set (DATAROOTDIR share)
17	- set (MANDIR "${DATAROOTDIR}/man")
18	+ set (MANDIR "man")
19	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
20	- set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
21	+ set (PKGCONFIGDIR "${CMAKE_LIBDATADIR}/pkgconfig")
22	endif (WIN32)
23		17
24	option(WITH_TLS	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

Removed Link Here

(-)a/net/mosquitto/files/patch-lib_mosquitto__internal.h (-33 lines)
1	--- lib/mosquitto_internal.h.orig 2018-09-25 15:27:43 UTC
2	+++ lib/mosquitto_internal.h
3	@@ -31,11 +31,7 @@ Contributors:
4	#endif
5	#include <stdlib.h>
6
7	-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
8	-# include <pthread.h>
9	-#else
10	-# include <dummypthread.h>
11	-#endif
12	+#include <pthread.h>
13
14	#ifdef WITH_SRV
15	# include <ares.h>
16	@@ -194,7 +190,7 @@ struct mosquitto {
17	#endif
18	bool want_write;
19	bool want_connect;
20	-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
21	+
22	pthread_mutex_t callback_mutex;
23	pthread_mutex_t log_callback_mutex;
24	pthread_mutex_t msgtime_mutex;
25	@@ -205,7 +201,7 @@ struct mosquitto {
26	pthread_mutex_t out_message_mutex;
27	pthread_mutex_t mid_mutex;
28	pthread_t thread_id;
29	-#endif
30	+
31	bool clean_session;
32	#ifdef WITH_BROKER
33	char old_id; / for when a duplicate client connects, but we still want to

Lines 1-33 Link Here

(-)b/net/mosquitto/files/patch-mosquitto.conf (-13 / +15 lines)
1	--- mosquitto.conf.orig 2019-02-06 15:54:59 UTC	1	Index: mosquitto.conf
		2	===================================================================
		3	--- mosquitto.conf.orig
2	+++ mosquitto.conf	4	+++ mosquitto.conf
3	@@ -28,7 +28,7 @@	5	@@ -158,7 +158,7 @@
4	# This should be set to /var/run/mosquitto.pid if mosquitto is	6	# This should be set to /var/run/mosquitto.pid if mosquitto is
5	# being run automatically on boot with an init script and	7	# being run automatically on boot with an init script and
6	# start-stop-daemon or similar.	8	# start-stop-daemon or similar.
7	-#pid_file	9	-#pid_file
8	+pid_file /var/run/mosquitto.pid	10	+pid_file /var/run/mosquitto.pid
9		11
10	# When run as root, drop privileges to this user and its primary	12	# Set to true to queue messages with QoS 0 when a persistent client is
11	# group.	13	# disconnected. These messages are included in the limit imposed by
12	@@ -36,7 +36,7 @@	14	@@ -195,7 +195,7 @@
13	# If run as a non-root user, this setting has no effect.	15	# If run as a non-root user, this setting has no effect.
14	# Note that on Windows this has no effect and so mosquitto should	16	# Note that on Windows this has no effect and so mosquitto should
15	# be started by the user you wish it to run as.	17	# be started by the user you wish it to run as.
16	-#user mosquitto	18	-#user mosquitto
17	+user nobody	19	+user nobody
18		20
19	# The maximum number of QoS 1 and 2 messages currently inflight per	21	# =================================================================
20	# client.	22	# Default listener
21	@@ -173,7 +173,7 @@	23	@@ -208,7 +208,7 @@
22	#bind_address	24	#bind_address
23		25
24	# Port to use for the default listener.	26	# Port to use for the default listener.
25	-#port 1883	27	-#port 1883
26	+port 1883	28	+port 1883
27		29
28	# The maximum number of client connections to allow. This is	30	# Bind the listener to a specific interface. This is similar to
29	# a per listener setting.	31	# bind_address above but is useful when an interface has multiple addresses or
30	@@ -224,7 +224,7 @@	32	@@ -267,7 +267,7 @@
31	# containing the CA certificates. For capath to work correctly, the	33	# containing the CA certificates. For capath to work correctly, the
32	# certificate files must have ".crt" as the file ending and you must run	34	# certificate files must have ".crt" as the file ending and you must run
33	# "openssl rehash <path to capath>" each time you add/remove a certificate.	35	# "openssl rehash <path to capath>" each time you add/remove a certificate.

Lines 1-14 Link Here

(-)b/net/mosquitto/files/patch-src_CMakeLists.txt (-13 / +7 lines)
1	--- src/CMakeLists.txt.orig 2018-09-25 15:27:43 UTC	1	Index: src/CMakeLists.txt
		2	===================================================================
		3	--- src/CMakeLists.txt.orig
2	+++ src/CMakeLists.txt	4	+++ src/CMakeLists.txt
3	@@ -114,6 +114,7 @@	5	@@ -126,6 +126,7 @@ if (WIN32 OR CYGWIN)
4	endif (WIN32 OR CYGWIN)	6	endif (WIN32 OR CYGWIN)
5		7
6	add_definitions (-DWITH_BROKER)	8	add_definitions (-DWITH_BROKER)
7	+add_definitions (-DWITH_THREADING)	9	+add_definitions (-DWITH_THREADING)
8		10
9	set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})	11	if (WITH_DLT)
10		12	message(STATUS "DLT_LIBDIR = ${DLT_LIBDIR}")
11	@@ -132,7 +133,7 @@	13	@@ -149,7 +150,7 @@ if (UNIX)
12	elseif(QNX)	14	elseif(QNX)
13	set(MOSQ_LIBS ${MOSQ_LIBS} m socket)	15	set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
14	else(APPLE)	16	else(APPLE)
Lines 17-27 Link Here
17	find_library(LIBRT rt)	19	find_library(LIBRT rt)
18	if (LIBRT)	20	if (LIBRT)
19	set (MOSQ_LIBS ${MOSQ_LIBS} rt)	21	set (MOSQ_LIBS ${MOSQ_LIBS} rt)
20	@@ -186,7 +187,6 @@
21	endif (${WITH_TLS} STREQUAL ON)
22
23	if (UNIX AND NOT APPLE)
24	- install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
25	endif (UNIX AND NOT APPLE)
26
27