Commit 3404ad7c authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

bash: bump to 4.1.7(1) and migrate to autotargets 



Closes #1993

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent da32c7ca

CHANGES

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
	New packages: cgilua, copas, coxpcall, ffmpeg, luafilesystem,

	luasocket, rings, wsapi, xavante, xterm



	Updated/fixed packages: berkeleydb, busybox, cdrkit, dash,

	Updated/fixed packages: berkeleydb, bash, busybox, cdrkit, dash,

	dialog, diffutils, distcc, dmalloc, dnsmasq, dropbear, fbv,

	file, gawk, gstreamer, gzip, intltool, ipsec-tools, iptables,

	libart, libfuse, libgpg-error, libidn, liblockfile, links,
@@ -45,6 +45,7 @@ 
	#1957: Bump sqlite to 3.6.23.1

	#1975: Package removal/deprecation

	#1987: intltool: Fix spelling mistake

	#1993: Bump bash to 4.1.7(1) and migrate to autotargets

	#1999: Typo in path checking

	#2005: Bump dnsmasq to 2.55 and migrate to gentargets

	#2035: ipsec-tools-0.7.2 fails to build with gcc-4.4.x

package/bash/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ config BR2_PACKAGE_BASH 
	help

	  The standard GNU Bourne again shell.



	  http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
 
	  http://tiswww.case.edu/php/chet/bash/bashtop.html

package/bash/bash32-001→package/bash/bash-4.1-001.patch

+48 −0
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release: 3.2

Patch-ID: bash32-001

Bash-Release:	4.1

Patch-ID:	bash41-001



Bug-Reported-by:	Greg Schafer <gschafer@zip.com.au>

Bug-Reference-ID:	<20061012084940.GA15768@tigers.local>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00046.html

Bug-Reported-by:	Yann Rouillard <yann@pleiades.fr.eu.org>

Bug-Reference-ID:	<4B44A410.4070107@pleiades.fr.eu.org>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html



Bug-Description:



When using historical ``-style command substitution, bash incorrectly attempts

to interpret shell comments while scanning for the closing backquote.

A prototype for vsnprintf was incorrect, and caused compilation failures

on systems that did not have a suitable vsnprintf, but had a declaration in

one of the system header files.



Patch:

Patch (apply with `patch -p0'):



*** bash-3.2/parse.y	Tue Sep 19 16:37:21 2006

--- bash-3.2/parse.y	Thu Oct 12 10:30:57 2006

*** ../bash-4.1-patched/builtins/printf.def	2009-11-20 15:31:23.000000000 -0500

--- ./builtins/printf.def	2010-01-07 08:50:06.000000000 -0500

***************

*** 2736,2740 ****

    count = 1;

    pass_next_character = backq_backslash = was_dollar = in_comment = 0;

!   check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;

  

    /* RFLAGS is the set of flags we want to pass to recursive calls. */

--- 2736,2740 ----

    count = 1;

    pass_next_character = backq_backslash = was_dollar = in_comment = 0;

!   check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;

  

    /* RFLAGS is the set of flags we want to pass to recursive calls. */

*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006

--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006

*** 173,177 ****

  

  #if !HAVE_VSNPRINTF

! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));

  #endif

  

--- 173,177 ----

  

  #if !HAVE_VSNPRINTF

! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));

  #endif

  

*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400

--- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500

***************

*** 26,30 ****

     looks for to find the patch level (for the sccs version string). */

package/bash/bash-4.1-002.patch

0 → 100644
+65 −0
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release:	4.1

Patch-ID:	bash41-002



Bug-Reported-by:	guillaume.outters@free.fr

Bug-Reference-ID:	<20100105230441.70D171AA7F52@asterix.local>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html



Bug-Description:



Bash-4.1/Readline-6.1 introduced a hook function that allows applications

to rewrite or modify filenames read from the file system before comparing

them with a word to be completed.  The converted filename, if it matches,

needs to be inserted into the line buffer, replacing the original contents.



This fixes a completion bug on Mac OS X involving filenames containing

UTF-8 characters.



Patch (apply with `patch -p0'):



*** ../bash-4.1-patched/lib/readline/complete.c	2009-11-29 18:39:30.000000000 -0500

--- ./lib/readline/complete.c	2010-01-06 08:30:23.000000000 -0500

***************

*** 2139,2143 ****

        if (filename_len == 0)

  	{

! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))

  	    continue;

  

