readline: bump to version 6.1

	mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,

	ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openssl,

	openvpn, oprofile, pango, patch, pcre, php, pkg-config, pppd,

	prboom, radvd, rdesktop, ruby, qt, quagga, samba, sawman,

	sdl_mixer, sdl_sound, setserial, shared-mime-info, speex,

	sqlite, squashfs, startup-notification, strace, sylpheed,

	taglib, tcpdump, thttpd, tiff, tn5250, torsmo, udev, udpcast,

	usbmount, usbutils, vsftpd, vtun, which, wpa_supplicant,

	xapp_twm, xapp_xbacklight, xapp_xcursorgen, xapp_xinput,

	xapp_xmore,

	prboom, radvd, rdesktop, readline, ruby, qt, quagga, samba,

	sawman, sdl_mixer, sdl_sound, setserial, shared-mime-info,

	speex, sqlite, squashfs, startup-notification, strace,

	sylpheed, taglib, tcpdump, thttpd, tiff, tn5250, torsmo, udev,

	udpcast, usbmount, usbutils, vsftpd, vtun, which,

	wpa_supplicant, xapp_twm, xapp_xbacklight, xapp_xcursorgen,

	xapp_xinput, xapp_xmore,

	xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard},

	xdriver-xf86-input-{mouse,synaptics,vmmouse,void},

	xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev},

# build GNU readline

#

#############################################################

READLINE_VERSION = 5.2

READLINE_VERSION = 6.1

READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz

READLINE_SITE = $(BR2_GNU_MIRROR)/readline

READLINE_INSTALL_STAGING = YES

			   READLINE PATCH REPORT

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

Readline-Release: 5.2

Patch-ID: readline52-001

Bug-Reported-by:	ebb9@byu.net

Bug-Reference-ID:	<45540862.9030900@byu.net>

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

			http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html

Bug-Description:

In some cases, code that is intended to be used in the presence of multibyte

characters is called when no such characters are present, leading to incorrect

display position calculations and incorrect redisplay.

Patch:

*** ../readline-5.2/display.c	Thu Sep 14 14:20:12 2006

--- readline-5.2/display.c	Mon Nov 13 17:55:57 2006

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

*** 2381,2384 ****

--- 2409,2414 ----

    if (end <= start)

      return 0;

+   if (MB_CUR_MAX == 1 || rl_byte_oriented)

+     return (end - start);

    memset (&ps, 0, sizeof (mbstate_t));

			   READLINE PATCH REPORT

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

Readline-Release: 5.2

Patch-ID: readline52-002

Bug-Reported-by: Magnus Svensson <msvensson@mysql.com>

Bug-Reference-ID: <45BDC44D.80609@mysql.com>

Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2007-01/msg00002.html

Bug-Description:

Readline neglects to reallocate the array it uses to keep track of wrapped

screen lines when increasing its size.  This will eventually result in

segmentation faults when given sufficiently long input.

Patch:

*** ../readline-5.2-patched/display.c	Thu Sep 14 14:20:12 2006

--- ./display.c	Fri Feb  2 20:23:17 2007

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

*** 561,574 ****

--- 561,586 ----

        wrap_offset = prompt_invis_chars_first_line = 0;

      }

+ #if defined (HANDLE_MULTIBYTE)

  #define CHECK_INV_LBREAKS() \

        do { \

  	if (newlines >= (inv_lbsize - 2)) \

  	  { \

  	    inv_lbsize *= 2; \

  	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

+ 	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \

  	  } \

        } while (0)

+ #else

+ #define CHECK_INV_LBREAKS() \

+       do { \

+ 	if (newlines >= (inv_lbsize - 2)) \

+ 	  { \

+ 	    inv_lbsize *= 2; \

+ 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

+ 	  } \

+       } while (0)

+ #endif /* HANDLE_MULTIBYTE */

  #if defined (HANDLE_MULTIBYTE)	  

  #define CHECK_LPOS() \

			   READLINE PATCH REPORT

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

Readline-Release: 5.2

Patch-ID: readline52-003

Bug-Reported-by: Peter Volkov <torre_cremata@mail.ru>

Bug-Reference-ID: <1171795523.8021.18.camel@localhost>

Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html

Bug-Description:

When moving the cursor, bash sometimes misplaces the cursor when the prompt

contains two or more multibyte characters.  The particular circumstance that

uncovered the problem was having the (multibyte) current directory name in

the prompt string.

Patch:

*** ../readline-5.2.2/display.c	Fri Jan 19 13:34:50 2007

--- ./display.c	Sat Mar 10 17:25:44 2007

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

*** 1745,1749 ****

      {

        dpos = _rl_col_width (data, 0, new);

!       if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */

  	{

  	  dpos -= woff;

--- 1745,1752 ----

      {

        dpos = _rl_col_width (data, 0, new);

!       /* Use NEW when comparing against the last invisible character in the

! 	 prompt string, since they're both buffer indices and DPOS is a

! 	 desired display position. */

!       if (new > prompt_last_invisible)		/* XXX - don't use woff here */

  	{

  	  dpos -= woff;