Upgrade Mosquitto to 1.4.11

[Daniel Oelschlegel <amoibos%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By:	amoibos
Date:		Sat Feb 25 12:35:19 2017 +0000
Changeset:	86d23add5620d8be5297cb7a8bebefbdc8c0b073

Modified Files:
	mosquitto/Makefile
	mosquitto/distinfo
	mosquitto/patches/patch-ab
	mosquitto/patches/patch-ae

Log Message:
Upgrade Mosquitto to 1.4.11

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

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         | 12 ++++++------
 mosquitto/patches/patch-ab | 15 +++++++++------
 mosquitto/patches/patch-ae | 14 +++++++-------
 4 files changed, 23 insertions(+), 20 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 578131f48c..defa8e2f08 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,5 +1,5 @@
 # $NetBSD$
-VERSION=	1.4.10
+VERSION=	1.4.11
 PKGNAME=	mosquitto-${VERSION}
 DISTNAME=	${PKGNAME}
 CATEGORIES=	net
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 676b74439a..186baa35ec 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -1,14 +1,14 @@
 $NetBSD$
 
-SHA1 (mosquitto-1.4.10.tar.gz) = f09641cd34eddb6747bc3e7ffee64d2a7cfd6183
-RMD160 (mosquitto-1.4.10.tar.gz) = 4d3c8eb45f3635044aea352fb0a42c709d004cb5
-SHA512 (mosquitto-1.4.10.tar.gz) = fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1
-Size (mosquitto-1.4.10.tar.gz) = 359569 bytes
+SHA1 (mosquitto-1.4.11.tar.gz) = 86788e801eec01538c57a55345749f2c5b99a3ad
+RMD160 (mosquitto-1.4.11.tar.gz) = d202ded36267043eea3e41557a42203df8130be1
+SHA512 (mosquitto-1.4.11.tar.gz) = c05ca8679b9a6f540868f4ccf701257fcabc114d5450ac0bbbe80b91bb7cd4fc52668773e945506760c7a5bd8a494e0a56100714112e5d2713d57bfab8951587
+Size (mosquitto-1.4.11.tar.gz) = 361468 bytes
 SHA1 (patch-aa) = 9bf1ff1a55a27192e5f528fbf5d376b47841b831
-SHA1 (patch-ab) = d8af18c34f230624fe4bb5c2acb31f62917eca63
+SHA1 (patch-ab) = a0aac10a9b96aa098178de7ff08fa52867f87e6b
 SHA1 (patch-ac) = 9ff1dd59ed5dbf499c82a8144d86e5d6cc6cd2e9
 SHA1 (patch-ad) = 722c3b11f8ff75d2ce6dc987dc31982f9d53ba81
-SHA1 (patch-ae) = a370b6e7de6bdcb62cbac86211963be45b4601a3
+SHA1 (patch-ae) = 690558efe530f335b5d0d8a17618fcd1c4394126
 SHA1 (patch-af) = 90561fcebe1bc2212e834d7cb12608d226246977
 SHA1 (patch-ag) = dd645cca8be0ca63b34737e35a1dcc3c29bd55f7
 SHA1 (patch-ah) = 87a54f8a1b75986352dc27ad720202281c017a57
diff --git a/mosquitto/patches/patch-ab b/mosquitto/patches/patch-ab
index e01d5adbf1..8af93fe8d4 100644
--- a/mosquitto/patches/patch-ab
+++ b/mosquitto/patches/patch-ab
@@ -1,20 +1,23 @@
 $NetBSD$
-Supports NetBSD detection, opened upstream pull request 
---- lib/CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
-+++ lib/CMakeLists.txt	2016-08-28 14:00:33.700421980 +0000
-@@ -43,9 +43,9 @@
+Supports NetBSD detection
+--- lib/CMakeLists.txt.orig	2017-02-20 22:06:57.000000000 +0000
++++ lib/CMakeLists.txt	2017-02-25 12:06:08.924946745 +0000
+@@ -48,12 +48,12 @@
  
  set (LIBRARIES ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES})
  
 -if (UNIX AND NOT APPLE)
 +if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
- 	set (LIBRARIES ${LIBRARIES} rt)
+ 	find_library(LIBRT rt)
+ 	if (LIBRT)
+ 		set (LIBRARIES ${LIBRARIES} rt)
+ 	endif (LIBRT)
 -endif (UNIX AND NOT APPLE)
 +endif (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
  
  if (WIN32)
  	set (LIBRARIES ${LIBRARIES} ws2_32)
-@@ -73,6 +73,3 @@
+@@ -81,6 +81,3 @@
  install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
  install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")
  
diff --git a/mosquitto/patches/patch-ae b/mosquitto/patches/patch-ae
index 73cbed72ef..49a55357b6 100644
--- a/mosquitto/patches/patch-ae
+++ b/mosquitto/patches/patch-ae
@@ -1,17 +1,17 @@
 $NetBSD$
 Supports configuration for NetBSD, taken from OpenBSD
---- src/CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
-+++ src/CMakeLists.txt	2016-08-28 14:13:03.999103447 +0000
-@@ -85,6 +85,8 @@
+--- src/CMakeLists.txt.orig	2017-02-20 22:06:57.000000000 +0000
++++ src/CMakeLists.txt	2017-02-25 12:18:04.360077118 +0000
+@@ -95,6 +95,8 @@
  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} rt dl m)
- 	endif (APPLE)
-@@ -101,10 +103,11 @@
+ 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
+ 		find_library(LIBRT rt)
+@@ -115,10 +117,11 @@
  # Simple detect libuuid
  if(NOT APPLE)
  	FIND_PATH(UUID_HEADER uuid/uuid.h)
@@ -26,7 +26,7 @@ Supports configuration for NetBSD, taken from OpenBSD
  endif(NOT APPLE)
  
  target_link_libraries(mosquitto ${MOSQ_LIBS})
-@@ -126,7 +129,3 @@
+@@ -140,7 +143,3 @@
  	install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
  endif (${WITH_TLS} STREQUAL ON)