From owner-svn-ports-head@freebsd.org Sun Mar 26 18:52:36 2017 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 D7907D1F716; Sun, 26 Mar 2017 18:52:36 +0000 (UTC) (envelope-from brnrd@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 8A9C21665; Sun, 26 Mar 2017 18:52:36 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2QIqZHB025904; Sun, 26 Mar 2017 18:52:35 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2QIqZdK025902; Sun, 26 Mar 2017 18:52:35 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201703261852.v2QIqZdK025902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 26 Mar 2017 18:52:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436977 - in head/ftp/proftpd: . 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, 26 Mar 2017 18:52:36 -0000 Author: brnrd Date: Sun Mar 26 18:52:35 2017 New Revision: 436977 URL: https://svnweb.freebsd.org/changeset/ports/436977 Log: ftp/proftpd: Fix mod_tls build with LibreSSL - Remove IGNORE with LibreSSL SSL_DEFAULT - Add patch for mod_tls to build with LibreSSL PR: 217025 Approved by: maintainer timeout Added: head/ftp/proftpd/files/patch-modules_mod__tls.c (contents, props changed) Modified: head/ftp/proftpd/Makefile Modified: head/ftp/proftpd/Makefile ============================================================================== --- head/ftp/proftpd/Makefile Sun Mar 26 18:30:24 2017 (r436976) +++ head/ftp/proftpd/Makefile Sun Mar 26 18:52:35 2017 (r436977) @@ -174,9 +174,6 @@ CONFIGURE_ARGS+= --with-libraries=${LIBD .if ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif -.if ${SSL_DEFAULT:Mlibressl*} -BROKEN= Does not build with libressl -.endif .if !defined(_BUILDING_PROFTPD_MODULE) Added: head/ftp/proftpd/files/patch-modules_mod__tls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/proftpd/files/patch-modules_mod__tls.c Sun Mar 26 18:52:35 2017 (r436977) @@ -0,0 +1,20 @@ +--- modules/mod_tls.c.orig 2017-01-16 01:13:01 UTC ++++ modules/mod_tls.c +@@ -609,7 +609,7 @@ static void tls_diags_cb(const SSL *ssl, + break; + #endif + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + case TLS_ST_OK: + #else + case SSL_ST_OK: +@@ -633,7 +633,7 @@ static void tls_diags_cb(const SSL *ssl, + + ssl_state = SSL_get_state(ssl); + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + if (ssl_state == TLS_ST_SR_CLNT_HELLO) { + #else + if (ssl_state == SSL3_ST_SR_CLNT_HELLO_A ||