From a5cfcb28c8c05e63f9e19fc0001b2061e0aedcfc Mon Sep 17 00:00:00 2001 From: Matheus Date: Mon, 10 Jun 2024 17:56:18 -0300 Subject: [PATCH] mlibc: bump commit --- patches/mlibc/jinx-working-patch.patch | 17 ----------------- source-recipes/mlibc | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/patches/mlibc/jinx-working-patch.patch b/patches/mlibc/jinx-working-patch.patch index c5f7f5e9..15180b98 100644 --- a/patches/mlibc/jinx-working-patch.patch +++ b/patches/mlibc/jinx-working-patch.patch @@ -100,23 +100,6 @@ index fc34a3b..b1a95a9 100644 #include #include -diff --git mlibc-clean/options/posix/generic/pwd-stubs.cpp mlibc-workdir/options/posix/generic/pwd-stubs.cpp -index 5d8f618..26eb4bb 100644 ---- mlibc-clean/options/posix/generic/pwd-stubs.cpp -+++ mlibc-workdir/options/posix/generic/pwd-stubs.cpp -@@ -273,9 +273,9 @@ void endpwent(void) { - close_global_file(); - } - --int putpwent(const struct passwd *, FILE *) { -- __ensure(!"Not implemented"); -- __builtin_unreachable(); -+int putpwent(const struct passwd *p, FILE *f) { -+ // Taken from musl. -+ return fprintf(f, "%s:%s:%u:%u:%s:%s:%s\n", p->pw_name, p->pw_passwd, p->pw_uid, p->pw_gid, p->pw_gecos, p->pw_dir, p->pw_shell) < 0 ? -1 : 0; - } - - struct passwd *fgetpwent(FILE *) { diff --git mlibc-clean/options/posix/generic/unistd-stubs.cpp mlibc-workdir/options/posix/generic/unistd-stubs.cpp index 3beb692..a7bbfaa 100644 --- mlibc-clean/options/posix/generic/unistd-stubs.cpp diff --git a/source-recipes/mlibc b/source-recipes/mlibc index 6e37fb8d..595dbe77 100644 --- a/source-recipes/mlibc +++ b/source-recipes/mlibc @@ -1,8 +1,8 @@ name=mlibc -version=1580691285ee17401319d6aca1c9683eee8119db +version=8beb05f23fa6b61cb38852e7633fda2b1eb27226 source_method=tarball tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz" -tarball_sha512="dabe4e2f0e2a5435ccfbbfd20a3e3fe649bc9dae179f4d44f26debec3ef4adea1f8a5ff0edef679ae6323f58dcbdbaa837c8ffd9befd14a1770ba42d4fe3e740" +tarball_sha512="3370f4c867e7fd5757ba2773615842115e97cdca92aefe6b49a259b300be4636203bb51a06f4d1cf6c38c834ad6074b1c734e79390153154b527ba12a0c97eab" regenerate() { mkdir -p ${source_dir}/sysdeps/astral/include/