From owner-svn-ports-head@freebsd.org Sun Sep 11 22:39:12 2016 Return-Path: Delivered-To: svn-ports-head@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 8B6EDBD6C11; Sun, 11 Sep 2016 22:39:12 +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 41A00644; Sun, 11 Sep 2016 22:39:12 +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 u8BMdBtw008051; Sun, 11 Sep 2016 22:39:11 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8BMdBk2008049; Sun, 11 Sep 2016 22:39:11 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609112239.u8BMdBk2008049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 11 Sep 2016 22:39:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421881 - in head/mail/courier-imap: . 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-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sun, 11 Sep 2016 22:39:12 -0000 Author: marino Date: Sun Sep 11 22:39:11 2016 New Revision: 421881 URL: https://svnweb.freebsd.org/changeset/ports/421881 Log: mail/courier-imap: Handle no SSLv3 method (fixes build with LibreSSL) Approved by: SSL blanket Added: head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c (contents, props changed) Modified: head/mail/courier-imap/Makefile Modified: head/mail/courier-imap/Makefile ============================================================================== --- head/mail/courier-imap/Makefile Sun Sep 11 22:14:52 2016 (r421880) +++ head/mail/courier-imap/Makefile Sun Sep 11 22:39:11 2016 (r421881) @@ -16,7 +16,7 @@ RUN_DEPENDS= courierauthconfig:security/ ${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode -USES= gmake perl5 tar:bzip2 +USES= gmake perl5 ssl tar:bzip2 GNU_CONFIGURE= yes USE_RC_SUBR= courier-imap-imapd courier-imap-imapd-ssl \ courier-imap-pop3d courier-imap-pop3d-ssl @@ -47,7 +47,6 @@ FAM_USES= fam CONFDIR?= ${PREFIX}/etc/${PORTNAME} USERDB?= ${PREFIX}/etc/userdb LIBEXECDIR?= ${PREFIX}/libexec/${PORTNAME} -USE_OPENSSL= yes PLIST_SUB= CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \ LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,} Added: head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/courier-imap/files/patch-libs_tcpd_libcouriertls.c Sun Sep 11 22:39:11 2016 (r421881) @@ -0,0 +1,12 @@ +--- libs/tcpd/libcouriertls.c.orig 2015-06-10 00:08:23 UTC ++++ libs/tcpd/libcouriertls.c +@@ -74,7 +74,9 @@ struct proto_ops op_list[] = + { "TLSv1", &TLSv1_method, SSL_OP_ALL }, + { "TLS1", &TLSv1_method, SSL_OP_ALL }, + { "SSL3+", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2 }, ++#ifdef HAVE_SSLV3_METHOD + { "SSL3", &SSLv3_method, SSL_OP_ALL }, ++#endif + { "SSL23", &SSLv23_method, SSL_OP_ALL }, + { "", &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 }, + { NULL, &SSLv23_method, SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 },