From nobody Sat Jul 1 13:25:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QtXxN3ryhz4kYr4; Sat, 1 Jul 2023 13:25:28 +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 4QtXxN3Cm5z3Fm2; Sat, 1 Jul 2023 13:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688217928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mF51DWT1APPInvuA7WiJ8jvs6vwdurR1ryudWa8KXFo=; b=H0TBNx1cvvKhyDpp4+KodahioHfPgDPRSyH696KcYiQcTPa86a/6bSQ6/sl/ff+b8gZ29b B1q8d55W56UmHczqqoV+x4sCXq7oZkcYBVArsXrra7NtAJqE9WOdfR3ydni2ou1nDTGmlb g0VaH5NIYHqS/pbtq/DKLH6xndzVPWGNEeL+vYG2g/TV6cQheZLXt7aPQdwIY5tRw9z2TU LgzU+1p8G2YB6DdplKZ5CztffaMwRxXubDaw0NGfBFrvpMytu0tGqeeLEVc99mHWuWodUg S2HmCZqP7aB9hFoLxt5xrvPzPKaq+bSrakEOFq9chGI3lkkFjZV8jcJeVyTfJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688217928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mF51DWT1APPInvuA7WiJ8jvs6vwdurR1ryudWa8KXFo=; b=RohxHLcElhcqVyoeQ5QgGFXc7wGKohmuGSnmKOkt48rQl2JM2Y1omWOw4HPopWTmzmzobz 6SCB3KnIcsaau3k/9E8llZDeYTVu+pZnYXxtAEI7i7uaN8742go66ZUxKc+3Slo/QjKlQM 3aaE0BfNR3Ky9+4IIUz0W2+wE+qRpYgJ65xNgxansSqwzzNiaPF7UmXeLva+fd81PV+GS1 rrJIautY1FceJm7UCdZpq1ShYAyTxZzGsTaGjuZigNX8A4cCPlAtJx7Fs226lHYcOQd2pK SAGmDag0eEenX3iuJJdO3iJzJRE8Dvup8drVb2bnquMR1Z9x9xHVtowt8Qkv1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688217928; a=rsa-sha256; cv=none; b=kuQBm7qM0Mtj7weSsRs6+GYdMNdgL2y/vM5xYVlHH4yePRpPV9t8AOXy2XNh72WHXl/sB6 omk41h5MriF2mfv5kyAuQJbcw4DPtF8FKjq9TkNcBHVE0kg+DdvECMJW6b7zgW+rCkmSHI UhQHWMVdjCKGTnWSdwSvOXzSKFhpV0Xn1o6bW8DocC7I5+yLNGHlcvx7888Z4mxT3ZTSam j8vE8wPBLEWiZhRqEvYfcCsToMhRXQ8a8+raPjEPzoGpSW1FKxFeDLgH+++eiHHfeGNAHG /IUlxBt1QkIZGOyR/bfed3aPS8TIzseQCmT7ASfYBmsc6tT1w1DkAPOJlqbMQg== 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 4QtXxN2GX9zRmc; Sat, 1 Jul 2023 13:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361DPSX5070944; Sat, 1 Jul 2023 13:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361DPSPH070943; Sat, 1 Jul 2023 13:25:28 GMT (envelope-from git) Date: Sat, 1 Jul 2023 13:25:28 GMT Message-Id: <202307011325.361DPSPH070943@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: 1c9f850369e7 - main - ftp/vsftpd: fix build with openssl30 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 1c9f850369e7dc17b7f0dd692f95f80989d58a3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c9f850369e7dc17b7f0dd692f95f80989d58a3a commit 1c9f850369e7dc17b7f0dd692f95f80989d58a3a Author: Dirk Meyer AuthorDate: 2023-07-01 13:24:45 +0000 Commit: Dirk Meyer CommitDate: 2023-07-01 13:24:45 +0000 ftp/vsftpd: fix build with openssl30 --- ftp/vsftpd/Makefile | 3 +-- ftp/vsftpd/files/patch-ssl.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile index 51aa1d50cb5f..0da3fa86f3b4 100644 --- a/ftp/vsftpd/Makefile +++ b/ftp/vsftpd/Makefile @@ -35,10 +35,9 @@ STACKPROTECTOR_DESC= Build with stack-protector .if ${PORT_OPTIONS:MVSFTPD_SSL} && !defined(WITHOUT_SSL) USES+= ssl -BROKEN_SSL= openssl30 openssl31 -BROKEN_SSL_REASON= Requires OpenSSL 3.0.0 deprecated EC_* routines SSL_SUFFIX= -ssl CFLAGS+= -I${OPENSSLINC} +CFLAGS+= -Wno-deprecated-declarations LDFLAGS+= -L${OPENSSLLIB} .endif diff --git a/ftp/vsftpd/files/patch-ssl.c b/ftp/vsftpd/files/patch-ssl.c index 5ff044dab8d5..3b8f49288292 100644 --- a/ftp/vsftpd/files/patch-ssl.c +++ b/ftp/vsftpd/files/patch-ssl.c @@ -26,7 +26,23 @@ SSL_CTX_set_options(p_ctx, options); if (tunable_rsa_cert_file) { -@@ -683,7 +685,7 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_session* p_sess +@@ -139,6 +141,7 @@ ssl_init(struct vsf_session* p_sess) + { + die("SSL: RNG is not seeded"); + } ++#if OPENSSL_VERSION_NUMBER < 0x10200000L + { + EC_KEY* key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); + if (key == NULL) +@@ -148,6 +151,7 @@ ssl_init(struct vsf_session* p_sess) + SSL_CTX_set_tmp_ecdh(p_ctx, key); + EC_KEY_free(key); + } ++#endif + if (tunable_ssl_request_cert) + { + verify_option |= SSL_VERIFY_PEER; +@@ -683,7 +687,7 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_session* p_sess } static char*