mosquitto: Update to 1.5.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mosquitto: Update to 1.5.1
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Tue, 04 Sep 2018 10:05:37 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Tue Sep 4 06:05:37 2018 -0400
Changeset:	7faf9c0ff337aa841fd596942bbd0ebe60536398

Modified Files:
	mosquitto/Makefile
	mosquitto/PLIST
	mosquitto/TODO
	mosquitto/distinfo
	mosquitto/patches/patch-aa
	mosquitto/patches/patch-ae
	mosquitto/patches/patch-ah
Removed Files:
	mosquitto/patches/patch-af
	mosquitto/patches/patch-ag
	mosquitto/patches/patch-ai
	mosquitto/patches/patch-aj

Log Message:
mosquitto: Update to 1.5.1

Adapt to upstream having incorporated some patches (or supplied them)
and addressing some issues differently.

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

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

diffstat:
 mosquitto/Makefile         | 11 +++++------
 mosquitto/PLIST            |  3 +++
 mosquitto/TODO             | 16 ----------------
 mosquitto/distinfo         | 22 +++++++---------------
 mosquitto/patches/patch-aa | 13 ++++++-------
 mosquitto/patches/patch-ae | 12 ++++++------
 mosquitto/patches/patch-af | 15 ---------------
 mosquitto/patches/patch-ag | 15 ---------------
 mosquitto/patches/patch-ah | 19 ++++++-------------
 mosquitto/patches/patch-ai | 15 ---------------
 mosquitto/patches/patch-aj | 15 ---------------
 11 files changed, 33 insertions(+), 123 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 1f311123f7..52605d7847 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-VERSION=	1.4.15
+VERSION=	1.5.1
 DISTNAME=	mosquitto-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 
@@ -13,6 +12,8 @@ COMMENT=	Open Source MQTT broker
 LICENSE=	epl-v1.0
 
 USE_LANGUAGES+=	c c++
+# Upstream documents that "unix" should use make, but Mac cmake.
+# After asking and receiving no guidance, choose to always use cmake.
 USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 
@@ -21,7 +22,7 @@ CONF_FILES=	share/examples/mosquitto/pskfile.example \
 		share/examples/mosquitto/mosquitto.conf \
 		share/examples/mosquitto/aclfile.example
 
-SUBST_CLASSES+=			ldconfig strip
+SUBST_CLASSES+=			ldconfig
 
 SUBST_STAGE.ldconfig=		post-extract
 SUBST_MESSAGE.ldconfig=		Removing non-portable ldconfig invocations
@@ -30,14 +31,12 @@ SUBST_FILES.ldconfig=		lib/CMakeLists.txt \
 				src/CMakeLists.txt
 SUBST_SED.ldconfig=		-E -e '/EXEC_PROGRAM\(\/sbin\/ldconfig/d'
 
+# \todo Perhaps delete as no longer needed
 SUBST_STAGE.strip=		post-extract
 SUBST_MESSAGE.strip=		removing unportable cross strip
 SUBST_FILES.strip=		lib/Makefile src/Makefile lib/cpp/Makefile client/Makefile
 SUBST_SED.strip=		-E -e '/--strip-program=\$${CROSS_COMPILE}\$${STRIP}/d'
 
--strip-program=${CROSS_COMPILE}${STRIP}
-
-
 post-install:
 	mkdir ${DESTDIR}${PREFIX}/share/examples/mosquitto
 	${INSTALL_DATA}	${WRKSRC}/pskfile.example ${WRKSRC}/pwfile.example ${WRKSRC}/mosquitto.conf ${WRKSRC}/aclfile.example ${DESTDIR}${PREFIX}/share/examples/mosquitto
diff --git a/mosquitto/PLIST b/mosquitto/PLIST
index eeeeffc160..979f8454cf 100644
--- a/mosquitto/PLIST
+++ b/mosquitto/PLIST
@@ -3,6 +3,7 @@ bin/mosquitto_passwd
 bin/mosquitto_pub
 bin/mosquitto_sub
 include/mosquitto.h
