Attachment #188661 for bug #224210

View | Details | Raw Unified | Return to bug 224210
Collapse All | Expand All

Lines 2-9 Link Here

(-)b/net/mosquitto/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/net/mosquitto/Makefile 446392 2017-07-22 12:02:56Z jbeich $	2	# $FreeBSD: head/net/mosquitto/Makefile 446392 2017-07-22 12:02:56Z jbeich $
3		3
4	PORTNAME= mosquitto	4	PORTNAME= mosquitto
5	PORTVERSION= 1.4.10	5	PORTVERSION= 1.4.14
6	PORTREVISION= 1	6	PORTREVISION= 0
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= http://mosquitto.org/files/source/	8	MASTER_SITES= http://mosquitto.org/files/source/
9		9

Lines 1-3 Link Here

(-)b/net/mosquitto/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1471433988	1	TIMESTAMP = 1512592902
2	SHA256 (mosquitto-1.4.10.tar.gz) = 437648d68a4a781dd8d913814cd5451f59ab4a5fcf84cccaf7c36e6a07459770	2	SHA256 (mosquitto-1.4.14.tar.gz) = 156b1fa731d12baad4b8b22f7b6a8af50ba881fc711b81e9919ec103cf2942d1
3	SIZE (mosquitto-1.4.10.tar.gz) = 359569	3	SIZE (mosquitto-1.4.14.tar.gz) = 365596

Lines 1-8 Link Here

(-)b/net/mosquitto/files/patch-CMakeLists.txt (-2 / +2 lines)
1	--- CMakeLists.txt.orig 2016-06-02 21:20:22 UTC	1	--- CMakeLists.txt.orig 2017-07-10 22:46:01 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -13,6 +13,9 @@ cmake_minimum_required(VERSION 2.8)	3	@@ -13,6 +13,9 @@ cmake_minimum_required(VERSION 2.8)
4		4
5	set (VERSION 1.4.9)	5	set (VERSION 1.4.14)
6		6
7	+include_directories(/usr/local/include)	7	+include_directories(/usr/local/include)
8	+link_directories(/usr/local/lib)	8	+link_directories(/usr/local/lib)

Lines 1-6 Link Here

(-)b/net/mosquitto/files/patch-config.mk (-2 / +2 lines)
1	--- config.mk.orig 2015-05-07 13:21:22 UTC	1	--- config.mk.orig 2017-07-10 22:46:01 UTC
2	+++ config.mk	2	+++ config.mk
3	@@ -241,7 +241,7 @@ ifeq ($(WITH_DOCS),yes)	3	@@ -249,7 +249,7 @@ ifeq ($(WITH_DOCS),yes)
4	endif	4	endif
5		5
6	INSTALL?=install	6	INSTALL?=install




From 9f74e09373f3be7b77f510ef8b0ae2c887f7b325 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@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).
-#else
-#  include <dummypthread.h>
-#endif
+#include <pthread.h>

Bug: #280

Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
--- lib/mosquitto_internal.h.orig	2017-12-09 15:08:26 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;

Lines 1-6 Link Here

(-)b/net/mosquitto/files/patch-lib_tls__mosq.h (-2 / +2 lines)
1	--- lib/tls_mosq.h.orig 2015-05-07 13:21:22 UTC	1	--- lib/tls_mosq.h.orig 2017-07-10 22:46:01 UTC
2	+++ lib/tls_mosq.h	2	+++ lib/tls_mosq.h
3	@@ -20,8 +20,9 @@ Contributors:	3	@@ -26,8 +26,9 @@ Contributors:
4	#ifdef WITH_TLS	4	#ifdef WITH_TLS
5		5
6	#include <openssl/ssl.h>	6	#include <openssl/ssl.h>

Lines 1-4 Link Here

(-)b/net/mosquitto/files/patch-mosquitto.conf (-1 / +1 lines)
1	--- mosquitto.conf.orig 2015-05-07 13:21:22 UTC	1	--- mosquitto.conf.orig 2017-07-10 22:46:01 UTC
2	+++ mosquitto.conf	2	+++ mosquitto.conf
3	@@ -32,7 +32,7 @@	3	@@ -32,7 +32,7 @@
4	# This should be set to /var/run/mosquitto.pid if mosquitto is	4	# This should be set to /var/run/mosquitto.pid if mosquitto is




--- 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)

 
 add_executable(mosquitto ${MOSQ_SRCS})
 
@@ -96,7 +97,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)
@@ -141,6 +142,5 @@ if (${WITH_TLS} STREQUAL ON)
 endif (${WITH_TLS} STREQUAL ON)
 
 if (UNIX)




