- This is v2 version of this patch with the locations for the sysconf and binaries corrected so that all files are in the same locations as they were with version 2.3.15 Added sysconfdir and bindir to the configure options to achieve this. - 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/xinetd OpenSUSE have forked the repo and have provided 2.3.15.3 and 2.3.15.4 to collect 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@ipfire.org --- config/rootfiles/packages/xinetd | 23 ++++++++++++++++++----- lfs/xinetd | 15 +++++++++------ 2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/config/rootfiles/packages/xinetd b/config/rootfiles/packages/xinetd index e007e1955..d92c0e30f 100644 --- a/config/rootfiles/packages/xinetd +++ b/config/rootfiles/packages/xinetd @@ -1,10 +1,23 @@ 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 +#etc/xinetd.d +#etc/xinetd.d/chargen +#etc/xinetd.d/chargen-udp +#etc/xinetd.d/daytime +#etc/xinetd.d/daytime-udp +#etc/xinetd.d/discard +#etc/xinetd.d/discard-udp +#etc/xinetd.d/echo +#etc/xinetd.d/echo-udp +#etc/xinetd.d/servers +#etc/xinetd.d/services +#etc/xinetd.d/time +#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..f49aa1449 100644 --- a/lfs/xinetd +++ b/lfs/xinetd @@ -26,15 +26,15 @@ include Config
SUMMARY = An 'inetd' with Expanded Functionality
-VER = 2.3.15 +VER = 2.3.15.4
THISAPP = xinetd-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = xinetd -PAK_VER = 4 +PAK_VER = 5
DEPS =
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 +$(DL_FILE)_BLAKE2 = e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d
install : $(TARGET)
@@ -83,9 +83,12 @@ $(subst %,%_BLAKE2,$(objects)) :
$(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=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --bindir=/usr/sbin cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -mkdir -pv /etc/xinetd.d