mosquitto: Update to 1.6.0

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

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Wed Apr 17 20:41:32 2019 -0400
Changeset:	239e493cf0c39e776f8387605afce5cb54709e2e

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

Log Message:
mosquitto: Update to 1.6.0

1.6 - 20190417
==============

Broker features:
- Add support for MQTT v5
- Add support for OCSP stapling.
- Add support for ALPN on bridge TLS connections. Closes #924.
- Add support for Automotive DLT logging.
- Add TLS Engine support.
- Persistence file read/write performance improvements.
- General performance improvements.
- Add max_keepalive option, to allow a maximum keepalive value to be set for
  MQTT v5 clients only.
- Add `bind_interface` option which allows a listener to be bound to a
  specific network interface, in a similar fashion to the `bind_address` option.
  Linux only.
- Add improved bridge restart interval based on Decorrelated Jitter.
- Add `dhparamfile` option, to allow DH parameters to be loaded for Ephemeral
  DH support
- Disallow writing to $ topics where appropriate.
- Fix mosquitto_passwd crashing on corrupt password file. Closes #1207.
- Add explicit support for TLS v1.3.
- Drop support for TLS v1.0.
- Improved general support for broker generated client ids. Removed libuuid
  dependency.
- auto_id_prefix now defaults to 'auto-'.
- QoS 1 and 2 flow control improvements.

Client library features:
- Add support for MQTT v5
- Add mosquitto_subscribe_multiple() for sending subscriptions to multiple
  topics in one command.
- Add TLS Engine support.
- Add explicit support for TLS v1.3.
- Drop support for TLS v1.0.
- QoS 1 and 2 flow control improvements.

Client features:
- Add support for MQTT v5
- Add mosquitto_rr client, which can be used for "request-response" messaging,
  by sending a request message and awaiting a response.
- Add TLS Engine support.
- Add support for ALPN on TLS connections. Closes #924.
- Add -D option for all clients to specify MQTT v5 properties.
- Add -E to mosquitto_sub, which causes it to exit immediately after having
  its subscriptions acknowledged. Use with -c to create a durable client
  session without requiring a message to be received.
- Add --remove-retained to mosquitto_sub, which can be used to clear retained
  messages on a broker.
- Add --repeat and --repeat-delay to mosquitto_pub, which can be used to
  repeat single message publishes at a regular interval.
