From owner-svn-ports-all@freebsd.org Sat Nov 5 14:42:51 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C652C301A3; Sat, 5 Nov 2016 14:42:51 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id CFB6995; Sat, 5 Nov 2016 14:42:50 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA5EgoXe034473; Sat, 5 Nov 2016 14:42:50 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA5EgnAZ034471; Sat, 5 Nov 2016 14:42:49 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201611051442.uA5EgnAZ034471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sat, 5 Nov 2016 14:42:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425393 - in head/mail/emailrelay: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Nov 2016 14:42:51 -0000 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()) ; +