From owner-svn-ports-head@freebsd.org Sat Mar 10 14:44:28 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 77F15F3DEDD; Sat, 10 Mar 2018 14:44:28 +0000 (UTC) (envelope-from riggs@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 29B32767AC; Sat, 10 Mar 2018 14:44:28 +0000 (UTC) (envelope-from riggs@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 2497274A5; Sat, 10 Mar 2018 14:44:28 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2AEiSmV051064; Sat, 10 Mar 2018 14:44:28 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2AEiRYi051062; Sat, 10 Mar 2018 14:44:27 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201803101444.w2AEiRYi051062@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 10 Mar 2018 14:44:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464076 - in head/mail/cclient: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/mail/cclient: . files X-SVN-Commit-Revision: 464076 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.25 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: Sat, 10 Mar 2018 14:44:28 -0000 Author: riggs Date: Sat Mar 10 14:44:27 2018 New Revision: 464076 URL: https://svnweb.freebsd.org/changeset/ports/464076 Log: Un-break with SSL OPTION (default) PR: 225885 Submitted by: brnrd MFH: 2018Q1 Added: head/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c (contents, props changed) Modified: head/mail/cclient/Makefile Modified: head/mail/cclient/Makefile ============================================================================== --- head/mail/cclient/Makefile Sat Mar 10 14:07:27 2018 (r464075) +++ head/mail/cclient/Makefile Sat Mar 10 14:44:27 2018 (r464076) @@ -3,7 +3,7 @@ PORTNAME= cclient PORTVERSION= 2007f -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= mail devel ipv6 MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ @@ -25,8 +25,6 @@ OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT OPTIONS_DEFAULT= SSL SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL MBX_DEFAULT_DESC= Use MBX as default mailbox format - -BROKEN_SSL= openssl-devel ALL_TARGET= bsf MAKE_JOBS_UNSAFE= yes Added: head/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c Sat Mar 10 14:44:27 2018 (r464076) @@ -0,0 +1,26 @@ +--- src/osdep/unix/ssl_unix.c.orig 2011-07-23 00:20:10 UTC ++++ src/osdep/unix/ssl_unix.c +@@ -270,9 +270,9 @@ static char *ssl_start_work (SSLSTREAM * + (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), + host))) { + /* application callback */ +- if (scq) return (*scq) (err,host,cert ? cert->name : "???") ? NIL : ""; ++ if (scq) return (*scq) (err,host,cert ? X509_get_subject_name(cert) : "???") ? NIL : ""; + /* error message to return via mm_log() */ +- sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); ++ sprintf (tmp,"*%.128s: %.255s",err,cert ? X509_get_subject_name(cert) : "???"); + return ssl_last_error = cpystr (tmp); + } + return NIL; +@@ -322,9 +322,9 @@ static char *ssl_validate_cert (X509 *ce + /* make sure have a certificate */ + if (!cert) ret = "No certificate from server"; + /* and that it has a name */ +- else if (!cert->name) ret = "No name in certificate"; ++ else if (!X509_get_subject_name(cert)) ret = "No name in certificate"; + /* locate CN */ +- else if (s = strstr (cert->name,"/CN=")) { ++ else if (s = strstr (X509_get_subject_name(cert),"/CN=")) { + if (t = strchr (s += 4,'/')) *t = '\0'; + /* host name matches pattern? */ + ret = ssl_compare_hostnames (host,s) ? NIL :