+include/mosquitto_broker.h
 include/mosquitto_plugin.h
 include/mosquittopp.h
 lib/libmosquitto.so
@@ -11,6 +12,8 @@ lib/libmosquitto.so.${PKGVERSION}
 lib/libmosquittopp.so
 lib/libmosquittopp.so.1
 lib/libmosquittopp.so.${PKGVERSION}
+lib/pkgconfig/libmosquitto.pc
+lib/pkgconfig/libmosquittopp.pc
 man/man1/mosquitto_passwd.1
 man/man1/mosquitto_pub.1
 man/man1/mosquitto_sub.1
diff --git a/mosquitto/TODO b/mosquitto/TODO
index 16409ebd9c..a149fa4c9b 100644
--- a/mosquitto/TODO
+++ b/mosquitto/TODO
@@ -1,7 +1,3 @@
-* update
-
-update to 1.5
-
 * conf files
 
 Decide on if a mosquitto config file should be installed in etc, or if
@@ -10,11 +6,6 @@ a user should take a few lines from the (large) example as needed.
 Document our strategy for modifying the example file, explaining if it
 is reflecting compiled-in defaults, or some other reasons.
 
-* build tools
-
-Depending on response from upstream, document our approach to using
-cmake always.
-
 * patches
 
 Rename to standard filenames a la mkpatches.
@@ -27,13 +18,6 @@ upstream is inappropriate.
 Upstream appears to run ldconfig on "UNIX", which is incorrect.  File
 a bug about this.
 
-* sunos shlib
-
-Figure out why the soname is different on sunos, and if this is an
-upstream bug.  Perhaps resolve, or perhaps use a PLIST variable to
-avoid having a second copy.
-
-
 * security
 
 This package has known vulnerabilities, please investigate and fix if possible:
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 2c2e089209..719bee7b33 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -1,19 +1,11 @@
 $NetBSD$
 
-SHA1 (mosquitto-1.4.15.tar.gz) = e3216a608b19ec56341e0897a12cb178f0b085ca
-RMD160 (mosquitto-1.4.15.tar.gz) = d2438c8c3b2005265def411826961f94c9413b52
-SHA512 (mosquitto-1.4.15.tar.gz) = 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
-Size (mosquitto-1.4.15.tar.gz) = 368961 bytes
-SHA1 (patch-aa) = f75af70317c8617cfa3289532231fd4289390894
+SHA1 (mosquitto-1.5.1.tar.gz) = 3931d0a6a2884ea010f6ed3a0a0d752e2322a8fe
+RMD160 (mosquitto-1.5.1.tar.gz) = c29581d6154627ecb9f8fdea3fd2851c4b72f6a4
+SHA512 (mosquitto-1.5.1.tar.gz) = 7b076a977778ca87f9fa4579eb4a6b62b171df746920719e9bd6efce0a4815c15edc9da177669819509184d2b01ed0756be8259adba344df690efe0547fd6741
+Size (mosquitto-1.5.1.tar.gz) = 430066 bytes
+SHA1 (patch-aa) = c23d6f014f64603dc0120ef74694fec6ee161215
 SHA1 (patch-ab) = ce5571c0d8e86a99d9cb641adfe5f8f66537370a
 SHA1 (patch-ad) = ed13ec2fdcc58082c4c27f63dd5afaa3805adff6
