From owner-svn-ports-all@freebsd.org  Tue Nov  6 13:49:51 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 A39351124273;
 Tue,  6 Nov 2018 13:49:51 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3398977077;
 Tue,  6 Nov 2018 13:49:51 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
 id 24184178B8; Tue,  6 Nov 2018 13:49:51 +0000 (UTC)
Date: Tue, 6 Nov 2018 13:49:51 +0000
From: Alexey Dokuchaev <danfe@freebsd.org>
To: Tobias Kortkamp <tobik@freebsd.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r484222 - in head/mail/libdomainkeys: . files
Message-ID: <20181106134950.GA12772@FreeBSD.org>
References: <201811052109.wA5L9f22029571@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201811052109.wA5L9f22029571@repo.freebsd.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
X-Rspamd-Queue-Id: 3398977077
X-Spamd-Result: default: False [-106.58 / 200.00]; ARC_NA(0.00)[];
 NEURAL_HAM_MEDIUM(-1.00)[-1.000,0];
 ALLOW_DOMAIN_WHITELIST(-100.00)[freebsd.org];
 FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4];
 TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];
 MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org];
 NEURAL_HAM_LONG(-1.00)[-1.000,0]; R_SPF_SOFTFAIL(0.00)[~all];
 IP_SCORE(-3.47)[ip: (-9.09), ipnet: 96.47.64.0/20(-4.54), asn: 11403(-3.63),
 country: US(-0.08)]; MX_GOOD(-0.01)[cached: mx66.freebsd.org];
 NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[];
 R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[];
 ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US];
 MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]
X-Rspamd-Server: mx1.freebsd.org
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2018 13:49:51 -0000

On Mon, Nov 05, 2018 at 09:09:41PM +0000, Tobias Kortkamp wrote:
> New Revision: 484222
> URL: https://svnweb.freebsd.org/changeset/ports/484222
> 
> Log:
>   mail/libdomainkeys: Unbreak with OpenSSL 1.1.1 [1]
>   
> ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL

I think this should be 0x10100005L instead; ditto below.

> +   EVP_MD_CTX mdctx;   /* the hash */
> ++#else
> ++  EVP_MD_CTX *mdctx;  /* the hash */
> ++#endif
> +   int signing;      /* our current signing/verifying state */
> +   int in_headers;   /* true if we're still processing headers */
> +   char *header;     /* points to a malloc'ed block for header. */
> +@@ -503,7 +507,24 @@ DK *dk_sign(DK_LIB *dklib, DK_STAT *statp, int canon)
> +     return NULL;
> +   }
> +   dk->canon = canon; /* TC13-simple, TC13-nofws */
> +-  EVP_SignInit(&dk->mdctx, dklib->md);
> ++#if OPENSSL_VERSION_NUMBER < 0x1010000fL
> ...

./danfe