From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] xinetd: Update to version 2.3.15.4
Date: Wed, 30 Aug 2023 16:17:42 +0200
Message-ID: <20230830141742.2723629-11-adolf.belka@ipfire.org>
In-Reply-To: <20230830141742.2723629-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5675188942744138565=="
List-Id: <development.lists.ipfire.org>

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

- Update from version 2.3.15 (2012) to 2.3.15.4 (2018)
- Update of rootfile.
- The original site for xinetd is no longer accessible.
- Version 2.3.15 was the last version from  https://github.com/xinetd-org/xin=
etd
   OpenSUSE have forked the repo and have provided 2.3.15.3 and 2.3.15.4 to c=
ollect a range
    of patches together from openSUSE, Debian, Fedora, Gentoo etc.
   Last bug fix was done on this github repo in Sep 2022 and the last commit =
in Oct 2022.
- This is as up to date as there is currently available.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/packages/xinetd | 28 +++++++++++++++++++++-------
 lfs/xinetd                       | 10 +++++-----
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/config/rootfiles/packages/xinetd b/config/rootfiles/packages/xin=
etd
index e007e1955..63d414511 100644
--- a/config/rootfiles/packages/xinetd
+++ b/config/rootfiles/packages/xinetd
@@ -1,10 +1,24 @@
 etc/rc.d/init.d/xinetd
 etc/xinetd.conf
-#usr/man/man5/xinetd.conf.5
-#usr/man/man8/itox.8
-#usr/man/man8/xconv.pl.8
-#usr/man/man8/xinetd.8
-#usr/man/man8/xinetd.log.8
-#usr/sbin/itox
-#usr/sbin/xconv.pl
+#usr/bin/itox
+#usr/bin/xconv.pl
+#usr/etc/xinetd.conf
+#usr/etc/xinetd.d
+#usr/etc/xinetd.d/chargen
+#usr/etc/xinetd.d/chargen-udp
+#usr/etc/xinetd.d/daytime
+#usr/etc/xinetd.d/daytime-udp
+#usr/etc/xinetd.d/discard
+#usr/etc/xinetd.d/discard-udp
+#usr/etc/xinetd.d/echo
+#usr/etc/xinetd.d/echo-udp
+#usr/etc/xinetd.d/servers
+#usr/etc/xinetd.d/services
+#usr/etc/xinetd.d/time
+#usr/etc/xinetd.d/time-udp
 usr/sbin/xinetd
+#usr/share/man/man5/xinetd.conf.5
+#usr/share/man/man5/xinetd.log.5
+#usr/share/man/man8/itox.8
+#usr/share/man/man8/xconv.pl.8
+#usr/share/man/man8/xinetd.8
diff --git a/lfs/xinetd b/lfs/xinetd
index 6c1cbecfc..aeee9ef36 100644
--- a/lfs/xinetd
+++ b/lfs/xinetd
@@ -26,15 +26,15 @@ include Config
=20
 SUMMARY    =3D An 'inetd' with Expanded Functionality
=20
-VER        =3D 2.3.15
+VER        =3D 2.3.15.4
=20
 THISAPP    =3D xinetd-$(VER)
-DL_FILE    =3D $(THISAPP).tar.gz
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D xinetd
-PAK_VER    =3D 4
+PAK_VER    =3D 5
=20
 DEPS       =3D
=20
@@ -50,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d47=
16325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419
+$(DL_FILE)_BLAKE2 =3D e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a=
1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d
=20
 install : $(TARGET)
=20
@@ -83,7 +83,7 @@ $(subst %,%_BLAKE2,$(objects)) :
=20
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure --prefix=3D/usr
 	cd $(DIR_APP) && make $(MAKETUNING)
--=20
2.42.0


--===============5675188942744138565==--