From 9f74e09373f3be7b77f510ef8b0ae2c887f7b325 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@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@alpinelinux.org>
---
 lib/mosquitto_internal.h | 3 +++
 src/mosquitto_passwd.c   | 4 ++--
 src/security_default.c   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

--- src/mosquitto_passwd.c.orig	2017-07-10 22:46:01 UTC
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
@@ -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;

 	EVP_MD_CTX context;
 #else
 	EVP_MD_CTX *context;
@@ -117,7 +117,7 @@ int output_new_password(FILE *fptr, const char *userna
 		return 1;
 	}
 

 	EVP_MD_CTX_init(&context);
 	EVP_DigestInit_ex(&context, digest, NULL);
 	EVP_DigestUpdate(&context, password, strlen(password));
--- src/security_default.c.orig	2017-07-10 22:46:01 UTC
index 64ca846..9ad8708 100644
--- src/security_default.c
+++ src/security_default.c
@@ -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;
- 

Return to bug 224210

Lines 1-33 Link Here

(-)b/net/mosquitto/files/patch-lib_mosquitto__internal.h (-30 / +22 lines)
1	--- lib/mosquitto_internal.h.orig 2017-07-18 16:25:21 UTC	1	From 9f74e09373f3be7b77f510ef8b0ae2c887f7b325 Mon Sep 17 00:00:00 2001
2	+++ lib/mosquitto_internal.h	2	From: Natanael Copa <ncopa@alpinelinux.org>
3	@@ -30,11 +30,7 @@ Contributors:	3	Date: Tue, 4 Oct 2016 14:35:33 +0200
4	#endif	4	Subject: [PATCH] [280] Fix build with libressl
5	#include <stdlib.h>	5
		6	Closes #280
