source: patches/bash-3.2-fixes-10.patch@ 152baa0

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 152baa0 was d849dd4, checked in by Jim Gifford <clfs@…>, 16 years ago

Changed Patches to Bash
  • Property mode set to 100644
File size: 6.7 KB

  • config.h.in 

    Submitted By: Jim Gifford (jim at cross-lfs dot org)
Date: 01-08-2009
Initial Package Version: 3.2
Origin: Various
Upstream Status: Applied
Description: Contains all Fixes from Various Sources
        Fedora:
                http://cvs.fedoraproject.org/viewvc/rpms/bash/F-10/bash-2.02-security.patch
                http://cvs.fedoraproject.org/viewvc/rpms/bash/F-10/bash-2.03-paths.patch
                http://cvs.fedoraproject.org/viewvc/rpms/bash/F-10/bash-2.05b-readline-oom.patch
                http://cvs.fedoraproject.org/viewvc/rpms/bash/F-10/bash-3.2-190350.patch
                http://cvs.fedoraproject.org/viewvc/rpms/bash/F-10/bash-3.2-comp_wordbreaks.patch

        All have been validated to be issues in CLFS.

diff -Naur bash-3.2.orig/config.h.in bash-3.2/config.h.in
    old new  
    201201
    202202/* System paths */
    203203
    204 #define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
     204#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
    205205
    206206/* Characteristics of the system's header files and libraries that affect
    207207   the compilation environment. */

  • config-top.h 

    diff -Naur bash-3.2.orig/config-top.h bash-3.2/config-top.h
    old new  
    5252/* The default value of the PATH variable. */
    5353#ifndef DEFAULT_PATH_VALUE
    5454#define DEFAULT_PATH_VALUE \
    55   "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
     55  "/usr/local/bin:/bin:/usr/bin"
    5656#endif
    5757
    5858/* The value for PATH when invoking `command -p'.  This is only used when
    5959   the Posix.2 confstr () function, or CS_PATH define are not present. */
    6060#ifndef STANDARD_UTILS_PATH
    6161#define STANDARD_UTILS_PATH \
    62   "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
     62  "/bin:/usr/bin:/usr/sbin:/sbin"
    6363#endif
    6464
    6565/* Default primary and secondary prompt strings. */

  • lib/readline/misc.c 

    diff -Naur bash-3.2.orig/lib/readline/misc.c bash-3.2/lib/readline/misc.c
    old new  
    560560#if defined (VI_MODE)
    561561  _rl_set_insert_mode (RL_IM_INSERT, 1);        /* vi mode ignores insert mode */
    562562  rl_editing_mode = vi_mode;
    563   rl_vi_insertion_mode (1, key);
     563  rl_vi_insert_mode (1, key);
    564564#endif /* VI_MODE */
    565565
    566566  return 0;

  • lib/readline/readline.c 

    diff -Naur bash-3.2.orig/lib/readline/readline.c bash-3.2/lib/readline/readline.c
    old new  
    370370
    371371#if defined (VI_MODE)
    372372  if (rl_editing_mode == vi_mode)
    373     rl_vi_insertion_mode (1, 'i');
     373    rl_vi_insert_mode (1, 'i');
    374374#endif /* VI_MODE */
    375375
    376376  if (rl_pre_input_hook)
    … …  
    733733        {
    734734          /* Special case rl_do_lowercase_version (). */
    735735          if (func == rl_do_lowercase_version)
    736             return (_rl_dispatch (_rl_to_lower (key), map));
     736            return (_rl_dispatch (_rl_to_lower ((unsigned char)key), map));
    737737
    738738          rl_executing_keymap = map;
    739739

  • lib/readline/readline.h 

    diff -Naur bash-3.2.orig/lib/readline/readline.h bash-3.2/lib/readline/readline.h
    old new  
    230230extern int rl_vi_end_word PARAMS((int, int));
    231231extern int rl_vi_insert_beg PARAMS((int, int));
    232232extern int rl_vi_append_mode PARAMS((int, int));
     233extern int rl_vi_insert_mode PARAMS((int, int));
    233234extern int rl_vi_append_eol PARAMS((int, int));
    234235extern int rl_vi_eof_maybe PARAMS((int, int));
    235236extern int rl_vi_insertion_mode PARAMS((int, int));

  • lib/readline/vi_keymap.c 

    diff -Naur bash-3.2.orig/lib/readline/vi_keymap.c bash-3.2/lib/readline/vi_keymap.c
    old new  
    151151  { ISFUNC, rl_vi_char_search },                /* f */
    152152  { ISFUNC, (rl_command_func_t *)0x0 },         /* g */
    153153  { ISFUNC, rl_backward_char },                 /* h */
    154   { ISFUNC, rl_vi_insertion_mode },             /* i */
     154  { ISFUNC, rl_vi_insert_mode },                /* i */
    155155  { ISFUNC, rl_get_next_history },              /* j */
    156156  { ISFUNC, rl_get_previous_history },          /* k */
    157157  { ISFUNC, rl_forward_char },                  /* l */

  • lib/readline/vi_mode.c 

    diff -Naur bash-3.2.orig/lib/readline/vi_mode.c bash-3.2/lib/readline/vi_mode.c
    old new  
    220220      if (rl_point > 0)
    221221        _rl_vi_backup ();
    222222    }
     223  /* Ditto for redoing an insert with `I', but move to the beginning of line
     224     like the `I' command does. */
     225  else if (_rl_vi_last_command == 'I' && vi_insert_buffer && *vi_insert_buffer)
     226    {
     227      rl_beg_of_line (1, 'I');
     228      _rl_vi_stuff_insert (count);
     229      if (rl_point > 0)
     230        _rl_vi_backup ();
     231    }
    223232  else
    224233    r = _rl_dispatch (_rl_vi_last_command, _rl_keymap);
    225234  vi_redoing = 0;
    … …  
    584593     int count, key;
    585594{
    586595  rl_beg_of_line (1, key);
    587   rl_vi_insertion_mode (1, key);
     596  rl_vi_insert_mode (1, key);
    588597  return (0);
    589598}
    590599
    … …  
    618627}
    619628
    620629int
     630rl_vi_insert_mode (count, key)
     631     int count, key;
     632{
     633  rl_vi_start_inserting (key, 1, rl_arg_sign);
     634  return (0);
     635}
     636
     637int
    621638rl_vi_append_eol (count, key)
    622639     int count, key;
    623640{
    … …  
    690707    }
    691708  else
    692709    {
    693       if ((_rl_vi_last_key_before_insert == 'i' || _rl_vi_last_key_before_insert == 'a') && rl_undo_list)
     710      if ((_rl_vi_last_key_before_insert == 'i' || _rl_vi_last_key_before_insert == 'a' || _rl_vi_last_key_before_insert == 'I') && rl_undo_list)
    694711        _rl_vi_save_insert (rl_undo_list);
    695712      /* XXX - Other keys probably need to be checked. */
    696713      else if (_rl_vi_last_key_before_insert == 'C')

  • parse.y 

    diff -Naur bash-3.2.orig/parse.y bash-3.2/parse.y
    old new  
    11821182
    11831183#if defined (READLINE)
    11841184char *current_readline_prompt = (char *)NULL;
    1185 char *current_readline_line = (char *)NULL;
     1185unsigned char *current_readline_line = (unsigned char *)NULL;
    11861186int current_readline_line_index = 0;
    11871187
    11881188static int

  • shell.c 

    diff -Naur bash-3.2.orig/shell.c bash-3.2/shell.c
    old new  
    7171#  include <readline/history.h>
    7272#endif
    7373
     74#if defined (READLINE)
     75#include "bashline.h"
     76#endif
     77
    7478#include <tilde/tilde.h>
    7579#include <glob/strmatch.h>
    7680
    … …  
    17191723  delete_all_contexts (shell_variables);
    17201724  delete_all_variables (shell_functions);
    17211725
     1726#if defined (READLINE)
     1727  sv_comp_wordbreaks ("COMP_WORDBREAKS");
     1728  bash_readline_initialized = 0;
     1729#endif /* READLINE */
     1730
    17221731  shell_reinitialized = 1;
    17231732}
    17241733
Note: See TracBrowser for help on using the repository browser.