mosquitto: Update to 1.6.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: mosquitto: Update to 1.6.1
From: Greg Troxel <gdt%lexort.com@localhost>
Date: Sat, 27 Apr 2019 20:18:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Apr 27 16:18:19 2019 -0400
Changeset:	700941b4571fbf2013b6c098e9f1cd4302719a26

Modified Files:
	mosquitto/Makefile
	mosquitto/distinfo
	mosquitto/patches/patch-CMakeLists.txt
	mosquitto/patches/patch-mosquitto.conf

Log Message:
mosquitto: Update to 1.6.1

This release is basically build fixes, including many to reduce
patches from pkgsrc.

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

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

diffstat:
 mosquitto/Makefile                     | 19 +++-----------
 mosquitto/distinfo                     | 12 ++++-----
 mosquitto/patches/patch-CMakeLists.txt | 45 +++++++++-------------------------
 mosquitto/patches/patch-mosquitto.conf | 30 +++++++++--------------
 4 files changed, 33 insertions(+), 73 deletions(-)

diffs:
diff --git a/mosquitto/Makefile b/mosquitto/Makefile
index 3fbcaa6471..fd717448be 100644
--- a/mosquitto/Makefile
+++ b/mosquitto/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-VERSION=	1.6.0
+VERSION=	1.6.1
 DISTNAME=	mosquitto-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://mosquitto.org/files/source/
 
@@ -19,6 +18,8 @@ USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 USE_TOOLS+=	gmake
 
+CMAKE_ARGS+=	-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/share/examples
+
 # config.mk is in theory used by only the non-cmake build.  Remove it,
 # to force a failure if it somehow becomes used.
 pre-configure:
@@ -30,20 +31,6 @@ CONF_FILES=	${PREFIX}/share/examples/mosquitto/pskfile.example \
 		${PREFIX}/share/examples/mosquitto/mosquitto.conf \
 		${PREFIX}/share/examples/mosquitto/aclfile.example
 
-# The upstream code uses ldconfig.
-# https://github.com/eclipse/mosquitto/issues/1048
-SUBST_CLASSES+=			ldconfig
-SUBST_STAGE.ldconfig=		pre-configure
-SUBST_MESSAGE.ldconfig=		Removing non-portable ldconfig invocations
-SUBST_FILES.ldconfig=		lib/CMakeLists.txt \
-				lib/cpp/CMakeLists.txt \
-				src/CMakeLists.txt
-SUBST_SED.ldconfig=		-E -e '/EXEC_PROGRAM\(\/sbin\/ldconfig/d'
-
-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
-
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/uthash/buildlink3.mk"
 # ?needed
diff --git a/mosquitto/distinfo b/mosquitto/distinfo
index 5ab3475280..a01c639f59 100644
--- a/mosquitto/distinfo
+++ b/mosquitto/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (mosquitto-1.6.0.tar.gz) = 37cb2cff316f8acef69ff139bdc08da7251d5232
-RMD160 (mosquitto-1.6.0.tar.gz) = adca791c1e796eb93b51d5cca909e2ccb3f1ae07
-SHA512 (mosquitto-1.6.0.tar.gz) = caa2eb5dae1a20a3da48d55ae2f141284ef80b9ec51adbb87f67ea1cc7ea09df5e39ea7b2993a2f88e2c7311c219f120b9cbd4e29faf5c070cc2212c5e411dfe
-Size (mosquitto-1.6.0.tar.gz) = 574988 bytes
-SHA1 (patch-CMakeLists.txt) = 34891235466aca2becd6072183298b8949a0a356
+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) = 43c6dfe5ce90990d1e9c4131cbe6481006e834a7
 SHA1 (patch-lib_CMakeLists.txt) = cddb8803a759820c8059028f924b56c22689ee54
-SHA1 (patch-mosquitto.conf) = bb1133a993f63351ec9768a3943301758ad28bce
+SHA1 (patch-mosquitto.conf) = 3db0e0bb4ca25bb12f539b604a957453268712bf
 SHA1 (patch-src_CMakeLists.txt) = 2dc455267f2cbf0810062bf588ca1369d2ce06ef
