From nobody Sun Apr 21 07:22:00 2024 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 4VMfvs0Mgbz5Hg9p; Sun, 21 Apr 2024 07:22:01 +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 4VMfvr6kgzz4Yxl; Sun, 21 Apr 2024 07:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713684120; 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=+7YybudsZJDegzXsKyVhdzF2lp9BhnY3EJ9ezt+/hQE=; b=lpz6VfGCOVDq9m3f+K+D7i9Jd8nH7sz2Ylat/2B83kk/0qEgX8kDo22BG7HWfXrtMXh/No 0C6Vf5RqR664ajA6tggrR1dfc5kdZ6/0VYpUge1ZNUXXz7bHDeFDaBRLw755ekVtfiiPem Sf4XG6rCVW0OkAvlI/4S1/S8hJc9JzAqRILTorWYKghUYRN3IRyU7L5DSF2Us9n7V/yyMP t8kO28lx4ioti492LV2yPn1JLTFUUqu4vwcwWKcwzvy7BoUBfjqOJK/XpQ2X26cIkkmqvb vWTTYuEGIChxR4gZ5TV9auWMa+53gSD2scwGlqDjcimMzMmSgUP8tYU7CVSbMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713684120; a=rsa-sha256; cv=none; b=QaZLrEcXICv2TjwoATENGvH7EER/12rED2FVCnnpuWTGi1jQCKMiVfOCwFUnAbjqLwIDx6 i3XCNX27CIpwk+vYZNh/GQri77MyALIggv3ToGMobGnnQOPxtPMWhQTfnIXsq1ooAOCAlP hWGoSGMT1s5/6pHuB2a0LJ6FX3s5CWG+TPM6W6Ln79RbZwj0XbazORd6du6JP9HzefIEHg a12ubDhd/teMSln6hmWcNio7e2WEPXgwdJdL6buCrt5NboDq5+x1z4VwR86HTYta42KRhM W5T+J/dvAe6Fkc/OiHA86QpM0Dz6imFDwrLn9PtIe0kFZWKZpyGSVyjc3RJ/Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713684120; 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=+7YybudsZJDegzXsKyVhdzF2lp9BhnY3EJ9ezt+/hQE=; b=Pz4x1KKLGrKCVnEcu/8i8tzdAk8+TgdNsIcgJyFjXq5fTHjg/67mm/5rxtFeqX+5lJW1Wh am3nhyvNxnTOWgBTTFcMiqGfp4J1GyU81mluqgJKexiMeYO1Z/lMJsckSaw054yQNytoEP p7PtDu/m71yTEMtZkPZQia9EjLu5iCRAsUdxeYFel7g9TvUev3R5XJPLOmuuehq6xyJSH6 2P1vClBAtght83M4yhOywE6PePbv+MY9nmAeks74j5K3ZSjct/cYXyOXO23PyaaSXQrOqE oq5h3RG0f5wil9C5RhD0a/W9PkAjTLADFAWNBi+nvpbl+dfLMt40KFpEvW9+ZQ== 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 4VMfvr6L42z1B9R; Sun, 21 Apr 2024 07:22:00 +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 43L7M0Bl031113; Sun, 21 Apr 2024 07:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L7M0al031110; Sun, 21 Apr 2024 07:22:00 GMT (envelope-from git) Date: Sun, 21 Apr 2024 07:22:00 GMT Message-Id: <202404210722.43L7M0al031110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: c392b136785e - main - ftp/libfilezilla: fix build by adding missing patch 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c392b136785e44d496fb7dc744ee616a9374197e Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=c392b136785e44d496fb7dc744ee616a9374197e commit c392b136785e44d496fb7dc744ee616a9374197e Author: Matthias Andree AuthorDate: 2024-04-21 07:21:14 +0000 Commit: Kurt Jaeger CommitDate: 2024-04-21 07:21:47 +0000 ftp/libfilezilla: fix build by adding missing patch PR: 278463 --- ftp/libfilezilla/files/patch-lib_impersonation.cpp | 73 ++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/ftp/libfilezilla/files/patch-lib_impersonation.cpp b/ftp/libfilezilla/files/patch-lib_impersonation.cpp new file mode 100644 index 000000000000..423e5bf90e44 --- /dev/null +++ b/ftp/libfilezilla/files/patch-lib_impersonation.cpp @@ -0,0 +1,73 @@ +FreeBSD defines crypt_r() via . + +--- lib/impersonation.cpp.orig 2023-06-28 13:00:47 UTC ++++ lib/impersonation.cpp +@@ -8,8 +8,6 @@ + #include + + #if FZ_UNIX +-#include +-#include + #endif + #include + #include +@@ -98,43 +96,7 @@ std::optional get_group(native_string const& gn + return {}; + } + +-#if FZ_UNIX +-struct shadow_holder { +- shadow_holder() = default; +- shadow_holder(shadow_holder const&) = delete; +- shadow_holder(shadow_holder &&) = default; +- +- shadow_holder& operator=(shadow_holder const&) = delete; +- shadow_holder& operator=(shadow_holder &&) = default; +- +- ~shadow_holder() noexcept = default; +- +- struct spwd* shadow_{}; +- +- struct spwd shadow_buffer_; +- buffer buf_{}; +-}; +- +-shadow_holder get_shadow(native_string const& username) +-{ +- shadow_holder ret; +- +- size_t s = 1024; +- int res{}; +- do { +- s *= 2; +- ret.buf_.get(s); +- res = getspnam_r(username.c_str(), &ret.shadow_buffer_, reinterpret_cast(ret.buf_.get(s)), s, &ret.shadow_); +- } while (res == ERANGE); +- +- if (res) { +- ret.shadow_ = nullptr; +- } +- +- return ret; + } +-#endif +-} + + class impersonation_token_impl final + { +@@ -191,14 +153,7 @@ bool check_auth(native_string const& username, native_ + bool check_auth(native_string const& username, native_string const& password) + { + #if FZ_UNIX +- auto shadow = get_shadow(username); +- if (shadow.shadow_) { +- struct crypt_data data{}; +- char* encrypted = crypt_r(password.c_str(), shadow.shadow_->sp_pwdp, &data); +- if (encrypted && !strcmp(encrypted, shadow.shadow_->sp_pwdp)) { +- return true; +- } +- } ++ return false; // FreeBSD does not have shadow.h support + #elif FZ_MAC + bool ret{}; +