From owner-dev-commits-ports-main@freebsd.org Wed Aug 11 07:36:57 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E3E267664F; Wed, 11 Aug 2021 07:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gl1qF1yNbz4W0m; Wed, 11 Aug 2021 07:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B8AB3078; Wed, 11 Aug 2021 07:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17B7avgG033926; Wed, 11 Aug 2021 07:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17B7av7o033925; Wed, 11 Aug 2021 07:36:57 GMT (envelope-from git) Date: Wed, 11 Aug 2021 07:36:57 GMT Message-Id: <202108110736.17B7av7o033925@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 6078a4f3bea1 - main - ftp/vsftpd: fix build for FreeBSD-11.4 and SSL MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6078a4f3bea1ac21ed70217a56211d34fc183383 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2021 07:36:57 -0000 The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=6078a4f3bea1ac21ed70217a56211d34fc183383 commit 6078a4f3bea1ac21ed70217a56211d34fc183383 Author: Dirk Meyer AuthorDate: 2021-08-11 07:36:39 +0000 Commit: Dirk Meyer CommitDate: 2021-08-11 07:36:39 +0000 ftp/vsftpd: fix build for FreeBSD-11.4 and SSL --- ftp/vsftpd/files/patch-ssl.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ftp/vsftpd/files/patch-ssl.c b/ftp/vsftpd/files/patch-ssl.c new file mode 100644 index 000000000000..c5d1cb7be75f --- /dev/null +++ b/ftp/vsftpd/files/patch-ssl.c @@ -0,0 +1,15 @@ +--- ssl.c.orig 2021-08-02 06:24:35 UTC ++++ ssl.c +@@ -93,10 +93,12 @@ ssl_init(struct vsf_session* p_sess) + { + options |= SSL_OP_NO_TLSv1_2; + } ++#ifdef SSL_OP_NO_TLSv1_3 + if (!tunable_tlsv1_3) + { + options |= SSL_OP_NO_TLSv1_3; + } ++#endif + SSL_CTX_set_options(p_ctx, options); + if (tunable_rsa_cert_file) + {