[ptxdist] [PATCH 1/2] readline: version bump 6.2 -> 7.0

[ptxdist] [PATCH 1/2] readline: version bump 6.2 -> 7.0

[Robert Schwebel]

Ported patches, although I'm not entirely sure if they are still needed.
They have a proper configure.ac now in upstream...

No relevant --enable/disable/with/without options in configure.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 patches/readline-6.2/0003-rl-no-cross-check.patch  | 28 ------------------
 patches/readline-6.2/series                        |  6 ----
 .../0001-rl-attribute.patch                        | 33 ++++++++++++----------
 .../0002-rl-header.patch                           | 29 ++++++++++---------
 .../0003-rl-no-rpath.patch}                        | 21 ++++++++------
 .../0004-rlfe-history.patch}                       | 21 ++++++++------
 ...lways-link-against-our-termcap-libraries.patch} | 19 +++++++------
 patches/readline-7.0/series                        |  8 ++++++
 rules/readline.make                                |  4 +--
 9 files changed, 79 insertions(+), 90 deletions(-)
 delete mode 100644 patches/readline-6.2/0003-rl-no-cross-check.patch
 delete mode 100644 patches/readline-6.2/series
 rename patches/{readline-6.2 => readline-7.0}/0001-rl-attribute.patch (60%)
 rename patches/{readline-6.2 => readline-7.0}/0002-rl-header.patch (57%)
 rename patches/{readline-6.2/0004-rl-no-rpath.patch => readline-7.0/0003-rl-no-rpath.patch} (57%)
 rename patches/{readline-6.2/0005-rlfe-history.patch => readline-7.0/0004-rlfe-history.patch} (72%)
 rename patches/{readline-6.2/0006-always-link-against-our-termcap-libraries.patch => readline-7.0/0005-always-link-against-our-termcap-libraries.patch} (73%)
 create mode 100644 patches/readline-7.0/series

diff --git a/patches/readline-6.2/0003-rl-no-cross-check.patch b/patches/readline-6.2/0003-rl-no-cross-check.patch
deleted file mode 100644
index 349e790d0..000000000
--- a/patches/readline-6.2/0003-rl-no-cross-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/series b/patches/readline-6.2/series
deleted file mode 100644
index 488514ca4..000000000
--- a/patches/readline-6.2/series
+++ /dev/null
@@ -1,6 +0,0 @@
-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/patches/readline-6.2/0001-rl-attribute.patch b/patches/readline-7.0/0001-rl-attribute.patch
similarity index 60%
rename from patches/readline-6.2/0001-rl-attribute.patch
rename to patches/readline-7.0/0001-rl-attribute.patch
index e05d53269..48a392d78 100644
--- a/patches/readline-6.2/0001-rl-attribute.patch
+++ b/patches/readline-7.0/0001-rl-attribute.patch
@@ -1,7 +1,7 @@
-From 28a3a685d30096d9567577acc18a890c814cad86 Mon Sep 17 00:00:00 2001
-From: doko@debian.org <doko@debian.org>
+From 9507873cefce15a1d5dd646fbfc49cefb7765350 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.
+Subject: [PATCH 1/5] rl-attribute.
 
 rl-attribute.dpatch by  <doko@debian.org>
 
@@ -10,15 +10,15 @@ 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 ++++----
+ 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
+diff --git a/readline.h b/readline.h
+index 924bbfb0f213..b1a177a577d5 100644
+--- a/readline.h
++++ b/readline.h
+@@ -385,7 +385,7 @@ extern int rl_reset_line_state PARAMS((void));
  extern int rl_crlf PARAMS((void));
  
  #if defined (USE_VARARGS) && defined (PREFER_STDARG)
@@ -27,10 +27,10 @@ Index: readline-6.2/readline.h
  #else
  extern int rl_message ();
  #endif
-Index: readline-6.2/rlstdc.h
-===================================================================
---- readline-6.2.orig/rlstdc.h
-+++ readline-6.2/rlstdc.h
+diff --git a/rlstdc.h b/rlstdc.h
+index 2aaa30babfbd..82b607cb35df 100644
+--- a/rlstdc.h
++++ b/rlstdc.h
 @@ -36,10 +36,10 @@
  #  endif
  #endif
