From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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
Content-Type: multipart/mixed; boundary="===============2991145547909385515=="
List-Id: <development.lists.ipfire.org>

--===============2991145547909385515==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- 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 <adolf.belka(a)ipfire.org>
---
 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 @@
=20
 include Config
=20
-VER        =3D 0.2
+VER        =3D 1.17
=20
 THISAPP    =3D ed-$(VER)
-DL_FILE    =3D $(THISAPP).tar.gz
+DL_FILE    =3D $(THISAPP).tar.lz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
@@ -35,13 +35,11 @@ TARGET     =3D $(DIR_INFO)/$(THISAPP)
 ############################################################################=
###
 # Top-level Rules
 ############################################################################=
###
-objects =3D $(DL_FILE) $(THISAPP)-mkstemp-1.patch
+objects =3D $(DL_FILE)
=20
 $(DL_FILE)                     =3D $(DL_FROM)/$(DL_FILE)
-$(THISAPP)-mkstemp-1.patch     =3D $(DL_FROM)/$(THISAPP)-mkstemp-1.patch
=20
-$(DL_FILE)_MD5                 =3D ddd57463774cae9b50e70cd51221281b
-$(THISAPP)-mkstemp-1.patch_MD5 =3D e7e2248f9baa76de3db8210298e0d79e
+$(DL_FILE)_MD5                 =3D 894748c9bbf35cb7c599f5317b1a8cdb
=20
 install : $(TARGET)
=20
@@ -70,8 +68,7 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(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=3D/usr --exec-prefix=3D"" --disable-n=
ls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
--=20
2.31.0


--===============2991145547909385515==--