-SHA1 (patch-ae) = 18b8f3648f78b8d1e22d7868456953d7852f2ade
-SHA1 (patch-af) = 910122fbe47526ac149871e23f6d3bed77c9fcb9
-SHA1 (patch-ag) = 63bd84643230a7e8486e3d7708c5503bd2eb8e10
-SHA1 (patch-ah) = b49e6c203695b64052926014b00f7098c4a17e2d
-SHA1 (patch-ai) = 8dcc43abfbbc823c70201fc78af20872ca1e3a84
-SHA1 (patch-aj) = 7f1acef0911f6839effb77f6fb70d99150b781ae
-SHA1 (patch-ak) = e967013010936d93e178bc4a55e3417a9a28e51d
-SHA1 (patch-al) = c9ea3c2de532060ea35993fd031c690b1849dd77
-SHA1 (patch-am) = 3b21040ea426c4ef9d742e4e52a7bcc34a9af269
-SHA1 (patch-an) = 96584ae38417be787cfa7cc1fcc31a33a7261780
+SHA1 (patch-ae) = 7e5b4cdb06515cbd6b02239eed974b673e9f8bfa
+SHA1 (patch-ah) = 84fb0a78f68ba35d079a32ce5d2c57192101fc54
diff --git a/mosquitto/patches/patch-aa b/mosquitto/patches/patch-aa
index a5d9201bf0..a50fb405c4 100644
--- a/mosquitto/patches/patch-aa
+++ b/mosquitto/patches/patch-aa
@@ -2,9 +2,9 @@ $NetBSD$
 
 In cmake build, adjust paths to pkgsrc norms.  (From OpenBSD.)
 
---- CMakeLists.txt.orig	2016-06-02 21:20:22.000000000 +0000
-+++ CMakeLists.txt	2016-08-28 15:50:53.430205374 +0000
-@@ -37,18 +40,12 @@
+--- CMakeLists.txt.orig	2018-08-16 16:05:26.000000000 +0000
++++ CMakeLists.txt
+@@ -30,17 +30,12 @@ if (WIN32)
  else (WIN32)
  	set (BINDIR bin)
  	set (SBINDIR sbin)
@@ -13,15 +13,14 @@ In cmake build, adjust paths to pkgsrc norms.  (From OpenBSD.)
 -	else ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
 -		set (SYSCONFDIR etc/mosquitto)
 -	endif ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
++	set (SYSCONFDIR "${DATAROOTDIR}/examples/mosquitto")
  	
  	set (LIBDIR lib${LIB_SUFFIX})
 -	set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
  	set (INCLUDEDIR include)
  	set (DATAROOTDIR share)
 -	set (MANDIR "${DATAROOTDIR}/man")
--	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
 +	set (MANDIR "man")
-+	set (SYSCONFDIR "${DATAROOTDIR}/examples/mosquitto")
+ 	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
+ 	set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
  endif (WIN32)
