Hi Michael,
On 30/08/2023 18:26, Michael Tremer wrote:
Hello Adolf,
Thanks for all the updates of the day :)
On 30 Aug 2023, at 15:17, Adolf Belka adolf.belka@ipfire.org wrote:
- 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.
This isn’t good.
- 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.
Better, but still not too good. But I suppose this is software that should not need any further development...
- This is as up to date as there is currently available.
There is a small problem here as it seems that xinetd will now look for its configuration in /usr/etc when it should be just /etc.
I missed that.
Could you please try adding —-sysconfdir=/etc or /etc/xinetd.d (more likely the first one) so that we will keep the configuration in the right place.
I checked the 2.3.15 and 2.3.15.4 configure files and both have sysconfdir defined as $prefix/etc so both should end up with the configuration stuff in /usr/etc but with 2.3.15 the configuration files are not created and put into the rootfile. The xinetd.conf comes from IPFire's config/xinetd directory.
So clearly the existing xinetd configure is not running as it would be expected to.
Anyway, I will redo the xinetd build with sysconfdir defined so that the correct directory is looked for.
Regards, Adolf.
I merged all other patches as they were - as usual - flawless :)
Best, -Michael
Signed-off-by: Adolf Belka adolf.belka@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/xinetd 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
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,7 +83,7 @@ $(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) && make $(MAKETUNING) -- 2.42.0