From e4733f35040891d33928cfcda2c1eb0a23954dae Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Wed, 2 Mar 2022 09:49:13 +0100 Subject: [PATCH] dash: add wait3 implementation Previously we patched sys/wait.h to add it, but patch was removed in commit 387928034524 ("ndk-patches: remove wait3 patch from sys/wait.h") since busybox (for which the patch was added) no longer needs it. Let's patch the packages that actually needs this instead of ndk-headers, to keep track of which packages that need it. Fixes https://github.com/termux/termux-packages/issues/9257. --- packages/dash/build.sh | 1 + packages/dash/wait3.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/dash/wait3.patch diff --git a/packages/dash/build.sh b/packages/dash/build.sh index e314a10ac..f57943edd 100644 --- a/packages/dash/build.sh +++ b/packages/dash/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Small POSIX-compliant implementation of /bin/sh" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=0.5.11.5 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://gondor.apana.org.au/~herbert/dash/files/dash-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=db778110891f7937985f29bf23410fe1c5d669502760f584e54e0e7b29e123bd TERMUX_PKG_ESSENTIAL=true diff --git a/packages/dash/wait3.patch b/packages/dash/wait3.patch new file mode 100644 index 000000000..40c6a37a2 --- /dev/null +++ b/packages/dash/wait3.patch @@ -0,0 +1,15 @@ +--- ./src/jobs.c.orig 2022-03-02 09:45:43.327156557 +0100 ++++ ./src/jobs.c 2022-03-02 09:47:08.592008372 +0100 +@@ -128,6 +128,12 @@ + static void xtcsetpgrp(int, pid_t); + #endif + ++STATIC pid_t ++wait3(int* status, int options, struct rusage* rusage) ++{ ++ return wait4(-1, status, options, rusage); ++} ++ + STATIC void + set_curjob(struct job *jp, unsigned mode) + {