svn commit: r483677 - in head/net/mosquitto: . files

[Steve Wills]

Author: swills
Date: Thu Nov  1 15:16:52 2018
New Revision: 483677
URL: https://svnweb.freebsd.org/changeset/ports/483677

Log:
  net/mosquitto: Fix OpenSSL build
  
  PR:		232168
  Submitted by:	Nathan <ndowens at yahoo.com>
  Approved by:	joe at thrallingpenguin.com (maintainer)

Added:
  head/net/mosquitto/files/patch-src_mosquitto__passwd.c   (contents, props changed)
  head/net/mosquitto/files/patch-src_security__default.c   (contents, props changed)
Deleted:
  head/net/mosquitto/files/patch-support-libressl
Modified:
  head/net/mosquitto/Makefile   (contents, props changed)

Modified: head/net/mosquitto/Makefile
==============================================================================
--- head/net/mosquitto/Makefile	Thu Nov  1 15:16:52 2018	(r483676)
+++ head/net/mosquitto/Makefile	Thu Nov  1 15:16:52 2018	(r483677)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mosquitto
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://mosquitto.org/files/source/
 

Added: head/net/mosquitto/files/patch-src_mosquitto__passwd.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mosquitto/files/patch-src_mosquitto__passwd.c	Thu Nov  1 15:16:52 2018	(r483677)
@@ -0,0 +1,33 @@
+ 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	2018-10-11 00:27:05 UTC
++++ src/mosquitto_passwd.c
+@@ -17,6 +17,7 @@ Contributors:
+ #include "config.h"
+ 
+ #include <errno.h>
++#include <openssl/opensslv.h>
+ #include <openssl/evp.h>
+ #include <openssl/rand.h>
+ #include <openssl/buffer.h>
+@@ -99,7 +100,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;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#ifdef HAVE_OPENSSL_OPAQUE_STRUCTS 
+ 	EVP_MD_CTX context;
+ #else
+ 	EVP_MD_CTX *context;
+@@ -126,7 +127,7 @@ int output_new_password(FILE *fptr, const char *userna
+ 		return 1;
+ 	}
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L 
+ 	EVP_MD_CTX_init(&context);
+ 	EVP_DigestInit_ex(&context, digest, NULL);
+ 	EVP_DigestUpdate(&context, password, strlen(password));

Added: head/net/mosquitto/files/patch-src_security__default.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mosquitto/files/patch-src_security__default.c	Thu Nov  1 15:16:52 2018	(r483677)
@@ -0,0 +1,11 @@
+--- src/security_default.c.orig	2018-10-11 00:28:56 UTC
++++ src/security_default.c
+@@ -18,7 +18,7 @@ Contributors:
+ 
+ #include <stdio.h>
+ #include <string.h>
+-
++#include <openssl/opensslv.h>
+ #include "mosquitto_broker_internal.h"
+ #include "memory_mosq.h"
+ #include "util_mosq.h"