diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-06-20 19:10:37 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-06-20 20:00:56 +0200 |
commit | 12503476c43336bff8fc28afdc021e1d0b717533 (patch) | |
tree | 70ff5a80db98afc7bfbaac3856d63e2267d0aa5f /patches/readline-6.2 | |
parent | 2c86cbb9e93d455a42810263e7c554a1d588cbe4 (diff) | |
download | ptxdist-12503476c43336bff8fc28afdc021e1d0b717533.tar.gz ptxdist-12503476c43336bff8fc28afdc021e1d0b717533.tar.xz |
readline: version bump 6.1 -> 6.2
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/readline-6.2')
-rw-r--r-- | patches/readline-6.2/0001-rl-attribute.patch | 48 | ||||
-rw-r--r-- | patches/readline-6.2/0002-rl-header.patch | 40 | ||||
-rw-r--r-- | patches/readline-6.2/0003-rl-no-cross-check.patch | 28 | ||||
-rw-r--r-- | patches/readline-6.2/0004-rl-no-rpath.patch | 28 | ||||
-rw-r--r-- | patches/readline-6.2/0005-rlfe-history.patch | 61 | ||||
-rw-r--r-- | patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch | 34 | ||||
-rw-r--r-- | patches/readline-6.2/series | 6 |
7 files changed, 245 insertions, 0 deletions
diff --git a/patches/readline-6.2/0001-rl-attribute.patch b/patches/readline-6.2/0001-rl-attribute.patch new file mode 100644 index 000000000..e05d53269 --- /dev/null +++ b/patches/readline-6.2/0001-rl-attribute.patch @@ -0,0 +1,48 @@ +From 28a3a685d30096d9567577acc18a890c814cad86 Mon Sep 17 00:00:00 2001 +From: doko@debian.org <doko@debian.org> +Date: Sun, 24 Jan 2010 00:31:09 +0100 +Subject: [PATCH 1/6] rl-attribute. + +rl-attribute.dpatch by <doko@debian.org> + +from: +http://ftp.de.debian.org/debian/pool/main/r/readline6/readline6_6.1-1.diff.gz + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + readline.h | 2 +- + rlstdc.h | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +Index: readline-6.2/readline.h +=================================================================== +--- readline-6.2.orig/readline.h ++++ readline-6.2/readline.h +@@ -376,7 +376,7 @@ extern int rl_reset_line_state PARAMS((v + extern int rl_crlf PARAMS((void)); + + #if defined (USE_VARARGS) && defined (PREFER_STDARG) +-extern int rl_message (const char *, ...) __attribute__((__format__ (printf, 1, 2))); ++extern int rl_message (const char *, ...) __rl_attribute__((__format__ (printf, 1, 2))); + #else + extern int rl_message (); + #endif +Index: readline-6.2/rlstdc.h +=================================================================== +--- readline-6.2.orig/rlstdc.h ++++ readline-6.2/rlstdc.h +@@ -36,10 +36,10 @@ + # endif + #endif + +-#ifndef __attribute__ +-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) +-# define __attribute__(x) +-# endif ++#if defined(__GNUC__) && __GNUC__ >= 2 ++# define __rl_attribute__(x) __attribute__(x) ++#else ++# define __rl_attribute__(x) + #endif + + #endif /* !_RL_STDC_H_ */ diff --git a/patches/readline-6.2/0002-rl-header.patch b/patches/readline-6.2/0002-rl-header.patch new file mode 100644 index 000000000..d729e2e02 --- /dev/null +++ b/patches/readline-6.2/0002-rl-header.patch @@ -0,0 +1,40 @@ +From 1667707d568e8c5b6380ea5a8ac5edfe03c2090d Mon Sep 17 00:00:00 2001 +From: doko@debian.org <doko@debian.org> +Date: Sun, 24 Jan 2010 00:31:22 +0100 +Subject: [PATCH 2/6] rl-header. + +rl-header.dpatch by <doko@debian.org> + +from: +http://ftp.de.debian.org/debian/pool/main/r/readline6/readline6_6.1-1.diff.gz + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + history.h | 1 + + readline.h | 1 + + 2 files changed, 2 insertions(+) + +Index: readline-6.2/history.h +=================================================================== +--- readline-6.2.orig/history.h ++++ readline-6.2/history.h +@@ -32,6 +32,7 @@ extern "C" { + # include "rlstdc.h" + # include "rltypedefs.h" + #else ++# include <stdio.h> + # include <readline/rlstdc.h> + # include <readline/rltypedefs.h> + #endif +Index: readline-6.2/readline.h +=================================================================== +--- readline-6.2.orig/readline.h ++++ readline-6.2/readline.h +@@ -32,6 +32,7 @@ extern "C" { + # include "keymaps.h" + # include "tilde.h" + #else ++# include <stdio.h> + # include <readline/rlstdc.h> + # include <readline/rltypedefs.h> + # include <readline/keymaps.h> diff --git a/patches/readline-6.2/0003-rl-no-cross-check.patch b/patches/readline-6.2/0003-rl-no-cross-check.patch new file mode 100644 index 000000000..349e790d0 --- /dev/null +++ b/patches/readline-6.2/0003-rl-no-cross-check.patch @@ -0,0 +1,28 @@ +From 713b0e2b4d4690c9cc8dae9acdb5df55d171b3ef Mon Sep 17 00:00:00 2001 +From: doko@debian.org <doko@debian.org> +Date: Sun, 24 Jan 2010 00:31:30 +0100 +Subject: [PATCH 3/6] rl-no-cross-check. + +rl-no-cross-check.dpatch by <doko@debian.org> + +from: +http://ftp.de.debian.org/debian/pool/main/r/readline6/readline6_6.1-1.diff.gz + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: readline-6.2/configure +=================================================================== +--- readline-6.2.orig/configure ++++ readline-6.2/configure +@@ -2538,7 +2538,7 @@ ac_exeext=$ac_cv_exeext + $as_echo_n "checking whether the C compiler works... " >&6; } + # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 + # If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then ++if false && test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; diff --git a/patches/readline-6.2/0004-rl-no-rpath.patch b/patches/readline-6.2/0004-rl-no-rpath.patch new file mode 100644 index 000000000..800de1ada --- /dev/null +++ b/patches/readline-6.2/0004-rl-no-rpath.patch @@ -0,0 +1,28 @@ +From 7302900f20c3710f487752f69f3f1dadab08ea92 Mon Sep 17 00:00:00 2001 +From: doko@debian.org <doko@debian.org> +Date: Sun, 24 Jan 2010 00:31:36 +0100 +Subject: [PATCH 4/6] rl-no-rpath. + +rl-no-rpath.dpatch by <doko@debian.org> + +from: +http://ftp.de.debian.org/debian/pool/main/r/readline6/readline6_6.1-1.diff.gz + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + support/shobj-conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: readline-6.2/support/shobj-conf +=================================================================== +--- readline-6.2.orig/support/shobj-conf ++++ readline-6.2/support/shobj-conf +@@ -114,7 +114,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-ge + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' + +- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' ++ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' + SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' + ;; + diff --git a/patches/readline-6.2/0005-rlfe-history.patch b/patches/readline-6.2/0005-rlfe-history.patch new file mode 100644 index 000000000..092b6e787 --- /dev/null +++ b/patches/readline-6.2/0005-rlfe-history.patch @@ -0,0 +1,61 @@ +From 7f075477b0583f318de652092b5d785c0b4455d3 Mon Sep 17 00:00:00 2001 +From: andrew@pimlott.net <andrew@pimlott.net> +Date: Sun, 24 Jan 2010 00:31:48 +0100 +Subject: [PATCH 5/6] rlfe-history. + +rlfe-history.dpatch by <andrew@pimlott.net> + +from: +http://ftp.de.debian.org/debian/pool/main/r/readline6/readline6_6.1-1.diff.gz + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + examples/rlfe/rlfe.c | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +Index: readline-6.2/examples/rlfe/rlfe.c +=================================================================== +--- readline-6.2.orig/examples/rlfe/rlfe.c ++++ readline-6.2/examples/rlfe/rlfe.c +@@ -154,21 +154,27 @@ struct termios orig_term; + static pid_t child = -1; + + static void +-sig_child (int signo) ++finish_up() + { +- int status; +- wait (&status); + if (hist_file != 0) + { + write_history (hist_file); + if (hist_size) + history_truncate_file (hist_file, hist_size); + } +- DPRINT0 ("(Child process died.)\n"); + tcsetattr(STDIN_FILENO, TCSANOW, &orig_term); + exit (0); + } + ++static void ++sig_child (int signo) ++{ ++ int status; ++ wait (&status); ++ DPRINT0 ("(Child process died.)\n"); ++ finish_up(); ++} ++ + volatile int propagate_sigwinch = 0; + + /* sigwinch_handler +@@ -703,8 +709,7 @@ main(int argc, char** argv) + if (count <= 0) + { + DPRINT0 ("(Connection closed by foreign host.)\n"); +- tcsetattr(STDIN_FILENO, TCSANOW, &orig_term); +- exit (0); ++ finish_up(); + } + old_count = buf_count; + diff --git a/patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch b/patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch new file mode 100644 index 000000000..c6cd1a190 --- /dev/null +++ b/patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch @@ -0,0 +1,34 @@ +From a3f5ba4366bf698d987277656c51bb6f12d55cf2 Mon Sep 17 00:00:00 2001 +From: Marc Kleine-Budde <mkl@pengutronix.de> +Date: Sun, 24 Jan 2010 00:32:08 +0100 +Subject: [PATCH 6/6] always link against our $termcap libraries + +This way our $user doesn't need to know wich $termcap library +we linked against. + +(If this lib would be written in the mid 2000s pkg-config would + probably used for this :) + +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + shlib/Makefile.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: readline-6.2/shlib/Makefile.in +=================================================================== +--- readline-6.2.orig/shlib/Makefile.in ++++ readline-6.2/shlib/Makefile.in +@@ -166,11 +166,11 @@ unsupported: + + $(SHARED_READLINE): $(SHARED_OBJ) + $(RM) $@ +- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) ++ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_OBJ) $(SHLIB_LIBS) $(TERMCAP_LIB) + + $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so + $(RM) $@ +- $(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 $(SHLIB_LIBS) $(TERMCAP_LIB) + + # 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 --git a/patches/readline-6.2/series b/patches/readline-6.2/series new file mode 100644 index 000000000..488514ca4 --- /dev/null +++ b/patches/readline-6.2/series @@ -0,0 +1,6 @@ +0001-rl-attribute.patch +0002-rl-header.patch +0003-rl-no-cross-check.patch +0004-rl-no-rpath.patch +0005-rlfe-history.patch +0006-always-link-against-our-termcap-libraries.patch |