Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Dec 2018 18:48:42 +0000 (UTC)
From:      =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r486979 - in head/net/mosquitto: . files
Message-ID:  <201812081848.wB8Imgel092729@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fernape
Date: Sat Dec  8 18:48:41 2018
New Revision: 486979
URL: https://svnweb.freebsd.org/changeset/ports/486979

Log:
  net/mosquitto: update to 1.5.4
  
  This release fixes a number of security, building and memory leak issues.
  
  Announcement: https://mosquitto.org/blog/2018/11/version-154-released/
  
  PR:	233552
  Submitted by:	iblis@hs.ntnu.edu.tw
  Approved by:	joe@thrallingpenguin.com (maintainer)

Deleted:
  head/net/mosquitto/files/patch-lib_socks__mosq.c
Modified:
  head/net/mosquitto/Makefile
  head/net/mosquitto/distinfo
  head/net/mosquitto/files/patch-src_CMakeLists.txt

Modified: head/net/mosquitto/Makefile
==============================================================================
--- head/net/mosquitto/Makefile	Sat Dec  8 18:47:16 2018	(r486978)
+++ head/net/mosquitto/Makefile	Sat Dec  8 18:48:41 2018	(r486979)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mosquitto
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.5.4
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 
@@ -17,20 +16,21 @@ LIB_DEPENDS=	libcares.so:dns/c-ares \
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
 USES=		cmake ssl
-NOCONFIGURE=	yes
 USE_RC_SUBR=	mosquitto
 USE_LDCONFIG=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USERS=		nobody
 
+NOCONFIGURE=	yes
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 OPTIONS_DEFINE=	WS
 
-CMAKE_ARGS+=	-DCMAKE_LIBDATADIR="${PREFIX}/libdata"
-
 WS_DESC=	MQTT over Websockets support
 WS_LIB_DEPENDS=	libwebsockets.so:net/libwebsockets
 WS_CMAKE_ON=	-DWITH_WEBSOCKETS=ON
+
+CMAKE_ARGS+=	-DCMAKE_LIBDATADIR="${PREFIX}/libdata"
 
 post-patch:
 # do not run ldconfig in stage dir

Modified: head/net/mosquitto/distinfo
==============================================================================
--- head/net/mosquitto/distinfo	Sat Dec  8 18:47:16 2018	(r486978)
+++ head/net/mosquitto/distinfo	Sat Dec  8 18:48:41 2018	(r486979)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538306679
-SHA256 (mosquitto-1.5.3.tar.gz) = 3081a998d303a883b1cd064009beabc88aa9159e26f5258a4ae6007160491d10
-SIZE (mosquitto-1.5.3.tar.gz) = 425844
+TIMESTAMP = 1542087175
+SHA256 (mosquitto-1.5.4.tar.gz) = 5fd7f3454fd6d286645d032bc07f44a1c8583cec02ef2422c9eb32e0a89a9b2f
+SIZE (mosquitto-1.5.4.tar.gz) = 430602

Modified: head/net/mosquitto/files/patch-src_CMakeLists.txt
==============================================================================
--- head/net/mosquitto/files/patch-src_CMakeLists.txt	Sat Dec  8 18:47:16 2018	(r486978)
+++ head/net/mosquitto/files/patch-src_CMakeLists.txt	Sat Dec  8 18:48:41 2018	(r486979)
@@ -1,6 +1,6 @@
 --- src/CMakeLists.txt.orig	2018-09-25 15:27:43 UTC
 +++ src/CMakeLists.txt
-@@ -114,6 +114,7 @@ if (WIN32 OR CYGWIN)
+@@ -114,6 +114,7 @@
  endif (WIN32 OR CYGWIN)
  
  add_definitions (-DWITH_BROKER)
@@ -8,16 +8,16 @@
  
  set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
  
-@@ -131,7 +132,7 @@ if (UNIX)
- 	if (APPLE)
- 		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
- 	else (APPLE)
--		set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
-+		set (MOSQ_LIBS ${MOSQ_LIBS} m)
- 		find_library(LIBRT rt)
- 		if (LIBRT)
- 			set (MOSQ_LIBS ${MOSQ_LIBS} rt)
-@@ -185,7 +186,6 @@ if (${WITH_TLS} STREQUAL ON)
+@@ -132,7 +133,7 @@
+     elseif(QNX)
+         set(MOSQ_LIBS ${MOSQ_LIBS} m socket)
+     else(APPLE)
+-        set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
++        set (MOSQ_LIBS ${MOSQ_LIBS} m)
+         find_library(LIBRT rt)
+         if (LIBRT)
+             set (MOSQ_LIBS ${MOSQ_LIBS} rt)
+@@ -186,7 +187,6 @@
  endif (${WITH_TLS} STREQUAL ON)
  
  if (UNIX AND NOT APPLE)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812081848.wB8Imgel092729>