From 9e339a2ff284a50d1043ff3fa5228f86544879c1 Mon Sep 17 00:00:00 2001
From: Matheus <matheusuky@gmail.com>
Date: Wed, 22 May 2024 09:47:15 -0300
Subject: [PATCH] mlibc port: fix getpgid and getsid

---
 patches/bash/jinx-working-patch.patch  | 34 ++++++++++++++------------
 patches/mlibc/jinx-working-patch.patch |  6 +++--
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/patches/bash/jinx-working-patch.patch b/patches/bash/jinx-working-patch.patch
index c8d2542d..fc8dc31e 100644
--- a/patches/bash/jinx-working-patch.patch
+++ b/patches/bash/jinx-working-patch.patch
@@ -1,7 +1,8 @@
-diff -ru bash-5.1/externs.h bash-5.1-patched/externs.h
---- bash-5.1/externs.h	2020-05-27 11:36:41.000000000 -0300
-+++ bash-5.1-patched/externs.h	2022-08-20 18:54:03.346557110 -0300
-@@ -290,7 +290,7 @@
+diff --git bash-clean/externs.h bash-workdir/externs.h
+index 3d7716c..8fb66a8 100644
+--- bash-clean/externs.h
++++ bash-workdir/externs.h
+@@ -290,7 +290,7 @@ extern int getdtablesize PARAMS((void));
  #endif /* !HAVE_GETDTABLESIZE */
  
  #if !defined (HAVE_GETHOSTNAME)
@@ -10,9 +11,10 @@ diff -ru bash-5.1/externs.h bash-5.1-patched/externs.h
  #endif /* !HAVE_GETHOSTNAME */
  
  extern int getmaxgroups PARAMS((void));
-diff -ru bash-5.1/subst.c bash-5.1-patched/subst.c
---- bash-5.1/subst.c	2020-11-16 12:33:15.000000000 -0300
-+++ bash-5.1-patched/subst.c	2022-08-20 19:06:46.039884500 -0300
+diff --git bash-clean/subst.c bash-workdir/subst.c
+index 9ccbf33..909bac9 100644
+--- bash-clean/subst.c
++++ bash-workdir/subst.c
 @@ -32,6 +32,7 @@
  #endif
  #include <signal.h>
@@ -21,10 +23,11 @@ diff -ru bash-5.1/subst.c bash-5.1-patched/subst.c
  
  #if defined (HAVE_UNISTD_H)
  #  include <unistd.h>
-diff -ru bash-5.1/support/config.sub bash-5.1-patched/support/config.sub
---- bash-5.1/support/config.sub	2020-11-18 16:40:12.000000000 -0300
-+++ bash-5.1-patched/support/config.sub	2022-08-20 18:20:06.006572931 -0300
-@@ -1720,7 +1720,7 @@
+diff --git bash-clean/support/config.sub bash-workdir/support/config.sub
+index c874b7a..8e4744e 100755
+--- bash-clean/support/config.sub
++++ bash-workdir/support/config.sub
+@@ -1720,7 +1720,7 @@ case $os in
  	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
  	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
  	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
@@ -33,10 +36,11 @@ diff -ru bash-5.1/support/config.sub bash-5.1-patched/support/config.sub
  		;;
  	# This one is extra strict with allowed versions
  	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
-diff -ru bash-5.1/support/shobj-conf bash-5.1-patched/support/shobj-conf
---- bash-5.1/support/shobj-conf	2019-12-13 11:51:17.000000000 -0300
-+++ bash-5.1-patched/support/shobj-conf	2022-09-14 21:09:42.592996760 -0300
-@@ -79,6 +79,9 @@
+diff --git bash-clean/support/shobj-conf bash-workdir/support/shobj-conf
+index 5a3f977..4d21483 100755
+--- bash-clean/support/shobj-conf
++++ bash-workdir/support/shobj-conf
+@@ -79,6 +79,9 @@ nsk-cc-tandem|nsk-c99-tandem)
  	SHOBJ_LDFLAGS='-shared -bglobalized -unres_symbols ignore'
  	;;
  
diff --git a/patches/mlibc/jinx-working-patch.patch b/patches/mlibc/jinx-working-patch.patch
index 9d391aa1..003588da 100644
--- a/patches/mlibc/jinx-working-patch.patch
+++ b/patches/mlibc/jinx-working-patch.patch
@@ -192,10 +192,10 @@ index 0000000..e5b087a
 +
 diff --git mlibc-workdir/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp
 new file mode 100644
-index 0000000..8cd908a
+index 0000000..8ebf840
 --- /dev/null
 +++ mlibc-workdir/sysdeps/astral/generic/generic.cpp
-@@ -0,0 +1,692 @@
+@@ -0,0 +1,694 @@
 +#include <bits/ensure.h>
 +#include <mlibc/debug.hpp>
 +#include <mlibc/all-sysdeps.hpp>
@@ -289,12 +289,14 @@ index 0000000..8cd908a
 +	int sys_getsid(pid_t pid, pid_t *pgid) {
 +		long ret;
 +		long error = syscall(SYSCALL_GETSID, &ret, pid);
++		*pgid = ret;
 +		return 0;
 +	}
 +
 +	int sys_getpgid(pid_t pid, pid_t *pgid) {
 +		long ret;
 +		long error = syscall(SYSCALL_GETPGID, &ret, pid);
++		*pgid = ret;
 +		return 0;
 +	}
 +