[3/3] remove old bash 3.2 patches
Message ID | 20170606082537.13830-3-marcel.lorenz@ipfire.org |
---|---|
State | Accepted |
Commit | 8e700473ac31eea7e24a78626a69de38bf5b3ab8 |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 8F84D61C5F for <patchwork@ipfire.org>; Tue, 6 Jun 2017 10:25:58 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 96DAB27BF; Tue, 6 Jun 2017 10:25:56 +0200 (CEST) Received: from localhost.localdomain (mail.ml-systec.de [87.140.105.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 3574B27B8 for <development@lists.ipfire.org>; Tue, 6 Jun 2017 10:25:51 +0200 (CEST) From: Marcel Lorenz <marcel.lorenz@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 3/3] remove old bash 3.2 patches Date: Tue, 6 Jun 2017 10:25:37 +0200 Message-Id: <20170606082537.13830-3-marcel.lorenz@ipfire.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170606082537.13830-1-marcel.lorenz@ipfire.org> References: <20170606082537.13830-1-marcel.lorenz@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
Message
Marcel Lorenz
June 6, 2017, 6:25 p.m. UTC
Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
---
src/patches/bash/bash32-052 | 104 --------------------------------------------
src/patches/bash/bash32-053 | 54 -----------------------
2 files changed, 158 deletions(-)
delete mode 100644 src/patches/bash/bash32-052
delete mode 100644 src/patches/bash/bash32-053
Comments
I will take this patch out of this patchset though. -Michael On Tue, 2017-06-06 at 10:25 +0200, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org> > --- > src/patches/bash/bash32-052 | 104 ----------------------------------------- > --- > src/patches/bash/bash32-053 | 54 ----------------------- > 2 files changed, 158 deletions(-) > delete mode 100644 src/patches/bash/bash32-052 > delete mode 100644 src/patches/bash/bash32-053 > > diff --git a/src/patches/bash/bash32-052 b/src/patches/bash/bash32-052 > deleted file mode 100644 > index 78e7d92..0000000 > --- a/src/patches/bash/bash32-052 > +++ /dev/null > @@ -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_ */ > diff --git a/src/patches/bash/bash32-053 b/src/patches/bash/bash32-053 > deleted file mode 100644 > index e7efce7..0000000 > --- a/src/patches/bash/bash32-053 > +++ /dev/null > @@ -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/5148873942946529 > 29 > - > -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_ */