update to 6.2
This commit is contained in:
Miroslav Lichvar
parent
ca2b6b9eb0
commit
4ef489284c
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
readline-6.1.tar.gz
|
||||
/readline-6.2.tar.gz
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
diff -up readline-6.1/shlib/Makefile.in.shlib readline-6.1/shlib/Makefile.in
|
||||
--- readline-6.1/shlib/Makefile.in.shlib 2009-03-05 16:51:23.000000000 +0100
|
||||
+++ readline-6.1/shlib/Makefile.in 2010-01-12 15:05:32.000000000 +0100
|
||||
diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in
|
||||
--- readline-6.2/shlib/Makefile.in.shlib 2010-12-28 21:56:21.000000000 +0100
|
||||
+++ readline-6.2/shlib/Makefile.in 2011-02-14 17:34:38.821537496 +0100
|
||||
@@ -170,7 +170,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
|
||||
|
||||
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so
|
||||
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
|
||||
$(RM) $@
|
||||
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
|
||||
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
|
||||
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
|
||||
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
|
||||
|
||||
# Since tilde.c is shared between readline and bash, make sure we compile
|
||||
# it with the right flags when it's built as part of readline
|
||||
diff -up readline-6.1/support/shlib-install.shlib readline-6.1/support/shlib-install
|
||||
--- readline-6.1/support/shlib-install.shlib 2009-10-28 14:30:18.000000000 +0100
|
||||
+++ readline-6.1/support/shlib-install 2010-01-12 15:05:32.000000000 +0100
|
||||
diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-install
|
||||
--- readline-6.2/support/shlib-install.shlib 2009-10-28 14:30:18.000000000 +0100
|
||||
+++ readline-6.2/support/shlib-install 2011-02-14 17:33:07.611768164 +0100
|
||||
@@ -72,7 +72,7 @@ fi
|
||||
case "$host_os" in
|
||||
hpux*|darwin*|macosx*|linux*)
|
||||
@ -22,9 +22,9 @@ diff -up readline-6.1/support/shlib-install.shlib readline-6.1/support/shlib-ins
|
||||
fi ;;
|
||||
cygwin*|mingw*)
|
||||
IMPLIBNAME=`echo ${LIBNAME} \
|
||||
diff -up readline-6.1/support/shobj-conf.shlib readline-6.1/support/shobj-conf
|
||||
--- readline-6.1/support/shobj-conf.shlib 2009-10-28 14:20:21.000000000 +0100
|
||||
+++ readline-6.1/support/shobj-conf 2010-01-12 15:07:27.000000000 +0100
|
||||
diff -up readline-6.2/support/shobj-conf.shlib readline-6.2/support/shobj-conf
|
||||
--- readline-6.2/support/shobj-conf.shlib 2009-10-28 14:20:21.000000000 +0100
|
||||
+++ readline-6.2/support/shobj-conf 2011-02-14 17:33:07.612767986 +0100
|
||||
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
|
||||
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
|
||||
SHOBJ_CFLAGS=-fPIC
|
||||
@ -1,16 +1,13 @@
|
||||
Summary: A library for editing typed command lines
|
||||
Name: readline
|
||||
Version: 6.1
|
||||
Release: 4%{?dist}
|
||||
Version: 6.2
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
|
||||
Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
|
||||
# upstream patches
|
||||
Patch1: readline61-001
|
||||
Patch2: readline61-002
|
||||
# fix file permissions, remove RPATH, use CFLAGS
|
||||
Patch20: readline-6.1-shlib.patch
|
||||
Patch20: readline-6.2-shlib.patch
|
||||
# add TTY input audit support
|
||||
Patch21: readline-6.1-audit.patch
|
||||
Requires(post): /sbin/install-info
|
||||
@ -51,8 +48,6 @@ library.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
%patch20 -p1 -b .shlib
|
||||
%patch21 -p1 -b .audit
|
||||
|
||||
@ -132,6 +127,9 @@ fi
|
||||
%{_libdir}/lib*.a
|
||||
|
||||
%changelog
|
||||
* Tue Feb 15 2011 Miroslav Lichvar <mlichvar@redhat.com> 6.2-1
|
||||
- update to 6.2
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,61 +0,0 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.1
|
||||
Patch-ID: readline61-001
|
||||
|
||||
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'):
|
||||
|
||||
*** ../readline-6.1-patched/complete.c 2009-11-29 18:39:30.000000000 -0500
|
||||
--- 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
|
||||
*** ../readline-6.1-patched/patchlevel 2008-11-18 11:01:14.000000000 -0500
|
||||
--- patchlevel 2010-01-14 10:15:52.000000000 -0500
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 0
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 1
|
||||
@ -1,47 +0,0 @@
|
||||
READLINE PATCH REPORT
|
||||
=====================
|
||||
|
||||
Readline-Release: 6.1
|
||||
Patch-ID: readline61-002
|
||||
|
||||
Bug-Reported-by: Chet Ramey <chet.ramey@case.edu>
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL:
|
||||
|
||||
Bug-Description:
|
||||
|
||||
The readline version information was not updated for the release of version 6.1.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../readline-6.1-patched/readline.h 2009-08-26 23:05:55.000000000 -0400
|
||||
--- readline.h 2010-01-26 10:42:42.000000000 -0500
|
||||
***************
|
||||
*** 40,46 ****
|
||||
|
||||
/* Hex-encoded Readline version number. */
|
||||
! #define RL_READLINE_VERSION 0x0600 /* Readline 6.0 */
|
||||
#define RL_VERSION_MAJOR 6
|
||||
! #define RL_VERSION_MINOR 0
|
||||
|
||||
/* Readline data structures. */
|
||||
--- 40,46 ----
|
||||
|
||||
/* Hex-encoded Readline version number. */
|
||||
! #define RL_READLINE_VERSION 0x0601 /* Readline 6.1 */
|
||||
#define RL_VERSION_MAJOR 6
|
||||
! #define RL_VERSION_MINOR 1
|
||||
|
||||
/* Readline data structures. */
|
||||
*** ../readline-6.1-patched/patchlevel 2008-11-18 11:01:14.000000000 -0500
|
||||
--- patchlevel 2010-01-14 10:15:52.000000000 -0500
|
||||
***************
|
||||
*** 1,3 ****
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 1
|
||||
--- 1,3 ----
|
||||
# Do not edit -- exists only for use by patch
|
||||
|
||||
! 2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user