6		7
7	-#if defined(WITH_THREADING) && !defined(WITH_BROKER)	8	Fix building with libressl which broke in commit fff741613 (Support for
8	-# include <pthread.h>	9	openssl 1.1.0).
9	-#else
10	-# include <dummypthread.h>
11	-#endif
12	+#include <pthread.h>
13		10
14	#ifdef WITH_SRV	11	Bug: #280
15	# include <ares.h>	12
16	@@ -184,7 +180,7 @@ struct mosquitto {	13	Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
		14	--- lib/mosquitto_internal.h.orig 2017-12-09 15:08:26 UTC
		15	+++ lib/mosquitto_internal.h
		16	@@ -25,6 +25,9 @@ Contributors:
		17
		18	#ifdef WITH_TLS
		19	# include <openssl/ssl.h>
		20	+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
		21	+# define HAVE_OPENSSL_OPAQUE_STRUCTS
		22	+# endif
		23	#else
		24	# include <time.h>
17	#endif	25	#endif
18	bool want_write;
19	bool want_connect;
20	-#if defined(WITH_THREADING) && !defined(WITH_BROKER)
21	+
22	pthread_mutex_t callback_mutex;
23	pthread_mutex_t log_callback_mutex;
24	pthread_mutex_t msgtime_mutex;
25	@@ -195,7 +191,7 @@ struct mosquitto {
26	pthread_mutex_t out_message_mutex;
27	pthread_mutex_t mid_mutex;
28	pthread_t thread_id;
29	-#endif
30	+
31	bool clean_session;
32	#ifdef WITH_BROKER
33	bool is_dropping;

Lines 1-4 Link Here

(-)b/net/mosquitto/files/patch-src_CMakeLists.txt (-8 / +8 lines)
1	--- src/CMakeLists.txt.orig 2016-08-17 11:05:14 UTC	1	--- src/CMakeLists.txt.orig 2017-07-10 22:46:01 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN)	3	@@ -77,6 +77,7 @@ if (WIN32 OR CYGWIN)
4	endif (WIN32 OR CYGWIN)	4	endif (WIN32 OR CYGWIN)
Lines 8-23 Link Here
8		8
9	add_executable(mosquitto ${MOSQ_SRCS})	9	add_executable(mosquitto ${MOSQ_SRCS})
10		10
11	@@ -86,7 +87,7 @@ if (UNIX)	11	@@ -96,7 +97,7 @@ if (UNIX)
12	if (APPLE)	12	if (APPLE)
13	set (MOSQ_LIBS ${MOSQ_LIBS} dl m)	13	set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
14	else (APPLE)	14	else (APPLE)
15	- set (MOSQ_LIBS ${MOSQ_LIBS} rt dl m)	15	- set (MOSQ_LIBS ${MOSQ_LIBS} dl m)
16	+ set (MOSQ_LIBS ${MOSQ_LIBS} rt m)	16	+ set (MOSQ_LIBS ${MOSQ_LIBS} m)
17	endif (APPLE)	17	find_library(LIBRT rt)
18	endif (UNIX)	18	if (LIBRT)
19		19	set (MOSQ_LIBS ${MOSQ_LIBS} rt)
20	@@ -127,6 +128,5 @@ if (${WITH_TLS} STREQUAL ON)	20	@@ -141,6 +142,5 @@ if (${WITH_TLS} STREQUAL ON)
21	endif (${WITH_TLS} STREQUAL ON)	21	endif (${WITH_TLS} STREQUAL ON)
22		22
23	if (UNIX)	23	if (UNIX)

Lines 1-41 Link Here

(-)b/net/mosquitto/files/patch-support-libressl (-38 / +5 lines)
1	From 9f74e09373f3be7b77f510ef8b0ae2c887f7b325 Mon Sep 17 00:00:00 2001
2	From: Natanael Copa <ncopa@alpinelinux.org>
3	Date: Tue, 4 Oct 2016 14:35:33 +0200
4	Subject: [PATCH] [280] Fix build with libressl
5
6	Closes #280
7
8	Fix building with libressl which broke in commit fff741613 (Support for
9	openssl 1.1.0).
10
11	Bug: #280
12
13	Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
14	---
15	lib/mosquitto_internal.h \| 3 +++	1	lib/mosquitto_internal.h \| 3 +++
16	src/mosquitto_passwd.c \| 4 ++--	2	src/mosquitto_passwd.c \| 4 ++--
17	src/security_default.c \| 2 +-	3	src/security_default.c \| 2 +-
18	3 files changed, 6 insertions(+), 3 deletions(-)	4	3 files changed, 6 insertions(+), 3 deletions(-)
19		5
20	diff --git lib/mosquitto_internal.h lib/mosquitto_internal.h	6	--- src/mosquitto_passwd.c.orig 2017-07-10 22:46:01 UTC
21	index 4b4cf85..700bbb0 100644
22	--- lib/mosquitto_internal.h
23	+++ lib/mosquitto_internal.h
24	@@ -25,6 +25,9 @@ and the Eclipse Distribution License is available at
25
26	#ifdef WITH_TLS
27	# include <openssl/ssl.h>
28	+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
29	+# define HAVE_OPENSSL_OPAQUE_STRUCTS
30	+# endif
31	#else
32	# include <time.h>
33	#endif
34	diff --git src/mosquitto_passwd.c src/mosquitto_passwd.c
35	index de9a719..5b854d9 100644
36	--- src/mosquitto_passwd.c
37	+++ src/mosquitto_passwd.c	7	+++ src/mosquitto_passwd.c
38	@@ -90,7 +90,7 @@ int output_new_password(FILE fptr, const char username, const char *password)	8	@@ -90,7 +90,7 @@ int output_new_password(FILE fptr, const char userna
39	unsigned char hash[EVP_MAX_MD_SIZE];	9	unsigned char hash[EVP_MAX_MD_SIZE];
40	unsigned int hash_len;	10	unsigned int hash_len;
41	const EVP_MD *digest;	11	const EVP_MD *digest;
Lines 44-50 index de9a719..5b854d9 100644 Link Here
44	EVP_MD_CTX context;	14	EVP_MD_CTX context;
45	#else	15	#else
46	EVP_MD_CTX *context;	16	EVP_MD_CTX *context;
47	@@ -117,7 +117,7 @@ int output_new_password(FILE fptr, const char username, const char *password)	17	@@ -117,7 +117,7 @@ int output_new_password(FILE fptr, const char userna
48	return 1;	18	return 1;
49	}	19	}
50		20
Lines 53-63 index de9a719..5b854d9 100644 Link Here
53	EVP_MD_CTX_init(&context);	23	EVP_MD_CTX_init(&context);
54	EVP_DigestInit_ex(&context, digest, NULL);	24	EVP_DigestInit_ex(&context, digest, NULL);
55	EVP_DigestUpdate(&context, password, strlen(password));	25	EVP_DigestUpdate(&context, password, strlen(password));
56	diff --git src/security_default.c src/security_default.c	26	--- src/security_default.c.orig 2017-07-10 22:46:01 UTC
57	index 64ca846..9ad8708 100644
58	--- src/security_default.c
59	+++ src/security_default.c	27	+++ src/security_default.c
60	@@ -770,7 +770,7 @@ int mosquitto_psk_key_get_default(struct mosquitto_db db, const char hint, con	28	@@ -790,7 +790,7 @@ int mosquitto_psk_key_get_default(struct mosquitto_db
61	int _pw_digest(const char password, const unsigned char salt, unsigned int salt_len, unsigned char hash, unsigned int hash_len)	29	int _pw_digest(const char password, const unsigned char salt, unsigned int salt_len, unsigned char hash, unsigned int hash_len)
62	{	30	{
63	const EVP_MD *digest;	31	const EVP_MD *digest;
64	-