svn commit: r464077 - in branches/2018Q1/mail/cclient: . files

[Thomas Zander]

Author: riggs
Date: Sat Mar 10 14:57:08 2018
New Revision: 464077
URL: https://svnweb.freebsd.org/changeset/ports/464077

Log:
  MFH: r464076
  
  Un-break with SSL OPTION (default)
  
  PR:		225885
  Submitted by:	brnrd
  
  Approved by:	ports-secteam (riggs)

Added:
  branches/2018Q1/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c
     - copied unchanged from r464076, head/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c
Modified:
  branches/2018Q1/mail/cclient/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/mail/cclient/Makefile
==============================================================================
--- branches/2018Q1/mail/cclient/Makefile	Sat Mar 10 14:44:27 2018	(r464076)
+++ branches/2018Q1/mail/cclient/Makefile	Sat Mar 10 14:57:08 2018	(r464077)
@@ -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

Copied: branches/2018Q1/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c (from r464076, head/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c	Sat Mar 10 14:57:08 2018	(r464077, copy of r464076, head/mail/cclient/files/patch-src_osdep_unix_ssl__unix.c)
@@ -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 :