svn commit: r425393 - in head/mail/emailrelay: . files

[John Marino]

Author: marino
Date: Sat Nov  5 14:42:49 2016
New Revision: 425393
URL: https://svnweb.freebsd.org/changeset/ports/425393

Log:
  mail/emailrelay: Fix DEFAULT_VERSIONS+=ssl
  
  Both LibreSSL and the latest version of OpenSSL lack definitions for
  SSLv3_method, so handle that case to fix the build with those SSL options.
  
  Appoved by:	SSL blanket

Added:
  head/mail/emailrelay/files/patch-src_gssl_gssl__openssl.cpp   (contents, props changed)
Modified:
  head/mail/emailrelay/Makefile

Modified: head/mail/emailrelay/Makefile
==============================================================================
--- head/mail/emailrelay/Makefile	Sat Nov  5 14:26:45 2016	(r425392)
+++ head/mail/emailrelay/Makefile	Sat Nov  5 14:42:49 2016	(r425393)
@@ -33,6 +33,8 @@ GUI_USE=		QT4=gui,moc
 
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USE=		OPENSSL=yes
+OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
+OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 

Added: head/mail/emailrelay/files/patch-src_gssl_gssl__openssl.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/emailrelay/files/patch-src_gssl_gssl__openssl.cpp	Sat Nov  5 14:42:49 2016	(r425393)
@@ -0,0 +1,13 @@
+--- src/gssl/gssl_openssl.cpp.orig	2013-12-07 22:55:47 UTC
++++ src/gssl/gssl_openssl.cpp
+@@ -292,8 +292,10 @@ GSsl::Context::Context( const std::strin
+ {
+ 	if( (flags&3U) == 2U )
+ 		m_ssl_ctx = SSL_CTX_new(SSLv23_method()) ;
++#ifndef OPENSSL_NO_SSL3
+ 	else if( (flags&3U) == 3U )
+ 		m_ssl_ctx = SSL_CTX_new(SSLv3_method()) ;
++#endif
+ 	else
+ 		m_ssl_ctx = SSL_CTX_new(TLSv1_method()) ;
+