commit 0507c857a3a18822884717f0859249384863cd63 Author: Marcin Krol <h...@tld-linux.org> Date: Sun Mar 21 13:30:13 2021 +0100
- rediffed bash-paths.patch | 33 +++++++-------- bash-profile.patch | 11 ++--- bash-requires.patch | 113 +++++++++++++++++++++++----------------------------- 3 files changed, 73 insertions(+), 84 deletions(-) --- diff --git a/bash-paths.patch b/bash-paths.patch index 21736d5..5c98b7d 100644 --- a/bash-paths.patch +++ b/bash-paths.patch @@ -1,17 +1,6 @@ -diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in ---- bash-3.0.org/config.h.in 2004-07-21 22:08:31.000000000 +0200 -+++ bash-3.0/config.h.in 2005-10-08 19:35:26.593219000 +0200 -@@ -197,7 +197,7 @@ - - /* System paths */ - --#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail" -+#define DEFAULT_MAIL_DIRECTORY "/var/mail" - - /* Characteristics of the system's header files and libraries that affect - the compilation environment. */ ---- bash-5.0/config-top.h~ 2019-03-21 14:06:54.000000000 +0100 -+++ bash-5.0/config-top.h 2019-03-21 14:08:18.043987487 +0100 +diff -urNp -x '*.orig' bash-5.1.org/config-top.h bash-5.1/config-top.h +--- bash-5.1.org/config-top.h 2020-11-16 16:34:26.000000000 +0100 ++++ bash-5.1/config-top.h 2021-03-21 13:21:08.467594925 +0100 @@ -63,7 +63,7 @@ /* The default value of the PATH variable. */ #ifndef DEFAULT_PATH_VALUE @@ -30,8 +19,8 @@ diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in #endif /* Default primary and secondary prompt strings. */ -@@ -73,7 +73,7 @@ - #define KSH_COMPATIBLE_SELECT +@@ -91,7 +91,7 @@ + #define DEFAULT_BASHRC "~/.bashrc" /* System-wide .bashrc file for interactive shells. */ -/* #define SYS_BASHRC "/etc/bash.bashrc" */ @@ -39,3 +28,15 @@ diff -urbB bash-3.0.org/config.h.in bash-3.0/config.h.in /* System-wide .bash_logout for login shells. */ /* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ +diff -urNp -x '*.orig' bash-5.1.org/config.h.in bash-5.1/config.h.in +--- bash-5.1.org/config.h.in 2020-05-19 19:54:22.000000000 +0200 ++++ bash-5.1/config.h.in 2021-03-21 13:21:08.467594925 +0100 +@@ -247,7 +247,7 @@ + + /* System paths */ + +-#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail" ++#define DEFAULT_MAIL_DIRECTORY "/var/mail" + + /* Characteristics of the system's header files and libraries that affect + the compilation environment. */ diff --git a/bash-profile.patch b/bash-profile.patch index 6bcae68..5ae804c 100644 --- a/bash-profile.patch +++ b/bash-profile.patch @@ -1,8 +1,9 @@ ---- bash-2.03/config-top.h.profile Mon Feb 22 14:37:17 1999 -+++ bash-2.03/config-top.h Mon Feb 22 14:37:29 1999 -@@ -3,6 +3,8 @@ - /* This contains various user-settable options not under the control of - autoconf. */ +diff -urNp -x '*.orig' bash-5.1.org/config-top.h bash-5.1/config-top.h +--- bash-5.1.org/config-top.h 2021-03-21 13:21:19.045594925 +0100 ++++ bash-5.1/config-top.h 2021-03-21 13:21:19.703594925 +0100 +@@ -18,6 +18,8 @@ + along with Bash. If not, see <http://www.gnu.org/licenses/>. + */ +#define NON_INTERACTIVE_LOGIN_SHELLS + diff --git a/bash-requires.patch b/bash-requires.patch index 35670bd..0c7b192 100644 --- a/bash-requires.patch +++ b/bash-requires.patch @@ -1,19 +1,6 @@ -diff --git a/builtins.h b/builtins.h -index dac95fd..5b7e811 100644 ---- a/builtins.h -+++ b/builtins.h -@@ -45,6 +45,7 @@ - #define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */ - #define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */ - #define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */ -+#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ - - #define BASE_INDENT 4 - -diff --git a/builtins/mkbuiltins.c b/builtins/mkbuiltins.c -index 4f51201..91c25db 100644 ---- a/builtins/mkbuiltins.c -+++ b/builtins/mkbuiltins.c +diff -urNp -x '*.orig' bash-5.1.org/builtins/mkbuiltins.c bash-5.1/builtins/mkbuiltins.c +--- bash-5.1.org/builtins/mkbuiltins.c 2020-06-05 19:14:43.000000000 +0200 ++++ bash-5.1/builtins/mkbuiltins.c 2021-03-21 13:21:29.803594925 +0100 @@ -69,10 +69,15 @@ extern char *strcpy (); #define whitespace(c) (((c) == ' ') || ((c) == '\t')) @@ -59,7 +46,7 @@ index 4f51201..91c25db 100644 array_add ((char *)new, defs->builtins); building_builtin = 1; -@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, externfile) +@@ -1250,12 +1265,13 @@ write_builtins (defs, structfile, extern else fprintf (structfile, "(sh_builtin_func_t *)0x0, "); @@ -88,10 +75,20 @@ index 4f51201..91c25db 100644 #if !defined (HAVE_RENAME) static int rename (from, to) -diff --git a/doc/bash.1 b/doc/bash.1 -index d91f1fd..111a66d 100644 ---- a/doc/bash.1 -+++ b/doc/bash.1 +diff -urNp -x '*.orig' bash-5.1.org/builtins.h bash-5.1/builtins.h +--- bash-5.1.org/builtins.h 2017-04-19 15:15:48.000000000 +0200 ++++ bash-5.1/builtins.h 2021-03-21 13:21:29.803594925 +0100 +@@ -45,6 +45,7 @@ + #define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */ + #define POSIX_BUILTIN 0x20 /* This builtins is special in the Posix command search order. */ + #define LOCALVAR_BUILTIN 0x40 /* This builtin creates local variables */ ++#define REQUIRES_BUILTIN 0x80 /* This builtin requires other files. */ + + #define BASE_INDENT 4 + +diff -urNp -x '*.orig' bash-5.1.org/doc/bash.1 bash-5.1/doc/bash.1 +--- bash-5.1.org/doc/bash.1 2020-11-18 21:03:59.000000000 +0100 ++++ bash-5.1/doc/bash.1 2021-03-21 13:21:29.804594925 +0100 @@ -239,6 +239,14 @@ The shell becomes restricted (see .B "RESTRICTED SHELL" below). @@ -107,11 +104,10 @@ index d91f1fd..111a66d 100644 .B \-\-verbose Equivalent to \fB\-v\fP. .TP -diff --git a/doc/bashref.texi b/doc/bashref.texi -index d33cd57..6fc4d18 100644 ---- a/doc/bashref.texi -+++ b/doc/bashref.texi -@@ -6453,6 +6453,13 @@ standard. @xref{Bash POSIX Mode}, for a description of the Bash +diff -urNp -x '*.orig' bash-5.1.org/doc/bashref.texi bash-5.1/doc/bashref.texi +--- bash-5.1.org/doc/bashref.texi 2021-03-21 13:21:29.428594925 +0100 ++++ bash-5.1/doc/bashref.texi 2021-03-21 13:21:29.806594925 +0100 +@@ -6554,6 +6554,13 @@ standard. @xref{Bash POSIX Mode}, for a @item --restricted Make the shell a restricted shell (@pxref{The Restricted Shell}). @@ -125,11 +121,10 @@ index d33cd57..6fc4d18 100644 @item --verbose Equivalent to @option{-v}. Print shell input lines as they're read. -diff --git a/eval.c b/eval.c -index f02d6e4..76c1e8d 100644 ---- a/eval.c -+++ b/eval.c -@@ -142,7 +142,8 @@ reader_loop () +diff -urNp -x '*.orig' bash-5.1.org/eval.c bash-5.1/eval.c +--- bash-5.1.org/eval.c 2020-08-31 16:39:51.000000000 +0200 ++++ bash-5.1/eval.c 2021-03-21 13:21:29.806594925 +0100 +@@ -137,7 +137,8 @@ reader_loop () if (read_command () == 0) { @@ -137,13 +132,12 @@ index f02d6e4..76c1e8d 100644 + + if (interactive_shell == 0 && (read_but_dont_execute && !rpm_requires)) { - last_command_exit_value = EXECUTION_SUCCESS; + set_exit_status (EXECUTION_SUCCESS); dispose_command (global_command); -diff --git a/execute_cmd.c b/execute_cmd.c -index 8b3c83a..4eae19c 100644 ---- a/execute_cmd.c -+++ b/execute_cmd.c -@@ -538,6 +538,8 @@ async_redirect_stdin () +diff -urNp -x '*.orig' bash-5.1.org/execute_cmd.c bash-5.1/execute_cmd.c +--- bash-5.1.org/execute_cmd.c 2020-10-12 16:16:13.000000000 +0200 ++++ bash-5.1/execute_cmd.c 2021-03-21 13:21:29.807594925 +0100 +@@ -539,6 +539,8 @@ async_redirect_stdin () #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0) @@ -151,8 +145,8 @@ index 8b3c83a..4eae19c 100644 + /* Execute the command passed in COMMAND, perhaps doing it asynchronously. COMMAND is exactly what read_command () places into GLOBAL_COMMAND. - ASYNCHROUNOUS, if non-zero, says to do this command in the background. -@@ -569,7 +571,13 @@ execute_command_internal (command, asynchronous, pipe_in, pipe_out, + ASYNCHRONOUS, if non-zero, says to do this command in the background. +@@ -570,7 +572,13 @@ execute_command_internal (command, async if (breaking || continuing) return (last_command_exit_value); @@ -167,7 +161,7 @@ index 8b3c83a..4eae19c 100644 return (EXECUTION_SUCCESS); QUIT; -@@ -2813,7 +2821,7 @@ execute_for_command (for_command) +@@ -2832,7 +2840,7 @@ execute_for_command (for_command) save_line_number = line_number; if (check_identifier (for_command->name, 1) == 0) { @@ -176,10 +170,9 @@ index 8b3c83a..4eae19c 100644 { last_command_exit_value = EX_BADUSAGE; jump_to_top_level (ERREXIT); -diff --git a/execute_cmd.h b/execute_cmd.h -index dc2f15e..506fff4 100644 ---- a/execute_cmd.h -+++ b/execute_cmd.h +diff -urNp -x '*.orig' bash-5.1.org/execute_cmd.h bash-5.1/execute_cmd.h +--- bash-5.1.org/execute_cmd.h 2020-03-03 17:39:04.000000000 +0100 ++++ bash-5.1/execute_cmd.h 2021-03-21 13:21:29.807594925 +0100 @@ -22,6 +22,9 @@ #define _EXECUTE_CMD_H_ @@ -190,10 +183,9 @@ index dc2f15e..506fff4 100644 #if defined (ARRAY_VARS) struct func_array_state -diff --git a/make_cmd.c b/make_cmd.c -index ecbbfd6..3d8bfa4 100644 ---- a/make_cmd.c -+++ b/make_cmd.c +diff -urNp -x '*.orig' bash-5.1.org/make_cmd.c bash-5.1/make_cmd.c +--- bash-5.1.org/make_cmd.c 2020-06-05 19:09:16.000000000 +0200 ++++ bash-5.1/make_cmd.c 2021-03-21 13:21:29.807594925 +0100 @@ -828,6 +828,27 @@ make_coproc_command (name, command) return (make_command (cm_coproc, (SIMPLE_COM *)temp)); } @@ -251,11 +243,10 @@ index ecbbfd6..3d8bfa4 100644 parser_state &= ~PST_REDIRLIST; return (command); } -diff --git a/shell.c b/shell.c -index a2b2a55..c5d99b3 100644 ---- a/shell.c -+++ b/shell.c -@@ -193,6 +193,9 @@ int have_devfd = 0; +diff -urNp -x '*.orig' bash-5.1.org/shell.c bash-5.1/shell.c +--- bash-5.1.org/shell.c 2020-08-04 17:00:24.000000000 +0200 ++++ bash-5.1/shell.c 2021-03-21 13:21:29.807594925 +0100 +@@ -194,6 +194,9 @@ int have_devfd = 0; /* The name of the .(shell)rc file. */ static char *bashrc_file = DEFAULT_BASHRC; @@ -265,7 +256,7 @@ index a2b2a55..c5d99b3 100644 /* Non-zero means to act more like the Bourne shell on startup. */ static int act_like_sh; -@@ -259,6 +262,7 @@ static const struct { +@@ -260,6 +263,7 @@ static const struct { { "protected", Int, &protected_mode, (char **)0x0 }, #endif { "rcfile", Charp, (int *)0x0, &bashrc_file }, @@ -273,7 +264,7 @@ index a2b2a55..c5d99b3 100644 #if defined (RESTRICTED_SHELL) { "restricted", Int, &restricted, (char **)0x0 }, #endif -@@ -496,6 +500,12 @@ main (argc, argv, env) +@@ -502,6 +506,12 @@ main (argc, argv, env) if (dump_translatable_strings) read_but_dont_execute = 1; @@ -286,10 +277,9 @@ index a2b2a55..c5d99b3 100644 if (running_setuid && privileged_mode == 0) disable_priv_mode (); -diff --git a/shell.h b/shell.h -index 8072605..6c4149d 100644 ---- a/shell.h -+++ b/shell.h +diff -urNp -x '*.orig' bash-5.1.org/shell.h bash-5.1/shell.h +--- bash-5.1.org/shell.h 2020-06-05 19:10:44.000000000 +0200 ++++ bash-5.1/shell.h 2021-03-21 13:21:29.807594925 +0100 @@ -34,12 +34,15 @@ #include "maxpath.h" #include "unwind_prot.h" @@ -306,7 +296,7 @@ index 8072605..6c4149d 100644 extern int EOF_Reached; -@@ -99,6 +102,9 @@ extern int interactive, interactive_shell; +@@ -99,6 +102,9 @@ extern int interactive, interactive_shel extern int startup_state; extern int reading_shell_script; extern int shell_initialized; @@ -316,6 +306,3 @@ index 8072605..6c4149d 100644 extern int bash_argv_initialized; extern int subshell_environment; extern int current_command_number; --- -2.17.2 - ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/bash.git/commitdiff/0507c857a3a18822884717f0859249384863cd63 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit