From nobody Mon Sep 30 05:09:22 2024 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 4XH8J23D0Jz5XlyJ; Mon, 30 Sep 2024 05:09:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH8J22Wddz4Z56; Mon, 30 Sep 2024 05:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672962; 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=pWGvrOzBM/rJwTNYwYEPw2/sfF3MaDmuKHAWPlO+W4g=; b=PrFRY9tyJBDULe19rhHPUwv+jGWCcvA/t0QGXEdOcPFnjQ6QupAkMJsOqXmc6j0bsYo5u3 xL9W0llX5vTJBj2t+xzSI/zVslvDg/+lGCyzV5LbP8F5rzCZxqydjnAYPfqtL7HFtXsH39 NWg4j3ZeAbQec0Ql4vzYov2NeZB24EZdeL076q/tOggnavos1bPBOskG1nSp51xI5rAylV 4+IDo/1EaJ6HV4XZ3LwXPryoFSBnbFzlKmu51ePgf6ABvBpQVlPwSTaHSfYB2QZk+KaYqs f3zBllU8RaW6QqTN9QaT6Cv1T8JW0yceM/Ql3J1pkPcmIQRS3K72TWvgNT9vGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672962; 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=pWGvrOzBM/rJwTNYwYEPw2/sfF3MaDmuKHAWPlO+W4g=; b=FQLA+mcasiLDUs1aRnoBvf6ON1NG3pyy/QHAfM9VEECUxfllHDPMgCDjoC0WY3vX7f+vir BpzACGu6rcew+YZNIjv70FCTy7+okW9nHic/1M2j2/7OnNPgc0PyuGiMsjI8XlbDSdFSVe 0UrGvzkdv34sUQLvTKSDl0/tIUqetz3lD7xtlrsR3A6CIw2Q+wUkeQXJl4BxeJhYB8rGsS dkkyOdDKjYoAAMaEYfw3/I+SImajaEvsHEv/l2waS5ymyHTUV9JR9DDQ94r7rdDYSj5yU8 qo7920nbvNpWmNuXZSIflXo0YbUwA31duYLxWa0ZV2nzWAOP+gujCt0JPtG4Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672962; a=rsa-sha256; cv=none; b=niUPS7XGVFeUe1oN78X9frwwCdHzMO4pVjmI7dcnDqB4jcsN7huMiHH/r+608yGoGttzZd dmpjq9OOuWI901zSyyK5GR3t3XPbqh7oZWkFg+yMmrGCFDD5+77Gwsv4Cz1VthXh0ctAop PBkm7za9Qu2JSkgFf3oOk+rD2VUxGhhY+1EOa+C0YQrizq+sfBIx1HIC31IsAiaAgDcGP2 7ZSyyZQ6051f7Iq9GV6j98K4xGc27wXKlVWKpiymR3wctMTTeq75Yx5QI/lLHdtcgG/WMm zK4CQ6tLcWp5yYFsSL9e62q7U0m9xhNSG5u2e/MIc5DcnRkyIDWWHnCn+Jev6Q== 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 4XH8J21FfGzftg; Mon, 30 Sep 2024 05:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U59MxQ026638; Mon, 30 Sep 2024 05:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U59MTh026635; Mon, 30 Sep 2024 05:09:22 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:09:22 GMT Message-Id: <202409300509.48U59MTh026635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: aad507854efd - main - Fix the cross-build after recent commits 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aad507854efd13c4387394e88d5667cc6f060933 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aad507854efd13c4387394e88d5667cc6f060933 commit aad507854efd13c4387394e88d5667cc6f060933 Author: Kyle Evans AuthorDate: 2024-09-30 04:54:32 +0000 Commit: Kyle Evans CommitDate: 2024-09-30 05:08:49 +0000 Fix the cross-build after recent commits - Provide a sys/md4.h in the cross-build environment to fix bootstrap of libmd. - flua now exposes WTRAPPED which isn't incredibly common- make it conditional, we probably won't be using it in any bootstrap context any time soon. Fixes: 442e0975ee4b3 ("Consolidate md4 implementations written in C") Fixes: c2caf3b3313fe ("flua: posix: add more useful functions [...]") --- libexec/flua/modules/lposix.c | 2 + tools/build/cross-build/include/common/sys/md4.h | 91 ++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/libexec/flua/modules/lposix.c b/libexec/flua/modules/lposix.c index 9ca57d409d10..77e152754b8c 100644 --- a/libexec/flua/modules/lposix.c +++ b/libexec/flua/modules/lposix.c @@ -529,7 +529,9 @@ luaopen_posix_sys_wait(lua_State *L) lua_pushflag(L, WCONTINUED); lua_pushflag(L, WSTOPPED); +#ifdef WTRAPPED lua_pushflag(L, WTRAPPED); +#endif lua_pushflag(L, WEXITED); lua_pushflag(L, WNOWAIT); #undef lua_pushflag diff --git a/tools/build/cross-build/include/common/sys/md4.h b/tools/build/cross-build/include/common/sys/md4.h new file mode 100644 index 000000000000..e00675e9f462 --- /dev/null +++ b/tools/build/cross-build/include/common/sys/md4.h @@ -0,0 +1,91 @@ +/* MD4.H - header file for MD4C.C + */ + +/*- + SPDX-License-Identifier: RSA-MD + + Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All + rights reserved. + + License to copy and use this software is granted provided that it + is identified as the "RSA Data Security, Inc. MD4 Message-Digest + Algorithm" in all material mentioning or referencing this software + or this function. + License is also granted to make and use derivative works provided + that such works are identified as "derived from the RSA Data + Security, Inc. MD4 Message-Digest Algorithm" in all material + mentioning or referencing the derived work. + + RSA Data Security, Inc. makes no representations concerning either + the merchantability of this software or the suitability of this + software for any particular purpose. It is provided "as is" + without express or implied warranty of any kind. + + These notices must be retained in any copies of any part of this + documentation and/or software. + */ + +#ifndef _SYS_MD4_H_ +#define _SYS_MD4_H_ +/* MD4 context. */ +typedef struct MD4Context { + u_int32_t state[4]; /* state (ABCD) */ + u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ + unsigned char buffer[64]; /* input buffer */ +} MD4_CTX; + +#include + +#ifndef _KERNEL + +/* Ensure libmd symbols do not clash with libcrypto */ + +#ifndef MD4Init +#define MD4Init _libmd_MD4Init +#endif +#ifndef MD4Update +#define MD4Update _libmd_MD4Update +#endif +#ifndef MD4Pad +#define MD4Pad _libmd_MD4Pad +#endif +#ifndef MD4Final +#define MD4Final _libmd_MD4Final +#endif +#ifndef MD4End +#define MD4End _libmd_MD4End +#endif +#ifndef MD4Fd +#define MD4Fd _libmd_MD4Fd +#endif +#ifndef MD4FdChunk +#define MD4FdChunk _libmd_MD4FdChunk +#endif +#ifndef MD4File +#define MD4File _libmd_MD4File +#endif +#ifndef MD4FileChunk +#define MD4FileChunk _libmd_MD4FileChunk +#endif +#ifndef MD4Data +#define MD4Data _libmd_MD4Data +#endif + +#endif + +__BEGIN_DECLS +void MD4Init(MD4_CTX *); +void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); +void MD4Pad(MD4_CTX *); +void MD4Final(unsigned char [__min_size(16)], MD4_CTX *); +#ifndef _KERNEL +char * MD4End(MD4_CTX *, char *); +char * MD4Fd(int, char *); +char * MD4FdChunk(int, char *, off_t, off_t); +char * MD4File(const char *, char *); +char * MD4FileChunk(const char *, char *, off_t, off_t); +char * MD4Data(const void *, unsigned int, char *); +#endif +__END_DECLS + +#endif /* _SYS_MD4_H_ */