mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-07 03:58:41 +08:00
Fix bash hash and patch
This commit is contained in:
Jeremy Soller
parent
95e95ab452
commit
e6f7479782
@ -1,6 +1,6 @@
|
||||
[source]
|
||||
tar = "http://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz"
|
||||
blake3 = "926927c370142cffa37dfc0a310ec386493b8b558ff3cc062376898154bc7ccb"
|
||||
blake3 = "c1548e3f2a9b6de5296e18c28b3d2007985e647273e03f039efd3e489edaa41f"
|
||||
patches = [
|
||||
"redox.patch"
|
||||
]
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -ruwN source/bashline.c source-new/bashline.c
|
||||
--- 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 @@
|
||||
--- source/bashline.c 2022-04-17 16:37:12.000000000 -0600
|
||||
+++ source-new/bashline.c 2023-09-09 07:46:51.157322285 -0600
|
||||
@@ -2645,7 +2645,7 @@
|
||||
const char *text;
|
||||
int state;
|
||||
{
|
||||
@ -11,9 +11,9 @@ 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 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 @@
|
||||
--- source/builtins/ulimit.def 2021-11-05 07:19:53.000000000 -0600
|
||||
+++ source-new/builtins/ulimit.def 2023-09-09 07:46:51.157322285 -0600
|
||||
@@ -609,7 +609,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -23,9 +23,9 @@ 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 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 @@
|
||||
--- source/config-top.h 2021-11-05 07:11:12.000000000 -0600
|
||||
+++ source-new/config-top.h 2023-09-09 07:49:50.705526090 -0600
|
||||
@@ -63,24 +63,24 @@
|
||||
/* The default value of the PATH variable. */
|
||||
#ifndef DEFAULT_PATH_VALUE
|
||||
#define DEFAULT_PATH_VALUE \
|
||||
@ -33,6 +33,11 @@ diff -ruwN source/config-top.h source-new/config-top.h
|
||||
+ "/usr/local/bin;/usr/local/sbin;/usr/bin;/usr/sbin;/bin;/sbin;."
|
||||
#endif
|
||||
|
||||
/* If you want to unconditionally set a value for PATH in every restricted
|
||||
shell, set this. */
|
||||
-/* #define RBASH_STATIC_PATH_VALUE "/rbin:/usr/rbin" */
|
||||
+/* #define RBASH_STATIC_PATH_VALUE "/rbin;/usr/rbin" */
|
||||
|
||||
/* The value for PATH when invoking `command -p'. This is only used when
|
||||
the Posix.2 confstr () function, or CS_PATH define are not present. */
|
||||
#ifndef STANDARD_UTILS_PATH
|
||||
@ -41,44 +46,29 @@ diff -ruwN source/config-top.h source-new/config-top.h
|
||||
+ "/bin;/usr/bin;/sbin;/usr/sbin;/etc;/usr/etc"
|
||||
#endif
|
||||
|
||||
/* The default path for enable -f */
|
||||
#ifndef DEFAULT_LOADABLE_BUILTINS_PATH
|
||||
#define DEFAULT_LOADABLE_BUILTINS_PATH \
|
||||
- "/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:."
|
||||
+ "/usr/local/lib/bash;/usr/lib/bash;/opt/local/lib/bash;/usr/pkg/lib/bash;/opt/pkg/lib/bash;."
|
||||
#endif
|
||||
|
||||
/* Default primary and secondary prompt strings. */
|
||||
diff -ruwN source/configure.ac source-new/configure.ac
|
||||
--- 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
|
||||
--- source/configure.ac 2022-09-23 08:12:27.000000000 -0600
|
||||
+++ source-new/configure.ac 2023-09-09 07:47:28.393364561 -0600
|
||||
@@ -92,6 +92,7 @@
|
||||
*-nsk*) opt_bash_malloc=no ;; # HP NonStop
|
||||
*-haiku*) opt_bash_malloc=no ;; # Haiku OS
|
||||
*-genode*) opt_bash_malloc=no ;; # Genode has no sbrk
|
||||
+*-redox*) opt_bash_malloc=no ;; # Redox OS
|
||||
esac
|
||||
|
||||
# memory scrambling on free()
|
||||
diff -ruwN source/execute_cmd.c source-new/execute_cmd.c
|
||||
--- 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)
|
||||
{
|
||||
-#if defined (HAVE_GETRUSAGE)
|
||||
+#if defined (HAVE_GETRUSAGE) && defined (HAVE_GETTIMEOFDAY)
|
||||
selfb.ru_utime.tv_sec = kidsb.ru_utime.tv_sec = selfb.ru_stime.tv_sec = kidsb.ru_stime.tv_sec = 0;
|
||||
selfb.ru_utime.tv_usec = kidsb.ru_utime.tv_usec = selfb.ru_stime.tv_usec = kidsb.ru_stime.tv_usec = 0;
|
||||
before.tv_sec = shell_start_time;
|
||||
before.tv_usec = 0;
|
||||
#else
|
||||
+# if defined (HAVE_TIMES)
|
||||
before.tms_utime = before.tms_stime = before.tms_cutime = before.tms_cstime = 0;
|
||||
tbefore = shell_start_time;
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
old_flags = command->flags;
|
||||
diff -ruwN source/general.c source-new/general.c
|
||||
--- 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 @@
|
||||
--- source/general.c 2022-11-23 15:10:12.000000000 -0700
|
||||
+++ source-new/general.c 2023-09-09 07:46:51.161322290 -0600
|
||||
@@ -589,6 +589,7 @@
|
||||
void
|
||||
check_dev_tty ()
|
||||
{
|
||||
@ -86,7 +76,7 @@ diff -ruwN source/general.c source-new/general.c
|
||||
int tty_fd;
|
||||
char *tty;
|
||||
|
||||
@@ -490,6 +491,7 @@
|
||||
@@ -603,6 +604,7 @@
|
||||
}
|
||||
if (tty_fd >= 0)
|
||||
close (tty_fd);
|
||||
@ -94,7 +84,7 @@ diff -ruwN source/general.c source-new/general.c
|
||||
}
|
||||
|
||||
/* Return 1 if PATH1 and PATH2 are the same file. This is kind of
|
||||
@@ -909,10 +911,10 @@
|
||||
@@ -1031,10 +1033,10 @@
|
||||
`:'. If I is 0, then the path has a leading colon. Trailing colons
|
||||
are handled OK by the `else' part of the if statement; an empty
|
||||
string is returned in that case. */
|
||||
@ -108,8 +98,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 2023-05-06 08:05:06.250133275 -0600
|
||||
+++ source-new/include/posixwait.h 2023-05-06 08:05:11.406125198 -0600
|
||||
--- source/include/posixwait.h 2019-03-29 11:25:52.000000000 -0600
|
||||
+++ source-new/include/posixwait.h 2023-09-09 07:46:51.161322290 -0600
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
/* How to get the status of a job. For Posix, this is just an
|
||||
@ -129,8 +119,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 2023-05-06 08:05:06.254133269 -0600
|
||||
+++ source-new/lib/sh/getcwd.c 2023-05-06 08:05:11.406125198 -0600
|
||||
--- source/lib/sh/getcwd.c 2012-03-10 08:48:50.000000000 -0700
|
||||
+++ source-new/lib/sh/getcwd.c 2023-09-09 07:46:51.161322290 -0600
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user