From patchwork Thu Aug 31 11:01:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7144 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 (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rbyrw2K2yz3wtG for ; Thu, 31 Aug 2023 11:01:20 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rbyrt5j4Czv0; Thu, 31 Aug 2023 11:01:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rbyrt4frnz2yRd; Thu, 31 Aug 2023 11:01:18 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rbyrs06pLz2xhG for ; Thu, 31 Aug 2023 11:01:17 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rbyrr1vNvzhS; Thu, 31 Aug 2023 11:01:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1693479676; 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=a48pca4FvFg/bS5Jd9Ex+2XyBU6EghaR+L/nlY0XsCQ=; b=dXCwE6BMJ6GAXX5s5EdszTkfvtf8FTIlN4tuHDbSHJhclwaSE8mpQsxbq+vO//lhbh/xw6 761fQincb2IRH5CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1693479676; 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=a48pca4FvFg/bS5Jd9Ex+2XyBU6EghaR+L/nlY0XsCQ=; b=QQx2ztRbofDz2bTDli/brWNyC8ARK9ewjg3TcdkxWcHsl251kbimEA2RtFXIG56ogsSPkJ gLU9Vmb/yxTEkfrUdvynvfDTBtlDLK5d422SAR1JlxfsRJo/KeQdsqAcrUipditn1DR7F+ 7qUD1sy85ECz7pGUDggZtfd33N76JsoIwIvJamv82kbPNgLPmPkHb5r3zag4/d3rjfyqAf vUNi1tjmyNBjgQG2OY7k7+EWh9WM3U8gSyUbBBRCSkqJnVVa8a3vY7RjbvBDAZAok8I/UW VvFL1gwNFYhiEaBOD+PS4pHkCrKH2/F+GSchw+y4kKPyOKe6vmqAkX9FlZuZTg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2] xinetd: Update to version 2.3.15.4 Date: Thu, 31 Aug 2023 13:01:08 +0200 Message-ID: <20230831110108.2135834-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" - 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 --- 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