From 0770383e1844c87c64e7ba840c0e23efa651d5b7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 6 May 2023 08:07:03 -0600
Subject: [PATCH] Adjust bash patch for new relibc
---
recipes/bash/redox.patch | 46 ++++++++++++++--------------------------
1 file changed, 16 insertions(+), 30 deletions(-)
diff --git a/recipes/bash/redox.patch b/recipes/bash/redox.patch
index 50a789d95..bbd56e25d 100644
--- a/recipes/bash/redox.patch
+++ b/recipes/bash/redox.patch
@@ -1,6 +1,6 @@
diff -ruwN source/bashline.c source-new/bashline.c
---- source/bashline.c 2016-08-05 19:44:05.000000000 -0600
-+++ source-new/bashline.c 2022-08-04 09:09:21.816427263 -0600
+--- source/bashline.c 2023-05-06 08:05:06.270133244 -0600
++++ source-new/bashline.c 2023-05-06 08:05:11.402125204 -0600
@@ -2465,7 +2465,7 @@
const char *text;
int state;
@@ -11,8 +11,8 @@ diff -ruwN source/bashline.c source-new/bashline.c
#else
static char *gname = (char *)NULL;
diff -ruwN source/builtins/ulimit.def source-new/builtins/ulimit.def
---- source/builtins/ulimit.def 2016-03-11 07:18:54.000000000 -0700
-+++ source-new/builtins/ulimit.def 2022-08-04 09:07:18.413033575 -0600
+--- source/builtins/ulimit.def 2023-05-06 08:05:06.246133282 -0600
++++ source-new/builtins/ulimit.def 2023-05-06 08:05:11.406125198 -0600
@@ -598,7 +598,7 @@
}
else
@@ -23,8 +23,8 @@ diff -ruwN source/builtins/ulimit.def source-new/builtins/ulimit.def
return -1;
# if defined (HPUX9)
diff -ruwN source/config-top.h source-new/config-top.h
---- source/config-top.h 2016-05-19 12:34:02.000000000 -0600
-+++ source-new/config-top.h 2022-08-04 09:07:18.413033575 -0600
+--- source/config-top.h 2023-05-06 08:05:06.266133250 -0600
++++ source-new/config-top.h 2023-05-06 08:05:11.406125198 -0600
@@ -63,14 +63,14 @@
/* The default value of the PATH variable. */
#ifndef DEFAULT_PATH_VALUE
@@ -43,8 +43,8 @@ diff -ruwN source/config-top.h source-new/config-top.h
/* Default primary and secondary prompt strings. */
diff -ruwN source/configure.ac source-new/configure.ac
---- source/configure.ac 2016-09-07 14:56:28.000000000 -0600
-+++ source-new/configure.ac 2022-08-04 09:07:18.413033575 -0600
+--- source/configure.ac 2023-05-06 08:05:06.266133250 -0600
++++ source-new/configure.ac 2023-05-06 08:05:11.406125198 -0600
@@ -90,6 +90,7 @@
*-opennt*|*-interix*) opt_bash_malloc=no ;; # Interix, now owned by Microsoft
*-nsk*) opt_bash_malloc=no ;; # HP NonStop
@@ -54,8 +54,8 @@ diff -ruwN source/configure.ac source-new/configure.ac
# memory scrambling on free()
diff -ruwN source/execute_cmd.c source-new/execute_cmd.c
---- source/execute_cmd.c 2016-08-26 05:10:08.000000000 -0600
-+++ source-new/execute_cmd.c 2022-08-04 09:07:18.413033575 -0600
+--- source/execute_cmd.c 2023-05-06 08:05:06.270133244 -0600
++++ source-new/execute_cmd.c 2023-05-06 08:05:11.406125198 -0600
@@ -1335,15 +1335,17 @@
nullcmd = (command == 0) || (command->type == cm_simple && command->value.Simple->words == 0 && command->value.Simple->redirects == 0);
if (posixly_correct && nullcmd)
@@ -76,8 +76,8 @@ diff -ruwN source/execute_cmd.c source-new/execute_cmd.c
old_flags = command->flags;
diff -ruwN source/general.c source-new/general.c
---- source/general.c 2016-08-11 09:16:56.000000000 -0600
-+++ source-new/general.c 2022-08-04 09:07:18.413033575 -0600
+--- source/general.c 2023-05-06 08:05:06.266133250 -0600
++++ source-new/general.c 2023-05-06 08:05:11.406125198 -0600
@@ -476,6 +476,7 @@
void
check_dev_tty ()
@@ -108,8 +108,8 @@ diff -ruwN source/general.c source-new/general.c
*p_index = i;
diff -ruwN source/include/posixwait.h source-new/include/posixwait.h
---- source/include/posixwait.h 2008-08-12 08:03:03.000000000 -0600
-+++ source-new/include/posixwait.h 2022-08-04 09:07:18.413033575 -0600
+--- source/include/posixwait.h 2023-05-06 08:05:06.250133275 -0600
++++ source-new/include/posixwait.h 2023-05-06 08:05:11.406125198 -0600
@@ -34,7 +34,7 @@
/* How to get the status of a job. For Posix, this is just an
@@ -129,8 +129,8 @@ diff -ruwN source/include/posixwait.h source-new/include/posixwait.h
# if !defined (WSTOPSIG)
# define WSTOPSIG(s) ((s) >> 8)
diff -ruwN source/lib/sh/getcwd.c source-new/lib/sh/getcwd.c
---- source/lib/sh/getcwd.c 2012-03-10 08:48:50.000000000 -0700
-+++ source-new/lib/sh/getcwd.c 2022-08-04 09:07:18.413033575 -0600
+--- source/lib/sh/getcwd.c 2023-05-06 08:05:06.254133269 -0600
++++ source-new/lib/sh/getcwd.c 2023-05-06 08:05:11.406125198 -0600
@@ -20,7 +20,7 @@
#include <config.h>
@@ -140,17 +140,3 @@ diff -ruwN source/lib/sh/getcwd.c source-new/lib/sh/getcwd.c
#if !defined (__GNUC__) && !defined (HAVE_ALLOCA_H) && defined (_AIX)
#pragma alloca
-diff -ruwN source/sig.c source-new/sig.c
---- source/sig.c 2016-02-11 13:02:45.000000000 -0700
-+++ source-new/sig.c 2022-08-04 09:07:18.413033575 -0600
-@@ -680,7 +680,9 @@
- }
-
- /* Signal functions used by the rest of the code. */
--#if !defined (HAVE_POSIX_SIGNALS)
-+#if defined(__redox__)
-+// Redox already has sigprocmask
-+#elif !defined (HAVE_POSIX_SIGNALS)
-
- /* Perform OPERATION on NEWSET, perhaps leaving information in OLDSET. */
- sigprocmask (operation, newset, oldset)
--
GitLab