fix license [release 6.3.006-2mamba;Tue Jul 22 2014]
This commit is contained in:
parent
c048e91169
commit
04af2e107a
300
libreadline-6.3.006-patchset.patch
Normal file
300
libreadline-6.3.006-patchset.patch
Normal file
@ -0,0 +1,300 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.3
|
||||
Patch-ID: readline63-001
|
||||
|
||||
Bug-Reported-by: Daan van Rossum <daan@flash.uchicago.edu>
|
||||
Bug-Reference-ID: <20140307072523.GA14250@flash.uchicago.edu>
|
||||
Bug-Reference-URL:
|
||||
|
||||
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 ****
|
||||
if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
|
||||
key != ANYOTHERKEY &&
|
||||
! rl_key_sequence_length == 1 && /* XXX */
|
||||
_rl_vi_textmod_command (key))
|
||||
_rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
|
||||
--- 965,969 ----
|
||||
if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
|
||||
key != ANYOTHERKEY &&
|
||||
! _rl_dispatching_keymap == vi_movement_keymap &&
|
||||
_rl_vi_textmod_command (key))
|
||||
_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 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 5
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 1
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.3
|
||||
Patch-ID: readline63-002
|
||||
|
||||
Bug-Reported-by: Anatol Pomozov <anatol.pomozov@gmail.com>
|
||||
Bug-Reference-ID: <CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-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 ****
|
||||
|
||||
RL_CHECK_SIGNALS ();
|
||||
! if (r == 0) /* success! */
|
||||
{
|
||||
_rl_keyseq_chain_dispose ();
|
||||
--- 745,750 ----
|
||||
|
||||
RL_CHECK_SIGNALS ();
|
||||
! /* We only treat values < 0 specially to simulate recursion. */
|
||||
! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */
|
||||
{
|
||||
_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 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 1
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 2
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
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. They are not public functions, 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 ----
|
||||
}
|
||||
|
||||
+ #if defined (DEBUG)
|
||||
#if defined (USE_VARARGS)
|
||||
static FILE *_rl_tracefp;
|
||||
***************
|
||||
*** 539,542 ****
|
||||
--- 542,546 ----
|
||||
}
|
||||
#endif
|
||||
+ #endif /* DEBUG */
|
||||
|
||||
|
||||
*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
|
||||
--- patchlevel 2014-03-21 08:28:40.000000000 -0400
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 2
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 3
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.3
|
||||
Patch-ID: readline63-004
|
||||
|
||||
Bug-Reported-by: Egmont Koblinger <egmont@gmail.com>
|
||||
Bug-Reference-ID: <CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
The signal handling changes to bash and readline (to avoid running any code
|
||||
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 ****
|
||||
if (_rl_echoing_p)
|
||||
{
|
||||
! _rl_move_vert (_rl_vis_botlin);
|
||||
_rl_vis_botlin = 0;
|
||||
fflush (rl_outstream);
|
||||
--- 2678,2683 ----
|
||||
if (_rl_echoing_p)
|
||||
{
|
||||
! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
|
||||
! _rl_move_vert (_rl_vis_botlin);
|
||||
_rl_vis_botlin = 0;
|
||||
fflush (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 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 3
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 4
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.3
|
||||
Patch-ID: readline63-005
|
||||
|
||||
Bug-Reported-by: Juergen Daubert <jue@jue.li>
|
||||
Bug-Reference-ID: <20140303180430.GA7346@jue.netz>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00002.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
There are still applications using the deprecated Function/VFunction/etc.
|
||||
typedefs in rltypedefs.h. This patch restores the typedefs, but attempts
|
||||
to mark them as deprecated using gcc/clang attributes. Thanks 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 ----
|
||||
#endif
|
||||
|
||||
+ /* Old-style, attempt to mark as deprecated in some way people will notice. */
|
||||
+
|
||||
+ #if !defined (_FUNCTION_DEF)
|
||||
+ # define _FUNCTION_DEF
|
||||
+
|
||||
+ #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
|
||||
+
|
||||
+ #endif /* _FUNCTION_DEF */
|
||||
+
|
||||
/* New style. */
|
||||
|
||||
*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
|
||||
--- patchlevel 2014-03-21 08:28:40.000000000 -0400
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 4
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 5
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.3
|
||||
Patch-ID: readline63-006
|
||||
|
||||
Bug-Reported-by: <Trond.Endrestol@ximalas.info>
|
||||
Bug-Reference-ID: <alpine.BSF.2.03.1404192114310.1973@enterprise.ximalas.info>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/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 ****
|
||||
the spot of first difference is before the end of the invisible chars,
|
||||
lendiff needs to be adjusted. */
|
||||
! if (current_line == 0 && !_rl_horizontal_scroll_mode &&
|
||||
current_invis_chars != visible_wrap_offset)
|
||||
{
|
||||
--- 1638,1642 ----
|
||||
the spot of first difference is before the end of the invisible chars,
|
||||
lendiff needs to be adjusted. */
|
||||
! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
|
||||
current_invis_chars != visible_wrap_offset)
|
||||
{
|
||||
***************
|
||||
*** 1826,1831 ****
|
||||
_rl_last_c_pos += bytes_to_insert;
|
||||
|
||||
if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
|
||||
! goto clear_rest_of_line;
|
||||
}
|
||||
}
|
||||
--- 1826,1836 ----
|
||||
_rl_last_c_pos += bytes_to_insert;
|
||||
|
||||
+ /* XXX - we only want to do this if we are at the end of the line
|
||||
+ so we move there with _rl_move_cursor_relative */
|
||||
if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
|
||||
! {
|
||||
! _rl_move_cursor_relative (ne-new, new);
|
||||
! goto clear_rest_of_line;
|
||||
! }
|
||||
}
|
||||
}
|
||||
*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500
|
||||
--- patchlevel 2014-03-21 08:28:40.000000000 -0400
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 5
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 6
|
||||
11
libreadline-autoupdate
Normal file
11
libreadline-autoupdate
Normal file
@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
VERSION=$1
|
||||
MAJRELEASE=`echo $VERSION | cut -d. -f1-2`
|
||||
MAJRELEASENODOT=`echo $MAJRELEASE | tr -d .`
|
||||
PATCHRELEASE=`echo $VERSION | cut -d. -f3`
|
||||
libreadline-$VERSION-patchset.patch
|
||||
for i in `seq 001 $PATCHRELEASE`; do
|
||||
PATCHRELEASEFMT=`printf "%0*d\n" 3 $i`
|
||||
curl -s ftp://ftp.gnu.org/gnu/readline/readline-$MAJRELEASE-patches/readline$MAJRELEASENODOT-$PATCHRELEASEFMT \
|
||||
>> libreadline-$VERSION-patchset.patch || exit 1
|
||||
done
|
||||
@ -2,7 +2,7 @@
|
||||
%define minver %(echo %version | cut -d. -f3)
|
||||
Name: libreadline
|
||||
Version: 6.3.006
|
||||
Release: 1mamba
|
||||
Release: 2mamba
|
||||
Summary: Lets users edit command lines as they are typed in
|
||||
Group: System/Libraries
|
||||
Vendor: openmamba
|
||||
@ -10,16 +10,12 @@ Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://www.gnu.org/directory/GNU/readline.html
|
||||
Source0: ftp://ftp.gnu.org/gnu/readline/readline-%{majver}.tar.gz
|
||||
Source1: libreadline-autoupdate
|
||||
Patch0: %{name}-6.2-shlib.patch
|
||||
#Patch1: libreadline-6.2-upstream-fixes-001.patch
|
||||
#Patch2: ftp://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-001
|
||||
#Patch3: ftp://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-002
|
||||
#Patch4: ftp://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-003
|
||||
#Patch5: ftp://ftp.gnu.org/gnu/readline/readline-6.2-patches/readline62-%{minver}
|
||||
License: LGPL
|
||||
Patch1: libreadline-%{version}-patchset.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libtermcap-devel
|
||||
## AUTOBUILDREQ-END
|
||||
Requires(post):%{__install_info}
|
||||
Requires(preun): %{__install_info}
|
||||
@ -50,12 +46,7 @@ The %{name}-static package contains the static version of the readline library.
|
||||
|
||||
%prep
|
||||
%setup -q -n readline-%{majver}
|
||||
#% patch0 -p1
|
||||
#% patch1 -p0
|
||||
##% patch2 -p0
|
||||
#% patch3 -p0
|
||||
#% patch4 -p0
|
||||
#% patch5 -p0
|
||||
%patch1 -p2
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -121,6 +112,9 @@ exit 0
|
||||
%{_libdir}/lib*.a
|
||||
|
||||
%changelog
|
||||
* Tue Jul 22 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 6.3.006-2mamba
|
||||
- fix license
|
||||
|
||||
* Thu Jun 05 2014 Automatic Build System <autodist@mambasoft.it> 6.3.006-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user