@@ -45,4 +45,7 @@ Index: readline-6.2/rlstdc.h
 +#  define __rl_attribute__(x)
  #endif
  
- #endif /* !_RL_STDC_H_ */
+ /* Moved from config.h.in because readline.h:rl_message depends on these
+-- 
+2.11.0
+
diff --git a/patches/readline-6.2/0002-rl-header.patch b/patches/readline-7.0/0002-rl-header.patch
similarity index 57%
rename from patches/readline-6.2/0002-rl-header.patch
rename to patches/readline-7.0/0002-rl-header.patch
index d729e2e02..74ca9696a 100644
--- a/patches/readline-6.2/0002-rl-header.patch
+++ b/patches/readline-7.0/0002-rl-header.patch
@@ -1,7 +1,7 @@
-From 1667707d568e8c5b6380ea5a8ac5edfe03c2090d Mon Sep 17 00:00:00 2001
-From: doko@debian.org <doko@debian.org>
+From 58b78b51eda1fb045f539b0c00ac904aff1c5413 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.
+Subject: [PATCH 2/5] rl-header.
 
 rl-header.dpatch by  <doko@debian.org>
 
@@ -10,14 +10,14 @@ 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 +
+ 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
+diff --git a/history.h b/history.h
+index 8ce7c805d168..8d568a79fa29 100644
+--- a/history.h
++++ b/history.h
 @@ -32,6 +32,7 @@ extern "C" {
  #  include "rlstdc.h"
  #  include "rltypedefs.h"
@@ -26,10 +26,10 @@ Index: readline-6.2/history.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
+diff --git a/readline.h b/readline.h
+index b1a177a577d5..06c2abe61736 100644
+--- a/readline.h
++++ b/readline.h
 @@ -32,6 +32,7 @@ extern "C" {
  #  include "keymaps.h"
  #  include "tilde.h"
@@ -38,3 +38,6 @@ Index: readline-6.2/readline.h
  #  include <readline/rlstdc.h>
  #  include <readline/rltypedefs.h>
  #  include <readline/keymaps.h>
+-- 
+2.11.0
+
diff --git a/patches/readline-6.2/0004-rl-no-rpath.patch b/patches/readline-7.0/0003-rl-no-rpath.patch
similarity index 57%
rename from patches/readline-6.2/0004-rl-no-rpath.patch
rename to patches/readline-7.0/0003-rl-no-rpath.patch
index 800de1ada..d105aa069 100644
--- a/patches/readline-6.2/0004-rl-no-rpath.patch
+++ b/patches/readline-7.0/0003-rl-no-rpath.patch
@@ -1,7 +1,7 @@
-From 7302900f20c3710f487752f69f3f1dadab08ea92 Mon Sep 17 00:00:00 2001
-From: doko@debian.org <doko@debian.org>
+From 9ec8b96a40704ce165a8699863a2bf9665de81e4 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.
+Subject: [PATCH 3/5] rl-no-rpath.
 
 rl-no-rpath.dpatch by  <doko@debian.org>
 
@@ -10,14 +10,14 @@ 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 +-
+ 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
+diff --git a/support/shobj-conf b/support/shobj-conf
+index 1f64433dea83..ce435d7db254 100644
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -128,7 +128,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
  	SHOBJ_LD='${CC}'
  	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
  
@@ -26,3 +26,6 @@ Index: readline-6.2/support/shobj-conf
  	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
  	;;
  
+-- 
+2.11.0
+
diff --git a/patches/readline-6.2/0005-rlfe-history.patch b/patches/readline-7.0/0004-rlfe-history.patch
similarity index 72%
rename from patches/readline-6.2/0005-rlfe-history.patch
rename to patches/readline-7.0/0004-rlfe-history.patch
index 092b6e787..298675181 100644
--- a/patches/readline-6.2/0005-rlfe-history.patch
+++ b/patches/readline-7.0/0004-rlfe-history.patch
@@ -1,7 +1,7 @@
-From 7f075477b0583f318de652092b5d785c0b4455d3 Mon Sep 17 00:00:00 2001
-From: andrew@pimlott.net <andrew@pimlott.net>
+From 1567246b7d3a81fb28aebf90b0496ee335944ab9 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.
+Subject: [PATCH 4/5] rlfe-history.
 
 rlfe-history.dpatch by  <andrew@pimlott.net>
 
@@ -10,13 +10,13 @@ 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 +++++++++++------
+ 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
+diff --git a/examples/rlfe/rlfe.c b/examples/rlfe/rlfe.c
+index f40b2ddaf00f..89bb17e462db 100644
+--- a/examples/rlfe/rlfe.c
++++ b/examples/rlfe/rlfe.c
 @@ -154,21 +154,27 @@ struct termios orig_term;
  static pid_t child = -1;
  
@@ -49,7 +49,7 @@ Index: readline-6.2/examples/rlfe/rlfe.c
  volatile int propagate_sigwinch = 0;
  
  /* sigwinch_handler
-@@ -703,8 +709,7 @@ main(int argc, char** argv)
+@@ -710,8 +716,7 @@ main(int argc, char** argv)
  	  if (count <= 0)
  	    {
  	      DPRINT0 ("(Connection closed by foreign host.)\n");
@@ -59,3 +59,6 @@ Index: readline-6.2/examples/rlfe/rlfe.c
  	    }
  	  old_count = buf_count;
  
+-- 
+2.11.0
+
diff --git a/patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch b/patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch
similarity index 73%
rename from patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch
rename to patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch
index c6cd1a190..497eead4c 100644
--- a/patches/readline-6.2/0006-always-link-against-our-termcap-libraries.patch
+++ b/patches/readline-7.0/0005-always-link-against-our-termcap-libraries.patch
@@ -1,7 +1,7 @@
-From a3f5ba4366bf698d987277656c51bb6f12d55cf2 Mon Sep 17 00:00:00 2001
+From 45c7b04d9b21a2d1be97f4d85ac4673144e9d69b 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
+Subject: [PATCH 5/5] always link against our $termcap libraries
 
 This way our $user doesn't need to know wich $termcap library
 we linked against.
@@ -11,14 +11,14 @@ we linked against.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- shlib/Makefile.in |    4 ++--
+ 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:
+diff --git a/shlib/Makefile.in b/shlib/Makefile.in
+index f2ec3e46b7ba..3298008abec4 100644
+--- a/shlib/Makefile.in
++++ b/shlib/Makefile.in
+@@ -174,11 +174,11 @@ unsupported:
  
  $(SHARED_READLINE):	$(SHARED_OBJ)
  	$(RM) $@
@@ -32,3 +32,6 @@ Index: readline-6.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
+-- 
+2.11.0
+
diff --git a/patches/readline-7.0/series b/patches/readline-7.0/series
new file mode 100644
index 000000000..5b5cd2fea
--- /dev/null
+++ b/patches/readline-7.0/series
@@ -0,0 +1,8 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-rl-attribute.patch
+0002-rl-header.patch
+0003-rl-no-rpath.patch
+0004-rlfe-history.patch
+0005-always-link-against-our-termcap-libraries.patch
+# 7b8eea3fcea421a1233d1d9232c74be5  - git-ptx-patches magic
diff --git a/rules/readline.make b/rules/readline.make
index 498d460d5..5df94bb13 100644
--- a/rules/readline.make
+++ b/rules/readline.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_READLINE) += readline
 #
 # Paths and names
 #
-READLINE_VERSION	:= 6.2
-READLINE_MD5		:= 67948acb2ca081f23359d0256e9a271c
+READLINE_VERSION	:= 7.0
+READLINE_MD5		:= 205b03a87fc83dab653b628c59b9fc91
 READLINE		:= readline-$(READLINE_VERSION)
 READLINE_SUFFIX		:= tar.gz
 READLINE_URL		:= $(call ptx/mirror, GNU, readline/$(READLINE).$(READLINE_SUFFIX))
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de