CVS commit: pkgsrc/net/mosquitto

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Aug 19 23:33:39 UTC 2020

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

Log Message:
net/mosquitto: Update to 1.6.12

pkgsrc changes: drop hunk appplied upstream.  Ask more clearly for
sunos hunk to be 1) explained and 2) filed upstream.

upstream changes: bugfixes


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/mosquitto/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/mosquitto/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt

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

Modified files:

Index: pkgsrc/net/mosquitto/Makefile
diff -u pkgsrc/net/mosquitto/Makefile:1.11 pkgsrc/net/mosquitto/Makefile:1.12
--- pkgsrc/net/mosquitto/Makefile:1.11  Tue Aug 11 12:26:41 2020
+++ pkgsrc/net/mosquitto/Makefile       Wed Aug 19 23:33:38 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2020/08/11 12:26:41 gdt Exp $
+# $NetBSD: Makefile,v 1.12 2020/08/19 23:33:38 gdt Exp $
 
-VERSION=       1.6.11
+VERSION=       1.6.12
 DISTNAME=      mosquitto-${VERSION}
 CATEGORIES=    net
 MASTER_SITES=  https://mosquitto.org/files/source/

Index: pkgsrc/net/mosquitto/distinfo
diff -u pkgsrc/net/mosquitto/distinfo:1.10 pkgsrc/net/mosquitto/distinfo:1.11
--- pkgsrc/net/mosquitto/distinfo:1.10  Tue Aug 11 18:06:10 2020
+++ pkgsrc/net/mosquitto/distinfo       Wed Aug 19 23:33:38 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2020/08/11 18:06:10 gdt Exp $
+$NetBSD: distinfo,v 1.11 2020/08/19 23:33:38 gdt Exp $
 
-SHA1 (mosquitto-1.6.11.tar.gz) = 0b80f39363a87d22b17d76eb0a5016c92fa5d865
-RMD160 (mosquitto-1.6.11.tar.gz) = 4e887495a340d1b1c5228aced8e641a03cd9bed5
-SHA512 (mosquitto-1.6.11.tar.gz) = b934f5442a588688dccd8459bfe86f6d4eac77934b0eadb3fba14c8a028d233af2136b6694ad9fa4de37ab4ab56671f4ab787f2cd631e1790064254529745b4a
-Size (mosquitto-1.6.11.tar.gz) = 610563 bytes
+SHA1 (mosquitto-1.6.12.tar.gz) = b8c047985a33f3c2e9855079030f91d6eed00c47
+RMD160 (mosquitto-1.6.12.tar.gz) = 3d0121c4d3ce8c388b5dc344b7e3153f6d5f783d
+SHA512 (mosquitto-1.6.12.tar.gz) = 68cd2e4aa14254c0332ad78eac1f885e0e4e9f2332540d3778b8c7df096db7618b8467b5bb25f70ddc3306d01dd36eb9a9e2bf2738da77e196c7a1ccaed869d2
+Size (mosquitto-1.6.12.tar.gz) = 618718 bytes
 SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54
 SHA1 (patch-lib_net__mosq.c) = a38294cdfea98f2da0879ea93373c5f04aebdb20
 SHA1 (patch-mosquitto.conf) = ca82a8a1bdc59d5e6f4121d8474693245b923789
-SHA1 (patch-src_CMakeLists.txt) = b0c7cfe7744ae3f1f8dfe92929a09e6ca1ef17cb
+SHA1 (patch-src_CMakeLists.txt) = 76a3c560929aabce943b25bf9d2cefa173b792b0

Index: pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt
diff -u pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.4 pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.5
--- pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt:1.4   Tue Aug 11 18:06:10 2020
+++ pkgsrc/net/mosquitto/patches/patch-src_CMakeLists.txt       Wed Aug 19 23:33:39 2020
@@ -1,31 +1,12 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.4 2020/08/11 18:06:10 gdt Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.5 2020/08/19 23:33:39 gdt Exp $
 
-* hunk 1
+\todo Explain this change
 
-On NetBSD, don't use -ldl
+\todo File upstream.
 
-Sent upstream via email 20190427, again on 20200811, and applied
-upstream on
-20200811.
-
-* hunk 2
-
-\todo Explain why this hunk is here.
-
-\todo File hunk upstream.
-
---- src/CMakeLists.txt.orig    2020-08-11 11:18:06.000000000 +0000
+--- src/CMakeLists.txt.orig    2020-08-19 13:55:03.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -152,6 +152,8 @@ if (UNIX)
-               set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
-     elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-           set (MOSQ_LIBS ${MOSQ_LIBS} m)
-+    elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-+          set (MOSQ_LIBS ${MOSQ_LIBS} m)
-     elseif(QNX)
-         set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
-     else(APPLE)
-@@ -185,9 +187,9 @@ target_link_libraries(mosquitto ${MOSQ_L
+@@ -187,9 +187,9 @@ target_link_libraries(mosquitto ${MOSQ_L
  if (UNIX)
        if (APPLE)
                set_target_properties(mosquitto PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list -Wl,${mosquitto_SOURCE_DIR}/src/linker-macosx.syms")