bash: update to 4.4.12
This commit is contained in:
Tom G. Christensen
parent
47e66e823e
commit
0c2b1093ec
@ -6,57 +6,27 @@
|
|||||||
###########################################################
|
###########################################################
|
||||||
# Check the following 4 variables before running the script
|
# Check the following 4 variables before running the script
|
||||||
topdir=bash
|
topdir=bash
|
||||||
real_version=4.3
|
real_version=4.4
|
||||||
version=4.3.42
|
version=4.4.12
|
||||||
pkgver=1
|
pkgver=1
|
||||||
source[0]=ftp://ftp.sunet.se/pub/gnu/bash/$topdir-$real_version.tar.gz
|
source[0]=ftp://ftp.sunet.se/pub/gnu/bash/$topdir-$real_version.tar.gz
|
||||||
|
|
||||||
# Source function library
|
# Source function library
|
||||||
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
. ${BUILDPKG_SCRIPTS}/buildpkg.functions
|
||||||
|
|
||||||
patch[0]="" # no sparse array support in buildpkg
|
patch[0]=bash-4.4-no-loadable-builtins.patch
|
||||||
patch[1]=bash43-001
|
patch[1]=bash44-001
|
||||||
patch[2]=bash43-002
|
patch[2]=bash44-002
|
||||||
patch[3]=bash43-003
|
patch[3]=bash44-003
|
||||||
patch[4]=bash43-004
|
patch[4]=bash44-004
|
||||||
patch[5]=bash43-005
|
patch[5]=bash44-005
|
||||||
patch[6]=bash43-006
|
patch[6]=bash44-006
|
||||||
patch[7]=bash43-007
|
patch[7]=bash44-007
|
||||||
patch[8]=bash43-008
|
patch[8]=bash44-008
|
||||||
patch[9]=bash43-009
|
patch[9]=bash44-009
|
||||||
patch[10]=bash43-010
|
patch[10]=bash44-010
|
||||||
patch[11]=bash43-011
|
patch[11]=bash44-011
|
||||||
patch[12]=bash43-012
|
patch[12]=bash44-012
|
||||||
patch[13]=bash43-013
|
|
||||||
patch[14]=bash43-014
|
|
||||||
patch[15]=bash43-015
|
|
||||||
patch[16]=bash43-016
|
|
||||||
patch[17]=bash43-017
|
|
||||||
patch[18]=bash43-018
|
|
||||||
patch[19]=bash43-019
|
|
||||||
patch[20]=bash43-020
|
|
||||||
patch[21]=bash43-021
|
|
||||||
patch[22]=bash43-022
|
|
||||||
patch[23]=bash43-023
|
|
||||||
patch[24]=bash43-024
|
|
||||||
patch[25]=bash43-025
|
|
||||||
patch[26]=bash43-026
|
|
||||||
patch[27]=bash43-027
|
|
||||||
patch[28]=bash43-028
|
|
||||||
patch[29]=bash43-029
|
|
||||||
patch[30]=bash43-030
|
|
||||||
patch[31]=bash43-031
|
|
||||||
patch[32]=bash43-032
|
|
||||||
patch[33]=bash43-033
|
|
||||||
patch[34]=bash43-034
|
|
||||||
patch[35]=bash43-035
|
|
||||||
patch[36]=bash43-036
|
|
||||||
patch[37]=bash43-037
|
|
||||||
patch[38]=bash43-038
|
|
||||||
patch[39]=bash43-039
|
|
||||||
patch[40]=bash43-040
|
|
||||||
patch[41]=bash43-041
|
|
||||||
patch[42]=bash43-042
|
|
||||||
|
|
||||||
# Global settings
|
# Global settings
|
||||||
export CPPFLAGS="-I$prefix/include"
|
export CPPFLAGS="-I$prefix/include"
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
CHANGELOG
|
CHANGELOG
|
||||||
---------
|
---------
|
||||||
|
* Sat Sep 30 2017 Tom G. Christensen <swpkg@jupiterrise.com> - 4.4.12-1
|
||||||
|
- Update to 4.4.12
|
||||||
|
|
||||||
* Sat Aug 22 2015 Tom G. Christensen <swpkg@jupiterrise.com> - 4.3.42-1
|
* Sat Aug 22 2015 Tom G. Christensen <swpkg@jupiterrise.com> - 4.3.42-1
|
||||||
- Update to 4.3.42
|
- Update to 4.3.42
|
||||||
|
|
||||||
|
|||||||
10
bash/src/bash-4.4-no-loadable-builtins.patch
Normal file
10
bash/src/bash-4.4-no-loadable-builtins.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
--- Makefile.in.nol 2016-01-15 14:55:37.000000000 +0100
|
||||||
|
+++ Makefile.in 2017-09-30 12:35:21.403046700 +0200
|
||||||
|
@@ -799,7 +799,6 @@
|
||||||
|
infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
|
||||||
|
-( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
|
||||||
|
-( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
|
||||||
|
- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
|
||||||
|
|
||||||
|
install-strip:
|
||||||
|
$(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
|
||||||
60
bash/src/bash44-001
Normal file
60
bash/src/bash44-001
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-001
|
||||||
|
|
||||||
|
Bug-Reported-by: Sean Zha <freeman_cha@hotmail.com>
|
||||||
|
Bug-Reference-ID: <BN3PR01MB13657D9303EB94BF6E54216E8CCA0@BN3PR01MB1365.prod.exchangelabs.com>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Bash-4.4 changed the way the history list is initially allocated to reduce
|
||||||
|
the number of reallocations and copies. Users who set HISTSIZE to a very
|
||||||
|
large number to essentially unlimit the size of the history list will get
|
||||||
|
memory allocation errors
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500
|
||||||
|
--- lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 58,61 ****
|
||||||
|
--- 58,63 ----
|
||||||
|
#define DEFAULT_HISTORY_INITIAL_SIZE 502
|
||||||
|
|
||||||
|
+ #define MAX_HISTORY_INITIAL_SIZE 8192
|
||||||
|
+
|
||||||
|
/* The number of slots to increase the_history by. */
|
||||||
|
#define DEFAULT_HISTORY_GROW_SIZE 50
|
||||||
|
***************
|
||||||
|
*** 308,312 ****
|
||||||
|
{
|
||||||
|
if (history_stifled && history_max_entries > 0)
|
||||||
|
! history_size = history_max_entries + 2;
|
||||||
|
else
|
||||||
|
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||||
|
--- 310,316 ----
|
||||||
|
{
|
||||||
|
if (history_stifled && history_max_entries > 0)
|
||||||
|
! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
|
||||||
|
! ? MAX_HISTORY_INITIAL_SIZE
|
||||||
|
! : history_max_entries + 2;
|
||||||
|
else
|
||||||
|
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 0
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 1
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
69
bash/src/bash44-002
Normal file
69
bash/src/bash44-002
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-002
|
||||||
|
|
||||||
|
Bug-Reported-by: Eric Pruitt <eric.pruitt@gmail.com>
|
||||||
|
Bug-Reference-ID: <20160916055120.GA28272@sinister.codevat.com>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Bash-4.4 warns when discarding NUL bytes in command substitution output
|
||||||
|
instead of silently dropping them. This patch changes the warnings from
|
||||||
|
one per NUL byte encountered to one warning per command substitution.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||||
|
--- subst.c 2016-09-26 10:20:19.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 5932,5935 ****
|
||||||
|
--- 5933,5937 ----
|
||||||
|
int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
|
||||||
|
ssize_t bufn;
|
||||||
|
+ int nullbyte;
|
||||||
|
|
||||||
|
istring = (char *)NULL;
|
||||||
|
***************
|
||||||
|
*** 5939,5942 ****
|
||||||
|
--- 5941,5946 ----
|
||||||
|
skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
|
||||||
|
|
||||||
|
+ nullbyte = 0;
|
||||||
|
+
|
||||||
|
/* Read the output of the command through the pipe. This may need to be
|
||||||
|
changed to understand multibyte characters in the future. */
|
||||||
|
***************
|
||||||
|
*** 5957,5961 ****
|
||||||
|
{
|
||||||
|
#if 1
|
||||||
|
! internal_warning ("%s", _("command substitution: ignored null byte in input"));
|
||||||
|
#endif
|
||||||
|
continue;
|
||||||
|
--- 5961,5969 ----
|
||||||
|
{
|
||||||
|
#if 1
|
||||||
|
! if (nullbyte == 0)
|
||||||
|
! {
|
||||||
|
! internal_warning ("%s", _("command substitution: ignored null byte in input"));
|
||||||
|
! nullbyte = 1;
|
||||||
|
! }
|
||||||
|
#endif
|
||||||
|
continue;
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 1
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 2
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
58
bash/src/bash44-003
Normal file
58
bash/src/bash44-003
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-003
|
||||||
|
|
||||||
|
Bug-Reported-by: op7ic \x00 <op7ica@gmail.com>
|
||||||
|
Bug-Reference-ID: <CAFHyJTopWC5Jx+U7WcvxSZKu+KrqSf+_3sHPiRWo=VzXSiPq=w@mail.gmail.com>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Specially-crafted input, in this case an incomplete pathname expansion
|
||||||
|
bracket expression containing an invalid collating symbol, can cause the
|
||||||
|
shell to crash.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400
|
||||||
|
--- lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 331,334 ****
|
||||||
|
--- 331,340 ----
|
||||||
|
if (p[pc] == L('.') && p[pc+1] == L(']'))
|
||||||
|
break;
|
||||||
|
+ if (p[pc] == 0)
|
||||||
|
+ {
|
||||||
|
+ if (vp)
|
||||||
|
+ *vp = INVALID;
|
||||||
|
+ return (p + pc);
|
||||||
|
+ }
|
||||||
|
val = COLLSYM (p, pc);
|
||||||
|
if (vp)
|
||||||
|
***************
|
||||||
|
*** 484,487 ****
|
||||||
|
--- 490,496 ----
|
||||||
|
c = FOLD (c);
|
||||||
|
|
||||||
|
+ if (c == L('\0'))
|
||||||
|
+ return ((test == L('[')) ? savep : (CHAR *)0);
|
||||||
|
+
|
||||||
|
if ((flags & FNM_PATHNAME) && c == L('/'))
|
||||||
|
/* [/] can never match when matching a pathname. */
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 2
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 3
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
84
bash/src/bash44-004
Normal file
84
bash/src/bash44-004
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-004
|
||||||
|
|
||||||
|
Bug-Reported-by: Christian Weisgerber <naddy@mips.inka.de>
|
||||||
|
Bug-Reference-ID: <20161101160302.GB54856@lorvorc.mips.inka.de>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
There is a race condition that can result in bash referencing freed memory
|
||||||
|
when freeing data associated with the last process substitution.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400
|
||||||
|
--- jobs.c 2016-11-02 18:24:45.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 454,457 ****
|
||||||
|
--- 454,472 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
+ void
|
||||||
|
+ discard_last_procsub_child ()
|
||||||
|
+ {
|
||||||
|
+ PROCESS *disposer;
|
||||||
|
+ sigset_t set, oset;
|
||||||
|
+
|
||||||
|
+ BLOCK_CHILD (set, oset);
|
||||||
|
+ disposer = last_procsub_child;
|
||||||
|
+ last_procsub_child = (PROCESS *)NULL;
|
||||||
|
+ UNBLOCK_CHILD (oset);
|
||||||
|
+
|
||||||
|
+ if (disposer)
|
||||||
|
+ discard_pipeline (disposer);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
struct pipeline_saver *
|
||||||
|
alloc_pipeline_saver ()
|
||||||
|
*** ../bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400
|
||||||
|
--- jobs.h 2016-11-02 18:25:08.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 191,194 ****
|
||||||
|
--- 191,195 ----
|
||||||
|
extern void stop_making_children __P((void));
|
||||||
|
extern void cleanup_the_pipeline __P((void));
|
||||||
|
+ extern void discard_last_procsub_child __P((void));
|
||||||
|
extern void save_pipeline __P((int));
|
||||||
|
extern PROCESS *restore_pipeline __P((int));
|
||||||
|
*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||||
|
--- subst.c 2016-11-02 18:23:24.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 5809,5816 ****
|
||||||
|
#if defined (JOB_CONTROL)
|
||||||
|
if (last_procsub_child)
|
||||||
|
! {
|
||||||
|
! discard_pipeline (last_procsub_child);
|
||||||
|
! last_procsub_child = (PROCESS *)NULL;
|
||||||
|
! }
|
||||||
|
last_procsub_child = restore_pipeline (0);
|
||||||
|
#endif
|
||||||
|
--- 5834,5838 ----
|
||||||
|
#if defined (JOB_CONTROL)
|
||||||
|
if (last_procsub_child)
|
||||||
|
! discard_last_procsub_child ();
|
||||||
|
last_procsub_child = restore_pipeline (0);
|
||||||
|
#endif
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 3
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 4
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
47
bash/src/bash44-005
Normal file
47
bash/src/bash44-005
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-005
|
||||||
|
|
||||||
|
Bug-Reported-by: Dr. Werner Fink <werner@suse.de>
|
||||||
|
Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf@noether.suse.de>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Under certain circumstances, a simple command is optimized to eliminate a
|
||||||
|
fork, resulting in an EXIT trap not being executed.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400
|
||||||
|
--- builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 105,114 ****
|
||||||
|
*bash_input.location.string == '\0' &&
|
||||||
|
command->type == cm_simple &&
|
||||||
|
- #if 0
|
||||||
|
signal_is_trapped (EXIT_TRAP) == 0 &&
|
||||||
|
signal_is_trapped (ERROR_TRAP) == 0 &&
|
||||||
|
- #else
|
||||||
|
any_signals_trapped () < 0 &&
|
||||||
|
- #endif
|
||||||
|
command->redirects == 0 && command->value.Simple->redirects == 0 &&
|
||||||
|
((command->flags & CMD_TIME_PIPELINE) == 0) &&
|
||||||
|
--- 105,111 ----
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 4
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 5
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
59
bash/src/bash44-006
Normal file
59
bash/src/bash44-006
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-006
|
||||||
|
|
||||||
|
Bug-Reported-by: <fernando@null-life.com>
|
||||||
|
Bug-Reference-ID: <CAEr-gPFPvqheiAeENmMkEwWRd4U=1iqCsYmR3sLdULOqL++_tQ@mail.gmail.com>
|
||||||
|
Bug-Reference-URL:
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Out-of-range negative offsets to popd can cause the shell to crash attempting
|
||||||
|
to free an invalid memory block.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500
|
||||||
|
--- builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 366,370 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
|
||||||
|
{
|
||||||
|
pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||||
|
--- 366,370 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
|
||||||
|
{
|
||||||
|
pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||||
|
***************
|
||||||
|
*** 388,391 ****
|
||||||
|
--- 388,396 ----
|
||||||
|
of the list into place. */
|
||||||
|
i = (direction == '+') ? directory_list_offset - which : which;
|
||||||
|
+ if (i < 0 || i > directory_list_offset)
|
||||||
|
+ {
|
||||||
|
+ pushd_error (directory_list_offset, which_word ? which_word : "");
|
||||||
|
+ return (EXECUTION_FAILURE);
|
||||||
|
+ }
|
||||||
|
free (pushd_directory_list[i]);
|
||||||
|
directory_list_offset--;
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 5
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 6
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
151
bash/src/bash44-007
Normal file
151
bash/src/bash44-007
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-007
|
||||||
|
|
||||||
|
Bug-Reported-by: Jens Heyens <jens.heyens@cispa.saarland>
|
||||||
|
Bug-Reference-ID:
|
||||||
|
Bug-Reference-URL: https://savannah.gnu.org/support/?109224
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
When performing filename completion, bash dequotes the directory name being
|
||||||
|
completed, which can result in match failures and potential unwanted
|
||||||
|
expansion.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/bashline.c 2016-08-05 21:44:05.000000000 -0400
|
||||||
|
--- bashline.c 2017-01-19 13:15:51.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 143,147 ****
|
||||||
|
static void restore_directory_hook __P((rl_icppfunc_t));
|
||||||
|
|
||||||
|
! static int directory_exists __P((const char *));
|
||||||
|
|
||||||
|
static void cleanup_expansion_error __P((void));
|
||||||
|
--- 144,148 ----
|
||||||
|
static void restore_directory_hook __P((rl_icppfunc_t));
|
||||||
|
|
||||||
|
! static int directory_exists __P((const char *, int));
|
||||||
|
|
||||||
|
static void cleanup_expansion_error __P((void));
|
||||||
|
***************
|
||||||
|
*** 3103,3111 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
! /* Check whether not the (dequoted) version of DIRNAME, with any trailing slash
|
||||||
|
! removed, exists. */
|
||||||
|
static int
|
||||||
|
! directory_exists (dirname)
|
||||||
|
const char *dirname;
|
||||||
|
{
|
||||||
|
char *new_dirname;
|
||||||
|
--- 3107,3116 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
! /* Check whether not DIRNAME, with any trailing slash removed, exists. If
|
||||||
|
! SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */
|
||||||
|
static int
|
||||||
|
! directory_exists (dirname, should_dequote)
|
||||||
|
const char *dirname;
|
||||||
|
+ int should_dequote;
|
||||||
|
{
|
||||||
|
char *new_dirname;
|
||||||
|
***************
|
||||||
|
*** 3113,3118 ****
|
||||||
|
struct stat sb;
|
||||||
|
|
||||||
|
! /* First, dequote the directory name */
|
||||||
|
! new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character);
|
||||||
|
dirlen = STRLEN (new_dirname);
|
||||||
|
if (new_dirname[dirlen - 1] == '/')
|
||||||
|
--- 3118,3124 ----
|
||||||
|
struct stat sb;
|
||||||
|
|
||||||
|
! /* We save the string and chop the trailing slash because stat/lstat behave
|
||||||
|
! inconsistently if one is present. */
|
||||||
|
! new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname);
|
||||||
|
dirlen = STRLEN (new_dirname);
|
||||||
|
if (new_dirname[dirlen - 1] == '/')
|
||||||
|
***************
|
||||||
|
*** 3146,3150 ****
|
||||||
|
should_expand_dirname = '`';
|
||||||
|
|
||||||
|
! if (should_expand_dirname && directory_exists (local_dirname))
|
||||||
|
should_expand_dirname = 0;
|
||||||
|
|
||||||
|
--- 3152,3156 ----
|
||||||
|
should_expand_dirname = '`';
|
||||||
|
|
||||||
|
! if (should_expand_dirname && directory_exists (local_dirname, 0))
|
||||||
|
should_expand_dirname = 0;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 3156,3160 ****
|
||||||
|
global_nounset = unbound_vars_is_error;
|
||||||
|
unbound_vars_is_error = 0;
|
||||||
|
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */
|
||||||
|
unbound_vars_is_error = global_nounset;
|
||||||
|
if (wl)
|
||||||
|
--- 3162,3166 ----
|
||||||
|
global_nounset = unbound_vars_is_error;
|
||||||
|
unbound_vars_is_error = 0;
|
||||||
|
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */
|
||||||
|
unbound_vars_is_error = global_nounset;
|
||||||
|
if (wl)
|
||||||
|
***************
|
||||||
|
*** 3245,3249 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
! if (should_expand_dirname && directory_exists (local_dirname))
|
||||||
|
should_expand_dirname = 0;
|
||||||
|
|
||||||
|
--- 3262,3266 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
! if (should_expand_dirname && directory_exists (local_dirname, 1))
|
||||||
|
should_expand_dirname = 0;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 3251,3255 ****
|
||||||
|
{
|
||||||
|
new_dirname = savestring (local_dirname);
|
||||||
|
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */
|
||||||
|
if (wl)
|
||||||
|
{
|
||||||
|
--- 3268,3272 ----
|
||||||
|
{
|
||||||
|
new_dirname = savestring (local_dirname);
|
||||||
|
! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */
|
||||||
|
if (wl)
|
||||||
|
{
|
||||||
|
*** ../bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400
|
||||||
|
--- subst.c 2017-01-19 07:09:57.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 9459,9462 ****
|
||||||
|
--- 9459,9466 ----
|
||||||
|
if (word->flags & W_COMPLETE)
|
||||||
|
tword->flags |= W_COMPLETE; /* for command substitutions */
|
||||||
|
+ if (word->flags & W_NOCOMSUB)
|
||||||
|
+ tword->flags |= W_NOCOMSUB;
|
||||||
|
+ if (word->flags & W_NOPROCSUB)
|
||||||
|
+ tword->flags |= W_NOPROCSUB;
|
||||||
|
|
||||||
|
temp = (char *)NULL;
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 6
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 7
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
84
bash/src/bash44-008
Normal file
84
bash/src/bash44-008
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-008
|
||||||
|
|
||||||
|
Bug-Reported-by: Koichi MURASE <myoga.murase@gmail.com>
|
||||||
|
Bug-Reference-ID: <CAFLRLk-V+1AeQ2k=pY7ih6V+MfQ_w8EF3YWL2E+wmLfgKBtzXA@mail.gmail.com>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Under certain circumstances, bash will evaluate arithmetic expressions as
|
||||||
|
part of reading an expression token even when evaluation is suppressed. This
|
||||||
|
happens while evaluating a conditional expression and skipping over the
|
||||||
|
failed branch of the expression.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/expr.c 2015-10-11 14:46:36.000000000 -0400
|
||||||
|
--- expr.c 2016-11-08 11:55:46.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 579,585 ****
|
||||||
|
if (curtok == QUES) /* found conditional expr */
|
||||||
|
{
|
||||||
|
- readtok ();
|
||||||
|
- if (curtok == 0 || curtok == COL)
|
||||||
|
- evalerror (_("expression expected"));
|
||||||
|
if (cval == 0)
|
||||||
|
{
|
||||||
|
--- 579,582 ----
|
||||||
|
***************
|
||||||
|
*** 588,591 ****
|
||||||
|
--- 585,592 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
+ readtok ();
|
||||||
|
+ if (curtok == 0 || curtok == COL)
|
||||||
|
+ evalerror (_("expression expected"));
|
||||||
|
+
|
||||||
|
val1 = EXP_HIGHEST ();
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 594,600 ****
|
||||||
|
if (curtok != COL)
|
||||||
|
evalerror (_("`:' expected for conditional expression"));
|
||||||
|
! readtok ();
|
||||||
|
! if (curtok == 0)
|
||||||
|
! evalerror (_("expression expected"));
|
||||||
|
set_noeval = 0;
|
||||||
|
if (cval)
|
||||||
|
--- 595,599 ----
|
||||||
|
if (curtok != COL)
|
||||||
|
evalerror (_("`:' expected for conditional expression"));
|
||||||
|
!
|
||||||
|
set_noeval = 0;
|
||||||
|
if (cval)
|
||||||
|
***************
|
||||||
|
*** 604,608 ****
|
||||||
|
--- 603,611 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
+ readtok ();
|
||||||
|
+ if (curtok == 0)
|
||||||
|
+ evalerror (_("expression expected"));
|
||||||
|
val2 = expcond ();
|
||||||
|
+
|
||||||
|
if (set_noeval)
|
||||||
|
noeval--;
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 7
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 8
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
107
bash/src/bash44-009
Normal file
107
bash/src/bash44-009
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-009
|
||||||
|
|
||||||
|
Bug-Reported-by: Hong Cho <hong.cho@citrix.com>
|
||||||
|
Bug-Reference-ID: <c30b5fe62b2543af8297e47ca487c29c@SJCPEX02CL02.citrite.net>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-12/msg00043.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
There is a race condition in add_history() that can be triggered by a fatal
|
||||||
|
signal arriving between the time the history length is updated and the time
|
||||||
|
the history list update is completed. A later attempt to reference an
|
||||||
|
invalid history entry can cause a crash.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/lib/readline/history.c 2016-11-11 13:42:49.000000000 -0500
|
||||||
|
--- lib/readline/history.c 2016-12-05 10:37:51.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 280,283 ****
|
||||||
|
--- 280,284 ----
|
||||||
|
{
|
||||||
|
HIST_ENTRY *temp;
|
||||||
|
+ int new_length;
|
||||||
|
|
||||||
|
if (history_stifled && (history_length == history_max_entries))
|
||||||
|
***************
|
||||||
|
*** 296,306 ****
|
||||||
|
/* Copy the rest of the entries, moving down one slot. Copy includes
|
||||||
|
trailing NULL. */
|
||||||
|
- #if 0
|
||||||
|
- for (i = 0; i < history_length; i++)
|
||||||
|
- the_history[i] = the_history[i + 1];
|
||||||
|
- #else
|
||||||
|
memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
|
||||||
|
- #endif
|
||||||
|
|
||||||
|
history_base++;
|
||||||
|
}
|
||||||
|
--- 297,303 ----
|
||||||
|
/* Copy the rest of the entries, moving down one slot. Copy includes
|
||||||
|
trailing NULL. */
|
||||||
|
memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
|
||||||
|
|
||||||
|
+ new_length = history_length;
|
||||||
|
history_base++;
|
||||||
|
}
|
||||||
|
***************
|
||||||
|
*** 316,320 ****
|
||||||
|
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||||
|
the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
|
||||||
|
! history_length = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
--- 313,317 ----
|
||||||
|
history_size = DEFAULT_HISTORY_INITIAL_SIZE;
|
||||||
|
the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
|
||||||
|
! new_length = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
***************
|
||||||
|
*** 326,330 ****
|
||||||
|
xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
|
||||||
|
}
|
||||||
|
! history_length++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- 323,327 ----
|
||||||
|
xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
|
||||||
|
}
|
||||||
|
! new_length = history_length + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
***************
|
||||||
|
*** 332,337 ****
|
||||||
|
temp = alloc_history_entry ((char *)string, hist_inittime ());
|
||||||
|
|
||||||
|
! the_history[history_length] = (HIST_ENTRY *)NULL;
|
||||||
|
! the_history[history_length - 1] = temp;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 329,335 ----
|
||||||
|
temp = alloc_history_entry ((char *)string, hist_inittime ());
|
||||||
|
|
||||||
|
! the_history[new_length] = (HIST_ENTRY *)NULL;
|
||||||
|
! the_history[new_length - 1] = temp;
|
||||||
|
! history_length = new_length;
|
||||||
|
}
|
||||||
|
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 8
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 9
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
49
bash/src/bash44-010
Normal file
49
bash/src/bash44-010
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-010
|
||||||
|
|
||||||
|
Bug-Reported-by: Clark Wang <dearvoid@gmail.com>
|
||||||
|
Bug-Reference-ID: <CADv8-og092RvvUUHy46=BPKChCXw5g=GOOqgN0V3f4a3TpLebQ@mail.gmail.com>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00104.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Depending on compiler optimizations and behavior, the `read' builtin may not
|
||||||
|
save partial input when a timeout occurs.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/builtins/read.def 2016-05-16 14:24:56.000000000 -0400
|
||||||
|
--- builtins/read.def 2016-11-25 12:37:56.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 182,186 ****
|
||||||
|
{
|
||||||
|
register char *varname;
|
||||||
|
! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
|
||||||
|
int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
|
||||||
|
int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
|
||||||
|
--- 182,187 ----
|
||||||
|
{
|
||||||
|
register char *varname;
|
||||||
|
! int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
|
||||||
|
! volatile int i;
|
||||||
|
int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
|
||||||
|
int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
|
||||||
|
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 9
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 10
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
50
bash/src/bash44-011
Normal file
50
bash/src/bash44-011
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-011
|
||||||
|
|
||||||
|
Bug-Reported-by: Russell King <rmk@armlinux.org.uk>
|
||||||
|
Bug-Reference-ID: <E1cNnFx-0007G2-S2@flint.armlinux.org.uk>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-01/msg00000.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
Subshells begun to run command and process substitutions may attempt to
|
||||||
|
set the terminal's process group to an incorrect value if they receive
|
||||||
|
a fatal signal. This depends on the behavior of the process that starts
|
||||||
|
the shell.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/sig.c 2016-02-11 15:02:45.000000000 -0500
|
||||||
|
--- sig.c 2017-01-04 09:09:47.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 586,590 ****
|
||||||
|
if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
|
||||||
|
hangup_all_jobs ();
|
||||||
|
! end_job_control ();
|
||||||
|
#endif /* JOB_CONTROL */
|
||||||
|
|
||||||
|
--- 571,576 ----
|
||||||
|
if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
|
||||||
|
hangup_all_jobs ();
|
||||||
|
! if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
|
||||||
|
! end_job_control ();
|
||||||
|
#endif /* JOB_CONTROL */
|
||||||
|
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 10
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 11
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
161
bash/src/bash44-012
Normal file
161
bash/src/bash44-012
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
BASH PATCH REPORT
|
||||||
|
=================
|
||||||
|
|
||||||
|
Bash-Release: 4.4
|
||||||
|
Patch-ID: bash44-012
|
||||||
|
|
||||||
|
Bug-Reported-by: Clark Wang <dearvoid@gmail.com>
|
||||||
|
Bug-Reference-ID: <CADv8-ojttPUFOZXqbjsvy83LfaJtQKZ5qejGdF6j0VJ3vtrYOA@mail.gmail.com>
|
||||||
|
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html
|
||||||
|
|
||||||
|
Bug-Description:
|
||||||
|
|
||||||
|
When -N is used, the input is not supposed to be split using $IFS, but
|
||||||
|
leading and trailing IFS whitespace was still removed.
|
||||||
|
|
||||||
|
Patch (apply with `patch -p0'):
|
||||||
|
|
||||||
|
*** ../bash-4.4-patched/subst.c 2017-01-20 14:22:01.000000000 -0500
|
||||||
|
--- subst.c 2017-01-25 13:43:22.000000000 -0500
|
||||||
|
***************
|
||||||
|
*** 2826,2834 ****
|
||||||
|
/* Parse a single word from STRING, using SEPARATORS to separate fields.
|
||||||
|
ENDPTR is set to the first character after the word. This is used by
|
||||||
|
! the `read' builtin. This is never called with SEPARATORS != $IFS;
|
||||||
|
! it should be simplified.
|
||||||
|
|
||||||
|
XXX - this function is very similar to list_string; they should be
|
||||||
|
combined - XXX */
|
||||||
|
char *
|
||||||
|
get_word_from_string (stringp, separators, endptr)
|
||||||
|
--- 2826,2838 ----
|
||||||
|
/* Parse a single word from STRING, using SEPARATORS to separate fields.
|
||||||
|
ENDPTR is set to the first character after the word. This is used by
|
||||||
|
! the `read' builtin.
|
||||||
|
!
|
||||||
|
! This is never called with SEPARATORS != $IFS, and takes advantage of that.
|
||||||
|
|
||||||
|
XXX - this function is very similar to list_string; they should be
|
||||||
|
combined - XXX */
|
||||||
|
+
|
||||||
|
+ #define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0)
|
||||||
|
+
|
||||||
|
char *
|
||||||
|
get_word_from_string (stringp, separators, endptr)
|
||||||
|
***************
|
||||||
|
*** 2838,2841 ****
|
||||||
|
--- 2842,2846 ----
|
||||||
|
char *current_word;
|
||||||
|
int sindex, sh_style_split, whitesep, xflags;
|
||||||
|
+ unsigned char local_cmap[UCHAR_MAX+1]; /* really only need single-byte chars here */
|
||||||
|
size_t slen;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2847,2854 ****
|
||||||
|
separators[2] == '\n' &&
|
||||||
|
separators[3] == '\0';
|
||||||
|
! for (xflags = 0, s = ifs_value; s && *s; s++)
|
||||||
|
{
|
||||||
|
if (*s == CTLESC) xflags |= SX_NOCTLESC;
|
||||||
|
if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 2852,2861 ----
|
||||||
|
separators[2] == '\n' &&
|
||||||
|
separators[3] == '\0';
|
||||||
|
! memset (local_cmap, '\0', sizeof (local_cmap));
|
||||||
|
! for (xflags = 0, s = separators; s && *s; s++)
|
||||||
|
{
|
||||||
|
if (*s == CTLESC) xflags |= SX_NOCTLESC;
|
||||||
|
if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
|
||||||
|
+ local_cmap[(unsigned char)*s] = 1; /* local charmap of separators */
|
||||||
|
}
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2857,2864 ****
|
||||||
|
|
||||||
|
/* Remove sequences of whitespace at the beginning of STRING, as
|
||||||
|
! long as those characters appear in IFS. */
|
||||||
|
! if (sh_style_split || !separators || !*separators)
|
||||||
|
{
|
||||||
|
! for (; *s && spctabnl (*s) && isifs (*s); s++);
|
||||||
|
|
||||||
|
/* If the string is nothing but whitespace, update it and return. */
|
||||||
|
--- 2864,2872 ----
|
||||||
|
|
||||||
|
/* Remove sequences of whitespace at the beginning of STRING, as
|
||||||
|
! long as those characters appear in SEPARATORS. This happens if
|
||||||
|
! SEPARATORS == $' \t\n' or if IFS is unset. */
|
||||||
|
! if (sh_style_split || separators == 0)
|
||||||
|
{
|
||||||
|
! for (; *s && spctabnl (*s) && islocalsep (*s); s++);
|
||||||
|
|
||||||
|
/* If the string is nothing but whitespace, update it and return. */
|
||||||
|
***************
|
||||||
|
*** 2879,2885 ****
|
||||||
|
This obeys the field splitting rules in Posix.2. */
|
||||||
|
sindex = 0;
|
||||||
|
! /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
|
||||||
|
! unless multibyte chars are possible. */
|
||||||
|
! slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
|
||||||
|
current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
|
||||||
|
|
||||||
|
--- 2887,2893 ----
|
||||||
|
This obeys the field splitting rules in Posix.2. */
|
||||||
|
sindex = 0;
|
||||||
|
! /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
|
||||||
|
! possible, but need it in string_extract_verbatim for bounds checking */
|
||||||
|
! slen = STRLEN (s);
|
||||||
|
current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2900,2904 ****
|
||||||
|
/* Now skip sequences of space, tab, or newline characters if they are
|
||||||
|
in the list of separators. */
|
||||||
|
! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
|
||||||
|
sindex++;
|
||||||
|
|
||||||
|
--- 2908,2912 ----
|
||||||
|
/* Now skip sequences of space, tab, or newline characters if they are
|
||||||
|
in the list of separators. */
|
||||||
|
! while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
|
||||||
|
sindex++;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 2907,2916 ****
|
||||||
|
delimiter, not a separate delimiter that would result in an empty field.
|
||||||
|
Look at POSIX.2, 3.6.5, (3)(b). */
|
||||||
|
! if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
|
||||||
|
{
|
||||||
|
sindex++;
|
||||||
|
/* An IFS character that is not IFS white space, along with any adjacent
|
||||||
|
IFS white space, shall delimit a field. */
|
||||||
|
! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
|
||||||
|
sindex++;
|
||||||
|
}
|
||||||
|
--- 2915,2924 ----
|
||||||
|
delimiter, not a separate delimiter that would result in an empty field.
|
||||||
|
Look at POSIX.2, 3.6.5, (3)(b). */
|
||||||
|
! if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
|
||||||
|
{
|
||||||
|
sindex++;
|
||||||
|
/* An IFS character that is not IFS white space, along with any adjacent
|
||||||
|
IFS white space, shall delimit a field. */
|
||||||
|
! while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
|
||||||
|
sindex++;
|
||||||
|
}
|
||||||
|
*** ../bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400
|
||||||
|
--- patchlevel.h 2016-10-01 11:01:28.000000000 -0400
|
||||||
|
***************
|
||||||
|
*** 26,30 ****
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 11
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
|
--- 26,30 ----
|
||||||
|
looks for to find the patch level (for the sccs version string). */
|
||||||
|
|
||||||
|
! #define PATCHLEVEL 12
|
||||||
|
|
||||||
|
#endif /* _PATCHLEVEL_H_ */
|
||||||
Loading…
x
Reference in New Issue
Block a user