From patchwork Fri Feb 12 17:59:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3890 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 (P-384) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Dch8S6LKyz3xCP for ; Fri, 12 Feb 2021 17:59: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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Dch8R5NX4z1yJ; Fri, 12 Feb 2021 17:59:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Dch8R4Ys5z2xkB; Fri, 12 Feb 2021 17:59:19 +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 RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Dch8P4ggvz2xkB for ; Fri, 12 Feb 2021 17:59: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 (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Dch8P1DBKz1yJ; Fri, 12 Feb 2021 17:59:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1613152757; 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=9E6wIF43iwMxsfWCIzxJECXlatQ39vEH1TPKMeeXg1Y=; b=RK4hPMXHUpDuHP2qkUmryO5nDy+vDEd4gkde72D3deW7B/LqyBLZIt69Z80grVkFCQ1Zrf gpT7lXjpmkBArxCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1613152757; 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=9E6wIF43iwMxsfWCIzxJECXlatQ39vEH1TPKMeeXg1Y=; b=mGcFLXKA7YWSg54hD/UgxBrXjCFX2Oxma28ZrgZMK1VyZ5YbC3ReF9pTcEJj2KMP/ktK4j 3CUPfJsaWEt1Wl2AGVL+7w86geO49oCe1jLQnBobx7nuVw65+5pE4U4IZOL68FfeGMg8dR 3nZW2jygIDDrab7gI4dNiIRg3ACvAirT3NZpLf1nPeJ5W8xxWkjsWDydxB0WlATZJieRX+ Dt+T54MJcxNv9WXUstdpUhPXl1kjyMRugFZ0PJw5FcK2QOgRutK/3u3/3wgymUB7uKnrmW 9A94qAk2kwy9xd4AIH4zq7j/7C0Zq3Blu8fHqBiV7yCK4kn/z67demW4gyt7yA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2] sysvinit: Update to 2.98 Date: Fri, 12 Feb 2021 18:59:15 +0100 Message-Id: <20210212175915.3661427-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" - Update sysvinit from 2.88dsf to 2.98 - From version 2.89 mounpoint build was not enabled as standard - Patch created to modify Makefile to define mountpoint to be built - Update of rootfiles - Changelog is ~400 lines long from 2.88dsf to 2.98 - For details see the Changelog in the doc directory in the tarball Signed-off-by: Adolf Belka --- config/rootfiles/common/sysvinit | 4 ++++ lfs/sysvinit | 7 ++++--- src/patches/sysvinit-2.98_build_mountpoint.patch | 12 ++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src/patches/sysvinit-2.98_build_mountpoint.patch diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index ede5aa50d..0b389a7c3 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -1,5 +1,6 @@ bin/mountpoint bin/pidof +#etc/inittab.d #sbin/bootlogd #sbin/fstab-decode sbin/halt @@ -14,6 +15,7 @@ sbin/telinit usr/bin/last usr/bin/lastb usr/bin/mesg +#usr/bin/readbootlog usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h @@ -21,8 +23,10 @@ usr/bin/wall #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 #usr/share/man/man1/mountpoint.1 +#usr/share/man/man1/readbootlog.1 #usr/share/man/man1/utmpdump.1 #usr/share/man/man1/wall.1 +#usr/share/man/man5/initctl.5 #usr/share/man/man5/initscript.5 #usr/share/man/man5/inittab.5 #usr/share/man/man8/bootlogd.8 diff --git a/lfs/sysvinit b/lfs/sysvinit index 0306b5518..e7b715ea4 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -24,10 +24,10 @@ include Config -VER = 2.88dsf +VER = 2.98 THISAPP = sysvinit-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f +$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59 install : $(TARGET) @@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Newer C libraries omit this include from sys/types.h. # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys\/stat.h/a#include \n" cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-2.98_build_mountpoint.patch new file mode 100644 index 000000000..719eff558 --- /dev/null +++ b/src/patches/sysvinit-2.98_build_mountpoint.patch @@ -0,0 +1,12 @@ +diff -aup sysvinit-2.98/src/Makefile.orig sysvinit-2.98/src/Makefile +--- sysvinit-2.98/src/Makefile.orig 2021-02-12 14:31:56.325112868 +0100 ++++ sysvinit-2.98/src/Makefile 2021-02-12 14:31:56.257086870 +0100 +@@ -19,7 +19,7 @@ MANDB := s@^\('\\\\\"\)[^\*-]*-\*- codin + # Leave empty if the mountpoint(1) command from util-linux 2.20 + # and above should be used, otherwise set it to yes. + # +-MNTPOINT= ++MNTPOINT=yes + + # For some known distributions we do not build all programs, otherwise we do. + BIN =