From mboxrd@z Thu Jan  1 00:00:00 1970
From: peter.mueller@ipfire.org
To: development@lists.ipfire.org
Subject: [PATCH] readline-compat: update to 6.3
Date: Tue, 12 Nov 2019 15:59:00 +0000
Message-ID: <4af98cfb-cd25-b2d0-39db-11649836bcb8@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8258669696962381497=="
List-Id: <development.lists.ipfire.org>

--===============8258669696962381497==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is necessary as many add-ons still need readline-compat as they
cannot link against readline 8.0, yet.

Reported-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 config/rootfiles/common/readline-compat |  8 ++++----
 lfs/readline-compat                     | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/rootfiles/common/readline-compat b/config/rootfiles/commo=
n/readline-compat
index 1ff73257c..9ef128a47 100644
--- a/config/rootfiles/common/readline-compat
+++ b/config/rootfiles/common/readline-compat
@@ -1,4 +1,4 @@
-lib/libhistory.so.5
-lib/libhistory.so.5.2
-lib/libreadline.so.5
-lib/libreadline.so.5.2
+lib/libhistory.so.6
+lib/libhistory.so.6.3
+lib/libreadline.so.6
+lib/libreadline.so.6.3
diff --git a/lfs/readline-compat b/lfs/readline-compat
index e7a49c306..248f522c4 100644
--- a/lfs/readline-compat
+++ b/lfs/readline-compat
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 5.2
+VER        =3D 6.3
=20
 THISAPP    =3D readline-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D e39331f32ad14009b9ff49cc10c5e751
+$(DL_FILE)_MD5 =3D 33c8fb279e981274f485fd91da77e94a
=20
 install : $(TARGET)
=20
@@ -72,8 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
=20
-	for i in $$(seq 1 14); do \
-		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline52-$=
$(printf "%03d" "$${i}") || exit 1; \
+	for i in $$(seq 1 6); do \
+		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$=
$(printf "%03d" "$${i}") || exit 1; \
 	done
=20
 	cd $(DIR_APP) && ./configure --prefix=3D/usr --libdir=3D/lib --disable-stat=
ic
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
=20
 	cd $(DIR_APP)/shlib && install -m 755 libreadline.so.$(VER) /lib
 	cd $(DIR_APP)/shlib && install -m 755 libhistory.so.$(VER) /lib
-	ln -svf libreadline.so.$(VER) /lib/libreadline.so.5
-	ln -svf libhistory.so.$(VER) /lib/libhistory.so.5
+	ln -svf libreadline.so.$(VER) /lib/libreadline.so.6
+	ln -svf libhistory.so.$(VER) /lib/libhistory.so.6
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
2.16.4

--===============8258669696962381497==--