From a9435e7cac07d9847d47e806cc6a73d01d19521c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 11:13:13 +0000 Subject: import bash-4.2.46-33.el7 --- diff --git a/SOURCES/bash-4.4-bracketed-paste.patch b/SOURCES/bash-4.4-bracketed-paste.patch new file mode 100644 index 0000000..76cfdbe --- /dev/null +++ b/SOURCES/bash-4.4-bracketed-paste.patch @@ -0,0 +1,228 @@ +diff --git a/lib/readline/bind.c b/lib/readline/bind.c +--- a/lib/readline/bind.c ++++ b/lib/readline/bind.c +@@ -1428,6 +1428,7 @@ static const struct { + { "convert-meta", &_rl_convert_meta_chars_to_ascii, 0 }, + { "disable-completion", &rl_inhibit_completion, 0 }, + { "echo-control-characters", &_rl_echo_control_chars, 0 }, ++ { "enable-bracketed-paste", &_rl_enable_bracketed_paste, 0 }, + { "enable-keypad", &_rl_enable_keypad, 0 }, + { "enable-meta-key", &_rl_enable_meta, 0 }, + { "expand-tilde", &rl_complete_with_tilde_expansion, 0 }, +diff --git a/lib/readline/funmap.c b/lib/readline/funmap.c +--- a/lib/readline/funmap.c ++++ b/lib/readline/funmap.c +@@ -68,6 +68,7 @@ static const FUNMAP default_funmap[] = { + { "backward-word", rl_backward_word }, + { "beginning-of-history", rl_beginning_of_history }, + { "beginning-of-line", rl_beg_of_line }, ++ { "bracketed-paste-begin", rl_bracketed_paste_begin }, + { "call-last-kbd-macro", rl_call_last_kbd_macro }, + { "capitalize-word", rl_capitalize_word }, + { "character-search", rl_char_search }, +diff --git a/lib/readline/kill.c b/lib/readline/kill.c +--- a/lib/readline/kill.c ++++ b/lib/readline/kill.c +@@ -656,6 +656,55 @@ rl_yank_last_arg (count, key) + return retval; + } + ++/* Having read the special escape sequence denoting the beginning of a ++ `bracketed paste' sequence, read the rest of the pasted input until the ++ closing sequence and insert the pasted text as a single unit without ++ interpretation. */ ++int ++rl_bracketed_paste_begin (int count, int key) ++{ ++ int retval, c; ++ size_t len, cap; ++ char *buf; ++ ++ retval = 1; ++ len = 0; ++ buf = xmalloc (cap = 64); ++ ++ RL_SETSTATE (RL_STATE_MOREINPUT); ++ while ((c = rl_read_key ()) >= 0) ++ { ++ if (RL_ISSTATE (RL_STATE_MACRODEF)) ++ _rl_add_macro_char (c); ++ ++ if (c == '\r') /* XXX */ ++ c = '\n'; ++ ++ if (len == cap) ++ buf = xrealloc (buf, cap *= 2); ++ ++ buf[len++] = c; ++ if (len >= BRACK_PASTE_SLEN && c == BRACK_PASTE_LAST && ++ STREQN (buf + len - BRACK_PASTE_SLEN, BRACK_PASTE_SUFF, BRACK_PASTE_SLEN)) ++ { ++ len -= BRACK_PASTE_SLEN; ++ break; ++ } ++ } ++ RL_UNSETSTATE (RL_STATE_MOREINPUT); ++ ++ if (c >= 0) ++ { ++ if (len == cap) ++ buf = xrealloc (buf, cap + 1); ++ buf[len] = '\0'; ++ retval = rl_insert_text (buf); ++ } ++ ++ xfree (buf); ++ return (retval); ++} ++ + /* A special paste command for users of Cygnus's cygwin32. */ + #if defined (__CYGWIN__) + #include +diff --git a/lib/readline/readline.c b/lib/readline/readline.c +--- a/lib/readline/readline.c ++++ b/lib/readline/readline.c +@@ -95,6 +95,8 @@ static void readline_initialize_everything PARAMS((void)); + static void bind_arrow_keys_internal PARAMS((Keymap)); + static void bind_arrow_keys PARAMS((void)); + ++static void bind_bracketed_paste_prefix PARAMS((void)); ++ + static void readline_default_bindings PARAMS((void)); + static void reset_default_bindings PARAMS((void)); + +@@ -285,6 +287,11 @@ int _rl_revert_all_at_newline = 0; + characters corresponding to keyboard-generated signals. */ + int _rl_echo_control_chars = 1; + ++/* Non-zero means to attempt to put the terminal in `bracketed paste mode', ++ where it will prefix pasted text with an escape sequence and send ++ another to mark the end of the paste. */ ++int _rl_enable_bracketed_paste = 0; ++ + /* **************************************************************** */ + /* */ + /* Top Level Functions */ +@@ -1143,6 +1150,10 @@ readline_initialize_everything () + /* Try to bind a common arrow key prefix, if not already bound. */ + bind_arrow_keys (); + ++ /* Bind the bracketed paste prefix assuming that the user will enable ++ it on terminals that support it. */ ++ bind_bracketed_paste_prefix (); ++ + /* Enable the meta key, if this terminal has one. */ + if (_rl_enable_meta) + _rl_enable_meta_key (); +@@ -1234,6 +1245,22 @@ bind_arrow_keys () + #endif + } + ++static void ++bind_bracketed_paste_prefix (void) ++{ ++ Keymap xkeymap; ++ ++ xkeymap = _rl_keymap; ++ ++ _rl_keymap = emacs_standard_keymap; ++ rl_bind_keyseq_if_unbound (BRACK_PASTE_PREF, rl_bracketed_paste_begin); ++ ++ _rl_keymap = vi_insertion_keymap; ++ rl_bind_keyseq_if_unbound (BRACK_PASTE_PREF, rl_bracketed_paste_begin); ++ ++ _rl_keymap = xkeymap; ++} ++ + /* **************************************************************** */ + /* */ + /* Saving and Restoring Readline's state */ +diff --git a/lib/readline/readline.h b/lib/readline/readline.h +--- a/lib/readline/readline.h ++++ b/lib/readline/readline.h +@@ -172,6 +172,7 @@ extern int rl_yank PARAMS((int, int)); + extern int rl_yank_pop PARAMS((int, int)); + extern int rl_yank_nth_arg PARAMS((int, int)); + extern int rl_yank_last_arg PARAMS((int, int)); ++extern int rl_bracketed_paste_begin PARAMS((int, int)); + /* Not available unless __CYGWIN__ is defined. */ + #ifdef __CYGWIN__ + extern int rl_paste_from_clipboard PARAMS((int, int)); +diff --git a/lib/readline/rlprivate.h b/lib/readline/rlprivate.h +--- a/lib/readline/rlprivate.h ++++ b/lib/readline/rlprivate.h +@@ -195,6 +195,14 @@ extern int rl_blink_matching_paren; + + /* kill.c */ + extern int rl_set_retained_kills PARAMS((int)); ++#define BRACK_PASTE_PREF "\033[200~" ++#define BRACK_PASTE_SUFF "\033[201~" ++ ++#define BRACK_PASTE_LAST '~' ++#define BRACK_PASTE_SLEN 6 ++ ++#define BRACK_PASTE_INIT "\033[?2004h" ++#define BRACK_PASTE_FINI "\033[?2004l\r" + + /* terminal.c */ + extern void _rl_set_screen_size PARAMS((int, int)); +@@ -452,6 +460,7 @@ extern int _rl_output_meta_chars; + extern int _rl_bind_stty_chars; + extern int _rl_revert_all_at_newline; + extern int _rl_echo_control_chars; ++extern int _rl_enable_bracketed_paste; + extern char *_rl_comment_begin; + extern unsigned char _rl_parsing_conditionalized_out; + extern Keymap _rl_keymap; +diff --git a/lib/readline/rltty.c b/lib/readline/rltty.c +--- a/lib/readline/rltty.c ++++ b/lib/readline/rltty.c +@@ -60,6 +60,12 @@ static void set_winsize PARAMS((int)); + /* */ + /* **************************************************************** */ + ++/* Non-zero means that the terminal is in a prepped state. There are several ++ flags that are OR'd in to denote whether or not we have sent various ++ init strings to the terminal. */ ++#define TPX_PREPPED 0x01 ++#define TPX_BRACKPASTE 0x02 ++ + /* Non-zero means that the terminal is in a prepped state. */ + static int terminal_prepped; + +@@ -595,7 +601,7 @@ void + rl_prep_terminal (meta_flag) + int meta_flag; + { +- int tty; ++ int tty, nprep; + TIOTYPE tio; + + if (terminal_prepped) +@@ -659,8 +665,16 @@ rl_prep_terminal (meta_flag) + if (_rl_enable_keypad) + _rl_control_keypad (1); + ++ nprep = TPX_PREPPED; ++ ++ if (_rl_enable_bracketed_paste) ++ { ++ fprintf (rl_outstream, BRACK_PASTE_INIT); ++ nprep |= TPX_BRACKPASTE; ++ } ++ + fflush (rl_outstream); +- terminal_prepped = 1; ++ terminal_prepped = nprep; + RL_SETSTATE(RL_STATE_TERMPREPPED); + + _rl_release_sigint (); +@@ -680,6 +694,9 @@ rl_deprep_terminal () + + tty = rl_instream ? fileno (rl_instream) : fileno (stdout); + ++ if (terminal_prepped & TPX_BRACKPASTE) ++ fprintf (rl_outstream, BRACK_PASTE_FINI); ++ + if (_rl_enable_keypad) + _rl_control_keypad (0); diff --git a/SOURCES/bash-5.0-syslog-history.patch b/SOURCES/bash-5.0-syslog-history.patch new file mode 100644 index 0000000..8cf7a45 --- /dev/null +++ b/SOURCES/bash-5.0-syslog-history.patch @@ -0,0 +1,79 @@ +diff --git a/bashhist.c b/bashhist.c +--- a/bashhist.c ++++ b/bashhist.c +@@ -702,6 +702,12 @@ check_add_history (line, force) + #if defined (SYSLOG_HISTORY) + #define SYSLOG_MAXLEN 600 + ++#if defined (SYSLOG_SHOPT) ++int syslog_history = SYSLOG_SHOPT; ++#else ++int syslog_history = 1; ++#endif ++ + void + bash_syslog_history (line) + const char *line; +@@ -782,7 +788,8 @@ bash_add_history (line) + really_add_history (line); + + #if defined (SYSLOG_HISTORY) +- bash_syslog_history (line); ++ if (syslog_history) ++ bash_syslog_history (line); + #endif + + using_history (); +diff --git a/builtins/shopt.def b/builtins/shopt.def +--- a/builtins/shopt.def ++++ b/builtins/shopt.def +@@ -115,6 +115,10 @@ extern char *shell_name; + extern int debugging_mode; + #endif + ++#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT) ++extern int syslog_history; ++#endif ++ + static void shopt_error __P((char *)); + + static int set_shellopts_after_change __P((char *, int)); +@@ -208,6 +212,9 @@ static struct { + #endif + { "shift_verbose", &print_shift_error, (shopt_set_func_t *)NULL }, + { "sourcepath", &source_uses_path, (shopt_set_func_t *)NULL }, ++#if defined (SYSLOG_HISTORY) && defined (SYSLOG_SHOPT) ++ { "syslog_history", &syslog_history, (shopt_set_func_t *)NULL }, ++#endif + { "xpg_echo", &xpg_echo, (shopt_set_func_t *)NULL }, + { (char *)0, (int *)0, (shopt_set_func_t *)NULL } + }; +diff --git a/config-top.h b/config-top.h +--- a/config-top.h ++++ b/config-top.h +@@ -109,5 +109,12 @@ + # define SYSLOG_LEVEL LOG_INFO + #endif + ++/* Define if you want syslogging history to be controllable at runtime via a ++ shell option; if defined, the value is the default for the syslog_history ++ shopt option */ ++#if defined (SYSLOG_HISTORY) ++#define SYSLOG_SHOPT 0 ++#endif ++ + /* Define if you want to include code in shell.c to support wordexp(3) */ + /* #define WORDEXP_OPTION */ +diff --git a/doc/bash.1 b/doc/bash.1 +--- a/doc/bash.1 ++++ b/doc/bash.1 +@@ -9224,6 +9224,9 @@ If set, the + to find the directory containing the file supplied as an argument. + This option is enabled by default. + .TP 8 ++.B syslog_history ++If set, command history is logged to syslog. ++.TP 8 + .B xpg_echo + If set, the \fBecho\fP builtin expands backslash-escape sequences + by default. diff --git a/SPECS/bash.spec b/SPECS/bash.spec index 2bbedcd..2720263 100644 --- a/SPECS/bash.spec +++ b/SPECS/bash.spec @@ -6,7 +6,7 @@ Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell -Release: 31%{?dist} +Release: 33%{?dist} Group: System Environment/Shells License: GPLv3+ Url: http://www.gnu.org/software/bash @@ -198,6 +198,12 @@ Patch153: bash-4.3-wshouldquote.patch #1495398 - Append '/' while tab completing directory names Patch154: bash-4.3-dircomp-append-slash.patch +#1160482 - Add a runtime option to enable history logging to syslog +Patch155: bash-5.0-syslog-history.patch + +#1573901 - RFE: (security) support bracketed paste mode +Patch156: bash-4.4-bracketed-paste.patch + BuildRequires: texinfo bison BuildRequires: ncurses-devel BuildRequires: autoconf, gettext @@ -330,6 +336,8 @@ This package contains documentation files for %{name}. %patch152 -p1 -b .pipefd-leak %patch153 -p1 -b .wshouldquote %patch154 -p1 -b .append-slash +%patch155 -p1 -b .syslog-history +%patch156 -p1 -b .bracketed-paste echo %{version} > _distribution echo %{release} > _patchlevel @@ -341,7 +349,7 @@ autoconf # Recycles pids is neccessary. When bash's last fork's pid was X # and new fork's pid is also X, bash has to wait for this same pid. # Without Recycles pids bash will not wait. -make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" +make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS` -DSYSLOG_HISTORY" %install rm -rf $RPM_BUILD_ROOT @@ -522,6 +530,14 @@ end #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Thu Mar 07 2019 Siteshwar Vashisht - 4.2.46-33 +- Add support for bracketed paste mode + Resolves: #1573901 + +* Wed Mar 06 2019 Siteshwar Vashisht - 4.2.46-32 +- Add configuration option for logging bash history to syslog + Resolves: #1160482 + * Tue May 22 2018 Siteshwar Vashisht - 4.2.46-31 - Append '/' while tab completing directory names Resolves: #1495398