diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index f97745760..d7a63e76a 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -20,6 +20,40 @@ usr/bin/mesg usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h +#usr/share/man/de/man1/last.1 +#usr/share/man/de/man1/mesg.1 +#usr/share/man/de/man1/mountpoint.1 +#usr/share/man/de/man1/readbootlog.1 +#usr/share/man/de/man1/utmpdump.1 +#usr/share/man/de/man1/wall.1 +#usr/share/man/de/man5 +#usr/share/man/de/man5/initctl.5 +#usr/share/man/de/man5/initscript.5 +#usr/share/man/de/man5/inittab.5 +#usr/share/man/de/man8 +#usr/share/man/de/man8/bootlogd.8 +#usr/share/man/de/man8/fstab-decode.8 +#usr/share/man/de/man8/halt.8 +#usr/share/man/de/man8/init.8 +#usr/share/man/de/man8/killall5.8 +#usr/share/man/de/man8/logsave.8 +#usr/share/man/de/man8/pidof.8 +#usr/share/man/de/man8/runlevel.8 +#usr/share/man/de/man8/shutdown.8 +#usr/share/man/de/man8/sulogin.8 +#usr/share/man/es +#usr/share/man/es/man5 +#usr/share/man/es/man5/initscript.5 +#usr/share/man/es/man5/inittab.5 +#usr/share/man/fr/man5 +#usr/share/man/fr/man5/initscript.5 +#usr/share/man/fr/man5/inittab.5 +#usr/share/man/fr/man8 +#usr/share/man/fr/man8/bootlogd.8 +#usr/share/man/fr/man8/fstab-decode.8 +#usr/share/man/fr/man8/init.8 +#usr/share/man/fr/man8/killall5.8 +#usr/share/man/fr/man8/pidof.8 #usr/share/man/man1/last.1 #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 @@ -43,3 +77,34 @@ usr/bin/wall #usr/share/man/man8/shutdown.8 #usr/share/man/man8/sulogin.8 #usr/share/man/man8/telinit.8 +#usr/share/man/pl +#usr/share/man/pl/man5 +#usr/share/man/pl/man5/initscript.5 +#usr/share/man/pl/man5/inittab.5 +#usr/share/man/pl/man8 +#usr/share/man/pl/man8/init.8 +#usr/share/man/pl/man8/killall5.8 +#usr/share/man/pl/man8/pidof.8 +#usr/share/man/pt +#usr/share/man/pt/man1 +#usr/share/man/pt/man1/last.1 +#usr/share/man/pt/man1/mesg.1 +#usr/share/man/pt/man1/mountpoint.1 +#usr/share/man/pt/man1/readbootlog.1 +#usr/share/man/pt/man1/utmpdump.1 +#usr/share/man/pt/man1/wall.1 +#usr/share/man/pt/man5 +#usr/share/man/pt/man5/initctl.5 +#usr/share/man/pt/man5/initscript.5 +#usr/share/man/pt/man5/inittab.5 +#usr/share/man/pt/man8 +#usr/share/man/pt/man8/bootlogd.8 +#usr/share/man/pt/man8/fstab-decode.8 +#usr/share/man/pt/man8/halt.8 +#usr/share/man/pt/man8/init.8 +#usr/share/man/pt/man8/killall5.8 +#usr/share/man/pt/man8/logsave.8 +#usr/share/man/pt/man8/pidof.8 +#usr/share/man/pt/man8/runlevel.8 +#usr/share/man/pt/man8/shutdown.8 +#usr/share/man/pt/man8/sulogin.8 diff --git a/lfs/sysvinit b/lfs/sysvinit index ec0a5c292..4da1b185e 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.00 +VER = 3.08 THISAPP = sysvinit-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = d1c4e509d7c13cf0fb9da290f875e7c0ab0666d843d75d4dd6885112248a859dd077bdf9cc926c4af58473da99a5229bb879c7094afd648d5ebe72597a3ba6a7 +$(DL_FILE)_BLAKE2 = ec4a4ff3663ac7d67808b50b67631ff4fe1ab56d376df15868df0eb79cbc329b192af124380eec6a797d827c3c7c5586058310d803f42ee1934dcffbfbe876f7 install : $(TARGET) @@ -70,14 +70,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @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) && patch -Np1 < $(DIR_SRC)/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.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 - cd $(DIR_APP) && make $(MAKETUNING) -C src - cd $(DIR_APP) && make -C src install + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-3.08_build_mountpoint.patch + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch deleted file mode 100644 index ee6f621b5..000000000 --- a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- sysvinit-3.00/src/sulogin.c~ 2022-08-09 09:43:41.993484098 +0000 -+++ sysvinit-3.00/src/sulogin.c 2022-08-09 09:45:04.897252500 +0000 -@@ -51,7 +51,6 @@ - #ifdef __linux__ - # include - # include --# include - # include - # include - # ifndef TMPFS_MAGIC diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-3.08_build_mountpoint.patch similarity index 100% rename from src/patches/sysvinit-2.98_build_mountpoint.patch rename to src/patches/sysvinit-3.08_build_mountpoint.patch