- 
- option(WITH_TLS
diff --git a/mosquitto/patches/patch-ae b/mosquitto/patches/patch-ae
index 464a73524d..3ae2eaa46d 100644
--- a/mosquitto/patches/patch-ae
+++ b/mosquitto/patches/patch-ae
@@ -6,9 +6,9 @@ For uuid, insist on library, not just header (why?).
 
 Omit ldconfig (from OpenBSD).
 
---- 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 @@
+--- src/CMakeLists.txt.orig	2018-09-04 01:33:51.000000000 +0000
++++ src/CMakeLists.txt
+@@ -125,6 +125,8 @@ endif (HAVE_GETADDRINFO_A)
  if (UNIX)
  	if (APPLE)
  		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
@@ -17,7 +17,7 @@ Omit ldconfig (from OpenBSD).
  	else (APPLE)
  		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
  		find_library(LIBRT rt)
-@@ -115,10 +117,11 @@
+@@ -153,10 +155,11 @@ endif (${WITH_WEBSOCKETS} STREQUAL ON)
  # Simple detect libuuid
  if(NOT APPLE)
  	FIND_PATH(UUID_HEADER uuid/uuid.h)
@@ -28,7 +28,7 @@ Omit ldconfig (from OpenBSD).
 -		set (MOSQ_LIBS ${MOSQ_LIBS} uuid)
 -	endif (UUID_HEADER)
 +		set (MOSQ_LIBS ${MOSQ_LIBS} ${UUID_LIBRARY})
-+	endif ()
++	endif (UUID_HEADER AND UUID_LIBRARY)
  endif(NOT APPLE)
  
- target_link_libraries(mosquitto ${MOSQ_LIBS})
+ add_executable(mosquitto ${MOSQ_SRCS})
diff --git a/mosquitto/patches/patch-af b/mosquitto/patches/patch-af
deleted file mode 100644
index e70fe832f6..0000000000
--- a/mosquitto/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Missing NetBSD detection, opened upstream pull request.
-
---- lib/memory_mosq.h.orig	2016-06-02 21:20:22.000000000 +0000
-+++ lib/memory_mosq.h	2016-08-28 14:30:34.000000000 +0000
-@@ -20,7 +20,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- 
--#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__) && !defined(__ANDROID__) && !defined(__UCLIBC__) && !defined(__OpenBSD__)
-+#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__) && !defined(__ANDROID__) && !defined(__UCLIBC__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- #define REAL_WITH_MEMORY_TRACKING
- #endif
- 
diff --git a/mosquitto/patches/patch-ag b/mosquitto/patches/patch-ag
deleted file mode 100644
index ae6e6b6cda..0000000000
--- a/mosquitto/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Include sys/socket.h (from OpenBSD).
-\todo verify if needed.
-
---- lib/tls_mosq.c.orig	2016-06-02 21:20:22.000000000 +0000
-+++ lib/tls_mosq.c	2016-08-28 14:31:56.000000000 +0000
-@@ -20,6 +20,7 @@
- #  include <winsock2.h>
- #  include <ws2tcpip.h>
- #else
-+#  include <sys/socket.h>
- #  include <arpa/inet.h>
- #  include <sys/socket.h>
- #endif
diff --git a/mosquitto/patches/patch-ah b/mosquitto/patches/patch-ah
index da968564e2..8aca5b4b12 100644
--- a/mosquitto/patches/patch-ah
+++ b/mosquitto/patches/patch-ah
@@ -1,19 +1,10 @@
 $NetBSD$
 
-Include NetBSD with Free/Open in not including -ldl (from FreeBSD).
+Set prefix, etc. to pkgsrc norms.
 
---- config.mk.orig	2016-06-02 21:20:22.000000000 +0000
-+++ config.mk	2016-08-28 15:27:03.968104814 +0000
-@@ -115,7 +115,7 @@
- BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DTIMESTAMP="\"${TIMESTAMP}\"" -DWITH_BROKER
- CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
- 
--ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD)),)
-+ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),)
- 	BROKER_LIBS:=-lm
- else
- 	BROKER_LIBS:=-ldl -lm
-@@ -241,7 +241,7 @@
+--- config.mk.orig	2018-08-16 16:05:26.000000000 +0000
++++ config.mk
+@@ -272,9 +272,9 @@ ifeq ($(WITH_WEBSOCKETS),static)
  endif
  
  INSTALL?=install
@@ -24,3 +15,5 @@ Include NetBSD with Free/Open in not including -ldl (from FreeBSD).
 +mandir=${PREFIX}/man
 +localedir=${PREFIX}/share/locale
  STRIP?=strip
+ 
+ ifeq ($(WITH_STRIP),yes)
diff --git a/mosquitto/patches/patch-ai b/mosquitto/patches/patch-ai
deleted file mode 100644
index f7a5c6c0f0..0000000000
--- a/mosquitto/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Missing NetBSD detection, opened upstream pull request.
-
---- src/net.c.orig	2016-06-02 21:20:22.000000000 +0000
-+++ src/net.c	2016-08-28 15:15:07.413097823 +0000
-@@ -35,7 +35,7 @@
- #include <tcpd.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #  include <netinet/in.h>
- #  include <sys/socket.h>
- #endif
diff --git a/mosquitto/patches/patch-aj b/mosquitto/patches/patch-aj
deleted file mode 100644
index 9e454c898a..0000000000
--- a/mosquitto/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Missing NetBSD detection, opened upstream pull request
-
---- lib/net_mosq.c.orig	2016-06-02 21:20:22.000000000 +0000
-+++ lib/net_mosq.c	2016-08-28 15:15:43.540861477 +0000
-@@ -34,7 +34,7 @@
- #include <sys/endian.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #  include <netinet/in.h>
- #endif
-
Prev by Date: tmux: Remove patches/patch-server-client.c
Next by Date: mosquitto: Update TODO
Previous by Thread: tmux: Remove patches/patch-server-client.c
Next by Thread: mosquitto: Update TODO
Indexes:
Home | Main Index | Thread Index | Old Index