From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] readline: update to 7.0 Date: Thu, 13 Oct 2016 23:47:49 +0100 Message-ID: <1476398869.9950.33.camel@ipfire.org> In-Reply-To: <1475868360.3340.6@mail01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3207677192410514917==" List-Id: --===============3207677192410514917== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This package has a sobump here which makes a compat package required. Rejected. Please resend with a compat package. Best, -Michael On Fri, 2016-10-07 at 21:26 +0200, Jonatan Schlag wrote: > Hi, >=20 > Am Fr, 7. Okt, 2016 um 6:28 schrieb Marcel Lorenz : > > Signed-off-by: Marcel Lorenz > > --- > > =C2=A0config/rootfiles/common/readline=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A0=C2= =A08 ++--- > > =C2=A0lfs/readline=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0| 15 ++++----- > > =C2=A0src/patches/readline/readline63-001 | 43 ------------------------- > > =C2=A0src/patches/readline/readline63-002 | 44 -------------------------- > > =C2=A0src/patches/readline/readline63-003 | 47 --------------------------- > > =C2=A0src/patches/readline/readline63-004 | 45 -------------------------- > > =C2=A0src/patches/readline/readline63-005 | 58 --------------------------= -------- > > =C2=A0src/patches/readline/readline63-006 | 63 --------------------------= -------- > > --- > > =C2=A08 files changed, 10 insertions(+), 313 deletions(-) > > =C2=A0delete mode 100644 src/patches/readline/readline63-001 > > =C2=A0delete mode 100644 src/patches/readline/readline63-002 > > =C2=A0delete mode 100644 src/patches/readline/readline63-003 > > =C2=A0delete mode 100644 src/patches/readline/readline63-004 > > =C2=A0delete mode 100644 src/patches/readline/readline63-005 > > =C2=A0delete mode 100644 src/patches/readline/readline63-006 > >=20 > > diff --git a/config/rootfiles/common/readline > > b/config/rootfiles/common/readline > > index b2ac26d..412de70 100644 > > --- a/config/rootfiles/common/readline > > +++ b/config/rootfiles/common/readline > > @@ -8,11 +8,11 @@ > > =C2=A0#usr/include/readline/rltypedefs.h > > =C2=A0#usr/include/readline/tilde.h > > =C2=A0#usr/lib/libhistory.so > > -usr/lib/libhistory.so.6 > > -usr/lib/libhistory.so.6.3 > > +usr/lib/libhistory.so.7 > > +usr/lib/libhistory.so.7.0 > > =C2=A0#usr/lib/libreadline.so > > -usr/lib/libreadline.so.6 > > -usr/lib/libreadline.so.6.3 > > +usr/lib/libreadline.so.7 > > +usr/lib/libreadline.so.7.0 > > =C2=A0#usr/share/doc/readline > > =C2=A0#usr/share/doc/readline/CHANGES > > =C2=A0#usr/share/doc/readline/INSTALL > > diff --git a/lfs/readline b/lfs/readline > > index eb488e3..7b63625 100644 > > --- a/lfs/readline > > +++ b/lfs/readline > > @@ -1,7 +1,7 @@ > > =C2=A0###################################################################= ######## > > #### > > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0=C2=A0# > > =C2=A0# IPFire.org - A linux based > > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > -# Copyright (C) 2007=C2=A0=C2=A0Michael Tremer & Christian > > Schmidt=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > +# Copyright (C) 2016=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0=C2=A0# > > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > > =C2=A0=C2=A0=C2=A0# > > =C2=A0# This program is free software: you can redistribute it and/or > > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > =C2=A0# it under the terms of the GNU General Public License as published > > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > > @@ -24,7 +24,7 @@ > > =C2=A0 > > =C2=A0include Config > > =C2=A0 > > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 6.3 > > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 7.0 > > =C2=A0 > > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D readline-$(VER) > > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP).tar.gz > > @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) > > =C2=A0 > > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > > =C2=A0 > > -$(DL_FILE)_MD5 =3D 33c8fb279e981274f485fd91da77e94a > > +$(DL_FILE)_MD5 =3D 205b03a87fc83dab653b628c59b9fc91 > > =C2=A0 > > =C2=A0install : $(TARGET) > > =C2=A0 > > @@ -70,15 +70,12 @@ $(subst %,%_MD5,$(objects)) : > > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > > =C2=A0 @$(PREBUILD) > > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > > - > > - for i in $$(seq 1 6); do \ > > - cd $(DIR_APP) && patch -Np0 < > > $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || e= xit > > 1; \ > > - done > > - > > + # prevent in some cases to trigger a linking bug in ldconfig > > + cd $(DIR_APP) &&sed -i '/MV.*old/d' Makefile.in > > + cd $(DIR_APP) &&sed -i '/{OLDSUFF}/c:' support/shlib-install > > =C2=A0 cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-static > > =C2=A0 cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=3D-lncurses > > =C2=A0 cd $(DIR_APP) && make install > > - > > =C2=A0 rm -rfv /usr/share/readline > > =C2=A0 @rm -rf $(DIR_APP) > > =C2=A0 @$(POSTBUILD) > > diff --git a/src/patches/readline/readline63-001 > > b/src/patches/readline/readline63-001 > > deleted file mode 100644 > > index bae6a2f..0000000 > > --- a/src/patches/readline/readline63-001 > > +++ /dev/null > > @@ -1,43 +0,0 @@ > > - =C2=A0=C2=A0=C2=A0READLINE PATCH REPORT > > - =C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > - > > -Readline-Release: 6.3 > > -Patch-ID: readline63-001 > > - > > -Bug-Reported-by: Daan van Rossum > > -Bug-Reference-ID: <20140307072523.GA14250(a)flash.uchicago.edu> > > -Bug-Reference-URL:=09 > > - > > -Bug-Description: > > - > > -The `.' command in vi mode cannot undo multi-key commands beginning with > > -`c', `d', and `y' (command plus motion specifier). > > - > > -Patch (apply with `patch -p0'): > > - > > -*** ../readline-6.3/readline.c 2013-10-28 14:58:06.000000000 -0400 > > ---- readline.c 2014-03-07 15:20:33.000000000 -0500 > > -*************** > > -*** 965,969 **** > > -=C2=A0=C2=A0=C2=A0=C2=A0if (rl_editing_mode =3D=3D vi_mode && _rl_keymap= =3D=3D vi_movement_keymap && > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0key !=3D ANYOTHERKEY && > > -!=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0rl_key_sequence_length =3D=3D= 1 && /* XXX */ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_vi_textmod_command (= key)) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_vi_set_last (key, rl_numeric_arg= , rl_arg_sign); > > ---- 965,969 ---- > > -=C2=A0=C2=A0=C2=A0=C2=A0if (rl_editing_mode =3D=3D vi_mode && _rl_keymap= =3D=3D vi_movement_keymap && > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0key !=3D ANYOTHERKEY && > > -!=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_dispatching_keymap =3D=3D= vi_movement_keymap && > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_vi_textmod_command (= key)) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_vi_set_last (key, rl_numeric_arg= , rl_arg_sign); > > -*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 > > ---- patchlevel 2014-03-21 08:28:40.000000000 -0400 > > -*************** > > -*** 1,3 **** > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 5 > > ---- 1,3 ---- > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 1 > > diff --git a/src/patches/readline/readline63-002 > > b/src/patches/readline/readline63-002 > > deleted file mode 100644 > > index 0e79f13..0000000 > > --- a/src/patches/readline/readline63-002 > > +++ /dev/null > > @@ -1,44 +0,0 @@ > > - =C2=A0=C2=A0=C2=A0READLINE PATCH REPORT > > - =C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > - > > -Readline-Release: 6.3 > > -Patch-ID: readline63-002 > > - > > -Bug-Reported-by: Anatol Pomozov > > -Bug-Reference-ID: > OQ(a)mail.gmail.com> > > -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/20 > > 14-03/msg00010.html > > - > > -Bug-Description: > > - > > -When in callback mode, some readline commands can cause readline to seg > > -fault by passing invalid contexts to callback functions. > > - > > -Patch (apply with `patch -p0'): > > - > > -*** ../readline-6.3/readline.c 2013-10-28 14:58:06.000000000 -0400 > > ---- readline.c 2014-03-10 14:15:02.000000000 -0400 > > -*************** > > -*** 745,749 **** > > -=C2=A0=C2=A0 > > -=C2=A0=C2=A0=C2=A0=C2=A0RL_CHECK_SIGNALS (); > > -!=C2=A0=C2=A0=C2=A0if (r =3D=3D 0) /* success! */ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_keyseq_chain_dispose= (); > > ---- 745,750 ---- > > -=C2=A0=C2=A0 > > -=C2=A0=C2=A0=C2=A0=C2=A0RL_CHECK_SIGNALS (); > > -!=C2=A0=C2=A0=C2=A0/* We only treat values < 0 specially to simulate rec= ursion. */ > > -!=C2=A0=C2=A0=C2=A0if (r >=3D 0 || (r =3D=3D -1 && (cxt->flags & KSEQ_SU= BSEQ) =3D=3D 0)) /* > > success! or failure! */ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_keyseq_chain_dispose= (); > > -*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 > > ---- patchlevel 2014-03-21 08:28:40.000000000 -0400 > > -*************** > > -*** 1,3 **** > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 1 > > ---- 1,3 ---- > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 2 > > diff --git a/src/patches/readline/readline63-003 > > b/src/patches/readline/readline63-003 > > deleted file mode 100644 > > index d2cad94..0000000 > > --- a/src/patches/readline/readline63-003 > > +++ /dev/null > > @@ -1,47 +0,0 @@ > > - =C2=A0=C2=A0=C2=A0READLINE PATCH REPORT > > - =C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > - > > -Readline-Release: 6.3 > > -Patch-ID: readline63-003 > > - > > -Bug-Reported-by: > > -Bug-Reference-ID: > > -Bug-Reference-URL: > > - > > -Bug-Description: > > - > > -There are debugging functions in the readline release that are > > theoretically > > -exploitable as security problems.=C2=A0=C2=A0They are not public functio= ns, but have > > -global linkage. > > - > > -Patch (apply with `patch -p0'): > > - > > -*** ../readline-6.3/util.c 2013-09-02 13:36:12.000000000 -0400 > > ---- util.c 2014-03-20 10:25:53.000000000 -0400 > > -*************** > > -*** 477,480 **** > > ---- 479,483 ---- > > -=C2=A0=C2=A0} > > -=C2=A0=C2=A0 > > -+ #if defined (DEBUG) > > -=C2=A0=C2=A0#if defined (USE_VARARGS) > > -=C2=A0=C2=A0static FILE *_rl_tracefp; > > -*************** > > -*** 539,542 **** > > ---- 542,546 ---- > > -=C2=A0=C2=A0} > > -=C2=A0=C2=A0#endif > > -+ #endif /* DEBUG */ > > -=C2=A0=C2=A0 > > -=C2=A0=C2=A0 > > -*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 > > ---- patchlevel 2014-03-21 08:28:40.000000000 -0400 > > -*************** > > -*** 1,3 **** > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 2 > > ---- 1,3 ---- > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 3 > > diff --git a/src/patches/readline/readline63-004 > > b/src/patches/readline/readline63-004 > > deleted file mode 100644 > > index 3cd89e3..0000000 > > --- a/src/patches/readline/readline63-004 > > +++ /dev/null > > @@ -1,45 +0,0 @@ > > - =C2=A0=C2=A0=C2=A0READLINE PATCH REPORT > > - =C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > - > > -Readline-Release: 6.3 > > -Patch-ID: readline63-004 > > - > > -Bug-Reported-by: Egmont Koblinger > > -Bug-Reference-ID: > Mg(a)mail.gmail.com> > > -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-0 > > 3/msg00153.html > > - > > -Bug-Description: > > - > > -The signal handling changes to bash and readline (to avoid running any c= ode > > -in a signal handler context) cause the cursor to be placed on the wrong > > -line of a multi-line command after a ^C interrupts editing. > > - > > -Patch (apply with `patch -p0'): > > - > > -*** ../readline-6.3-patched/display.c 2013-12-27 13:10:56.000000000 > > -0500 > > ---- display.c 2014-03-27 11:52:45.000000000 -0400 > > -*************** > > -*** 2678,2682 **** > > -=C2=A0=C2=A0=C2=A0=C2=A0if (_rl_echoing_p) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ > > -!=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_move_vert (_rl_vis_botlin= ); > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_vis_botlin =3D 0; > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fflush (rl_outstream); > > ---- 2678,2683 ---- > > -=C2=A0=C2=A0=C2=A0=C2=A0if (_rl_echoing_p) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ > > -!=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (_rl_vis_botlin > 0) /* mi= nor optimization plus bug fix > > */ > > -!=C2=A0 _rl_move_vert (_rl_vis_botlin); > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0_rl_vis_botlin =3D 0; > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0fflush (rl_outstream); > > -*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 > > ---- patchlevel 2014-03-21 08:28:40.000000000 -0400 > > -*************** > > -*** 1,3 **** > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 3 > > ---- 1,3 ---- > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 4 > > diff --git a/src/patches/readline/readline63-005 > > b/src/patches/readline/readline63-005 > > deleted file mode 100644 > > index 8a63738..0000000 > > --- a/src/patches/readline/readline63-005 > > +++ /dev/null > > @@ -1,58 +0,0 @@ > > - =C2=A0=C2=A0=C2=A0READLINE PATCH REPORT > > - =C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > - > > -Readline-Release: 6.3 > > -Patch-ID: readline63-005 > > - > > -Bug-Reported-by: Juergen Daubert > > -Bug-Reference-ID: <20140303180430.GA7346(a)jue.netz> > > -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/20 > > 14-03/msg00002.html > > - > > -Bug-Description: > > - > > -There are still applications using the deprecated Function/VFunction/etc. > > -typedefs in rltypedefs.h.=C2=A0=C2=A0This patch restores the typedefs, b= ut attempts > > -to mark them as deprecated using gcc/clang attributes.=C2=A0=C2=A0Thanks= to Max Horn > > -for the suggestion. > > - > > -Patch (apply with `patch -p0'): > > - > > -*** ../readline-6.3-patched/rltypedefs.h 2011-03-26 > > 14:53:31.000000000 -0400 > > ---- rltypedefs.h 2014-04-10 11:30:45.000000000 -0400 > > -*************** > > -*** 27,30 **** > > ---- 27,49 ---- > > -=C2=A0=C2=A0#endif > > -=C2=A0=C2=A0 > > -+ /* Old-style, attempt to mark as deprecated in some way people will > > notice. */ > > -+=C2=A0 > > -+ #if !defined (_FUNCTION_DEF) > > -+ #=C2=A0=C2=A0define _FUNCTION_DEF > > -+=C2=A0 > > -+ #if defined(__GNUC__) || defined(__clang__) > > -+ typedef int Function () __attribute__ ((deprecated)); > > -+ typedef void VFunction () __attribute__ ((deprecated)); > > -+ typedef char *CPFunction () __attribute__ ((deprecated)); > > -+ typedef char **CPPFunction () __attribute__ ((deprecated)); > > -+ #else > > -+ typedef int Function (); > > -+ typedef void VFunction (); > > -+ typedef char *CPFunction (); > > -+ typedef char **CPPFunction (); > > -+ #endif > > -+=C2=A0 > > -+ #endif /* _FUNCTION_DEF */ > > -+=C2=A0 > > -=C2=A0=C2=A0/* New style. */ > > -=C2=A0=C2=A0 > > -*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 > > ---- patchlevel 2014-03-21 08:28:40.000000000 -0400 > > -*************** > > -*** 1,3 **** > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 4 > > ---- 1,3 ---- > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 5 > > diff --git a/src/patches/readline/readline63-006 > > b/src/patches/readline/readline63-006 > > deleted file mode 100644 > > index a3f0930..0000000 > > --- a/src/patches/readline/readline63-006 > > +++ /dev/null > > @@ -1,63 +0,0 @@ > > - =C2=A0=C2=A0=C2=A0READLINE PATCH REPORT > > - =C2=A0=C2=A0=C2=A0=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > > - > > -Readline-Release: 6.3 > > -Patch-ID: readline63-006 > > - > > -Bug-Reported-by: > > -Bug-Reference-ID: > alas.info> > > -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-0 > > 4/msg00069.html > > - > > -Bug-Description: > > - > > -Using reverse-i-search when horizontal scrolling is enabled does not > > redisplay > > -the entire line containing the successful search results. > > - > > -Patch (apply with `patch -p0'): > > - > > -*** ../readline-6.3-patched/display.c 2014-04-08 18:19:36.000000000 > > -0400 > > ---- display.c 2014-04-20 18:32:52.000000000 -0400 > > -*************** > > -*** 1638,1642 **** > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0the spot of first difference i= s before the end of the invisible > > chars, > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0lendiff needs to be adjusted. = */ > > -!=C2=A0=C2=A0=C2=A0if (current_line =3D=3D 0 && !_rl_horizontal_scroll_m= ode && > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0current_invis_chars !=3D= visible_wrap_offset) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ > > ---- 1638,1642 ---- > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0the spot of first difference i= s before the end of the invisible > > chars, > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0lendiff needs to be adjusted. = */ > > -!=C2=A0=C2=A0=C2=A0if (current_line =3D=3D 0 && /* !_rl_horizontal_scrol= l_mode && */ > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0current_invis_chars !=3D= visible_wrap_offset) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0{ > > -*************** > > -*** 1826,1831 **** > > -=C2=A0=C2=A0 _rl_last_c_pos +=3D bytes_to_insert; > > -=C2=A0=C2=A0 > > -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (_rl_horizontal_scro= ll_mode && ((oe-old) > (ne-new))) > > -!=C2=A0 goto clear_rest_of_line; > > -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0} > > -=C2=A0=C2=A0 } > > ---- 1826,1836 ---- > > -=C2=A0=C2=A0 _rl_last_c_pos +=3D bytes_to_insert; > > -=C2=A0=C2=A0 > > -+=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0/* XXX - we only want to do = this if we are at the end of > > the line > > -+=C2=A0 =C2=A0so we move there with _rl_move_cursor_relative */ > > -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if (_rl_horizontal_scro= ll_mode && ((oe-old) > (ne-new))) > > -!=C2=A0 { > > -!=C2=A0 =C2=A0=C2=A0_rl_move_cursor_relative (ne-new, new); > > -!=C2=A0 =C2=A0=C2=A0goto clear_rest_of_line; > > -!=C2=A0 } > > -=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0=C2=A0} > > -=C2=A0=C2=A0 } > > -*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 > > ---- patchlevel 2014-03-21 08:28:40.000000000 -0400 > > -*************** > > -*** 1,3 **** > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 5 > > ---- 1,3 ---- > > -=C2=A0=C2=A0# Do not edit -- exists only for use by patch > > -=C2=A0=C2=A0 > > -! 6 > > --=C2=A0 > > 2.9.3 >=20 >=20 > Reviewed-by: Jonatan Schlag >=20 > Jonatan --===============3207677192410514917== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSllBQThWQUFvSkVJQjU4UDl2a0FrSGhlVVAvMFNqcGpOOWprd25LS3RrUVo2NTNmZkMK NjZwWWZZU3pWVVhZWEFCUG1NOXYrWHFGN0hsVWJCQUtjQ09vRE9WSHhwNkFZRC9tWHdPekdQZjVm SWFWdC85YQp2MnlaT2h6ZUFuRDNWRWNnL0tDd1BHNUtRc3hNeERxTlhZTklhNEpWVTJYRkRkd2pr OTdaNjJVZ1VjVUVOYWlDCkxsRzUrVDZXRjQ5Z0tqdlpPbHMzV2xIWjl3Vy96S3EwSG1kTzhLQWl0 VjBxSklEWnI1RVFuUGw0S0tkTnFtYmcKRkxYZGR3YlR4MUdodU9yd0IvSmlWeXBCTDBNMlVaUklT Z3V5QzI1RzdVMkQwaEVjaWxaL2Zia1FqMjIwY3JOSgplUlZXUFdOOGRzYWRKakkyWU9HVzhxbmQ2 OTZvQWp5RDBCQTVKZzk2V3djQlZWeXVVdjEzaEJLb1RWbml0WWRPCk8xd285MnFaZ0FaVENoYUVD Z0JaRmlFRFRxc3d0Q0hncVRMSnJHQ2I4NTlZZUdWRzVhaEoxQVFtS2I4SHBQVFgKdklWVEcwNTVj WStyY1ZTbm5nRlY0NDJmaVU2T1BqK0lNWndHU2tzdWQrdGtxS29xWFJwTTRTM3hpREtzamswZwoz UWJyalRsbnR0WFVIdEU2WkJialFQczRMa1p3QzIrVk1XeVFmbTQwblNXMDNMOWw3ekppb0cvQ0tU UXdqY0RTCjFmWUFCNzc5b3Z2UmNHN3Mwb2RNVE0xcE1ENnZoT3d4ZHhTVDlsL25KSElKSU12SDFn RXQ5WUpLWHQxV1ByWTgKeXdZK3p0dmhwRFZLM2VnTlA4SGJpZ0ZxZzJ0Wk9vTHEzRXk0aHlWaVRr Q0ZnbHFxQXo3S1d0WVQ3WWNWK3IxcAp4dXlqTHd0Rmo3ai85eUlSRlJwQQo9VEt1MwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============3207677192410514917==--