From owner-svn-ports-head@freebsd.org Sun Mar 7 12:19:24 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 461AA5652F7; Sun, 7 Mar 2021 12:19:24 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DtgWc1bcxz4kTM; Sun, 7 Mar 2021 12:19:24 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A368161AE; Sun, 7 Mar 2021 12:19:24 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 127CJNVc069106; Sun, 7 Mar 2021 12:19:23 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 127CJMDd069101; Sun, 7 Mar 2021 12:19:22 GMT (envelope-from wen@FreeBSD.org) Message-Id: <202103071219.127CJMDd069101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Sun, 7 Mar 2021 12:19:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567563 - in head/net/mosquitto: . files X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: in head/net/mosquitto: . files X-SVN-Commit-Revision: 567563 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Mar 2021 12:19:24 -0000 Author: wen Date: Sun Mar 7 12:19:22 2021 New Revision: 567563 URL: https://svnweb.freebsd.org/changeset/ports/567563 Log: - Update to 2.0.8 - Add CARES_DESC - Update DEPENDS PR: 252237 Submitted by: freebsd@justmail.de Approved by: maintainer Deleted: head/net/mosquitto/files/patch-src_CMakeLists.txt head/net/mosquitto/files/patch-src_mosquitto__passwd.c head/net/mosquitto/files/patch-src_security__default.c Modified: head/net/mosquitto/Makefile head/net/mosquitto/distinfo head/net/mosquitto/files/patch-CMakeLists.txt head/net/mosquitto/files/patch-config.mk head/net/mosquitto/files/patch-mosquitto.conf head/net/mosquitto/pkg-plist Modified: head/net/mosquitto/Makefile ============================================================================== --- head/net/mosquitto/Makefile Sun Mar 7 11:06:11 2021 (r567562) +++ head/net/mosquitto/Makefile Sun Mar 7 12:19:22 2021 (r567563) @@ -2,20 +2,19 @@ # $FreeBSD$ PORTNAME= mosquitto -PORTVERSION= 1.6.7 -PORTREVISION= 1 +PORTVERSION= 2.0.8 CATEGORIES= net MASTER_SITES= http://mosquitto.org/files/source/ -PATCH_SITES= https://github.com/eclipse/mosquitto/commit/ -PATCHFILES= 8a4ae28fa926589e9891674ca4424dc703ad2d88.patch:-p1 - MAINTAINER= joe@thrallingpenguin.com COMMENT= Open source MQTT broker LICENSE= EPL -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +BUILD_DEPENDS= xsltproc:textproc/libxslt \ + docbook-xsl>0:textproc/docbook-xsl +LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ + libcjson.so:devel/libcjson RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= cmake ssl @@ -30,6 +29,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= CARES WS OPTIONS_DEFAULT= CARES +CARES_DESC= Asynchronous DNS resolution via c-ares CARES_LIB_DEPENDS= libcares.so:dns/c-ares CARES_CMAKE_ON= -DWITH_SRV:BOOL=ON Modified: head/net/mosquitto/distinfo ============================================================================== --- head/net/mosquitto/distinfo Sun Mar 7 11:06:11 2021 (r567562) +++ head/net/mosquitto/distinfo Sun Mar 7 12:19:22 2021 (r567563) @@ -1,5 +1,3 @@ -TIMESTAMP = 1598533546 -SHA256 (mosquitto-1.6.7.tar.gz) = bcd31a8fbbd053fee328986fadd8666d3058357ded56b9782f7d4f19931d178e -SIZE (mosquitto-1.6.7.tar.gz) = 591062 -SHA256 (8a4ae28fa926589e9891674ca4424dc703ad2d88.patch) = a142cb321992b975be27514fc074938098e83e322a87d40279492e75dd3dd74e -SIZE (8a4ae28fa926589e9891674ca4424dc703ad2d88.patch) = 1088 +TIMESTAMP = 1615114358 +SHA256 (mosquitto-2.0.8.tar.gz) = b15da8fc4edcb91d554e1259e220ea0173ef639ceaa4b465e06feb7e125b84bf +SIZE (mosquitto-2.0.8.tar.gz) = 756636 Modified: head/net/mosquitto/files/patch-CMakeLists.txt ============================================================================== --- head/net/mosquitto/files/patch-CMakeLists.txt Sun Mar 7 11:06:11 2021 (r567562) +++ head/net/mosquitto/files/patch-CMakeLists.txt Sun Mar 7 12:19:22 2021 (r567563) @@ -1,26 +1,12 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig +--- CMakeLists.txt.orig 2020-12-28 11:28:48 UTC +++ CMakeLists.txt -@@ -15,6 +15,9 @@ set (VERSION 1.6.4) +@@ -14,6 +14,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cma add_definitions (-DCMAKE -DVERSION=\"${VERSION}\") -+include_directories(/usr/local/include) -+link_directories(/usr/local/lib) ++include_directories("/usr/local/include") ++link_directories("/usr/local/lib") + if (WIN32) add_definitions("-D_CRT_SECURE_NO_WARNINGS") add_definitions("-D_CRT_NONSTDC_NO_DEPRECATE") -@@ -108,9 +111,9 @@ install(FILES mosquitto.conf aclfile.exa - # ======================================== - - 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_PREFIX}/libdata/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_PREFIX}/libdata/pkgconfig") - - # ======================================== - # Testing Modified: head/net/mosquitto/files/patch-config.mk ============================================================================== --- head/net/mosquitto/files/patch-config.mk Sun Mar 7 11:06:11 2021 (r567562) +++ head/net/mosquitto/files/patch-config.mk Sun Mar 7 12:19:22 2021 (r567563) @@ -1,8 +1,6 @@ -Index: config.mk -=================================================================== ---- config.mk.orig +--- config.mk.orig 2020-12-28 13:24:40 UTC +++ config.mk -@@ -283,7 +283,7 @@ ifeq ($(WITH_WEBSOCKETS),static) +@@ -329,7 +329,7 @@ ifeq ($(WITH_WEBSOCKETS),static) endif INSTALL?=install Modified: head/net/mosquitto/files/patch-mosquitto.conf ============================================================================== --- head/net/mosquitto/files/patch-mosquitto.conf Sun Mar 7 11:06:11 2021 (r567562) +++ head/net/mosquitto/files/patch-mosquitto.conf Sun Mar 7 12:19:22 2021 (r567563) @@ -1,9 +1,7 @@ -Index: mosquitto.conf -=================================================================== ---- mosquitto.conf.orig +--- mosquitto.conf.orig 2020-12-28 13:22:44 UTC +++ mosquitto.conf -@@ -158,7 +158,7 @@ - # This should be set to /var/run/mosquitto.pid if mosquitto is +@@ -148,7 +148,7 @@ + # This should be set to /var/run/mosquitto/mosquitto.pid if mosquitto is # being run automatically on boot with an init script and # start-stop-daemon or similar. -#pid_file @@ -11,25 +9,16 @@ Index: mosquitto.conf # Set to true to queue messages with QoS 0 when a persistent client is # disconnected. These messages are included in the limit imposed by -@@ -195,7 +195,7 @@ +@@ -187,7 +187,7 @@ # If run as a non-root user, this setting has no effect. - # Note that on Windows this has no effect and so mosquitto should - # be started by the user you wish it to run as. + # Note that on Windows this has no effect and so mosquitto should be started by + # the user you wish it to run as. -#user mosquitto +user nobody # ================================================================= - # Default listener -@@ -208,7 +208,7 @@ - #bind_address - - # Port to use for the default listener. --#port 1883 -+port 1883 - - # Bind the listener to a specific interface. This is similar to - # bind_address above but is useful when an interface has multiple addresses or -@@ -267,7 +267,7 @@ + # Listeners +@@ -340,7 +340,7 @@ # containing the CA certificates. For capath to work correctly, the # certificate files must have ".crt" as the file ending and you must run # "openssl rehash " each time you add/remove a certificate. @@ -37,4 +26,4 @@ Index: mosquitto.conf +cafile /usr/local/share/certs/ca-root-nss.crt #capath - # Path to the PEM encoded server certificate. + Modified: head/net/mosquitto/pkg-plist ============================================================================== --- head/net/mosquitto/pkg-plist Sun Mar 7 11:06:11 2021 (r567562) +++ head/net/mosquitto/pkg-plist Sun Mar 7 12:19:22 2021 (r567563) @@ -1,3 +1,4 @@ +bin/mosquitto_ctrl bin/mosquitto_passwd bin/mosquitto_pub bin/mosquitto_sub @@ -10,14 +11,18 @@ include/mosquitto.h include/mosquitto_broker.h include/mosquitto_plugin.h include/mosquittopp.h +include/mqtt_protocol.h lib/libmosquitto.so lib/libmosquitto.so.1 lib/libmosquitto.so.%%PORTVERSION%% lib/libmosquittopp.so lib/libmosquittopp.so.1 lib/libmosquittopp.so.%%PORTVERSION%% +lib/mosquitto_dynamic_security.so libdata/pkgconfig/libmosquitto.pc libdata/pkgconfig/libmosquittopp.pc +man/man1/mosquitto_ctrl.1.gz +man/man1/mosquitto_ctrl_dynsec.1.gz man/man1/mosquitto_passwd.1.gz man/man1/mosquitto_pub.1.gz man/man1/mosquitto_rr.1.gz