From nobody Tue Jan 25 01:40:02 2022 X-Original-To: dev-commits-src-branches@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 71BB51972919; Tue, 25 Jan 2022 01:40:04 +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 4JjV0M1pVdz4ZYn; Tue, 25 Jan 2022 01:40:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074803; 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=o8EISLBi8mvr5po20n1XzoBYTXhZA9+pHkJeCS+HrEk=; b=iVFXrxWWNWHhwz8FR1BICTCXDvr73fLUjngoISzXTRm2+VFWt9L7ZwYxtrinEI/1nvrGwL cFmMHVBxhtuIdZ+2gkryo3D7TAIXzZ/O0dcnLmHoDeG1tEddFgdU7hmJHDqKRuLtTB9bKZ j1FjqgXLN9jbtMOjcKWZ/4hCCSxt0j0GvcjfTV9SDq7CmlRQSA7dnk0qqGE+hzcUajJpuM iDFIgoUyLEdP8tYqhfY4eWdXPnRK+fF+1pUinJhnx7S+tprABauyd0GSbAwyC0/kqcRNpS KfhwIZ3fyu0tiS3h7GjWvePIJSbvFOwjdwGr10mLtYKF3zEbtRsq1q9e+9S47Q== 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 07E2F2086B; Tue, 25 Jan 2022 01:40:03 +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 20P1e2ZC044924; Tue, 25 Jan 2022 01:40:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e2UQ044921; Tue, 25 Jan 2022 01:40:02 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:02 GMT Message-Id: <202201250140.20P1e2UQ044921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 94b6c9bab7ef - stable/13 - cross-build: Define crypt_data in unistd.h for libcrypt List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 94b6c9bab7ef2d857d5d56d3e9f6b42926caefd5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074803; 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=o8EISLBi8mvr5po20n1XzoBYTXhZA9+pHkJeCS+HrEk=; b=DJbKIn876FDR7TCL8knWm9nhEZ01gFxEa/tRXbMM7mfA+fjxCxCrettKd+HtDvyT4V1qXk ctMyeEXQBdgXqXJlTOQFP+fEzrNsgUlFUpVEQR91kv3v4ihzgEXhgl1iV3ZxURNERG1PAC S1igBUT/7eQJRBCAoSO3XKWvEgsTbPX3E0xtV4/ED5qnR/q7OBk25+hVrtqI8pmOpnMjCN CpV98IwqbvjS1PBxk4vjmUD+4wE/y3z9GXF0CTEiX1Bcl+XoZtPrAtm0K2DZexPjkhBZmx xaH1I02Y+HZJtbvw6LU2SlZRylWyFWnmPBaT56i3uwglR1w+UuMJk6iwVacyrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074803; a=rsa-sha256; cv=none; b=ALeEJ02HGJVr0sQyw5cIH17ojK8Q1qiaDjnoNF/pnwZQcBZ7HAuVPwni4jjiq2Vshfrr4N UWnBNFCpbRb1Yv0zB9f8rgP8X/iv3N1N0fbCsMLtgzzROnyCxIUnjZXQ7xZ/LsxAbocjU2 yCgQOuSl0CXrXCkc/EkW7LNE3Pcx3m8khsP7Zov5vbk8gSuIZfgPMtvYjiiIBQoP38PdaH Tcg8OgvzZzioOuwcbtSL/2soHbNAYmCn0W2ben3fNhMz+F8kn/oVa6wwkEfU5VOyBRxHXp 34Y4XTwXMaFLOYnQEgAdMz98nUe+AvRJhVodn5sDYSTobv9tgwDxuFrD/NWGPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=94b6c9bab7ef2d857d5d56d3e9f6b42926caefd5 commit 94b6c9bab7ef2d857d5d56d3e9f6b42926caefd5 Author: Jessica Clarke AuthorDate: 2021-12-06 22:29:51 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:21 +0000 cross-build: Define crypt_data in unistd.h for libcrypt This is where it's defined in the base system, so is where libcrypt expects it to exist when being built, and will be needed when being bootstrapped in a subsequent commit. MFC after: 1 week (cherry picked from commit 8ceba27a5d51e2fcc0ea547d5051bd859d15233c) --- tools/build/cross-build/include/common/unistd.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/build/cross-build/include/common/unistd.h b/tools/build/cross-build/include/common/unistd.h index 593dd700f140..fbcc0cc31795 100644 --- a/tools/build/cross-build/include/common/unistd.h +++ b/tools/build/cross-build/include/common/unistd.h @@ -39,6 +39,11 @@ #include_next #include +struct crypt_data { + int initialized; /* For compatibility with glibc. */ + char __buf[256]; /* Buffer returned by crypt_r(). */ +}; + static inline int check_utility_compat(const char *utility __unused) {