X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Freadline;h=3e9e2a3d57593169a4c3c3385b1179a569d6b9f5;hp=fdc38e557f08d05bcbdff59de6204864b3aa705e;hb=eee037b8902c3163850069f302479e7733966bd0;hpb=0145f271e10034de8af568e38c64061e38ce341e

diff --git a/lfs/readline b/lfs/readline
index fdc38e557f..3e9e2a3d57 100644
--- a/lfs/readline
+++ b/lfs/readline
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2018  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 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# 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 IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,7 +24,7 @@
 
 include Config
 
-VER        = 5.1
+VER        = 6.3
 
 THISAPP    = readline-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -42,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7ee5a692db88b30ca48927a13fd60e46
+$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a
 
 install : $(TARGET)
 
@@ -72,16 +70,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/patches/readline-5.1-fixes-3.patch
-	cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in
-	cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install
-	cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib
-	cd $(DIR_APP) && make SHLIB_LIBS=-lncurses
+
+	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 --disable-static
+	cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses
 	cd $(DIR_APP) && make install
-	chmod -v 755 /lib/lib{readline,history}.so*
-	mv -v /lib/lib{readline,history}.a /usr/lib
-	rm -v /lib/lib{readline,history}.so
-	ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so
-	ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so
+
+	rm -rfv /usr/share/readline
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)