From 8ea237077d77220e2bf990bdf8abfbb361f5af63 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Feb 2021 16:23:17 +0000
Subject: [PATCH] readline-compat: Drop package

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/readline-compat |  4 --
 config/rootfiles/core/155/update.sh     |  4 ++
 lfs/readline-compat                     | 87 -------------------------
 make.sh                                 |  1 -
 4 files changed, 4 insertions(+), 92 deletions(-)
 delete mode 100644 config/rootfiles/common/readline-compat
 delete mode 100644 lfs/readline-compat

diff --git a/config/rootfiles/common/readline-compat b/config/rootfiles/common/readline-compat
deleted file mode 100644
index 9ef128a479..0000000000
--- a/config/rootfiles/common/readline-compat
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/libhistory.so.6
-lib/libhistory.so.6.3
-lib/libreadline.so.6
-lib/libreadline.so.6.3
diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
index 8995bd02ed..f22690cd08 100644
--- a/config/rootfiles/core/155/update.sh
+++ b/config/rootfiles/core/155/update.sh
@@ -33,6 +33,10 @@ done
 
 # Remove files
 rm -vrf \
+	/lib/libhistory.so.6 \
+	/lib/libhistory.so.6.3 \
+	/lib/libreadline.so.6 \
+	/lib/libreadline.so.6.3 \
 	/usr/lib/sse2 \
 	/usr/local/lib/sse2 \
 	/usr/lib/libdb-4.so \
diff --git a/lfs/readline-compat b/lfs/readline-compat
deleted file mode 100644
index 248f522c49..0000000000
--- a/lfs/readline-compat
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# 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        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 6.3
-
-THISAPP    = readline-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-
-	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
-	cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses
-
-	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.6
-	ln -svf libhistory.so.$(VER) /lib/libhistory.so.6
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 43d7f5359c..6ef584f302 100755
--- a/make.sh
+++ b/make.sh
@@ -1094,7 +1094,6 @@ buildbase() {
 	lfsmake2 ncurses
 	lfsmake2 perl
 	lfsmake2 readline
-	lfsmake2 readline-compat
 	lfsmake2 bzip2
 	lfsmake2 xz
 	lfsmake2 lzip
-- 
2.39.5