Hi,

Peter, your email still has an incorrect From: header.

-Michael

On 12 Nov 2019, at 15:59, peter.mueller@ipfire.org wrote:

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@ipfire.org Signed-off-by: Peter Müller peter.mueller@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/common/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@ipfire.org # +# Copyright (C) 2007-2019 IPFire Team info@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 @@

include Config

-VER = 5.2 +VER = 6.3

THISAPP = readline-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = e39331f32ad14009b9ff49cc10c5e751 +$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a

install : $(TARGET)

@@ -72,8 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)

• 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

  cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib --disable-static

@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

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)

-- 2.16.4