--- 2139,2143 ----

        if (filename_len == 0)

  	{

! 	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))

  	    continue;

  

***************

*** 2220,2224 ****

  	    }

  

! 	  strcpy (temp + dirlen, entry->d_name);

  	}

        else

--- 2220,2224 ----

  	    }

  

! 	  strcpy (temp + dirlen, convfn);

  	}

        else

*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400

--- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500

***************

*** 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_ */

package/bash/bash32-008→package/bash/bash-4.1-003.patch

+48 −0
Original line number Diff line number Diff line 
			     BASH PATCH REPORT

			     =================



Bash-Release: 3.2

Patch-ID: bash32-008

Bash-Release:	4.1

Patch-ID:	bash41-003



Bug-Reported-by:	Linda Walsh <bash@tlinx.org>

Bug-Reference-ID:	<456041FD.8000605@tlinx.org>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00040.html

Bug-Reported-by:	coyote@wariat.org.pl

Bug-Reference-ID:	<4b64a1f8.06e2660a.60af.4bfb@mx.google.com>

Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html



Bug-Description:



When checking pathnames from the command hash table (e.g., when the `checkhash'

shell option is enabled), a bug causes bash to delete and re-lookup each

command.

If command completion is attempted on a word with a quoted globbing

character (e.g., `*' or `?'), bash can reference a NULL pointer and

dump core.



Patch:

Patch (apply with `patch -p0'):



*** bash-3.2-patched/findcmd.c	Wed Aug 17 16:49:54 2005

--- bash-3.2/findcmd.c	Fri Nov 24 10:48:37 2006

*** ../bash-4.1-patched/bashline.c	2009-10-24 14:10:19.000000000 -0400

--- ./bashline.c	2010-01-30 21:53:49.000000000 -0500

***************

*** 309,313 ****

*** 1681,1685 ****

       characters in the common prefix are bad) will ever be returned on

       regular completion. */

!   if (glob_pattern_p (hint))

      {

        st = file_status (hashed_file);

!       if ((st ^ (FS_EXISTS | FS_EXECABLE)) != 0)

        if (state == 0)

--- 1681,1685 ----

       characters in the common prefix are bad) will ever be returned on

       regular completion. */

!   if (globpat)

      {

  	  phash_remove (pathname);

--- 309,313 ----

      {

        st = file_status (hashed_file);

!       if ((st & (FS_EXISTS|FS_EXECABLE)) != (FS_EXISTS|FS_EXECABLE))

  	{

  	  phash_remove (pathname);

*** bash-3.2/patchlevel.h	Thu Apr 13 08:31:04 2006

--- bash-3.2/patchlevel.h	Mon Oct 16 14:22:54 2006

        if (state == 0)

*** ../bash-4.1-patched/patchlevel.h	2009-10-01 16:39:22.000000000 -0400

--- ./patchlevel.h	2010-01-14 09:38:08.000000000 -0500

***************

*** 26,30 ****

     looks for to find the patch level (for the sccs version string). */

  

! #define PATCHLEVEL 7

! #define PATCHLEVEL 2

  

  #endif /* _PATCHLEVEL_H_ */

--- 26,30 ----

     looks for to find the patch level (for the sccs version string). */

  

! #define PATCHLEVEL 8

! #define PATCHLEVEL 3

  

  #endif /* _PATCHLEVEL_H_ */