From nobody Tue Dec 07 00:24:49 2021 X-Original-To: dev-commits-src-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 3616E18D1BF7; Tue, 7 Dec 2021 00:24:51 +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 4J7LfB0D6Vz3vw8; Tue, 7 Dec 2021 00:24:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C518415EC5; Tue, 7 Dec 2021 00:24:49 +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 1B70On9t020868; Tue, 7 Dec 2021 00:24:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B70OnoW020867; Tue, 7 Dec 2021 00:24:49 GMT (envelope-from git) Date: Tue, 7 Dec 2021 00:24:49 GMT Message-Id: <202112070024.1B70OnoW020867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: e0cb1fe7dd34 - main - cross-build: Provide _PASSWORD_EFMT1 for libcrypt on Linux List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e0cb1fe7dd34e9786320befa623b181d29d6bdf9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638836690; 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=9oDMgkGRiLhueMUlRhTjHxUYC1iH/tOfsKv6tnCLIf4=; b=KblYT7tCSFS4NN/mntY0wFoSzNH/laGKwC1czwQQfFqxsEjdIJAK6diyzXFet8YwFGXfg/ nTQxIskrXsK+sZKw4mCIhTNDU+2fO1cXi48OKWxMNEFjP3APziuh7Y7Cigud7tIhhRMKeV FCx/q+AvbdCkG4CQlNisb+nRhGbw935u5Z8LyAQcZBqO8tKgxfCSXEa5gCDA2w8qjh2g+3 xd3L1L2LHhnMrwu65/QLKKR1CrVa9vSK5S0ObfclGemLlyAKKB9j9a6Onsq05h3CBxECF0 m5eMcIUNpiM2xVazz1dX8BSAYt6TECkVmKATr34lNUsWZKI+L7iOr4saB1fooA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638836690; a=rsa-sha256; cv=none; b=l1361s6T2UJnGooxE/KuokoDNajbbmdv9IWKs/2TcY8D4biNUStIysdirk6LTu5FlorbZm GL8JnFbGT1EgjyspBdGZQejJf/Z4Oj1XXBnQt0xJAWaRnAppVzo5YSLq6LzyGvrtq4bilO Mh53+iq7BVoFskrdPxSs+wr8R8jJOn9cOINp9xZmKBb4wh5J9G33RiXssyN9KI+acP4EPZ eeiLSiZfBmv9TLLcvFbaQHKnJjYf5i0D5VwdFn6tfn/68W33FbqdcXKo1KuFq1IF7J6JO5 eaJTI+SJoTaxrF6c6o2ZA5cgIzqcQL19sKtOjdrTaDDpOZmRmL7oIdV4AOleZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e0cb1fe7dd34e9786320befa623b181d29d6bdf9 commit e0cb1fe7dd34e9786320befa623b181d29d6bdf9 Author: Jessica Clarke AuthorDate: 2021-12-06 23:25:53 +0000 Commit: Jessica Clarke CommitDate: 2021-12-07 00:24:20 +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 --- 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 14abc7fcadf0..109119e9bfe3 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));