X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=bash%2Fpatches%2Fbash-requires.patch;fp=bash%2Fpatches%2Fbash-requires.patch;h=5d82ac60763d46aeed65b5e0cdf353c0303b5e6b;hb=56ba7d1911fe9d55c2f720662e37c24f59ddc40d;hp=63ef4d7f696710a0073bab5d5018e64c986ccd95;hpb=461b7e77b1ed90bf172cb0af13b7c08b70e98cdc;p=people%2Fms%2Fipfire-3.x.git

diff --git a/bash/patches/bash-requires.patch b/bash/patches/bash-requires.patch
index 63ef4d7f6..5d82ac607 100644
--- a/bash/patches/bash-requires.patch
+++ b/bash/patches/bash-requires.patch
@@ -71,7 +71,7 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
 +		    (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
  		    document_name (builtin));
  
- 		  fprintf
+ 		  if (inhibit_functions)
 @@ -1581,6 +1599,13 @@ is_posix_builtin (name)
    return (_find_in_table (name, posix_builtins));
  }
@@ -130,8 +130,8 @@ diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
  extern int expand_aliases;
 +extern int rpm_requires;
  
- static void send_pwd_to_eterm __P((void));
- static sighandler alrm_catcher __P((int));
+ #if defined (HAVE_POSIX_SIGNALS)
+ extern sigset_t top_level_mask;
 @@ -136,7 +137,7 @@ reader_loop ()
  
        if (read_command () == 0)
@@ -150,11 +150,11 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
  
 +extern int rpm_requires;
 +
- /* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
+ /* 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.
 @@ -534,7 +536,13 @@ execute_command_internal (command, async
- #else
+ 
    if (breaking || continuing)
      return (last_command_exit_value);
 -  if (command == 0 || read_but_dont_execute)
@@ -166,8 +166,8 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
 +                              command->value.Function_def->command);
 +  if (read_but_dont_execute)
      return (EXECUTION_SUCCESS);
- #endif
  
+   QUIT;
 @@ -5066,7 +5074,7 @@ execute_intern_function (name, function)
  
    if (check_identifier (name, posixly_correct) == 0)
@@ -289,8 +289,8 @@ diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
  static int act_like_sh;
  
 @@ -251,6 +254,7 @@ static const struct {
-   { "posix", Int, &posixly_correct, (char **)0x0 },
    { "protected", Int, &protected_mode, (char **)0x0 },
+ #endif
    { "rcfile", Charp, (int *)0x0, &bashrc_file },
 +  { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
  #if defined (RESTRICTED_SHELL)