Tue Aug 11 12:26:41 2020 UTC ()
net/mosquitto: Update to 1.6.11

pkgsrc changes: none
upstream changes: bugfixes


(gdt)
diff -r1.10 -r1.11 pkgsrc/net/mosquitto/Makefile
diff -r1.8 -r1.9 pkgsrc/net/mosquitto/distinfo
diff -r1.2 -r1.3 pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt
cvs diff -r1.10 -r1.11 pkgsrc/net/mosquitto/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mosquitto/Makefile 2020/04/16 15:19:11 1.10
+++ pkgsrc/net/mosquitto/Makefile 2020/08/11 12:26:41 1.11
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.10 2020/04/16 15:19:11 jperkin Exp $ 1# $NetBSD: Makefile,v 1.11 2020/08/11 12:26:41 gdt Exp $
2 2
3VERSION= 1.6.9 3VERSION= 1.6.11
4DISTNAME= mosquitto-${VERSION} 4DISTNAME= mosquitto-${VERSION}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= https://mosquitto.org/files/source/ 6MASTER_SITES= https://mosquitto.org/files/source/
7 7
8#MAINTAINER= amoibos@gmail.com 8#MAINTAINER= amoibos@gmail.com
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= https://mosquitto.org/ 10HOMEPAGE= https://mosquitto.org/
11COMMENT= Open Source MQTT broker 11COMMENT= Open Source MQTT broker
12LICENSE= epl-v1.0 12LICENSE= epl-v1.0
13 13
14USE_LANGUAGES+= c c++ 14USE_LANGUAGES+= c c++
15# Upstream documents that "unix" should use make, but Mac cmake. 15# Upstream documents that "unix" should use make, but Mac cmake.
16# After asking and receiving no guidance, choose to always use cmake. 16# After asking and receiving no guidance, choose to always use cmake.
cvs diff -r1.8 -r1.9 pkgsrc/net/mosquitto/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mosquitto/distinfo 2020/04/16 15:19:11 1.8
+++ pkgsrc/net/mosquitto/distinfo 2020/08/11 12:26:41 1.9
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.8 2020/04/16 15:19:11 jperkin Exp $ 1$NetBSD: distinfo,v 1.9 2020/08/11 12:26:41 gdt Exp $
2 2
3SHA1 (mosquitto-1.6.9.tar.gz) = 424686c7cc3e0a9eced4875bef23ed666537d890 3SHA1 (mosquitto-1.6.11.tar.gz) = 0b80f39363a87d22b17d76eb0a5016c92fa5d865
4RMD160 (mosquitto-1.6.9.tar.gz) = f10560110d223861d35c7d22f620282028a8241e 4RMD160 (mosquitto-1.6.11.tar.gz) = 4e887495a340d1b1c5228aced8e641a03cd9bed5
5SHA512 (mosquitto-1.6.9.tar.gz) = f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7 5SHA512 (mosquitto-1.6.11.tar.gz) = b934f5442a588688dccd8459bfe86f6d4eac77934b0eadb3fba14c8a028d233af2136b6694ad9fa4de37ab4ab56671f4ab787f2cd631e1790064254529745b4a
6Size (mosquitto-1.6.9.tar.gz) = 610934 bytes 6Size (mosquitto-1.6.11.tar.gz) = 610563 bytes
7SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54 7SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54
8SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20 8SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20
9SHA1 (patch-mosquitto.conf) = ca82a8a1bdc59d5e6f4121d8474693245b923789 9SHA1 (patch-mosquitto.conf) = ca82a8a1bdc59d5e6f4121d8474693245b923789
10SHA1 (patch-src_CMakeLists.txt) = 66571704d96c672b8c1537794cf492e9cfce2e0c 10SHA1 (patch-src_CMakeLists.txt) = abcd6c11f0b6831c3155104b43e8ce654f0b42b8
cvs diff -r1.2 -r1.3 pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt 2020/04/16 15:19:11 1.2
+++ pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt 2020/08/11 12:26:41 1.3
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: patch-src_CMakeLists.txt,v 1.2 2020/04/16 15:19:11 jperkin Exp $ 1$NetBSD: patch-src_CMakeLists.txt,v 1.3 2020/08/11 12:26:41 gdt Exp $
2 2
3On NetBSD, don't use -ldl (why?). 3On NetBSD, don't use -ldl (why?).
4 4
5Sent upstream via email 20190427. 5Sent upstream via email 20190427.
6 6
7--- src/CMakeLists.txt.orig 2020-02-27 23:49:51.000000000 +0000 7--- src/CMakeLists.txt.orig 2020-08-11 11:18:06.000000000 +0000
8+++ src/CMakeLists.txt 8+++ src/CMakeLists.txt
9@@ -151,6 +151,8 @@ endif (HAVE_GETADDRINFO_A AND WITH_ADNS) 9@@ -152,6 +152,8 @@ if (UNIX)
10 if (UNIX) 
11 if (APPLE) 
12 set (MOSQ_LIBS ${MOSQ_LIBS} dl m) 10 set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
13+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") 11 elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
14+ set (MOSQ_LIBS ${MOSQ_LIBS} m) 12 set (MOSQ_LIBS ${MOSQ_LIBS} m)
 13+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
 14+ set (MOSQ_LIBS ${MOSQ_LIBS} m)
15 elseif(QNX) 15 elseif(QNX)
16 set(MOSQ_LIBS ${MOSQ_LIBS} m socket) 16 set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
17 else(APPLE) 17 else(APPLE)
18@@ -184,9 +186,9 @@ target_link_libraries(mosquitto ${MOSQ_L 18@@ -185,9 +187,9 @@ target_link_libraries(mosquitto ${MOSQ_L
19 if (UNIX) 19 if (UNIX)
20 if (APPLE) 20 if (APPLE)
21 set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms") 21 set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms")
22- else (APPLE) 22- else (APPLE)
23+ elseif (NOT CMAKE_SYSTEM_NAME STREQUAL SunOS) 23+ elseif (NOT CMAKE_SYSTEM_NAME STREQUAL SunOS)
24 set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-dynamic-list=${mosquitto_SOURCE_DIR}/src/linker.syms") 24 set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-dynamic-list=${mosquitto_SOURCE_DIR}/src/linker.syms")
25- endif (APPLE) 25- endif (APPLE)
26+ endif () 26+ endif ()
27 endif (UNIX) 27 endif (UNIX)
28  28
29 install(TARGETS mosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_SBINDIR}") 29 install(TARGETS mosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_SBINDIR}")