From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 3/3] remove old bash 3.2 patches
Date: Wed, 07 Jun 2017 10:01:16 +0100
Message-ID: <1496826076.4077.8.camel@ipfire.org>
In-Reply-To: <20170606082537.13830-3-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4567563646724000246=="
List-Id: <development.lists.ipfire.org>

--===============4567563646724000246==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
> ---
> =C2=A0src/patches/bash/bash32-052 | 104 -----------------------------------=
------
> ---
> =C2=A0src/patches/bash/bash32-053 |=C2=A0=C2=A054 -----------------------
> =C2=A02 files changed, 158 deletions(-)
> =C2=A0delete mode 100644 src/patches/bash/bash32-052
> =C2=A0delete mode 100644 src/patches/bash/bash32-053
>=20
> 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 @@
> -			=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0BASH PATCH REPORT
> -			=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> -
> -Bash-Release: 3.2
> -Patch-ID: bash32-052
> -
> -Bug-Reported-by:	Stephane Chazelas <stephane.chazelas(a)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 ----
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0/* Flags for describe_command, shared between type.def and com=
mand.def */
> -+ #define SEVAL_FUNCDEF	0x080		/* only allow function
> definitions */
> -+ #define SEVAL_ONECMD	0x100		/* only allow a single
> command */
> -=C2=A0=C2=A0#define CDESC_ALL		0x001	/* type -a */
> -=C2=A0=C2=A0#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 ----
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0struct fd_bitmap *bitmap;
> -=C2=A0=C2=A0
> -+=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if ((flags & SEVAL_FUNCDEF) &&=
 command->type !=3D
> cm_function_def)
> -+=C2=A0		{
> -+=C2=A0		=C2=A0=C2=A0internal_warning ("%s: ignoring function definition
> attempt", from_file);
> -+=C2=A0		=C2=A0=C2=A0should_jump_to_top_level =3D 0;
> -+=C2=A0		=C2=A0=C2=A0last_result =3D last_command_exit_value =3D EX_BADUSA=
GE;
> -+=C2=A0		=C2=A0=C2=A0break;
> -+=C2=A0		}
> -+=C2=A0
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0bitmap =3D new_fd_bitmap =
(FD_BITMAP_SIZE);
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0begin_unwind_frame ("pe_d=
ispose");
> -***************
> -*** 292,295 ****
> ---- 300,306 ----
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0dispose_fd_bitmap (bitmap=
);
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0discard_unwind_frame ("pe=
_dispose");
> -+=C2=A0
> -+=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (flags & SEVAL_ONECMD)
> -+=C2=A0		break;
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0}
> -=C2=A0=C2=A0	}
> -*** ../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 ****
> -=C2=A0=C2=A0	=C2=A0=C2=A0strcpy (temp_string + char_index + 1, string);
> -=C2=A0=C2=A0
> -!=C2=A0	=C2=A0=C2=A0parse_and_execute (temp_string, name, SEVAL_NONINT|SEV=
AL_NOHIST);
> -!=C2=A0
> -!=C2=A0	=C2=A0=C2=A0/* Ancient backwards compatibility.=C2=A0=C2=A0Old ver=
sions of bash
> exported
> -!=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0functions like name()=3D() {...} */
> -!=C2=A0	=C2=A0=C2=A0if (name[char_index - 1] =3D=3D ')' && name[char_index=
 - 2] =3D=3D '(')
> -!=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0name[char_index - 2] =3D '\0';
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0	=C2=A0=C2=A0if (temp_var =3D find_function (name))
> ---- 319,326 ----
> -=C2=A0=C2=A0	=C2=A0=C2=A0strcpy (temp_string + char_index + 1, string);
> -=C2=A0=C2=A0
> -!=C2=A0	=C2=A0=C2=A0/* Don't import function names that are invalid identi=
fiers from
> the
> -!=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0environment. */
> -!=C2=A0	=C2=A0=C2=A0if (legal_identifier (name))
> -!=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0parse_and_execute (temp_string, name,
> SEVAL_NONINT|SEVAL_NOHIST|SEVAL_FUNCDEF|SEVAL_ONECMD);
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0	=C2=A0=C2=A0if (temp_var =3D find_function (name))
> -***************
> -*** 333,340 ****
> -=C2=A0=C2=A0	=C2=A0=C2=A0else
> -=C2=A0=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0report_error (_("error importing func=
tion definition for
> `%s'"), name);
> --=C2=A0
> --=C2=A0	=C2=A0=C2=A0/* ( */
> --=C2=A0	=C2=A0=C2=A0if (name[char_index - 1] =3D=3D ')' && name[char_index=
 - 2] =3D=3D '\0')
> --=C2=A0	=C2=A0=C2=A0=C2=A0=C2=A0name[char_index - 2] =3D '(';		/* ) */
> -=C2=A0=C2=A0	}
> -=C2=A0=C2=A0#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 ****
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0looks for to find the patch level (for the s=
ccs version string). */
> -=C2=A0=C2=A0
> -! #define PATCHLEVEL 51
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0#endif /* _PATCHLEVEL_H_ */
> ---- 26,30 ----
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0looks for to find the patch level (for the s=
ccs version string). */
> -=C2=A0=C2=A0
> -! #define PATCHLEVEL 52
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0#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 @@
> -			=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0BASH PATCH REPORT
> -			=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> -
> -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 charact=
er
> 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 ----
> -=C2=A0=C2=A0=C2=A0=C2=A0word_desc_to_read =3D (WORD_DESC *)NULL;
> -=C2=A0=C2=A0
> -+=C2=A0=C2=A0=C2=A0eol_ungetc_lookahead =3D 0;
> -+=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0last_read_token =3D '\n';
> -=C2=A0=C2=A0=C2=A0=C2=A0token_to_read =3D '\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 ----
> -=C2=A0=C2=A0=C2=A0=C2=A0word_desc_to_read =3D (WORD_DESC *)NULL;
> -=C2=A0=C2=A0
> -+=C2=A0=C2=A0=C2=A0eol_ungetc_lookahead =3D 0;
> -+=C2=A0
> -=C2=A0=C2=A0=C2=A0=C2=A0last_read_token =3D '\n';
> -=C2=A0=C2=A0=C2=A0=C2=A0token_to_read =3D '\n';
> -*** ../bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006
> ---- patchlevel.h	Mon Oct 16 14:22:54 2006
> -***************
> -*** 26,30 ****
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0looks for to find the patch level (for the s=
ccs version string). */
> -=C2=A0=C2=A0
> -! #define PATCHLEVEL 52
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0#endif /* _PATCHLEVEL_H_ */
> ---- 26,30 ----
> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0looks for to find the patch level (for the s=
ccs version string). */
> -=C2=A0=C2=A0
> -! #define PATCHLEVEL 53
> -=C2=A0=C2=A0
> -=C2=A0=C2=A0#endif /* _PATCHLEVEL_H_ */

--===============4567563646724000246==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlpOOERjQUFvSkVJQjU4UDl2a0FrSGU0QVFBSVR4RnhFb3o3cktkUWV5TTlSY3FzVE0K
UFczNExxR0xsalJrTXZLZU9XRkVCZElzTFcyd1JoazRCOHZqaXhQaTZJcDJZTGFxVmhKdURiSURt
eDR6cDlJYwp4MnNYU1lvd0JtZCtmTVB5M0ZpTjQzb21Neis3RFRpTXRaT0xxNTZQOEx0Z2pneU9m
eDFQc0RZclNhVm9kcC9XCnZIRWJ4M0E1UUNoa05kaFIrQlE1U3ExTHY5cmVvNkIzcThsWk5TQjlL
SjhUMjdydVp2ZDlKUkpJazBQU3V0Y2QKS0V6bjE0S3Q0bVNQSDhUb0MvRzU5UDY5T3owNXorZ1dq
MTVISHhndnhta2JoYlZZd3VxR0FYZkhRYSt4R3ljbgpHQldXRFFqbXVRVVR2L21yWlVrczJoSmMv
WW1oZ0tESDFpdWI0NnZuU0F5NkcyOWJtaHBnbEUvV0tLTytDZ2lkCnRKYzdJS05HYnBmVmtsZytx
ZU8xNVZCTHl1T2NGOEJ3WitaMVg2bEJYRWk4Q0RaZ3F0R1BzS0VRSEtSR0gxMHQKQjFlSEE5MVps
a1RTaEozc1puZWFEdXhpeVJ2dzE2b00yWW9xWG9Vcm5oMHp0N3JuUnJLL1Rrajgrb09iM1Babwpr
SUNSOGxFdCs3ZVk5Z3ZwMi9YbmM3WlZleDVodzY3OFVnYVFOZ3MwQXRJRUxRQ3I1ZlcybEtCUzIy
dGNxMFlPCk43TmVzN0dveWhmdXVURHppeDNkVHpOejlpZHdqOHhJYkJ4WFFTRmFQdVlKQjh4OHd1
YXAwR0huUW5jcXdreTYKZDZNYzVZbUc4aVVueDZPcG92eTV0YU9vTGV5VWhJQldOYzJzZUtmN3ha
WlE1aDJ2TVUrcTE2MW1kRks1bjZrRgpVU1hsVUZDNi9QTmloVE1BSFcrWAo9bkF6ZgotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============4567563646724000246==--