From owner-svn-ports-head@freebsd.org Thu Nov 1 15:16:53 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 956FE10F5779; Thu, 1 Nov 2018 15:16:53 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 478D87A67C; Thu, 1 Nov 2018 15:16:53 +0000 (UTC) (envelope-from swills@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 106151D70C; Thu, 1 Nov 2018 15:16:53 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA1FGqbI009224; Thu, 1 Nov 2018 15:16:52 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA1FGqnW009191; Thu, 1 Nov 2018 15:16:52 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201811011516.wA1FGqnW009191@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 1 Nov 2018 15:16:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483677 - in head/net/mosquitto: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net/mosquitto: . files X-SVN-Commit-Revision: 483677 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.29 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: Thu, 01 Nov 2018 15:16:53 -0000 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 Approved by: joe@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 ++#include + #include + #include + #include +@@ -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 + #include +- ++#include + #include "mosquitto_broker_internal.h" + #include "memory_mosq.h" + #include "util_mosq.h"