diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-12-22 00:09:56 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-22 00:09:56 +0000 |
commit | ca8764d64bb8d894568b3f4c938512bde16ea277 (patch) | |
tree | 392327519236a19393474fc81b7970725d24d62c /sys-libs | |
parent | old (diff) | |
download | historical-ca8764d64bb8d894568b3f4c938512bde16ea277.tar.gz historical-ca8764d64bb8d894568b3f4c938512bde16ea277.tar.bz2 historical-ca8764d64bb8d894568b3f4c938512bde16ea277.zip |
Update to use the official readline patch.
Package-Manager: portage-2.0.53
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/readline/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/readline/Manifest | 15 | ||||
-rw-r--r-- | sys-libs/readline/files/digest-readline-5.1-r2 | 1 | ||||
-rw-r--r-- | sys-libs/readline/files/readline-5.1-callback-segv.patch | 87 | ||||
-rw-r--r-- | sys-libs/readline/readline-5.1-r2.ebuild | 19 |
5 files changed, 25 insertions, 103 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog index c36d3f8dc901..783fbd490293 100644 --- a/sys-libs/readline/ChangeLog +++ b/sys-libs/readline/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/readline # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.53 2005/12/21 11:21:55 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.54 2005/12/22 00:09:56 vapier Exp $ + + 22 Dec 2005; Mike Frysinger <vapier@gentoo.org> + -files/readline-5.1-callback-segv.patch, readline-5.1-r2.ebuild: + Update to use the official readline patch. *readline-5.1-r2 (21 Dec 2005) diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest index c3b781c7fac2..ab62b2bf8717 100644 --- a/sys-libs/readline/Manifest +++ b/sys-libs/readline/Manifest @@ -1,13 +1,12 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 397e61fa71b5cd362c40e73bd5e9fcba ChangeLog 7961 +MD5 859a4914369f517eda6c25cbd2889119 ChangeLog 8122 MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348 MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348 MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350 -MD5 a0e38a462831e1a0e4e8871bc0c25fea files/digest-readline-5.1-r1 65 -MD5 a0e38a462831e1a0e4e8871bc0c25fea files/digest-readline-5.1-r2 65 +MD5 1d930552cdea6057066fcf79714f9253 files/digest-readline-5.1-r2 122 MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504 MD5 b908c05444b4c9edbeefa1977345182e files/readline-5.0-darwin.patch 461 MD5 6fea6318a26be7b6186ba83c42fb0d75 files/readline-5.0-del-backspace-policy.patch 1074 @@ -15,18 +14,16 @@ MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363 MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849 MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463 MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756 -MD5 d71ff4677fdab2bf72cb799bb76c960b files/readline-5.1-callback-segv.patch 3312 MD5 e4ac33c0a2293b72378e00e8729c71af files/readline-5.1-cleanups.patch 3817 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764 MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090 MD5 d33ebebef248a79c288c6b1dce06b0ee readline-5.0-r2.ebuild 2778 -MD5 dc0b48946bb4117622f73bb9a1bb3000 readline-5.1-r1.ebuild 2467 -MD5 e871b866cee3e3f49291cf4ad3d8ee04 readline-5.1-r2.ebuild 2543 +MD5 b781d2f9cd41248dd4dc7c8c90344457 readline-5.1-r2.ebuild 2760 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDqTroJrHF4yAQTrARAioBAJ4j5vUA/p7ILeKuLHHiL7sj6YmO2QCfVYIO -wrmtt7eEsQ3Uq8KYHeexjRM= -=7rIu +iD8DBQFDqe8I2+ySkm8kpY0RAvZTAKCEFieCvxiPddxD3ZOKw7PYDIVr5wCgvaOd +/35kiDedqOAFZUvuFI3Rn/Y= +=isbW -----END PGP SIGNATURE----- diff --git a/sys-libs/readline/files/digest-readline-5.1-r2 b/sys-libs/readline/files/digest-readline-5.1-r2 index 69fda4e3389b..9f211c6577e7 100644 --- a/sys-libs/readline/files/digest-readline-5.1-r2 +++ b/sys-libs/readline/files/digest-readline-5.1-r2 @@ -1 +1,2 @@ MD5 7ee5a692db88b30ca48927a13fd60e46 readline-5.1.tar.gz 2030276 +MD5 63faf622820ca0828131c8b5aeac1e6a readline51-001 2042 diff --git a/sys-libs/readline/files/readline-5.1-callback-segv.patch b/sys-libs/readline/files/readline-5.1-callback-segv.patch deleted file mode 100644 index 94e3bfdccf7a..000000000000 --- a/sys-libs/readline/files/readline-5.1-callback-segv.patch +++ /dev/null @@ -1,87 +0,0 @@ -http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00033.html - -Configuration Information [Automatically generated, do not change]: -Machine: ia64 -OS: linux -Compiler: gcc -I/usr/src/packages/BUILD/bash-3.1 -L/usr/src/packages/BUILD/bash-3.1/../readline-5.1 -Compilation CFLAGS: -DPROGRAM='bash' -DCONF_HOSTTYPE='ia64' -DCONF_OSTYPE='linux' -DCONF_MACHTYPE='ia64-suse-linux' -DCONF_VENDOR='suse' -DLOCALEDIR='/usr/share/locale' -DPACKAGE='bash' -DSHELL -DHAVE_CONFIG_H -I. -I. -I./include -I./lib -O2 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -g -D_GNU_SOURCE -DRECYCLES_PIDS -Wall -pipe -g -fbranch-probabilities -uname output: Linux sykes 2.6.13-15-default #1 SMP Tue Sep 13 14:56:15 UTC 2005 ia64 ia64 ia64 GNU/Linux -Machine Type: ia64-suse-linux - -Bash Version: 3.1 -Patch Level: 0 -Release Status: release - -Description: -When using the readline callback interface (rl_callback_read_char) you'll -get a segfault when using the delete-char function via a multi-character -key. The problem is (1) that rl_delete_char returns non-zero even if -successful and (2) that _rl_dispatch_subseq reports the return value of -any readline function as if it were the result of the keymap dispatch. -The result is that _rl_dispatch_callback doesn't clear the -RL_STATE_MULTIKEY flag, and the next input crashes because _rl_kscxt is -NULL when _rl_dispatch_callback is called the next time. This is only a -problem with the callback interface, because otherwise RL_STATE_MULTIKEY -is never set. - -Repeat-By: -Build gdb with readline 5.1. - -Fix: - lib/readline/readline.c | 2 +- - lib/readline/text.c | 8 +++----- - 2 files changed, 4 insertions(+), 6 deletions(-) - -Index: bash-3.1/lib/readline/text.c -=================================================================== ---- bash-3.1.orig/lib/readline/text.c 2005-12-13 14:07:38.000000000 +0100 -+++ bash-3.1/lib/readline/text.c 2005-12-13 14:09:53.000000000 +0100 -@@ -1071,8 +1071,6 @@ int - rl_delete (count, key) - int count, key; - { -- int r; -- - if (count < 0) - return (_rl_rubout_char (-count, key)); - -@@ -1090,17 +1088,17 @@ rl_delete (count, key) - else - rl_forward_byte (count, key); - -- r = rl_kill_text (orig_point, rl_point); -+ rl_kill_text (orig_point, rl_point); - rl_point = orig_point; -- return r; - } - else - { - int new_point; - - new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); -- return (rl_delete_text (rl_point, new_point)); -+ rl_delete_text (rl_point, new_point); - } -+ return 0; - } - - /* Delete the character under the cursor, unless the insertion -Index: bash-3.1/lib/readline/readline.c -=================================================================== ---- bash-3.1.orig/lib/readline/readline.c 2005-12-13 14:07:24.000000000 +0100 -+++ bash-3.1/lib/readline/readline.c 2005-12-13 14:38:01.000000000 +0100 -@@ -721,7 +721,7 @@ _rl_dispatch_subseq (key, map, got_subse - - rl_dispatching = 1; - RL_SETSTATE(RL_STATE_DISPATCHING); -- r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); -+ (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); - RL_UNSETSTATE(RL_STATE_DISPATCHING); - rl_dispatching = 0; - - - -_______________________________________________ -Bug-bash mailing list -Bug-bash@gnu.org -http://lists.gnu.org/mailman/listinfo/bug-bash diff --git a/sys-libs/readline/readline-5.1-r2.ebuild b/sys-libs/readline/readline-5.1-r2.ebuild index 69c6703dd2a8..fb9ee11c27f7 100644 --- a/sys-libs/readline/readline-5.1-r2.ebuild +++ b/sys-libs/readline/readline-5.1-r2.ebuild @@ -1,16 +1,22 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.1 2005/12/21 11:21:55 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.2 2005/12/22 00:09:56 vapier Exp $ inherit eutils multilib # Official patches -PLEVEL="" +# See ftp://ftp.cwru.edu/pub/bash/readline-5.1-patches/ +PLEVEL=1 DESCRIPTION="Another cute console display library" HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" SRC_URI="mirror://gnu/readline/${P}.tar.gz - ${PLEVEL//x/mirror://gnu/${PN}/${PN}-${PV}-patches/${PN}${PV/\.}-}" + $(for ((i=1; i<=PLEVEL; i++)); do + printf 'ftp://ftp.cwru.edu/pub/bash/readline-%s-patches/readline%s-%03d\n' \ + ${PV} ${PV/\.} ${i} + printf 'mirror://gnu/bash/readline-%s-patches/readline%s-%03d\n' \ + ${PV} ${PV/\.} ${i} + done)" LICENSE="GPL-2" SLOT="0" @@ -27,13 +33,14 @@ src_unpack() { unpack ${P}.tar.gz cd "${S}" - for x in ${PLEVEL//x} ; do - epatch "${DISTDIR}"/${PN}${PV/\.}-${x} + # Official patches + local i + for ((i=1; i<=PLEVEL; i++)); do + epatch "${DISTDIR}"/${PN}${PV/\.}-$(printf '%03d' ${i}) done epatch "${FILESDIR}"/bash-3.0-etc-inputrc.patch epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch epatch "${FILESDIR}"/${P}-cleanups.patch - epatch "${FILESDIR}"/${P}-callback-segv.patch #115326 # force ncurses linking #71420 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed" |