diff --git a/mosquitto/patches/patch-CMakeLists.txt b/mosquitto/patches/patch-CMakeLists.txt
index feec6819fe..05a67d732f 100644
--- a/mosquitto/patches/patch-CMakeLists.txt
+++ b/mosquitto/patches/patch-CMakeLists.txt
@@ -1,39 +1,18 @@
 $NetBSD$
 
-In cmake build, adjust paths to pkgsrc norms.  (Originally from
-OpenBSD.)
+Adjust pkgconfig installation location to lib, not share.
 
-The main point (but not using examples for sysconf) is filed upstream as:
-https://github.com/eclipse/mosquitto/issues/1049
-
---- CMakeLists.txt.orig	2018-09-25 15:27:43.000000000 +0000
+--- CMakeLists.txt.orig	2019-04-26 16:07:59.000000000 +0000
 +++ CMakeLists.txt
-@@ -15,6 +15,8 @@ set (VERSION 1.5.3)
+@@ -108,9 +114,9 @@ install(FILES mosquitto.conf aclfile.exa
+ # ========================================
  
- add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
+ 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")
+ 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")
  
-+include(GNUInstallDirs)
-+
- if (WIN32)
- 	set (BINDIR .)
- 	set (SBINDIR .)
-@@ -30,17 +32,12 @@ if (WIN32)
- else (WIN32)
- 	set (BINDIR bin)
- 	set (SBINDIR sbin)
--	if ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
--		set (SYSCONFDIR /etc/mosquitto)
--	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 (MANDIR ${CMAKE_INSTALL_MANDIR})
- 	set (SHAREDIR "${DATAROOTDIR}/mosquitto")
- 	set (PKGCONFIGDIR "${LIBDIR}/pkgconfig")
- endif (WIN32)
+ # ========================================
+ # Testing
diff --git a/mosquitto/patches/patch-mosquitto.conf b/mosquitto/patches/patch-mosquitto.conf
index 375096f1f5..df99fd6f98 100644
--- a/mosquitto/patches/patch-mosquitto.conf
+++ b/mosquitto/patches/patch-mosquitto.conf
@@ -1,20 +1,15 @@
 $NetBSD$
 
-Better defaults for configuration, inspired by FreeBSD.
-\todo Rethink if we should be deviating from upstream.
+Log to syslog, instead of (perhaps) not logging.
 
---- mosquitto.conf.orig	2019-04-17 19:54:00.000000000 +0000
+\todo Figure out what happens if port is not defined, and why we set it.
+
+\todo Think about pidfile; because this can be run in various modes
+that seems like it should perhaps be command-line, not config.
+
+--- mosquitto.conf.orig	2019-04-26 16:07:59.000000000 +0000
 +++ mosquitto.conf
-@@ -28,7 +28,7 @@
- # This should be set to /var/run/mosquitto.pid if mosquitto is
- # being run automatically on boot with an init script and 
- # start-stop-daemon or similar.
--#pid_file
-+#pid_file /var/run/mosquitto.pid
- 
- # When run as root, drop privileges to this user and its primary 
- # group.
-@@ -205,7 +205,7 @@
+@@ -216,7 +216,7 @@
  #bind_address
  
  # Port to use for the default listener.
@@ -23,12 +18,11 @@ Better defaults for configuration, inspired by FreeBSD.
  
  # Bind the listener to a specific interface. This is similar to
  # bind_address above but is useful when an interface has multiple addresses or
-@@ -570,7 +570,7 @@
- # Note that if the broker is running as a Windows service it will default to
+@@ -594,6 +594,7 @@
  # "log_dest none" and neither stdout nor stderr logging is available.
  # Use "log_dest none" if you wish to disable logging.
--#log_dest stderr
+ #log_dest stderr
 +log_dest syslog
  
- # If using syslog logging (not on Windows), messages will be logged to the
- # "daemon" facility by default. Use the log_facility option to choose which of
+ # Types of messages to log. Use multiple log_type lines for logging
+ # multiple types of messages.
Prev by Date: khotkeys: be happier about HAVE_X11
Next by Date: moquitto: Add comments about upstream status of patches
Previous by Thread: khotkeys: be happier about HAVE_X11
Next by Thread: moquitto: Add comments about upstream status of patches
Indexes:
Home | Main Index | Thread Index | Old Index