[2/7] readline: update to 8.0

Message ID d83e1f00-c329-6d72-5a0d-5bffa2ded09b@ipfire.org
State Staged
Commit 6e8e8ee41cfcec7338a5674c21c0e8aa62a59a04
Headers show
Series
  • [1/7] bash: update to 5.0
Related show

Commit Message

Peter Müller Oct. 7, 2019, 6:16 p.m. UTC
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 lfs/readline | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Comments

Michael Tremer Oct. 8, 2019, 1:46 p.m. UTC | #1
Hi,

> On 7 Oct 2019, at 19:16, peter.mueller@ipfire.org wrote:
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> lfs/readline | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/lfs/readline b/lfs/readline
> index 3e9e2a3d5..4f7329766 100644
> --- a/lfs/readline
> +++ b/lfs/readline
> @@ -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        = 6.3
> +VER        = 8.0
> 
> THISAPP    = readline-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a
> +$(DL_FILE)_MD5 = 7e6c1f16aee3244a69aba6e438295ca3
> 
> install : $(TARGET)
> 
> @@ -71,9 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> 
> -	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) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline80-001

I would have kept the loop, even for one patch to be able to extend it easier later.

> 
> 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
> 	cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses
> -- 
> 2.16.4

Patch

diff --git a/lfs/readline b/lfs/readline
index 3e9e2a3d5..4f7329766 100644
--- a/lfs/readline
+++ b/lfs/readline
@@ -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        = 6.3
+VER        = 8.0
 
 THISAPP    = readline-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a
+$(DL_FILE)_MD5 = 7e6c1f16aee3244a69aba6e438295ca3
 
 install : $(TARGET)
 
@@ -71,9 +71,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	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) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline80-001
 
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
 	cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses