svn commit: r455922 - in head/net/mosquitto: . files
Steve Wills
swills at FreeBSD.org
Mon Dec 11 04:01:48 UTC 2017
Author: swills
Date: Mon Dec 11 04:01:46 2017
New Revision: 455922
URL: https://svnweb.freebsd.org/changeset/ports/455922
Log:
net/mosquitto update to 1.4.14
While here, make it PREFIX clean.
PR: 224210
Submitted by: Manuel Stühn <freebsd at justmail.de>
Approved by: Joseph Benden <joe at thrallingpenguin.com>
Modified:
head/net/mosquitto/Makefile
head/net/mosquitto/distinfo (contents, props changed)
head/net/mosquitto/files/patch-CMakeLists.txt
head/net/mosquitto/files/patch-config.mk (contents, props changed)
head/net/mosquitto/files/patch-lib_mosquitto__internal.h
head/net/mosquitto/files/patch-lib_tls__mosq.h (contents, props changed)
head/net/mosquitto/files/patch-src_CMakeLists.txt
head/net/mosquitto/files/patch-support-libressl
Modified: head/net/mosquitto/Makefile
==============================================================================
--- head/net/mosquitto/Makefile Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/Makefile Mon Dec 11 04:01:46 2017 (r455922)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= mosquitto
-PORTVERSION= 1.4.10
-PORTREVISION= 1
+PORTVERSION= 1.4.14
+PORTREVISION= 0
CATEGORIES= net
MASTER_SITES= http://mosquitto.org/files/source/
@@ -31,8 +31,9 @@ WS_CMAKE_ON= -DWITH_WEBSOCKETS=ON
post-patch:
# do not run ldconfig in stage dir
- ${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
+ @${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/CMakeLists.txt
post-install:
# Adjust configuration files
Modified: head/net/mosquitto/distinfo
==============================================================================
--- head/net/mosquitto/distinfo Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/distinfo Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471433988
-SHA256 (mosquitto-1.4.10.tar.gz) = 437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770
-SIZE (mosquitto-1.4.10.tar.gz) = 359569
+TIMESTAMP = 1512592902
+SHA256 (mosquitto-1.4.14.tar.gz) = 156b1fa731d12baad4b8b22f7b6a8af50ba881fc711b81e9919ec103cf2942d1
+SIZE (mosquitto-1.4.14.tar.gz) = 365596
Modified: head/net/mosquitto/files/patch-CMakeLists.txt
==============================================================================
--- head/net/mosquitto/files/patch-CMakeLists.txt Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/files/patch-CMakeLists.txt Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig 2016-06-02 21:20:22 UTC
+--- CMakeLists.txt.orig 2017-07-10 22:46:01 UTC
+++ CMakeLists.txt
@@ -13,6 +13,9 @@ cmake_minimum_required(VERSION 2.8)
- set (VERSION 1.4.9)
+ set (VERSION 1.4.14)
-+include_directories(/usr/local/include)
-+link_directories(/usr/local/lib)
++include_directories(%%PREFIX%%/include)
++link_directories(%%PREFIX%%/lib)
+
if (WIN32)
execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
Modified: head/net/mosquitto/files/patch-config.mk
==============================================================================
--- head/net/mosquitto/files/patch-config.mk Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/files/patch-config.mk Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,6 +1,6 @@
---- config.mk.orig 2015-05-07 13:21:22 UTC
+--- config.mk.orig 2017-07-10 22:46:01 UTC
+++ config.mk
-@@ -241,7 +241,7 @@ ifeq ($(WITH_DOCS),yes)
+@@ -249,7 +249,7 @@ ifeq ($(WITH_DOCS),yes)
endif
INSTALL?=install
Modified: head/net/mosquitto/files/patch-lib_mosquitto__internal.h
==============================================================================
--- head/net/mosquitto/files/patch-lib_mosquitto__internal.h Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/files/patch-lib_mosquitto__internal.h Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,33 +1,25 @@
---- lib/mosquitto_internal.h.orig 2017-07-18 16:25:21 UTC
-+++ lib/mosquitto_internal.h
-@@ -30,11 +30,7 @@ Contributors:
- #endif
- #include <stdlib.h>
+From 9f74e09373f3be7b77f510ef8b0ae2c887f7b325 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa at alpinelinux.org>
+Date: Tue, 4 Oct 2016 14:35:33 +0200
+Subject: [PATCH] [280] Fix build with libressl
--#if defined(WITH_THREADING) && !defined(WITH_BROKER)
--# include <pthread.h>
--#else
--# include <dummypthread.h>
--#endif
-+#include <pthread.h>
+Closes #280
- #ifdef WITH_SRV
- # include <ares.h>
-@@ -184,7 +180,7 @@ struct mosquitto {
+Fix building with libressl which broke in commit fff741613 (Support for
+openssl 1.1.0).
+
+Bug: #280
+
+Signed-off-by: Natanael Copa <ncopa at alpinelinux.org>
+--- lib/mosquitto_internal.h.orig 2017-07-10 22:46:01 UTC
++++ lib/mosquitto_internal.h
+@@ -25,6 +25,9 @@ Contributors:
+
+ #ifdef WITH_TLS
+ # include <openssl/ssl.h>
++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++# define HAVE_OPENSSL_OPAQUE_STRUCTS
++# endif
+ #else
+ # include <time.h>
#endif
- bool want_write;
- bool want_connect;
--#if defined(WITH_THREADING) && !defined(WITH_BROKER)
-+
- pthread_mutex_t callback_mutex;
- pthread_mutex_t log_callback_mutex;
- pthread_mutex_t msgtime_mutex;
-@@ -195,7 +191,7 @@ struct mosquitto {
- pthread_mutex_t out_message_mutex;
- pthread_mutex_t mid_mutex;
- pthread_t thread_id;
--#endif
-+
- bool clean_session;
- #ifdef WITH_BROKER
- bool is_dropping;
Modified: head/net/mosquitto/files/patch-lib_tls__mosq.h
==============================================================================
--- head/net/mosquitto/files/patch-lib_tls__mosq.h Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/files/patch-lib_tls__mosq.h Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,6 +1,6 @@
---- lib/tls_mosq.h.orig 2015-05-07 13:21:22 UTC
+--- lib/tls_mosq.h.orig 2017-07-10 22:46:01 UTC
+++ lib/tls_mosq.h
-@@ -20,8 +20,9 @@ Contributors:
+@@ -26,8 +26,9 @@ Contributors:
#ifdef WITH_TLS
#include <openssl/ssl.h>
Modified: head/net/mosquitto/files/patch-src_CMakeLists.txt
==============================================================================
--- head/net/mosquitto/files/patch-src_CMakeLists.txt Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/files/patch-src_CMakeLists.txt Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,4 +1,4 @@
---- src/CMakeLists.txt.orig 2016-08-17 11:05:14 UTC
+--- src/CMakeLists.txt.orig 2017-07-10 22:46:01 UTC
+++ src/CMakeLists.txt
@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN)
endif (WIN32 OR CYGWIN)
@@ -8,16 +8,16 @@
add_executable(mosquitto ${MOSQ_SRCS})
-@@ -86,7 +87,7 @@ if (UNIX)
+@@ -96,7 +97,7 @@ if (UNIX)
if (APPLE)
set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
else (APPLE)
-- set (MOSQ_LIBS ${MOSQ_LIBS} rt dl m)
-+ set (MOSQ_LIBS ${MOSQ_LIBS} rt m)
- endif (APPLE)
- endif (UNIX)
-
-@@ -127,6 +128,5 @@ if (${WITH_TLS} STREQUAL ON)
+- 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)
+@@ -141,6 +142,5 @@ if (${WITH_TLS} STREQUAL ON)
endif (${WITH_TLS} STREQUAL ON)
if (UNIX)
Modified: head/net/mosquitto/files/patch-support-libressl
==============================================================================
--- head/net/mosquitto/files/patch-support-libressl Mon Dec 11 03:37:20 2017 (r455921)
+++ head/net/mosquitto/files/patch-support-libressl Mon Dec 11 04:01:46 2017 (r455922)
@@ -1,41 +1,11 @@
-From 9f74e09373f3be7b77f510ef8b0ae2c887f7b325 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa at alpinelinux.org>
-Date: Tue, 4 Oct 2016 14:35:33 +0200
-Subject: [PATCH] [280] Fix build with libressl
-
-Closes #280
-
-Fix building with libressl which broke in commit fff741613 (Support for
-openssl 1.1.0).
-
-Bug: #280
-
-Signed-off-by: Natanael Copa <ncopa at alpinelinux.org>
----
lib/mosquitto_internal.h | 3 +++
src/mosquitto_passwd.c | 4 ++--
src/security_default.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
-diff --git lib/mosquitto_internal.h lib/mosquitto_internal.h
-index 4b4cf85..700bbb0 100644
---- lib/mosquitto_internal.h
-+++ lib/mosquitto_internal.h
-@@ -25,6 +25,9 @@ and the Eclipse Distribution License is available at
-
- #ifdef WITH_TLS
- # include <openssl/ssl.h>
-+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+# define HAVE_OPENSSL_OPAQUE_STRUCTS
-+# endif
- #else
- # include <time.h>
- #endif
-diff --git src/mosquitto_passwd.c src/mosquitto_passwd.c
-index de9a719..5b854d9 100644
---- src/mosquitto_passwd.c
+--- src/mosquitto_passwd.c.orig 2017-07-10 22:46:01 UTC
+++ src/mosquitto_passwd.c
-@@ -90,7 +90,7 @@ int output_new_password(FILE *fptr, const char *username, const char *password)
+@@ -90,7 +90,7 @@ int output_new_password(FILE *fptr, const char *userna
unsigned char hash[EVP_MAX_MD_SIZE];
unsigned int hash_len;
const EVP_MD *digest;
@@ -44,7 +14,7 @@ index de9a719..5b854d9 100644
EVP_MD_CTX context;
#else
EVP_MD_CTX *context;
-@@ -117,7 +117,7 @@ int output_new_password(FILE *fptr, const char *username, const char *password)
+@@ -117,7 +117,7 @@ int output_new_password(FILE *fptr, const char *userna
return 1;
}
@@ -53,11 +23,9 @@ index de9a719..5b854d9 100644
EVP_MD_CTX_init(&context);
EVP_DigestInit_ex(&context, digest, NULL);
EVP_DigestUpdate(&context, password, strlen(password));
-diff --git src/security_default.c src/security_default.c
-index 64ca846..9ad8708 100644
---- src/security_default.c
+--- src/security_default.c.orig 2017-07-10 22:46:01 UTC
+++ src/security_default.c
-@@ -770,7 +770,7 @@ int mosquitto_psk_key_get_default(struct mosquitto_db *db, const char *hint, con
+@@ -790,7 +790,7 @@ int mosquitto_psk_key_get_default(struct mosquitto_db
int _pw_digest(const char *password, const unsigned char *salt, unsigned int salt_len, unsigned char *hash, unsigned int *hash_len)
{
const EVP_MD *digest;
More information about the svn-ports-head
mailing list