mosquitto: update to 1.5.4

[Greg Troxel <gdt%lexort.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Thu Nov 15 12:09:36 2018 -0500
Changeset:	eb88d104a311020c4a327682335c46f89db33476

Modified Files:
	mosquitto/Makefile
	mosquitto/distinfo
	mosquitto/patches/patch-src_CMakeLists.txt

Log Message:
mosquitto: update to 1.5.4

Version 1.5.4 changes
Security

    When using a TLS enabled websockets listener with require_certificate enabled, the mosquitto broker does not correctly verify client certificates. This is now fixed. All other security measures operate as expected, and in particular non-websockets listeners are not affected by this. Closes #996.

Broker

    Process all pending messages even when a client has disconnected. This means a client that send a PUBLISH then DISCONNECT quickly, then disconnects will have its DISCONNECT message processed properly and so no Will will be sent. Closes #7.
    $SYS/broker/clients/disconnected should never be negative. Closes #287.
    Give better error message if a client sends a password without a username. Closes #1015.
    Fix bridge not honoring restart_timeout. Closes #1019.
    Don't disconnect a client if an auth plugin denies access to SUBSCRIBE. Closes #1016.

Library

    Fix memory leak that occurred if mosquitto_reconnect() was used when TLS errors were present. Closes #592.
    Fix TLS connections when using an external event loop with mosquitto_loop_read() and mosquitto_write(). Closes #990.

Build

    Fix clients not being compiled with threading support when using CMake. Closes #983.
    Header fixes for FreeBSD. Closes #977.
    Use _GNU_SOURCE to fix build errors in websockets and getaddrinfo usage. Closes [#862] and #933.
    Fix builds on QNX 7.0.0. Closes #1018.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eb88d104a311020c4a327682335c46f89db33476

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mosquitto/Makefile                         |  2 +-
 mosquitto/distinfo                         | 10 +++++-----
 mosquitto/patches/patch-src_CMakeLists.txt | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index b79d19e232..bdf180444f 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	1.5.3
+VERSION=	1.5.4
 DISTNAME=	mosquitto-${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 94b97b2217..fa1d0fa194 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (mosquitto-1.5.3.tar.gz) = f61a2fcf814c3c1c28320be2a71d04e5dbbe28b1
-RMD160 (mosquitto-1.5.3.tar.gz) = 91b6695d40742db02d6243716e494ae1044dc3ca
-SHA512 (mosquitto-1.5.3.tar.gz) = 8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
-Size (mosquitto-1.5.3.tar.gz) = 425844 bytes
+SHA1 (mosquitto-1.5.4.tar.gz) = 52d9624afc4fca6c502327c6c64ea9ddedb5ea2f
+RMD160 (mosquitto-1.5.4.tar.gz) = 162e06ebdc8dd09f211a382663bf52548c2d6696
+SHA512 (mosquitto-1.5.4.tar.gz) = 4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
+Size (mosquitto-1.5.4.tar.gz) = 430602 bytes
 SHA1 (patch-CMakeLists.txt) = b440be07073a7603d8740abece10afd43a541b22
 SHA1 (patch-lib_CMakeLists.txt) = 9ab510e09f5099e595129b8bacf1a348b0868271
 SHA1 (patch-mosquitto.conf) = faa7e77c30a58105bd678d510f1f545345f6ce0b
-SHA1 (patch-src_CMakeLists.txt) = 908f439f7e04d31f5e7ab7ab2ee5b6e5ff23145d
+SHA1 (patch-src_CMakeLists.txt) = 08aacc3da1ad69b2a132af3d405d109416a94434
diff --git a/mosquitto/patches/patch-src_CMakeLists.txt b/mosquitto/patches/patch-src_CMakeLists.txt
index 843c409c3a..8323e9f243 100644
--- a/mosquitto/patches/patch-src_CMakeLists.txt
+++ b/mosquitto/patches/patch-src_CMakeLists.txt
@@ -4,18 +4,18 @@ On NetBSD, don't use -ldl (why?).
 
 For uuid, insist on library, not just header (why?).
 
---- src/CMakeLists.txt.orig	2018-09-04 16:57:17.000000000 +0000
+--- src/CMakeLists.txt.orig	2018-11-15 17:06:23.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -125,6 +125,8 @@ endif (HAVE_GETADDRINFO_A)
+@@ -129,6 +129,8 @@ endif (HAVE_GETADDRINFO_A)
  if (UNIX)
  	if (APPLE)
  		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
 +	elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
 +		set (MOSQ_LIBS ${MOSQ_LIBS} m)
- 	else (APPLE)
- 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
- 		find_library(LIBRT rt)
-@@ -153,10 +155,11 @@ endif (${WITH_WEBSOCKETS} STREQUAL ON)
+     elseif(QNX)
+         set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
+     else(APPLE)
+@@ -159,10 +161,11 @@ endif (${WITH_WEBSOCKETS} STREQUAL ON)
  # Simple detect libuuid
  if(NOT APPLE)
  	FIND_PATH(UUID_HEADER uuid/uuid.h)