From nobody Wed Oct 5 18:45:53 2022 X-Original-To: dev-commits-ports-all@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 4MjNnG0WMjz4dpfp; Wed, 5 Oct 2022 18:45:54 +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 4MjNnF743Wz428s; Wed, 5 Oct 2022 18:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664995554; 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=UDQ9WUFkFbeZLrnBFJpQK6Ir3F6yfzFLQ7k+tpqlmkg=; b=RwaA71/ijLYSzz65dqchRA+Yr05tEng99sx7IY73K0mQmBBkejdh4HO8oCDfYhoSjiVSem 6peQAPGwX9BlzfcwybBaiajj2uxLf9VG9n/IfkaYkCpposhtC1aEW+UWF02Z5L8DhVw9Rx othX2QXaTsFmOVBumlpRmsbkxTiPhJHhwQmFg5pA7WHd5n8h7fvACSWCxcXSfZegWpMCsW IaW9hY2IX5DEHwnpjAmyoE7AvDdfDx5a+8xWYVk23N6LmkGfBuwI7Wvhvuslo8PnXVmTQU Txcqn+mLUY3Q7JXvKgAizUE1Wb5jC9RRP5D4JZ1+7uEMfh3meshxNTNhFQvzJA== 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 4MjNnF65Tlz10gm; Wed, 5 Oct 2022 18:45:53 +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 295Ijruf014569; Wed, 5 Oct 2022 18:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295Ijrbg014568; Wed, 5 Oct 2022 18:45:53 GMT (envelope-from git) Date: Wed, 5 Oct 2022 18:45:53 GMT Message-Id: <202210051845.295Ijrbg014568@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 9a36ff5299c8 - main - ftp/lftp: Fix build with libressl >= 2.7.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664995554; 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=UDQ9WUFkFbeZLrnBFJpQK6Ir3F6yfzFLQ7k+tpqlmkg=; b=LkNZz8STtbra64UKeRlRXBanzM15E0/+50w7YkOeMkHmekxD4XgIdj5F7HTmpOQP3/LjIu 8miJ8S/pdzbCySqSZ5T8N8AjfhehzSZzy0yKCM0RAI4rAgbfSUcI7qZTE24QisWiDOIx1c RdLGM/IyPXXbIziqWAFX6ruF7fZGFEqPMOkeCuz+ZjLLVc5GgbG2aWR83ABkuvrXBpn6Dc qRziP7Qj/yrF89V5Pts2W0gvZGy2IDsI5P00FU20U2lYAf/FTQWg4nJTqI1oNRJ1Zi1G+t sa/IdzgvMFbo4V2t0m5SUyAq4OpZ54ZAkH3RruOi/4lSk5BW/VsbDWi107hRKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664995554; a=rsa-sha256; cv=none; b=DidZOrNd/0zdjDPhXR2ZUsGa8piILdK/YA7RLdj0vnZ9eASNf8FN1FyuAcgHh/hodb7duR aYo+g+k4v+FcmXXos4tecEBV/9088auDMOP7YRiBGyUUIImUbk8zXnWLaCcDtJ3UQc9buv IROu4jhD7bb9V2h/9h4fHJx9TFsoQi7jKOHNMa5a7pw0emV8LTEq8bLwZGnBGoGB3Xs6p1 Wxx6yNcjARRqOC7jPejuE4W+8DS8SAcWmRgx+xzhSskTbyV8tfDQcNw6ZrOkQX+QW88czu MCNyt+vr3kH9uGWbafCwz9HNvp/4pFLv7xzTHmdVapP4Zlg0Ad6RLDzx55wwPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 commit 9a36ff5299c8de0f7a97093fcfe88a2befc0fe35 Author: Ganael LAPLANCHE AuthorDate: 2022-10-05 18:38:05 +0000 Commit: Ganael LAPLANCHE CommitDate: 2022-10-05 18:45:45 +0000 ftp/lftp: Fix build with libressl >= 2.7.0 While here, re-generate patches using makepatch target. PR: 266803 Reported by: tjlegg@gmail.com Obtained from: https://github.com/lavv17/lftp/commit/3ffa0132987bdde986c82c924bc51b13b37f8b54 --- ftp/lftp/files/patch-src-Makefile.in | 4 ++-- ftp/lftp/files/patch-src_lftp__ssl.cc | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ftp/lftp/files/patch-src-Makefile.in b/ftp/lftp/files/patch-src-Makefile.in index a0a82f1b3647..be33f1b58e7c 100644 --- a/ftp/lftp/files/patch-src-Makefile.in +++ b/ftp/lftp/files/patch-src-Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2019-12-21 09:41:47 UTC +--- src/Makefile.in.orig 2020-08-13 19:57:03 UTC +++ src/Makefile.in -@@ -2607,7 +2607,7 @@ info: info-am +@@ -2625,7 +2625,7 @@ info: info-am info-am: diff --git a/ftp/lftp/files/patch-src_lftp__ssl.cc b/ftp/lftp/files/patch-src_lftp__ssl.cc index 03a2b75a31c8..79d85fd04207 100644 --- a/ftp/lftp/files/patch-src_lftp__ssl.cc +++ b/ftp/lftp/files/patch-src_lftp__ssl.cc @@ -9,6 +9,15 @@ #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject #endif extern "C" { +@@ -775,7 +775,7 @@ error: + #elif USE_OPENSSL + //static int lftp_ssl_passwd_callback(char *buf,int size,int rwflag,void *userdata); + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || LIBRESSL_VERSION_NUMBER ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L) + // for compatibility with older versions + X509_OBJECT *X509_OBJECT_new() + { @@ -840,7 +840,7 @@ lftp_ssl_openssl_instance::lftp_ssl_openssl_instance() ssl_ctx=SSL_CTX_new(); X509_set_default_verify_paths(ssl_ctx->cert);