source:
patches/bash-3.2-fixes-10.patch@
60ec2de
Last change on this file since 60ec2de was d849dd4, checked in by , 16 years ago | |
---|---|
|
|
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 201 201 202 202 /* System paths */ 203 203 204 #define DEFAULT_MAIL_DIRECTORY "/ usr/spool/mail"204 #define DEFAULT_MAIL_DIRECTORY "/var/spool/mail" 205 205 206 206 /* Characteristics of the system's header files and libraries that affect 207 207 the compilation environment. */ -
config-top.h
diff -Naur bash-3.2.orig/config-top.h bash-3.2/config-top.h
old new 52 52 /* The default value of the PATH variable. */ 53 53 #ifndef DEFAULT_PATH_VALUE 54 54 #define DEFAULT_PATH_VALUE \ 55 "/usr/ gnu/bin:/usr/local/bin:/bin:/usr/bin:."55 "/usr/local/bin:/bin:/usr/bin" 56 56 #endif 57 57 58 58 /* The value for PATH when invoking `command -p'. This is only used when 59 59 the Posix.2 confstr () function, or CS_PATH define are not present. */ 60 60 #ifndef STANDARD_UTILS_PATH 61 61 #define STANDARD_UTILS_PATH \ 62 "/bin:/usr/bin:/ sbin:/usr/sbin:/etc:/usr/etc"62 "/bin:/usr/bin:/usr/sbin:/sbin" 63 63 #endif 64 64 65 65 /* 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 560 560 #if defined (VI_MODE) 561 561 _rl_set_insert_mode (RL_IM_INSERT, 1); /* vi mode ignores insert mode */ 562 562 rl_editing_mode = vi_mode; 563 rl_vi_insert ion_mode (1, key);563 rl_vi_insert_mode (1, key); 564 564 #endif /* VI_MODE */ 565 565 566 566 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 370 370 371 371 #if defined (VI_MODE) 372 372 if (rl_editing_mode == vi_mode) 373 rl_vi_insert ion_mode (1, 'i');373 rl_vi_insert_mode (1, 'i'); 374 374 #endif /* VI_MODE */ 375 375 376 376 if (rl_pre_input_hook) … … 733 733 { 734 734 /* Special case rl_do_lowercase_version (). */ 735 735 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)); 737 737 738 738 rl_executing_keymap = map; 739 739 -
lib/readline/readline.h
diff -Naur bash-3.2.orig/lib/readline/readline.h bash-3.2/lib/readline/readline.h
old new 230 230 extern int rl_vi_end_word PARAMS((int, int)); 231 231 extern int rl_vi_insert_beg PARAMS((int, int)); 232 232 extern int rl_vi_append_mode PARAMS((int, int)); 233 extern int rl_vi_insert_mode PARAMS((int, int)); 233 234 extern int rl_vi_append_eol PARAMS((int, int)); 234 235 extern int rl_vi_eof_maybe PARAMS((int, int)); 235 236 extern 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 151 151 { ISFUNC, rl_vi_char_search }, /* f */ 152 152 { ISFUNC, (rl_command_func_t *)0x0 }, /* g */ 153 153 { ISFUNC, rl_backward_char }, /* h */ 154 { ISFUNC, rl_vi_insert ion_mode }, /* i */154 { ISFUNC, rl_vi_insert_mode }, /* i */ 155 155 { ISFUNC, rl_get_next_history }, /* j */ 156 156 { ISFUNC, rl_get_previous_history }, /* k */ 157 157 { 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 220 220 if (rl_point > 0) 221 221 _rl_vi_backup (); 222 222 } 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 } 223 232 else 224 233 r = _rl_dispatch (_rl_vi_last_command, _rl_keymap); 225 234 vi_redoing = 0; … … 584 593 int count, key; 585 594 { 586 595 rl_beg_of_line (1, key); 587 rl_vi_insert ion_mode (1, key);596 rl_vi_insert_mode (1, key); 588 597 return (0); 589 598 } 590 599 … … 618 627 } 619 628 620 629 int 630 rl_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 637 int 621 638 rl_vi_append_eol (count, key) 622 639 int count, key; 623 640 { … … 690 707 } 691 708 else 692 709 { 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) 694 711 _rl_vi_save_insert (rl_undo_list); 695 712 /* XXX - Other keys probably need to be checked. */ 696 713 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 1182 1182 1183 1183 #if defined (READLINE) 1184 1184 char *current_readline_prompt = (char *)NULL; 1185 char *current_readline_line = (char *)NULL;1185 unsigned char *current_readline_line = (unsigned char *)NULL; 1186 1186 int current_readline_line_index = 0; 1187 1187 1188 1188 static int -
shell.c
diff -Naur bash-3.2.orig/shell.c bash-3.2/shell.c
old new 71 71 # include <readline/history.h> 72 72 #endif 73 73 74 #if defined (READLINE) 75 #include "bashline.h" 76 #endif 77 74 78 #include <tilde/tilde.h> 75 79 #include <glob/strmatch.h> 76 80 … … 1719 1723 delete_all_contexts (shell_variables); 1720 1724 delete_all_variables (shell_functions); 1721 1725 1726 #if defined (READLINE) 1727 sv_comp_wordbreaks ("COMP_WORDBREAKS"); 1728 bash_readline_initialized = 0; 1729 #endif /* READLINE */ 1730 1722 1731 shell_reinitialized = 1; 1723 1732 } 1724 1733
Note:
See TracBrowser
for help on using the repository browser.