git: aad507854efd - main - Fix the cross-build after recent commits

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=aad507854efd13c4387394e88d5667cc6f060933

commit aad507854efd13c4387394e88d5667cc6f060933
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2024-09-30 04:54:32 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
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 <sys/cdefs.h>
+
+#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_ */