From patchwork Wed Oct 28 20:46:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 10518 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "YR1" (not verified)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4jFKDF3JcKz3wpN for ; Wed, 28 Oct 2026 20:47:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "YE2" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4jFKDD5Tk0z6bQ for ; Wed, 28 Oct 2026 20:47:08 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4jFKDD4f5hz334L for ; Wed, 28 Oct 2026 20:47:08 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [IPv6:2001:678:b28::25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "YR1" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4jFKD96wtgz2xHd for ; Wed, 28 Oct 2026 20:47:05 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4jFKD764DWzb9; Wed, 28 Oct 2026 20:47:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1793220424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ahwvbX+ig71scx5/ci+wXjGCKY+VV8Nt5IUTBZkk2oA=; b=B5mFVr1W8NkErAsfy8VXqkz7b5CQSHjefZXclw9mBRZnj9QA57H8Lo4E+7/ldXo4orAKoS VZxZPjPC4iSnNdAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1793220424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ahwvbX+ig71scx5/ci+wXjGCKY+VV8Nt5IUTBZkk2oA=; b=qRpcYXgaikn3S28ccVwLlTuuh+q9bke1+Y9/nOTiW9jdt0HoGm+DfFc+X0aVD81NVc/GMo +1LtejZ614DZRSalUkgzib3XxDdw9D8+72qgCgNMqKyWCA9SMvSsjv5Eeb8lyqX5eA2TBr G9qW/0T6KERxn6mMXDauPozk+UlUdQEBmTNuFdQmXTGRc3Oa3DrvvmYYRWQDZJe0RINET6 JEJz8DR30w2iak0A7/n22CbtBOXi2umiugQx83lSK5oP5odJoPfPVyQof3cefP5BxThzU4 jI3XBpAJUgqFfPoX3UHBUI8RJ/DP5iOWtzeTCt6l5AwNzo1xXrGz4PiXmrxO7g== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] bash: Change the VER parameter to also include the patch number Date: Wed, 28 Oct 2026 21:46:59 +0100 Message-ID: <20261028204700.2431586-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - 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 --- 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