[1/7] bash: update to 5.0

Message ID d19cd44b-cc36-dd32-2bf8-2f292c79576a@ipfire.org
State Staged
Commit 700f11b305e941bb42b0a0b4e451af962b1bc23d
Headers show
Series
  • [1/7] bash: update to 5.0
Related show

Commit Message

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

Comments

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

This patchset looks okay, although it could have been slightly smaller. You do not need to split the changes in the lfs files from the root files. That should be one patch per package.

> On 7 Oct 2019, at 19:15, peter.mueller@ipfire.org wrote:
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> lfs/bash | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/lfs/bash b/lfs/bash
> index 09b4e71e6..79c21896b 100644
> --- a/lfs/bash
> +++ b/lfs/bash
> @@ -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        = 4.3
> +VER        = 5.0
> 
> THISAPP    = bash-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -53,7 +53,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE)             = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5         = 81348932d5da294953e15d4814c74dd1
> +$(DL_FILE)_MD5         = 2b44b47b905be16f45709648f671820b
> 
> install : $(TARGET)
> 
> @@ -87,8 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
> 		-i $(DIR_APP)/builtins/enable.def
> 
> -	for i in $$(seq 1 30); do \
> -		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash43-$$(printf "%03d" "$${i}") || exit 1; \
> +	for i in $$(seq 1 11); do \
> +		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash50-$$(printf "%03d" "$${i}") || exit 1; \
> 	done
> 
> 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch
> -- 
> 2.16.4

Patch

diff --git a/lfs/bash b/lfs/bash
index 09b4e71e6..79c21896b 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -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        = 4.3
+VER        = 5.0
 
 THISAPP    = bash-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -53,7 +53,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE)             = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5         = 81348932d5da294953e15d4814c74dd1
+$(DL_FILE)_MD5         = 2b44b47b905be16f45709648f671820b
 
 install : $(TARGET)
 
@@ -87,8 +87,8 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
 		-i $(DIR_APP)/builtins/enable.def
 
-	for i in $$(seq 1 30); do \
-		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash43-$$(printf "%03d" "$${i}") || exit 1; \
+	for i in $$(seq 1 11); do \
+		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash50-$$(printf "%03d" "$${i}") || exit 1; \
 	done
 
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-paths-1.patch