From patchwork Mon Mar 29 11:44:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3995 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4F89jc1SnYz3wrV for ; Mon, 29 Mar 2021 11:44:52 +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 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4F89jb64Jsz1TT; Mon, 29 Mar 2021 11:44:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4F89jb5LLvz2xkF; Mon, 29 Mar 2021 11:44:51 +0000 (UTC) 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4F89jZ0kwsz2xdN for ; Mon, 29 Mar 2021 11:44:50 +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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4F89jY58BHz1TG; Mon, 29 Mar 2021 11:44:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1617018289; 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=pMaFfMvagK1xPzRYHHndikg9yGbh6MB079Cak/lRB6M=; b=WoL0gAZ5HpyVDRtBGlYkoTpBzDuOK0WvdbKaP+TGi/JZg/5DWq7YiGHVnmW3P8wj410hJR JpGcjxYLOuemxHAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1617018289; 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=pMaFfMvagK1xPzRYHHndikg9yGbh6MB079Cak/lRB6M=; b=Xu6Pd43jvJ/Mx06WBT+kRVaf2t3xkzCISCVE8nRuWMjKnYg3theqCPqcmmnRYo/+KNa3/A J6SS7HRdPCQeaIp5x4RnMbIDs0UTLQcaA4iKO+hLAnbO9sz+8pwt1sIVBjl+0f0tCoB3GP zHRXWZX7UkSYiomBKwrZDuJIqvBIPSlhA2Kn5PD+CVOtcxbXbWM2GNmu6e212LC1XDXWIT K73heQmD5ERIJFVQgvZM0TpucCfjZ49Joayx/xB4QEW+vA7zQPpkmjHycJU0InLVioPXsY qMqojXT8JSgI1tXlBY9VthKjEI3FXc7HYINn/Xz0qkihqeM8CS2fDHDH5Sf3OA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] ed: Update to 1.17 Date: Mon, 29 Mar 2021 13:44:47 +0200 Message-Id: <20210329114447.3758311-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 0.2 to 1.17 - Update of rootfile carried out - ed-0.2-mkstemp-1.patch from LFS is no longer required in later versions of ed or LFS - Changelog is a bit too long to add here. Full change log can be found by viewing ChangeLog file in tar sourceball Signed-off-by: Adolf Belka --- config/rootfiles/common/ed | 7 +++---- lfs/ed | 13 +++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/common/ed b/config/rootfiles/common/ed index 0779fcfe1..55e16d813 100644 --- a/config/rootfiles/common/ed +++ b/config/rootfiles/common/ed @@ -1,6 +1,5 @@ #bin/ed #bin/red -#usr/info -#usr/info/ed.info -#usr/man/man1/ed.1 -#usr/man/man1/red.1 +#usr/share/info/ed.info +#usr/share/man/man1/ed.1 +#usr/share/man/man1/red.1 diff --git a/lfs/ed b/lfs/ed index d628a029b..b2f2dd8fe 100644 --- a/lfs/ed +++ b/lfs/ed @@ -24,10 +24,10 @@ include Config -VER = 0.2 +VER = 1.17 THISAPP = ed-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.lz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -35,13 +35,11 @@ TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-mkstemp-1.patch +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(THISAPP)-mkstemp-1.patch = $(DL_FROM)/$(THISAPP)-mkstemp-1.patch -$(DL_FILE)_MD5 = ddd57463774cae9b50e70cd51221281b -$(THISAPP)-mkstemp-1.patch_MD5 = e7e2248f9baa76de3db8210298e0d79e +$(DL_FILE)_MD5 = 894748c9bbf35cb7c599f5317b1a8cdb install : $(TARGET) @@ -70,8 +68,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-mkstemp-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --exec-prefix="" --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install