[readline] version bump to 6.1

and import the current debian patches:
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>

9 files changed, 243 insertions, 13 deletions

diff --git a/patches/readline-5.2/series b/patches/readline-5.2/series
deleted file mode 100644
index 20865c3a1..000000000
--- a/patches/readline-5.2/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-termlib-linking.diff
diff --git a/patches/readline-6.1/0001-rl-attribute.patch b/patches/readline-6.1/0001-rl-attribute.patch
new file mode 100644
index 000000000..b1d5c6735
--- /dev/null
+++ b/patches/readline-6.1/0001-rl-attribute.patch
@@ -0,0 +1,51 @@
+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(-)
+
+diff --git a/readline.h b/readline.h
+index 7a4ffaa..a29c600 100644
+--- a/readline.h
++++ b/readline.h
+@@ -376,7 +376,7 @@ extern int rl_reset_line_state PARAMS((void));
+ 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
+diff --git a/rlstdc.h b/rlstdc.h
+index a6d2394..59d570b 100644
+--- a/rlstdc.h
++++ b/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_ */
+-- 
+1.6.6
+
diff --git a/patches/readline-6.1/0002-rl-header.patch b/patches/readline-6.1/0002-rl-header.patch
new file mode 100644
index 000000000..0247a55fa
--- /dev/null
+++ b/patches/readline-6.1/0002-rl-header.patch
@@ -0,0 +1,43 @@
+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(+), 0 deletions(-)
+
+diff --git a/history.h b/history.h
+index 1257e66..a9e907a 100644
+--- a/history.h
++++ b/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
+diff --git a/readline.h b/readline.h
+index a29c600..8ae77da 100644
+--- a/readline.h
++++ b/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>
+-- 
+1.6.6
+
diff --git a/patches/readline-6.1/0003-rl-no-cross-check.patch b/patches/readline-6.1/0003-rl-no-cross-check.patch
new file mode 100644
index 000000000..8a2af2746
--- /dev/null
+++ b/patches/readline-6.1/0003-rl-no-cross-check.patch
@@ -0,0 +1,31 @@
+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 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 868d29e..3bacf88 100755
+--- a/configure
++++ b/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;;
+-- 
+1.6.6
+
diff --git a/patches/readline-6.1/0004-rl-no-rpath.patch b/patches/readline-6.1/0004-rl-no-rpath.patch
new file mode 100644
index 000000000..c55f41ff2
--- /dev/null
+++ b/patches/readline-6.1/0004-rl-no-rpath.patch
@@ -0,0 +1,31 @@
+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 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/support/shobj-conf b/support/shobj-conf
+index 5a63e80..a6960d1 100644
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -114,7 +114,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
+ 	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)'
+ 	;;
+ 
+-- 
+1.6.6
+
diff --git a/patches/readline-6.1/0005-rlfe-history.patch b/patches/readline-6.1/0005-rlfe-history.patch
new file mode 100644
index 000000000..b5744282e
--- /dev/null
+++ b/patches/readline-6.1/0005-rlfe-history.patch
@@ -0,0 +1,64 @@
+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 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/examples/rlfe/rlfe.c b/examples/rlfe/rlfe.c
+index eacd5ab..de2c607 100644
+--- a/examples/rlfe/rlfe.c
++++ b/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;
+ 
+-- 
+1.6.6
+
diff --git a/patches/readline-5.2/fix-termlib-linking.diff b/patches/readline-6.1/0006-always-link-against-our-termcap-libraries.patch
index e944ff428..acd681e76 100644
--- a/patches/readline-5.2/fix-termlib-linking.diff
+++ b/patches/readline-6.1/0006-always-link-against-our-termcap-libraries.patch
@@ -1,5 +1,7 @@
+From a3f5ba4366bf698d987277656c51bb6f12d55cf2 Mon Sep 17 00:00:00 2001
 From: Marc Kleine-Budde <mkl@pengutronix.de>
-Subject: always link against our $termcap libraries
+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.
@@ -10,13 +12,13 @@ we linked against.
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
  shlib/Makefile.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: readline-5.2/shlib/Makefile.in
-===================================================================
---- readline-5.2.orig/shlib/Makefile.in
-+++ readline-5.2/shlib/Makefile.in
-@@ -164,11 +164,11 @@ unsupported:
+diff --git a/shlib/Makefile.in b/shlib/Makefile.in
+index 61724e7..316e2db 100644
+--- a/shlib/Makefile.in
++++ b/shlib/Makefile.in
+@@ -166,11 +166,11 @@ unsupported:
  
  $(SHARED_READLINE):	$(SHARED_OBJ)
  	$(RM) $@
@@ -30,3 +32,6 @@ Index: readline-5.2/shlib/Makefile.in
  
  # 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
+-- 
+1.6.6
+
diff --git a/patches/readline-6.1/series b/patches/readline-6.1/series
new file mode 100644
index 000000000..488514ca4
--- /dev/null
+++ b/patches/readline-6.1/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
diff --git a/rules/readline.make b/rules/readline.make
index 8c41c17af..7c92253f8 100644
--- a/rules/readline.make
+++ b/rules/readline.make
@@ -1,7 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2004 by Sascha Hauer
-#               2008, 2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#               2008, 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_READLINE) += readline
 #
 # Paths and names
 #
-READLINE_VERSION	:= 5.2
+READLINE_VERSION	:= 6.1
 READLINE		:= readline-$(READLINE_VERSION)
 READLINE_SUFFIX		:= tar.gz
 READLINE_URL		:= $(PTXCONF_SETUP_GNUMIRROR)/readline/$(READLINE).$(READLINE_SUFFIX)
@@ -72,9 +72,9 @@ $(STATEDIR)/readline.targetinstall:
 	@$(call install_fixup, readline,DESCRIPTION,missing)
 
 	@$(call install_copy, readline, 0, 0, 0644, -, \
-		/lib/libreadline.so.5.2)
-	@$(call install_link, readline, libreadline.so.5.2, /lib/libreadline.so.5)
-	@$(call install_link, readline, libreadline.so.5.2, /lib/libreadline.so)
+		/lib/libreadline.so.6.1)
+	@$(call install_link, readline, libreadline.so.6.1, /lib/libreadline.so.6)
+	@$(call install_link, readline, libreadline.so.6.1, /lib/libreadline.so)
 
 ifdef PTXCONF_READLINE_ETC_INPUTRC
 	@$(call install_alternative, readline, 0, 0, 0644, /etc/inputrc)