mosquitto: Update to 1.6.3

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

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Jun 18 18:03:52 2019 -0400
Changeset:	9aa43989be8cacda13eef8bdbe637d928e773a42

Modified Files:
	mosquitto/Makefile
	mosquitto/distinfo
	mosquitto/patches/patch-CMakeLists.txt
Removed Files:
	mosquitto/patches/patch-lib_util__mosq.c

Log Message:
mosquitto: Update to 1.6.3

Upstream NEWS says that 1.6.2 and 1.6.3 were basically bugfixes.

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

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                       | 11 +++++------
 mosquitto/patches/patch-CMakeLists.txt   | 12 ++++--------
 mosquitto/patches/patch-lib_util__mosq.c | 25 -------------------------
 4 files changed, 10 insertions(+), 40 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index ac1e6eb284..89eb62c9e2 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-VERSION=	1.6.1
+VERSION=	1.6.3
 DISTNAME=	mosquitto-${VERSION}
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index cc6137d7ad..d19a24a987 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -1,12 +1,11 @@
 $NetBSD$
 
-SHA1 (mosquitto-1.6.1.tar.gz) = 0d8684782daffb9dd2f084acccc103735965e21a
-RMD160 (mosquitto-1.6.1.tar.gz) = 1e585bd941cfee635be28554a735ac903d7cbc9b
-SHA512 (mosquitto-1.6.1.tar.gz) = 64a9a5ea9a9f28f13d1a730c69445fb56a196e151dbcf1a003060e878a8615aa18235723440740e9fe5c6e8503130a99b58766aa131b1a19f0ba593342026f3f
-Size (mosquitto-1.6.1.tar.gz) = 575753 bytes
-SHA1 (patch-CMakeLists.txt) = bb50a613e72ab2052a2b1dfeffa6173ad5bbceb5
+SHA1 (mosquitto-1.6.3.tar.gz) = afd7115ac826f2bf296b870a12b5c288028daeb5
+RMD160 (mosquitto-1.6.3.tar.gz) = 7eb4f725d07d98f4f95a790676a0e73e5aebdd50
+SHA512 (mosquitto-1.6.3.tar.gz) = d78d95789cfadaa8c989becb799e6eace1a82cfed9d79582cf7278dd2f9f31060b0b6492c5e3461c687629445efbdda0db68cba65962eb6a305ada46611f6d94
+Size (mosquitto-1.6.3.tar.gz) = 578952 bytes
+SHA1 (patch-CMakeLists.txt) = fb04da93970ccca17657021597b8311875473242
 SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54
 SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20
-SHA1 (patch-lib_util__mosq.c) = 3c0c01bd4bbfa838a3e2206485d63df7c2857eaf
 SHA1 (patch-mosquitto.conf) = 3db0e0bb4ca25bb12f539b604a957453268712bf
 SHA1 (patch-src_CMakeLists.txt) = 2346ee3f13ab7f7e2c34492a4271e0b1adcae4fb
diff --git a/mosquitto/patches/patch-CMakeLists.txt b/mosquitto/patches/patch-CMakeLists.txt
index 46923be6a6..e10e938bc1 100644
--- a/mosquitto/patches/patch-CMakeLists.txt
+++ b/mosquitto/patches/patch-CMakeLists.txt
@@ -4,21 +4,17 @@ Adjust pkgconfig installation location to lib, not share.
 
 Sent upstream via email 20190427.
 
---- CMakeLists.txt.orig	2019-04-26 16:07:59.000000000 +0000
+--- CMakeLists.txt.orig	2019-06-18 11:45:59.000000000 +0000
 +++ CMakeLists.txt
-@@ -108,12 +108,12 @@ install(FILES mosquitto.conf aclfile.exa
+@@ -108,9 +108,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_LIBDIR}/pkgconfig")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/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_LIBDIR}/pkgconfig")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
  
  # ========================================
  # Testing
- # ========================================
- enable_testing()
--add_test("test" make -C ${mosquitto_SOURCE_DIR}/test test)
-+add_test("test" gmake -C ${mosquitto_SOURCE_DIR}/test test)
diff --git a/mosquitto/patches/patch-lib_util__mosq.c b/mosquitto/patches/patch-lib_util__mosq.c
deleted file mode 100644
index 9a7eb4c1a6..0000000000
--- a/mosquitto/patches/patch-lib_util__mosq.c
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-Something in the tests breaks because __GLIBC_PREREQ is not defined.
-See https://github.com/eclipse/mosquitto/issues/1242
-
---- lib/util_mosq.c.orig	2019-04-26 16:07:59.000000000 +0000
-+++ lib/util_mosq.c
-@@ -29,7 +29,7 @@ Contributors:
- #endif
- 
- #if !defined(WITH_TLS) && defined(__linux__)
--#  if defined(__GLIBC__) && __GLIBC_PREREQ(2, 25)
-+#  if defined(__GLIBC__)
- #    include <sys/random.h>
- #  endif
- #endif
-@@ -325,7 +325,7 @@ int util__random_bytes(void *bytes, int 
- 	if(RAND_bytes(bytes, count) == 1){
- 		rc = MOSQ_ERR_SUCCESS;
- 	}
--#elif defined(__GLIBC__) && __GLIBC_PREREQ(2, 25)
-+#elif defined(__GLIBC__)
- 	if(getrandom(bytes, count, 0) == 0){
- 		rc = MOSQ_ERR_SUCCESS;
- 	}