mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-11 09:48:24 +02:00
remove old bash 3.2 patches
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Marcel Lorenz
committed by
Michael Tremer
Michael Tremer
parent
5dd7cec068
commit
8e700473ac
@@ -1,104 +0,0 @@
|
|||||||
BASH PATCH REPORT
|
|
||||||
=================
|
|
||||||
|
|
||||||
Bash-Release: 3.2
|
|
||||||
Patch-ID: bash32-052
|
|
||||||
|
|
||||||
Bug-Reported-by: Stephane Chazelas <stephane.chazelas@gmail.com>
|
|
||||||
Bug-Reference-ID:
|
|
||||||
Bug-Reference-URL:
|
|
||||||
|
|
||||||
Bug-Description:
|
|
||||||
|
|
||||||
Under certain circumstances, bash will execute user code while processing the
|
|
||||||
environment for exported function definitions.
|
|
||||||
|
|
||||||
Patch (apply with `patch -p0'):
|
|
||||||
|
|
||||||
*** ../bash-3.2.51/builtins/common.h 2006-03-06 09:38:44.000000000 -0500
|
|
||||||
--- builtins/common.h 2014-09-16 19:08:02.000000000 -0400
|
|
||||||
***************
|
|
||||||
*** 34,37 ****
|
|
||||||
--- 34,39 ----
|
|
||||||
|
|
||||||
/* Flags for describe_command, shared between type.def and command.def */
|
|
||||||
+ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */
|
|
||||||
+ #define SEVAL_ONECMD 0x100 /* only allow a single command */
|
|
||||||
#define CDESC_ALL 0x001 /* type -a */
|
|
||||||
#define CDESC_SHORTDESC 0x002 /* command -V */
|
|
||||||
*** ../bash-3.2.51/builtins/evalstring.c 2008-11-15 17:47:04.000000000 -0500
|
|
||||||
--- builtins/evalstring.c 2014-09-16 19:08:02.000000000 -0400
|
|
||||||
***************
|
|
||||||
*** 235,238 ****
|
|
||||||
--- 235,246 ----
|
|
||||||
struct fd_bitmap *bitmap;
|
|
||||||
|
|
||||||
+ if ((flags & SEVAL_FUNCDEF) && command->type != cm_function_def)
|
|
||||||
+ {
|
|
||||||
+ internal_warning ("%s: ignoring function definition attempt", from_file);
|
|
||||||
+ should_jump_to_top_level = 0;
|
|
||||||
+ last_result = last_command_exit_value = EX_BADUSAGE;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
bitmap = new_fd_bitmap (FD_BITMAP_SIZE);
|
|
||||||
begin_unwind_frame ("pe_dispose");
|
|
||||||
***************
|
|
||||||
*** 292,295 ****
|
|
||||||
--- 300,306 ----
|
|
||||||
dispose_fd_bitmap (bitmap);
|
|
||||||
discard_unwind_frame ("pe_dispose");
|
|
||||||
+
|
|
||||||
+ if (flags & SEVAL_ONECMD)
|
|
||||||
+ break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
*** ../bash-3.2.51/variables.c 2008-11-15 17:15:06.000000000 -0500
|
|
||||||
--- variables.c 2014-09-16 19:10:39.000000000 -0400
|
|
||||||
***************
|
|
||||||
*** 319,328 ****
|
|
||||||
strcpy (temp_string + char_index + 1, string);
|
|
||||||
|
|
||||||
! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST);
|
|
||||||
!
|
|
||||||
! /* Ancient backwards compatibility. Old versions of bash exported
|
|
||||||
! functions like name()=() {...} */
|
|
||||||
! if (name[char_index - 1] == ')' && name[char_index - 2] == '(')
|
|
||||||
! name[char_index - 2] = '\0';
|
|
||||||
|
|
||||||
if (temp_var = find_function (name))
|
|
||||||
--- 319,326 ----
|
|
||||||
strcpy (temp_string + char_index + 1, string);
|
|
||||||
|
|
||||||
! /* Don't import function names that are invalid identifiers from the
|
|
||||||
! environment. */
|
|
||||||
! if (legal_identifier (name))
|
|
||||||
! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
|
|
||||||
|
|
||||||
if (temp_var = find_function (name))
|
|
||||||
***************
|
|
||||||
*** 333,340 ****
|
|
||||||
else
|
|
||||||
report_error (_("error importing function definition for `%s'"), name);
|
|
||||||
-
|
|
||||||
- /* ( */
|
|
||||||
- if (name[char_index - 1] == ')' && name[char_index - 2] == '\0')
|
|
||||||
- name[char_index - 2] = '('; /* ) */
|
|
||||||
}
|
|
||||||
#if defined (ARRAY_VARS)
|
|
||||||
--- 331,334 ----
|
|
||||||
*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
|
|
||||||
--- patchlevel.h Mon Oct 16 14:22:54 2006
|
|
||||||
***************
|
|
||||||
*** 26,30 ****
|
|
||||||
looks for to find the patch level (for the sccs version string). */
|
|
||||||
|
|
||||||
! #define PATCHLEVEL 51
|
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
|
||||||
--- 26,30 ----
|
|
||||||
looks for to find the patch level (for the sccs version string). */
|
|
||||||
|
|
||||||
! #define PATCHLEVEL 52
|
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
BASH PATCH REPORT
|
|
||||||
=================
|
|
||||||
|
|
||||||
Bash-Release: 3.2
|
|
||||||
Patch-ID: bash32-053
|
|
||||||
|
|
||||||
Bug-Reported-by: Tavis Ormandy <taviso () cmpxchg8b com>
|
|
||||||
Bug-Reference-ID:
|
|
||||||
Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929
|
|
||||||
|
|
||||||
Bug-Description:
|
|
||||||
|
|
||||||
Under certain circumstances, bash can incorrectly save a lookahead character and
|
|
||||||
return it on a subsequent call, even when reading a new line.
|
|
||||||
|
|
||||||
Patch:
|
|
||||||
|
|
||||||
*** ../bash-3.2.52/parse.y 2008-04-29 21:24:55.000000000 -0400
|
|
||||||
--- parse.y 2014-09-25 16:18:41.000000000 -0400
|
|
||||||
***************
|
|
||||||
*** 2504,2507 ****
|
|
||||||
--- 2504,2509 ----
|
|
||||||
word_desc_to_read = (WORD_DESC *)NULL;
|
|
||||||
|
|
||||||
+ eol_ungetc_lookahead = 0;
|
|
||||||
+
|
|
||||||
last_read_token = '\n';
|
|
||||||
token_to_read = '\n';
|
|
||||||
*** ../bash-3.2.52/y.tab.c 2006-09-25 08:15:16.000000000 -0400
|
|
||||||
--- y.tab.c 2014-09-25 20:28:17.000000000 -0400
|
|
||||||
***************
|
|
||||||
*** 3833,3836 ****
|
|
||||||
--- 3833,3838 ----
|
|
||||||
word_desc_to_read = (WORD_DESC *)NULL;
|
|
||||||
|
|
||||||
+ eol_ungetc_lookahead = 0;
|
|
||||||
+
|
|
||||||
last_read_token = '\n';
|
|
||||||
token_to_read = '\n';
|
|
||||||
*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
|
|
||||||
--- patchlevel.h Mon Oct 16 14:22:54 2006
|
|
||||||
***************
|
|
||||||
*** 26,30 ****
|
|
||||||
looks for to find the patch level (for the sccs version string). */
|
|
||||||
|
|
||||||
! #define PATCHLEVEL 52
|
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
|
||||||
--- 26,30 ----
|
|
||||||
looks for to find the patch level (for the sccs version string). */
|
|
||||||
|
|
||||||
! #define PATCHLEVEL 53
|
|
||||||
|
|
||||||
#endif /* _PATCHLEVEL_H_ */
|
|
||||||
Reference in New Issue
Block a user