From patchwork Wed Oct 28 20:47:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 10519 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 4jFKDF3N8kz3wqC for ; Wed, 28 Oct 2026 20:47:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [IPv6:2001:678:b28::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 4jFKDD5GGTz6bP 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 4jFKDD4Tzcz30LN 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 4jFKD96z1Sz2y1f 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 4jFKD83jVGz28X; Wed, 28 Oct 2026 20:47:04 +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: in-reply-to:in-reply-to:references:references; bh=PDLwF/5Y/TcX52gGWjHpot5XcHZmKMLPjFnqW79VHzo=; b=wyhf3iMD5Ro265MbmDUO6bmEHcYSkv01ZfpRco49k6BcoDWFWa74hh9RTwLY63dLNtYMjC kg16XV15MSPw5IBQ== 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: in-reply-to:in-reply-to:references:references; bh=PDLwF/5Y/TcX52gGWjHpot5XcHZmKMLPjFnqW79VHzo=; b=W6LH9W2wNewsvAWFTaJok6nuiFr3PQLaDoLR7YbXRL5Fud7sl0DbPkWIAgpJx3eWnGA3n1 bYdRKZIk5G2qwbRoIuDCT8dIuzOOXt5SbNXp1nBGcd6ZqY8J3/VLCGXV2v4KvW9IHq7fWl iUFsXnRacjiEKdTHvImmb6G9R2mRmKU06dJAd+zXYuWnxKdfvXymO4lLjxASIZV7mnr66z rxJAwlaktkgYCdSEWV9M+YdEeVYpOysJGx2IrXdekCPHkiElvH8b2qRDxt8sVYLz0/XQOM 2iIJnYU4peQKxWEA3FcR36swmSDx6gw9CktDBn6S+DIP5h1Gr6e/81K0d91YtA== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] readline: Change the VER parameter to also include the patch number Date: Wed, 28 Oct 2026 21:47:00 +0100 Message-ID: <20261028204700.2431586-2-adolf.belka@ipfire.org> In-Reply-To: <20261028204700.2431586-1-adolf.belka@ipfire.org> References: <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, 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 --- 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