From nobody Tue Jan 25 01:40:04 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 979E8197293B; Tue, 25 Jan 2022 01:40:05 +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 4JjV0N6sGwz4ZhR; Tue, 25 Jan 2022 01:40:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074805; 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=kajiYU1P80SSnwRhdAjuUypndhjh2x7oHqLqVyoTzYs=; b=Crz2DJ9rW0pi9AWhGjOBGkfXFGdUiGIPKtoHz5hte8E8jk/7AEZqr01al8iJSwIOBGTFP+ 6XyGmpzPjzorEIo9PKCNtGz06IzSC87s7kv6Mhl5z3XMfUvGIdMxVwNAuQZuPoapHc6rel LPZy786KSesuGNueQ/lTUg3K0pUtWzQ3+Ur8nygElkrxHtMRcqjkLeoroxTYSaY7zFRigN GbdH2csJRDDS0mBna/fKujLGSkoX0OLjQLY0PiEBvS8HoKijubQigNI0bmihmgi3H00phU wfddDeqMhAKKqAxEYXQ3KLz/Bpq9mmilfQHLzKo3Cy2ihIox2Pu410mlgFSwQA== 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 1EDBB20B38; Tue, 25 Jan 2022 01:40:04 +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 20P1e4th045137; Tue, 25 Jan 2022 01:40:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1e4L6045134; Tue, 25 Jan 2022 01:40:04 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:04 GMT Message-Id: <202201250140.20P1e4L6045134@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: 102717f773f8 - stable/13 - cross-build: Provide _PASSWORD_EFMT1 for libcrypt on Linux 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: 102717f773f8b7c54b2ba389e894aeeddbaae596 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074805; 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=kajiYU1P80SSnwRhdAjuUypndhjh2x7oHqLqVyoTzYs=; b=GrJzn3OgvV37lQXLpThM6ebmn4354Dmn4GaPQdRdXtQS8aeF5QcxBZgzToqRZknBmD1/fJ IE8o8/dW6oLXIWwAPq4axgH6L6ydfhe4XD2xk/7c9fJ/J1broyi0lTuSb8/9ISKeFFpN7z eArZMiIsVlRIEbzF9Z2efUmCoNwZ9FWPD8Yzp/QKpOxR3vqHqYt/TjQtOWm1Il4RE7TPs9 xFBa2aKpkWKTMKz/s0+PtZcLqyAVurl5GANl7t+euEz4keI1vG9uHvFgJ6yEpIKmD+waNP u7oJESNmHFZ15kAzQW32TP4iYTMMIL3+H5ybX7zok3SW/HJwdLq6zJUaxGF3rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074805; a=rsa-sha256; cv=none; b=Meygb8aHn0Akdjihog/E2jU9+IYZrdPRm2O1Pmkuw5dcSW4p9UkWKjzvVsFlUe/7wKtmji 7BpMjIask3m7ljibSZkgB9yNyBn4zfCaULJYtHfgk7mW1DlODRdP/hZmNh5gvZdY9bx/L3 Wn50MKNlOLT8wPGmTioIvgLLvXJf1l33+x/zLC1sxmZJrrZDy9kSIMW2HYbwwxEqF2SJCG MP3vgNYMRNxBmInuvCKJIdJKWKJ325fds/A6eJBsHbKfMmobSar8GqWlLjQlZXwCZ0tMgB 6UAg0vALOxutKHAogCc8CxEkAWiqlbTf4/7p+7KC23t+sup+rMxqT+CdGSlozA== 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=102717f773f8b7c54b2ba389e894aeeddbaae596 commit 102717f773f8b7c54b2ba389e894aeeddbaae596 Author: Jessica Clarke AuthorDate: 2021-12-06 23:25:53 +0000 Commit: Jessica Clarke CommitDate: 2022-01-24 23:59:24 +0000 cross-build: Provide _PASSWORD_EFMT1 for libcrypt on Linux Linux's pwd.h does not define _PASSWORD_EFMT1 (macOS's does), so we need to define it in order to be able to bootstrap libcrypt (crypt-des.c uses it) on non-FreeBSD, which will be done in a subsequent commit. MFC after: 1 week (cherry picked from commit e0cb1fe7dd34e9786320befa623b181d29d6bdf9) --- tools/build/cross-build/include/common/pwd.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/cross-build/include/common/pwd.h b/tools/build/cross-build/include/common/pwd.h index e167fe47701f..03814b62c254 100644 --- a/tools/build/cross-build/include/common/pwd.h +++ b/tools/build/cross-build/include/common/pwd.h @@ -41,6 +41,10 @@ #define user_from_uid __nbcompat_user_from_uid +#ifndef _PASSWORD_EFMT1 +#define _PASSWORD_EFMT1 '_' /* extended encryption format */ +#endif + int pwcache_userdb(int (*a_setpassent)(int), void (*a_endpwent)(void), struct passwd *(*a_getpwnam)(const char *), struct passwd *(*a_getpwuid)(uid_t));