- -V now accepts `5, `311`, `31`, as well as `mqttv5` etc.
- Add explicit support for TLS v1.3.
- Drop support for TLS v1.0.

Broker fixes:
- Improve error reporting when creating listeners.
- Fix build on SmartOS due to missing IPV6_V6ONLY. Closes #1212.

Client library fixes
- Add missing `mosquitto_userdata()` function.

Client fixes:
- mosquitto_pub wouldn't always publish all messages when using `-l` and
  QoS>0. This has been fixed.
- mosquitto_sub was incorrectly encoding special characters when using %j
  output format. Closes #1220.

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

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

diffstat:
 mosquitto/Makefile                         |  2 +-
 mosquitto/PLIST                            |  2 ++
 mosquitto/distinfo                         | 12 ++++++------
 mosquitto/patches/patch-mosquitto.conf     | 10 +++++-----
 mosquitto/patches/patch-src_CMakeLists.txt | 21 ++-------------------
 5 files changed, 16 insertions(+), 31 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 6abf93a1a9..4ed0e121df 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	1.5.8
+VERSION=	1.6.0
 DISTNAME=	mosquitto-${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
diff --git a/mosquitto/PLIST b/mosquitto/PLIST
index 979f8454cf..2b0f45dfd7 100644
--- a/mosquitto/PLIST
+++ b/mosquitto/PLIST
@@ -1,6 +1,7 @@
 @comment $NetBSD$
 bin/mosquitto_passwd
 bin/mosquitto_pub
+bin/mosquitto_rr
 bin/mosquitto_sub
 include/mosquitto.h
 include/mosquitto_broker.h
@@ -16,6 +17,7 @@ lib/pkgconfig/libmosquitto.pc
 lib/pkgconfig/libmosquittopp.pc
 man/man1/mosquitto_passwd.1
 man/man1/mosquitto_pub.1
+man/man1/mosquitto_rr.1
 man/man1/mosquitto_sub.1
 man/man3/libmosquitto.3
 man/man5/mosquitto.conf.5
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index f24003df9e..5ab3475280 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (mosquitto-1.5.8.tar.gz) = b1b4e27c563000a35d5df11149b160cd42b58342
-RMD160 (mosquitto-1.5.8.tar.gz) = 3c84581f497fd8d191d8df5b6dc7658af650e711
-SHA512 (mosquitto-1.5.8.tar.gz) = 5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
-Size (mosquitto-1.5.8.tar.gz) = 442834 bytes
+SHA1 (mosquitto-1.6.0.tar.gz) = 37cb2cff316f8acef69ff139bdc08da7251d5232
+RMD160 (mosquitto-1.6.0.tar.gz) = adca791c1e796eb93b51d5cca909e2ccb3f1ae07
+SHA512 (mosquitto-1.6.0.tar.gz) = caa2eb5dae1a20a3da48d55ae2f141284ef80b9ec51adbb87f67ea1cc7ea09df5e39ea7b2993a2f88e2c7311c219f120b9cbd4e29faf5c070cc2212c5e411dfe
+Size (mosquitto-1.6.0.tar.gz) = 574988 bytes
 SHA1 (patch-CMakeLists.txt) = 34891235466aca2becd6072183298b8949a0a356
 SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54
-SHA1 (patch-mosquitto.conf) = faa7e77c30a58105bd678d510f1f545345f6ce0b
-SHA1 (patch-src_CMakeLists.txt) = 08aacc3da1ad69b2a132af3d405d109416a94434
+SHA1 (patch-mosquitto.conf) = bb1133a993f63351ec9768a3943301758ad28bce
+SHA1 (patch-src_CMakeLists.txt) = 2dc455267f2cbf0810062bf588ca1369d2ce06ef
diff --git a/mosquitto/patches/patch-mosquitto.conf b/mosquitto/patches/patch-mosquitto.conf
index a2e26d2810..375096f1f5 100644
--- a/mosquitto/patches/patch-mosquitto.conf
+++ b/mosquitto/patches/patch-mosquitto.conf
@@ -3,7 +3,7 @@ $NetBSD$
 Better defaults for configuration, inspired by FreeBSD.
 \todo Rethink if we should be deviating from upstream.
 
---- mosquitto.conf.orig	2018-08-16 16:05:26.000000000 +0000
+--- mosquitto.conf.orig	2019-04-17 19:54:00.000000000 +0000
 +++ mosquitto.conf
 @@ -28,7 +28,7 @@
  # This should be set to /var/run/mosquitto.pid if mosquitto is
@@ -14,16 +14,16 @@ Better defaults for configuration, inspired by FreeBSD.
  
  # When run as root, drop privileges to this user and its primary 
  # group.
-@@ -160,7 +160,7 @@
+@@ -205,7 +205,7 @@
  #bind_address
  
  # Port to use for the default listener.
 -#port 1883
 +port 1883
  
- # The maximum number of client connections to allow. This is 
- # a per listener setting.
-@@ -494,7 +494,7 @@
+ # Bind the listener to a specific interface. This is similar to
+ # bind_address above but is useful when an interface has multiple addresses or
+@@ -570,7 +570,7 @@
  # Note that if the broker is running as a Windows service it will default to
  # "log_dest none" and neither stdout nor stderr logging is available.
  # Use "log_dest none" if you wish to disable logging.
diff --git a/mosquitto/patches/patch-src_CMakeLists.txt b/mosquitto/patches/patch-src_CMakeLists.txt
index 8323e9f243..b339eb9e3e 100644
--- a/mosquitto/patches/patch-src_CMakeLists.txt
+++ b/mosquitto/patches/patch-src_CMakeLists.txt
@@ -2,11 +2,9 @@ $NetBSD$
 
 On NetBSD, don't use -ldl (why?).
 
-For uuid, insist on library, not just header (why?).
-
---- src/CMakeLists.txt.orig	2018-11-15 17:06:23.000000000 +0000
+--- src/CMakeLists.txt.orig	2019-04-17 19:54:00.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -129,6 +129,8 @@ endif (HAVE_GETADDRINFO_A)
+@@ -146,6 +146,8 @@ endif (HAVE_GETADDRINFO_A)
  if (UNIX)
  	if (APPLE)
  		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
@@ -15,18 +13,3 @@ For uuid, insist on library, not just header (why?).
      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)
--	if (UUID_HEADER)
-+	FIND_LIBRARY(UUID_LIBRARY NAMES uuid)
-+	IF (UUID_HEADER AND UUID_LIBRARY)
- 		add_definitions(-DWITH_UUID)
--		set (MOSQ_LIBS ${MOSQ_LIBS} uuid)
--	endif (UUID_HEADER)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} ${UUID_LIBRARY})
-+	endif (UUID_HEADER AND UUID_LIBRARY)
- endif(NOT APPLE)
- 
- add_executable(mosquitto ${MOSQ_SRCS})