[PATCH] bash: Change the VER parameter to also include the patch number

[PATCH] bash: Change the VER parameter to also include the patch number

[Adolf Belka]

- There was a separate VER and PATCHVER number and when building only the VER part was
   shown, 5.3 in the bash case.
- With this change 5.3.20 is now shown, combining the package and patch version
- The other changes are to use the appropriate parts of the new VER parameter THISAPP
   and the application of the patches.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/bash | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lfs/bash b/lfs/bash
index 245aaa791..41350da37 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -24,10 +24,9 @@
 
 include Config
 
-VER        = 5.3
-PATCHVER   = 20
+VER        = 5.3.20
 
-THISAPP    = bash-$(VER)
+THISAPP    = bash-$(basename $(VER))
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -94,9 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-4.0-profile-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash/bash-3.2-ssh_source_bash.patch
 
-ifneq "$(PATCHVER)" "0"
-	for i in $$(seq 1 $(PATCHVER)); do \
-		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash$(subst .,,$(VER))-$$(printf "%03d" "$${i}") || exit 1; \
+ifneq ($(suffix $(VER)),.0)
+	for i in $$(seq 1 $(patsubst .%,%,$(suffix $(VER)))); do \
+		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash$(subst .,,$(basename $(VER)))-$$(printf "%03d" "$${i}") || exit 1; \
 	done
 endif
 
-- 
2.56.0

[PATCH] readline: Change the VER parameter to also include the patch number

[Adolf Belka]

- There was a separate VER and PATCHVER number and when building only the VER part was
   shown, 8.3 in the readline case.
- With this change 8.3.6 is now shown, combining the package and patch version
- The other changes are to use the appropriate parts of the new VER parameter THISAPP
   and the application of the patches.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 lfs/readline | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lfs/readline b/lfs/readline
index 37769c2ca..b8589c4b9 100644
--- a/lfs/readline
+++ b/lfs/readline
@@ -24,11 +24,11 @@
 
 include Config
 
-VER        = 8.3
-PATCHVER   = 6
+VER        = 8.3.6
+
 #            https://ftp.gnu.org/gnu/readline/
 
-THISAPP    = readline-$(VER)
+THISAPP    = readline-$(basename $(VER))
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -73,9 +73,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-ifneq "$(PATCHVER)" "0"
-	for i in $$(seq 1 $(PATCHVER)); do \
-		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline$(subst .,,$(VER))-$$(printf "%03d" "$${i}") || exit 1; \
+ifneq ($(suffix $(VER)),.0)
+	for i in $$(seq 1 $(patsubst .%,%,$(suffix $(VER)))); do \
+		cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline$(subst .,,$(basename $(VER)))-$$(printf "%03d" "$${i}") || exit 1; \
 	done
 endif
 
-- 
2.56.0