Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sysvinit for openSUSE:Factory checked in at 2025-01-12 11:10:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysvinit (Old) and /work/SRC/openSUSE:Factory/.sysvinit.new.1881 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysvinit" Sun Jan 12 11:10:13 2025 rev:186 rq:1236152 version:3.13 Changes: -------- --- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2024-10-31 16:09:14.758760025 +0100 +++ /work/SRC/openSUSE:Factory/.sysvinit.new.1881/sysvinit.changes 2025-01-12 11:10:43.941980725 +0100 @@ -1,0 +2,29 @@ +Thu Jan 9 10:50:10 UTC 2025 - Dr. Werner Fink <[email protected]> + +- Update to sysvinit 3.31 + * Adjusted manual page install location. Patch provided + by Mark Hindley. + sysvinit (3.12) released; urgency=low + * There were instances of the ctime() function being called in multiple files without + checking the return value (can be NULL) and without checking the length of the + returned information. While there _should_ never be a case where ctime() fails + assuming success and length of returned string isn't ideal (or future-proof). + We now check the return value of ctime() in bootlogd, dowall, last, logsave, and + shutdown. Where no valid value is returned we supply a dummy value (usually a + space in place of the expected time stamp). We also no longer assume returned string + is at least 11-16 characters. + * Re-commit flexible Makefile for GoboLinux. + * Make sure pty.h and sys/sysmacros.h are included when building bootlogd on + systems with glibc. + * Fixed typos and syntax in manual page for init.8. + Edits provided by : Bjarni Ingi Gislason. + * Allow setting of location of the /usr directory in src/Makefile. + This is handled by the usrdir variable. + * Make sure src/Makefile uses sysconfdir (/etc by default) when installing + configuration files. + * Fix typos and syntax in pidof manual page. +- Port patches + * sysvinit-2.88dsf-suse.patch + * sysvinit-2.90.dif + +------------------------------------------------------------------- Old: ---- sysvinit-3.11.tar.xz sysvinit-3.11.tar.xz.sig New: ---- sysvinit-3.13.tar.xz sysvinit-3.13.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysvinit.spec ++++++ --- /var/tmp/diff_new_pack.84iJtO/_old 2025-01-12 11:10:44.738013482 +0100 +++ /var/tmp/diff_new_pack.84iJtO/_new 2025-01-12 11:10:44.742013647 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysvinit # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ Name: sysvinit %define KPVER 2.23 -%define SIVER 3.11 +%define SIVER 3.13 %define START 0.65 Version: %{SIVER} Release: 0 @@ -89,7 +89,7 @@ %setup -n %{name}-%{SIVER} -q -b 1 -b 2 %patch -P 2 -p0 -b .suse %patch -P 9 -p0 -b .no-kill -%patch -P 0 +%patch -P 0 -b .p0 pushd doc mkdir killproc popd ++++++ sysvinit-2.88dsf-suse.patch ++++++ --- /var/tmp/diff_new_pack.84iJtO/_old 2025-01-12 11:10:44.782015293 +0100 +++ /var/tmp/diff_new_pack.84iJtO/_new 2025-01-12 11:10:44.786015457 +0100 @@ -17,8 +17,8 @@ Miquel van Smoorenburg --- man/pidof.8 +++ man/pidof.8 2022-03-29 07:06:43.889930825 +0000 -@@ -102,6 +102,7 @@ The \fB\-z\fP flag (see above) tells \fB - processes, at the risk of failing or hanging. +@@ -115,6 +115,7 @@ The \fB\-z\fP flag (see above) tells \fB + at the risk of failing or hanging. .SH SEE ALSO +.BR pidofproc (8), ++++++ sysvinit-2.90.dif ++++++ --- /var/tmp/diff_new_pack.84iJtO/_old 2025-01-12 11:10:44.802016116 +0100 +++ /var/tmp/diff_new_pack.84iJtO/_new 2025-01-12 11:10:44.806016280 +0100 @@ -1,9 +1,9 @@ --- - src/Makefile | 25 ++++++++----------------- - 1 file changed, 8 insertions(+), 17 deletions(-) + src/Makefile | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) --- src/Makefile -+++ src/Makefile 2023-05-12 13:30:54.143754871 +0200 ++++ src/Makefile 2025-01-09 10:46:54.490430980 +0000 @@ -9,7 +9,7 @@ # @@ -44,19 +44,18 @@ MANDB := endif -@@ -210,13 +206,8 @@ install: all - # $(INSTALL_DIR) $(ROOT)/etc/ - $(INSTALL_DIR) $(ROOT)/etc/inittab.d - # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ -- ln -sf halt $(ROOT)/sbin/reboot -- ln -sf halt $(ROOT)/sbin/poweroff -- ln -sf init $(ROOT)/sbin/telinit -+ ln -sf killall5 $(ROOT)/sbin/pidof - ln -sf ../sbin/killall5 $(ROOT)/bin/pidof -- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ -- ln -sf last $(ROOT)/usr/bin/lastb; \ +@@ -213,13 +209,7 @@ install: all + # $(INSTALL_DIR) $(ROOT)/$(sysconfdir)/ + $(INSTALL_DIR) $(ROOT)/$(sysconfdir)/inittab.d + # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/$(sysconfdir)/ +- ln -sf halt $(ROOT)$(base_sbindir)/reboot +- ln -sf halt $(ROOT)$(base_sbindir)/poweroff +- ln -sf init $(ROOT)$(base_sbindir)/telinit + ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof +- if [ ! -f $(ROOT)$(bindir)/lastb ]; then \ +- ln -sf last $(ROOT)$(bindir)/lastb; \ - fi - $(INSTALL_DIR) $(ROOT)/usr/include/ - $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ - for man in $(MANPAGES) ; do \ + $(INSTALL_DIR) $(ROOT)$(includedir)/ + $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/ + for lang in '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \ ++++++ sysvinit-3.11.tar.xz -> sysvinit-3.13.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/doc/Changelog new/sysvinit-3.13/doc/Changelog --- old/sysvinit-3.11/doc/Changelog 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/doc/Changelog 2025-01-03 22:09:46.000000000 +0100 @@ -1,3 +1,38 @@ +sysvinit (3.13) released; urgency=low + + * Adjusted manual page install location. Patch provided + by Mark Hindley. + + +sysvinit (3.12) released; urgency=low + + * There were instances of the ctime() function being called in multiple files without + checking the return value (can be NULL) and without checking the length of the + returned information. While there _should_ never be a case where ctime() fails + assuming success and length of returned string isn't ideal (or future-proof). + We now check the return value of ctime() in bootlogd, dowall, last, logsave, and + shutdown. Where no valid value is returned we supply a dummy value (usually a + space in place of the expected time stamp). We also no longer assume returned string + is at least 11-16 characters. + + * Re-commit flexible Makefile for GoboLinux. + + * Make sure pty.h and sys/sysmacros.h are included when building bootlogd on + systems with glibc. + + * Fixed typos and syntax in manual page for init.8. + Edits provided by : Bjarni Ingi Gislason. + + * Allow setting of location of the /usr directory in src/Makefile. + This is handled by the usrdir variable. + + * Make sure src/Makefile uses sysconfdir (/etc by default) when installing + configuration files. + + * Fix typos and syntax in pidof manual page. + + + sysvinit (3.11) released; urgency=low * Some escape characters were included in the inittab manual page, but not displayed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/man/init.8 new/sysvinit-3.13/man/init.8 --- old/sysvinit-3.11/man/init.8 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/man/init.8 2025-01-03 22:09:46.000000000 +0100 @@ -26,14 +26,14 @@ .\"{{{ Synopsis .SH SYNOPSIS .B /sbin/init -.RB [ " -a " ] -.RB [ " -s " ] -.RB [ " -b " ] +.RB [ " \-a " ] +.RB [ " \-s " ] +.RB [ " \-b " ] [ \fB\-z\fP \fIxxx\fP ] .RB [ " 0123456Ss " ] .br .B /sbin/init -.RB [ " --version " ] +.RB [ " \-\-version " ] .br .B /sbin/telinit [ \fB\-t\fP \fISECONDS\fP ] @@ -52,14 +52,14 @@ \fBinittab\fR(5)). This file usually has entries which cause \fBinit\fR to spawn \fBgetty\fRs on each line that users can log in. It also controls autonomous processes required by any particular system. -.PP +. .\"{{{ Runlevels .SH RUNLEVELS A \fIrunlevel\fR is a software configuration of the system which allows only a selected group of processes to exist. The processes spawned by \fBinit\fR for each of these runlevels are defined in the \fI/etc/inittab\fR file. \fBinit\fR can be in one of eight runlevels: -\fB0\(en6\fP and \fBS\fP (a.k.a. \fBs\fP). The runlevel is +\fB0\(en6\fP and \fBS\fP (a.k.a., \fBs\fP). The runlevel is changed by having a privileged user run \fBtelinit\fP, which sends appropriate signals to \fBinit\fP, telling it which runlevel to change to. @@ -83,38 +83,40 @@ For more information, see the manpages for \fBshutdown\fP(8) and \fBinittab\fP(5). .PP -Runlevels 7-9 are also valid, though not really documented. This is -because "traditional" Unix variants don't use them. +Runlevels 7\(en9 are also valid, though not really documented. +This is because "traditional" Unix variants don't use them. .PP Runlevels \fIS\fP and \fIs\fP are the same. Internally they are aliases for the same runlevel. .\"}}} -.PP +. .SH BOOTING After \fBinit\fP is invoked as the last step of the kernel boot sequence, it looks for the file \fI/etc/inittab\fP to see if there is an entry of the -type \fBinitdefault\fP (see \fBinittab\fR(5)). The \fBinitdefault\fP entry -determines the initial runlevel of the system. If there is no such -entry (or no \fI/etc/inittab\fR at all), a runlevel must be -entered at the system console. +type \fBinitdefault\fP (see \fBinittab\fR(5)). +The \fBinitdefault\fP entry determines the initial runlevel of the system. +If there is no such entry +(or no \fI/etc/inittab\fR at all), +a runlevel must be entered at the system console. .PP Runlevel \fBS\fP or \fBs\fP initialize the system and do not require an \fI/etc/inittab\fP file. .PP In single user mode, \fB/sbin/sulogin\fP is invoked on \fI/dev/console\fP. .PP -When entering single user mode, \fBinit\fP initializes the consoles -\fBstty\fP settings to sane values. Clocal mode is set. Hardware -speed and handshaking are not changed. +When entering single user mode, +\fBinit\fP initializes the consoles \fBstty\fP settings to sane values. +Clocal mode is set. +Hardware speed and handshaking are not changed. .PP When entering a multi-user mode for the first time, \fBinit\fP performs the \fBboot\fP and \fBbootwait\fP entries to allow file systems to be mounted before users can log in. Then all entries matching the runlevel are processed. .PP -When starting a new process, \fBinit\fP first checks whether the file -\fI/etc/initscript\fP exists. If it does, it uses this script to -start the process. +When starting a new process, +\fBinit\fP first checks whether the file \fI/etc/initscript\fP exists. +If it does, it uses this script to start the process. .PP Each time a child terminates, \fBinit\fP records the fact and the reason it died in \fI/var/run/utmp\fP and \fI/var/log/wtmp\fP, @@ -122,34 +124,37 @@ .SH CHANGING RUNLEVELS After it has spawned all of the processes specified, \fBinit\fP waits for one of its descendant processes to die, a powerfail signal, or until -it is signaled by \fBtelinit\fP to change the system's runlevel. +it is signaled by \fBtelinit\fP to change the system's runlevel. When one of the above three conditions occurs, it re-examines the \fI/etc/inittab\fP file. New entries can be added to this file at any time. However, \fBinit\fP still waits for one of the above three -conditions to occur. To provide for an instantaneous response, the -\fBtelinit Q\fP or \fBq\fP command can wake up \fBinit\fP to re-examine (reload) the -\fI/etc/inittab\fP file. +conditions to occur. +To provide for an instantaneous response, +the \fBtelinit Q\fP or \fBq\fP command can wake up \fBinit\fP to re-examine +(reload) the \fI/etc/inittab\fP file. .PP If \fBinit\fP is not in single user mode and receives a powerfail -signal (SIGPWR), it reads the file \fI/etc/powerstatus\fP. It then starts -a command based on the contents of this file: +signal (SIGPWR), +it reads the file \fI/etc/powerstatus\fP. +It then starts a command based on the contents of this file: .IP F(AIL) -Power is failing, UPS is providing the power. Execute the \fBpowerwait\fP -and \fBpowerfail\fP entries. +Power is failing, +UPS is providing the power. +Execute the \fBpowerwait\fP and \fBpowerfail\fP entries. .IP O(K) The power has been restored, execute the \fBpowerokwait\fP entries. .IP L(OW) -The power is failing and the UPS has a low battery. Execute the -\fBpowerfailnow\fP entries. +The power is failing and the UPS has a low battery. +Execute the \fBpowerfailnow\fP entries. .PP If \fI/etc/powerstatus\fR doesn't exist or contains anything else then the letters \fBF\fP, \fBO\fP or \fBL\fP, \fBinit\fR will behave as if it has read the letter \fBF\fP. .PP -Usage of \fBSIGPWR\fP and \fI/etc/powerstatus\fP is discouraged. Someone -wanting to interact with \fBinit\fP should use the \fI/run/initctl\fP -control channel - see the \fBinitctl\fR(5) manual page for more documentation -about this. +Usage of \fBSIGPWR\fP and \fI/etc/powerstatus\fP is discouraged. +Someone wanting to interact with \fBinit\fP should use the \fI/run/initctl\fP +control channel \(en +see the \fBinitctl\fR(5) manual page for more documentation about this. .PP When \fBinit\fP is requested to change the runlevel, it sends the warning signal \fBSIGTERM\fP to all processes that are undefined @@ -177,18 +182,19 @@ .IP "\fBS\fP or \fBs\fP" tell \fBinit\fP to switch to single user mode. .IP "\fBU\fP or \fBu\fP" -tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of -\fI/etc/inittab\fP file happens. Runlevel should be one of -\fBSs0123456\fP +tell \fBinit\fP to re-execute itself (preserving the state). +No re-examining of \fI/etc/inittab\fP file happens. +Runlevel should be one of \fBSs0123456\fP otherwise request would be silently ignored. .PP \fBtelinit\fP can tell \fBinit\fP how long it should wait -between sending processes the \fBSIGTERM\fR and \fBSIGKILL\fR signals. The default -is 3 seconds, but this can be changed with the \fB-t\fP option. +between sending processes the \fBSIGTERM\fR and \fBSIGKILL\fR signals. +The default is 3 seconds, +but this can be changed with the \fB\-t\fP option. .PP -\fBtelinit -e\fP tells \fBinit\fP to change the environment +\fBtelinit \-e\fP tells \fBinit\fP to change the environment for processes it spawns. -The argument of \fB-e\fP is either of the form \fIVAR\fP=\fIVAL\fP +The argument of \fB\-e\fP is either of the form \fIVAR\fP=\fIVAL\fP which sets variable \fIVAR\fP to value \fIVAL\fP, or of the form \fIVAR\fP (without an equality sign) @@ -199,7 +205,7 @@ .PP The \fBinit\fP binary checks if it is \fBinit\fP or \fBtelinit\fP by looking at its \fIprocess id\fP; the real \fBinit\fP's process id is always \fB1\fP. -From this it follows that instead of calling \fBtelinit\fP one can also +\&From this it follows that instead of calling \fBtelinit\fP one can also just use \fBinit\fP instead as a shortcut. .\"}}} .\"}}} @@ -208,93 +214,107 @@ .IP \fBPATH\fP \fI/bin:/usr/bin:/sbin:/usr/sbin\fP .IP \fBINIT_VERSION\fP -As the name says. Useful to determine if a script runs directly from \fBinit\fP. +As the name says. +Useful to determine if a script runs directly from \fBinit\fP. .IP \fBRUNLEVEL\fP The current system runlevel. .IP \fBPREVLEVEL\fP The previous runlevel (useful after a runlevel switch). .IP \fBCONSOLE\fP -The system console. This is really inherited from the kernel; however +The system console. +This is really inherited from the kernel; however if it is not set \fBinit\fP will set it to \fI/dev/console\fP by default. .SH BOOTFLAGS It is possible to pass a number of flags to \fBinit\fP from the -boot monitor (eg. LILO or GRUB). \fBinit\fP accepts the following flags: +boot monitor (e.g., LILO or GRUB). +\fBinit\fP accepts the following flags: .TP 0.5i -.B -s, S, single -Single user mode boot. In this mode \fI/etc/inittab\fP is -examined and the bootup rc scripts are usually run before -the single user mode shell is started. -.PP +.B \-s, S, single +Single user mode boot. +In this mode \fI/etc/inittab\fP is examined and +the bootup rc scripts are usually run before the single user mode shell is +started. +. .TP 0.5i -.B 1-5 +.B 1\(en5 Runlevel to boot into. -.PP +. .TP 0.5i -.B -b, emergency +.B \-b, emergency Boot directly into a single user shell without running any other startup scripts. -.PP +. .TP 0.5i -.B -a, auto +.B \-a, auto The LILO boot loader adds the word "auto" to the command line if it booted the kernel with the default command line (without user intervention). If this is found \fBinit\fP sets the "AUTOBOOT" environment -variable to "yes". Note that you cannot use this for any security -measures - of course the user could specify "auto" or \fB-a\fR on the +variable to "yes". +Note that you cannot use this for any security measures \(en +of course the user could specify "auto" or \fB\-a\fR on the command line manually. -.PP +. .TP 0.5i -.BI "-z " xxx -The argument to \fB-z\fP is ignored. You can use this to expand the command -line a bit, so that it takes some more space on the stack. \fBinit\fP -can then manipulate the command line so that \fBps\fP(1) shows -the current runlevel. -.PP +.BI "\-z " xxx +The argument to \fB\-z\fP is ignored. +You can use this to expand the command line a bit, +so that it takes some more space on the stack. +\fBinit\fP can then manipulate the command line +so that \fBps\fP(1) shows the current runlevel. +. .TP 0.5i .B \-\-version This argument, when used on its own, displays the current version of \fBinit\fP -to the console/stdout. It is a quick way to determine which \fBinit\fP software and -version is being used. After the version information is displayed, \fBinit\fP -immediately exits with a return code of zero. -.PP +to the console/stdout. +It is a quick way to determine which \fBinit\fP software and +version is being used. +After the version information is displayed, +\fBinit\fP immediately exits with a return code of zero. +. .SH INTERFACE \fBinit\fP listens on a \fIfifo\fP in /dev, \fI/run/initctl\fP, for messages. -\fBTelinit\fP uses this to communicate with \fBinit\fP. The interface is not -very well documented or finished. Those interested should study the -\fIinitreq.h\fP file in the \fIsrc/\fP subdirectory of the \fBinit\fP -source code tar archive. +\fBTelinit\fP uses this to communicate with \fBinit\fP. +The interface is not very well documented or finished. +Those interested should study the \fIinitreq.h\fP file in the \fIsrc/\fP +subdirectory of the \fBinit\fP source code tar archive. .SH SIGNALS Init reacts to several signals: .TP 0.5i .B SIGHUP Has the same effect as \fBtelinit q\fP. -.PP +. .TP 0.5i .B SIGUSR1 -On receipt of this signals, \fBinit\fP closes and re-opens its control fifo, -\fB/run/initctl\fP. Useful for bootscripts when \fI/dev\fP is remounted. +On receipt of this signals, +\fBinit\fP closes and re-opens its control fifo, +\fB/run/initctl\fP. +Useful for bootscripts when \fI/dev\fP is remounted. .TP 0.5i .B SIGUSR2 -When \fBinit\fP receives \fBSIGUSR2\fR, \fBinit\fP closes and leaves the control fifo, -\fB/run/initctl\fP, closed. This may be used to make sure \fBinit\fP is not -holding open any files. However, it also prevents \fBinit\fP from switching -runlevels. Which means commands like shutdown no longer work. +When \fBinit\fP receives \fBSIGUSR2\fR, +\fBinit\fP closes and leaves the control fifo, +\fB/run/initctl\fP, closed. +This may be used to make sure \fBinit\fP is not holding open any files. +However, it also prevents \fBinit\fP from switching runlevels. +Which means commands like shutdown no longer work. The fifo can be re-opened by sending \fBinit\fP the \fBSIGUSR1\fR signal. .TP 0.5i .B SIGINT Normally the kernel sends this signal to \fBinit\fP when CTRL-ALT-DEL is -pressed. It activates the \fIctrlaltdel\fP action. +pressed. +It activates the \fIctrlaltdel\fP action. .TP 0.5i .B SIGWINCH The kernel sends this signal when the \fIKeyboardSignal\fP key is hit. It activates the \fIkbrequest\fP action. \"{{{ Conforming to .SH CONFORMING TO -\fBinit\fP is compatible with the System V init. It works closely -together with the scripts in the directories +\fBinit\fP is compatible with the System V init. +It works closely together with the scripts in the directories \fI/etc/init.d\fP and \fI/etc/rc{runlevel}.d\fP. -If your system uses this convention, there should be a \fIREADME\fP -file in the directory \fI/etc/init.d\fP explaining how these scripts work. +If your system uses this convention, +there should be a \fIREADME\fP file in the directory \fI/etc/init.d\fP +explaining how these scripts work. .\"}}} .\"{{{ Files .SH FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/man/init.8.orig new/sysvinit-3.13/man/init.8.orig --- old/sysvinit-3.11/man/init.8.orig 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/man/init.8.orig 2025-01-03 22:09:46.000000000 +0100 @@ -26,14 +26,14 @@ .\"{{{ Synopsis .SH SYNOPSIS .B /sbin/init -.RB [ " -a " ] -.RB [ " -s " ] -.RB [ " -b " ] +.RB [ " \-a " ] +.RB [ " \-s " ] +.RB [ " \-b " ] [ \fB\-z\fP \fIxxx\fP ] .RB [ " 0123456Ss " ] .br .B /sbin/init -.RB [ " --version " ] +.RB [ " \-\-version " ] .br .B /sbin/telinit [ \fB\-t\fP \fISECONDS\fP ] @@ -52,14 +52,14 @@ \fBinittab\fR(5)). This file usually has entries which cause \fBinit\fR to spawn \fBgetty\fRs on each line that users can log in. It also controls autonomous processes required by any particular system. -.PP +. .\"{{{ Runlevels .SH RUNLEVELS A \fIrunlevel\fR is a software configuration of the system which allows only a selected group of processes to exist. The processes spawned by \fBinit\fR for each of these runlevels are defined in the \fI/etc/inittab\fR file. \fBinit\fR can be in one of eight runlevels: -\fB0\(en6\fP and \fBS\fP (a.k.a. \fBs\fP). The runlevel is +\fB0\(en6\fP and \fBS\fP (a.k.a., \fBs\fP). The runlevel is changed by having a privileged user run \fBtelinit\fP, which sends appropriate signals to \fBinit\fP, telling it which runlevel to change to. @@ -83,38 +83,40 @@ For more information, see the manpages for \fBshutdown\fP(8) and \fBinittab\fP(5). .PP -Runlevels 7-9 are also valid, though not really documented. This is -because "traditional" Unix variants don't use them. +Runlevels 7\(en9 are also valid, though not really documented. +This is because "traditional" Unix variants don't use them. .PP Runlevels \fIS\fP and \fIs\fP are the same. Internally they are aliases for the same runlevel. .\"}}} -.PP +. .SH BOOTING After \fBinit\fP is invoked as the last step of the kernel boot sequence, it looks for the file \fI/etc/inittab\fP to see if there is an entry of the -type \fBinitdefault\fP (see \fBinittab\fR(5)). The \fBinitdefault\fP entry -determines the initial runlevel of the system. If there is no such -entry (or no \fI/etc/inittab\fR at all), a runlevel must be -entered at the system console. +type \fBinitdefault\fP (see \fBinittab\fR(5)). +The \fBinitdefault\fP entry determines the initial runlevel of the system. +If there is no such entry +(or no \fI/etc/inittab\fR at all), +a runlevel must be entered at the system console. .PP Runlevel \fBS\fP or \fBs\fP initialize the system and do not require an \fI/etc/inittab\fP file. .PP In single user mode, \fB/sbin/sulogin\fP is invoked on \fI/dev/console\fP. .PP -When entering single user mode, \fBinit\fP initializes the consoles -\fBstty\fP settings to sane values. Clocal mode is set. Hardware -speed and handshaking are not changed. +When entering single user mode, +\fBinit\fP initializes the consoles \fBstty\fP settings to sane values. +Clocal mode is set. +Hardware speed and handshaking are not changed. .PP When entering a multi-user mode for the first time, \fBinit\fP performs the \fBboot\fP and \fBbootwait\fP entries to allow file systems to be mounted before users can log in. Then all entries matching the runlevel are processed. .PP -When starting a new process, \fBinit\fP first checks whether the file -\fI/etc/initscript\fP exists. If it does, it uses this script to -start the process. +When starting a new process, +\fBinit\fP first checks whether the file \fI/etc/initscript\fP exists. +If it does, it uses this script to start the process. .PP Each time a child terminates, \fBinit\fP records the fact and the reason it died in \fI/var/run/utmp\fP and \fI/var/log/wtmp\fP, @@ -122,34 +124,37 @@ .SH CHANGING RUNLEVELS After it has spawned all of the processes specified, \fBinit\fP waits for one of its descendant processes to die, a powerfail signal, or until -it is signaled by \fBtelinit\fP to change the system's runlevel. +it is signaled by \fBtelinit\fP to change the system's runlevel. When one of the above three conditions occurs, it re-examines the \fI/etc/inittab\fP file. New entries can be added to this file at any time. However, \fBinit\fP still waits for one of the above three -conditions to occur. To provide for an instantaneous response, the -\fBtelinit Q\fP or \fBq\fP command can wake up \fBinit\fP to re-examine (reload) the -\fI/etc/inittab\fP file. +conditions to occur. +To provide for an instantaneous response, +the \fBtelinit Q\fP or \fBq\fP command can wake up \fBinit\fP to re-examine +(reload) the \fI/etc/inittab\fP file. .PP If \fBinit\fP is not in single user mode and receives a powerfail -signal (SIGPWR), it reads the file \fI/etc/powerstatus\fP. It then starts -a command based on the contents of this file: +signal (SIGPWR), +it reads the file \fI/etc/powerstatus\fP. +It then starts a command based on the contents of this file: .IP F(AIL) -Power is failing, UPS is providing the power. Execute the \fBpowerwait\fP -and \fBpowerfail\fP entries. +Power is failing, +UPS is providing the power. +Execute the \fBpowerwait\fP and \fBpowerfail\fP entries. .IP O(K) The power has been restored, execute the \fBpowerokwait\fP entries. .IP L(OW) -The power is failing and the UPS has a low battery. Execute the -\fBpowerfailnow\fP entries. +The power is failing and the UPS has a low battery. +Execute the \fBpowerfailnow\fP entries. .PP If \fI/etc/powerstatus\fR doesn't exist or contains anything else then the letters \fBF\fP, \fBO\fP or \fBL\fP, \fBinit\fR will behave as if it has read the letter \fBF\fP. .PP -Usage of \fBSIGPWR\fP and \fI/etc/powerstatus\fP is discouraged. Someone -wanting to interact with \fBinit\fP should use the \fI/run/initctl\fP -control channel - see the \fBinitctl\fR(5) manual page for more documentation -about this. +Usage of \fBSIGPWR\fP and \fI/etc/powerstatus\fP is discouraged. +Someone wanting to interact with \fBinit\fP should use the \fI/run/initctl\fP +control channel \(en +see the \fBinitctl\fR(5) manual page for more documentation about this. .PP When \fBinit\fP is requested to change the runlevel, it sends the warning signal \fBSIGTERM\fP to all processes that are undefined @@ -177,18 +182,19 @@ .IP "\fBS\fP or \fBs\fP" tell \fBinit\fP to switch to single user mode. .IP "\fBU\fP or \fBu\fP" -tell \fBinit\fP to re-execute itself (preserving the state). No re-examining of -\fI/etc/inittab\fP file happens. Runlevel should be one of -\fBSs0123456\fP +tell \fBinit\fP to re-execute itself (preserving the state). +No re-examining of \fI/etc/inittab\fP file happens. +Runlevel should be one of \fBSs0123456\fP otherwise request would be silently ignored. .PP \fBtelinit\fP can tell \fBinit\fP how long it should wait -between sending processes the \fBSIGTERM\fR and \fBSIGKILL\fR signals. The default -is 3 seconds, but this can be changed with the \fB-t\fP option. +between sending processes the \fBSIGTERM\fR and \fBSIGKILL\fR signals. +The default is 3 seconds, +but this can be changed with the \fB\-t\fP option. .PP -\fBtelinit -e\fP tells \fBinit\fP to change the environment +\fBtelinit \-e\fP tells \fBinit\fP to change the environment for processes it spawns. -The argument of \fB-e\fP is either of the form \fIVAR\fP=\fIVAL\fP +The argument of \fB\-e\fP is either of the form \fIVAR\fP=\fIVAL\fP which sets variable \fIVAR\fP to value \fIVAL\fP, or of the form \fIVAR\fP (without an equality sign) @@ -199,7 +205,7 @@ .PP The \fBinit\fP binary checks if it is \fBinit\fP or \fBtelinit\fP by looking at its \fIprocess id\fP; the real \fBinit\fP's process id is always \fB1\fP. -From this it follows that instead of calling \fBtelinit\fP one can also +\&From this it follows that instead of calling \fBtelinit\fP one can also just use \fBinit\fP instead as a shortcut. .\"}}} .\"}}} @@ -208,93 +214,107 @@ .IP \fBPATH\fP \fI/bin:/usr/bin:/sbin:/usr/sbin\fP .IP \fBINIT_VERSION\fP -As the name says. Useful to determine if a script runs directly from \fBinit\fP. +As the name says. +Useful to determine if a script runs directly from \fBinit\fP. .IP \fBRUNLEVEL\fP The current system runlevel. .IP \fBPREVLEVEL\fP The previous runlevel (useful after a runlevel switch). .IP \fBCONSOLE\fP -The system console. This is really inherited from the kernel; however +The system console. +This is really inherited from the kernel; however if it is not set \fBinit\fP will set it to \fI/dev/console\fP by default. .SH BOOTFLAGS It is possible to pass a number of flags to \fBinit\fP from the -boot monitor (eg. LILO or GRUB). \fBinit\fP accepts the following flags: +boot monitor (e.g., LILO or GRUB). +\fBinit\fP accepts the following flags: .TP 0.5i -.B -s, S, single -Single user mode boot. In this mode \fI/etc/inittab\fP is -examined and the bootup rc scripts are usually run before -the single user mode shell is started. -.PP +.B \-s, S, single +Single user mode boot. +In this mode \fI/etc/inittab\fP is examined and +the bootup rc scripts are usually run before the single user mode shell is +started. +. .TP 0.5i -.B 1-5 +.B 1\(en5 Runlevel to boot into. -.PP +. .TP 0.5i -.B -b, emergency +.B \-b, emergency Boot directly into a single user shell without running any other startup scripts. -.PP +. .TP 0.5i -.B -a, auto +.B \-a, auto The LILO boot loader adds the word "auto" to the command line if it booted the kernel with the default command line (without user intervention). If this is found \fBinit\fP sets the "AUTOBOOT" environment -variable to "yes". Note that you cannot use this for any security -measures - of course the user could specify "auto" or \fB-a\fR on the +variable to "yes". +Note that you cannot use this for any security measures \(en +of course the user could specify "auto" or \fB\-a\fR on the command line manually. -.PP +. .TP 0.5i -.BI "-z " xxx -The argument to \fB-z\fP is ignored. You can use this to expand the command -line a bit, so that it takes some more space on the stack. \fBinit\fP -can then manipulate the command line so that \fBps\fP(1) shows -the current runlevel. -.PP +.BI "\-z " xxx +The argument to \fB\-z\fP is ignored. +You can use this to expand the command line a bit, +so that it takes some more space on the stack. +\fBinit\fP can then manipulate the command line +so that \fBps\fP(1) shows the current runlevel. +. .TP 0.5i .B \-\-version This argument, when used on its own, displays the current version of \fBinit\fP -to the console/stdout. It is a quick way to determine which \fBinit\fP software and -version is being used. After the version information is displayed, \fBinit\fP -immediately exits with a return code of zero. -.PP +to the console/stdout. +It is a quick way to determine which \fBinit\fP software and +version is being used. +After the version information is displayed, +\fBinit\fP immediately exits with a return code of zero. +. .SH INTERFACE \fBinit\fP listens on a \fIfifo\fP in /dev, \fI/run/initctl\fP, for messages. -\fBTelinit\fP uses this to communicate with \fBinit\fP. The interface is not -very well documented or finished. Those interested should study the -\fIinitreq.h\fP file in the \fIsrc/\fP subdirectory of the \fBinit\fP -source code tar archive. +\fBTelinit\fP uses this to communicate with \fBinit\fP. +The interface is not very well documented or finished. +Those interested should study the \fIinitreq.h\fP file in the \fIsrc/\fP +subdirectory of the \fBinit\fP source code tar archive. .SH SIGNALS Init reacts to several signals: .TP 0.5i .B SIGHUP Has the same effect as \fBtelinit q\fP. -.PP +. .TP 0.5i .B SIGUSR1 -On receipt of this signals, \fBinit\fP closes and re-opens its control fifo, -\fB/run/initctl\fP. Useful for bootscripts when \fI/dev\fP is remounted. +On receipt of this signals, +\fBinit\fP closes and re-opens its control fifo, +\fB/run/initctl\fP. +Useful for bootscripts when \fI/dev\fP is remounted. .TP 0.5i .B SIGUSR2 -When \fBinit\fP receives \fBSIGUSR2\fR, \fBinit\fP closes and leaves the control fifo, -\fB/run/initctl\fP, closed. This may be used to make sure \fBinit\fP is not -holding open any files. However, it also prevents \fBinit\fP from switching -runlevels. Which means commands like shutdown no longer work. +When \fBinit\fP receives \fBSIGUSR2\fR, +\fBinit\fP closes and leaves the control fifo, +\fB/run/initctl\fP, closed. +This may be used to make sure \fBinit\fP is not holding open any files. +However, it also prevents \fBinit\fP from switching runlevels. +Which means commands like shutdown no longer work. The fifo can be re-opened by sending \fBinit\fP the \fBSIGUSR1\fR signal. .TP 0.5i .B SIGINT Normally the kernel sends this signal to \fBinit\fP when CTRL-ALT-DEL is -pressed. It activates the \fIctrlaltdel\fP action. +pressed. +It activates the \fIctrlaltdel\fP action. .TP 0.5i .B SIGWINCH The kernel sends this signal when the \fIKeyboardSignal\fP key is hit. It activates the \fIkbrequest\fP action. \"{{{ Conforming to .SH CONFORMING TO -\fBinit\fP is compatible with the System V init. It works closely -together with the scripts in the directories +\fBinit\fP is compatible with the System V init. +It works closely together with the scripts in the directories \fI/etc/init.d\fP and \fI/etc/rc{runlevel}.d\fP. -If your system uses this convention, there should be a \fIREADME\fP -file in the directory \fI/etc/init.d\fP explaining how these scripts work. +If your system uses this convention, +there should be a \fIREADME\fP file in the directory \fI/etc/init.d\fP +explaining how these scripts work. .\"}}} .\"{{{ Files .SH FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/man/pidof.8 new/sysvinit-3.13/man/pidof.8 --- old/sysvinit-3.11/man/pidof.8 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/man/pidof.8 2025-01-03 22:09:46.000000000 +0100 @@ -17,7 +17,7 @@ .\" .TH PIDOF 8 "01 Sep 1998" "sysvinit " "Linux System Administrator's Manual" .SH NAME -pidof - find the process ID of a running program +pidof \- find the process ID of a running program .SH SYNOPSIS .B pidof .RB [ \-s ] @@ -26,21 +26,23 @@ .RB [ \-x ] .RB [ \-z ] .RB [ \-o -.IR omitpid[,omitpid...] ] +.IR omitpid [ \fB,\fPomitpid "...\&]]" .RB [ \-o -.IR omitpid[,omitpid...]... ] +.IR omitpid [ \fB,\fPomitpid ...]...\&] .RB [ \-d .IR sep ] .I program -.RI [ program... ] +.RI [ program "...]" .SH DESCRIPTION .B pidof -finds the process id's (PIDs) of the named programs. It prints those -id's on the standard output. This program is on some systems used in -run-level change scripts, especially when the system has a -\fISystem-V\fP like \fIrc\fP structure. In that case these scripts are -located in \fI/etc/rc?.d\fP, where ? is the runlevel. If the system has -a \fBstart-stop-daemon\fP(8) program that should be used instead. +finds the process id's (PIDs) of the named programs. +It prints those id's on the standard output. +This program is on some systems used in run-level change scripts, +especially when the system has a \fISystem-V\fP like \fIrc\fP structure. +In that case these scripts are located in \fI/etc/rc?.d\fP, +where ? is the runlevel. +If the system has a \fBstart-stop-daemon\fP(8) program +that should be used instead. .SH OPTIONS .IP \fB\-s\fP Single shot - this instructs the program to only return one \fIpid\fP. @@ -58,25 +60,31 @@ .B PIDOF_NETFS may be set and exported. .IP \fB\-q\fP -Do not display matched PIDs to standard out. Simply exit with -a status of true or false to indicate whether a matching PID was found. +Do not display matched PIDs to standard out. +Simply exit with a status of true or false to indicate whether a matching +PID was found. .IP \fB\-x\fP Scripts too - this causes the program to also return process id's of shells running the named scripts. .IP \fB\-z\fP -Try to detect processes which are stuck in zombie (Z) -status. Usually these processes are skipped as trying to deal with them can cause -pidof or related tools to hang. Note: In the past pidof would ignore processes -in the uninterruptable state (D), unless the \fB-z\fP flag was specified. This is no -longer the case. The \fBpidof\fP program will find and report processes in the D state -whether \fB-z\fP is specified or not. -.IP "-d \fIsep\fP" -Tells \fIpidof\fP to use \fIsep\fP as an output separator if more than one PID -is shown. The default separator is a space. -.IP "-o \fIomitpid\fP" -Tells \fIpidof\fP to omit processes with that process id. The special -pid \fB%PPID\fP can be used to name the parent process of the \fBpidof\fP -program, in other words the calling shell or shell script. +Try to detect processes which are stuck in zombie (Z) status. +Usually these processes are skipped +as trying to deal with them can cause pidof or related tools to hang. +Note: In the past pidof would ignore processes in the uninterruptable state +(D), +unless the \fB\-z\fP flag was specified. +This is no longer the case. +The \fBpidof\fP program will find and report processes in the D state +whether \fB\-z\fP is specified or not. +.IP "\-d \fIsep\fP" +Tells \fIpidof\fP to use \fIsep\fP as an output separator +if more than one PID is shown. +The default separator is a space. +.IP "\-o \fIomitpid\fP" +Tells \fIpidof\fP to omit processes with that process id. +The special pid \fB%PPID\fP can be used to name the parent process of the +\fBpidof\fP program, +in other words the calling shell or shell script. .SH "EXIT STATUS" .TP .B 0 @@ -89,17 +97,22 @@ the program behaves according to the name under which it is called. .PP When \fBpidof\fP is invoked with a full pathname to the program it -should find the pid of, it is reasonably safe. Otherwise it is possible +should find the pid of, +it is reasonably safe. +Otherwise it is possible that it returns PIDs of running programs that happen to have the same name -as the program you're after but are actually other programs. Note -that the executable name of running processes is calculated with +as the program you're after but are actually other programs. +Note that the executable name of running processes is calculated with .BR readlink (2), so symbolic links to executables will also match. .PP -Zombie processes or processes in disk sleep (states Z and D, respectively) -are ignored, as attempts to access the stats of these will sometimes fail. -The \fB\-z\fP flag (see above) tells \fBpidof\fP to try to detect these sleeping and zombie -processes, at the risk of failing or hanging. +Zombie processes or processes in disk sleep +(states Z and D, respectively) +are ignored, +as attempts to access the stats of these will sometimes fail. +The \fB\-z\fP flag (see above) tells \fBpidof\fP to try to detect these +sleeping and zombie processes, +at the risk of failing or hanging. .SH SEE ALSO .BR shutdown (8), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/man/pidof.8.orig new/sysvinit-3.13/man/pidof.8.orig --- old/sysvinit-3.11/man/pidof.8.orig 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/man/pidof.8.orig 2025-01-03 22:09:46.000000000 +0100 @@ -17,7 +17,7 @@ .\" .TH PIDOF 8 "01 Sep 1998" "sysvinit " "Linux System Administrator's Manual" .SH NAME -pidof - find the process ID of a running program +pidof \- find the process ID of a running program .SH SYNOPSIS .B pidof .RB [ \-s ] @@ -26,21 +26,23 @@ .RB [ \-x ] .RB [ \-z ] .RB [ \-o -.IR omitpid[,omitpid...] ] +.IR omitpid [ \fB,\fPomitpid "...\&]]" .RB [ \-o -.IR omitpid[,omitpid...]... ] +.IR omitpid [ \fB,\fPomitpid ...]...\&] .RB [ \-d .IR sep ] .I program -.RI [ program... ] +.RI [ program "...]" .SH DESCRIPTION .B pidof -finds the process id's (PIDs) of the named programs. It prints those -id's on the standard output. This program is on some systems used in -run-level change scripts, especially when the system has a -\fISystem-V\fP like \fIrc\fP structure. In that case these scripts are -located in \fI/etc/rc?.d\fP, where ? is the runlevel. If the system has -a \fBstart-stop-daemon\fP(8) program that should be used instead. +finds the process id's (PIDs) of the named programs. +It prints those id's on the standard output. +This program is on some systems used in run-level change scripts, +especially when the system has a \fISystem-V\fP like \fIrc\fP structure. +In that case these scripts are located in \fI/etc/rc?.d\fP, +where ? is the runlevel. +If the system has a \fBstart-stop-daemon\fP(8) program +that should be used instead. .SH OPTIONS .IP \fB\-s\fP Single shot - this instructs the program to only return one \fIpid\fP. @@ -58,25 +60,31 @@ .B PIDOF_NETFS may be set and exported. .IP \fB\-q\fP -Do not display matched PIDs to standard out. Simply exit with -a status of true or false to indicate whether a matching PID was found. +Do not display matched PIDs to standard out. +Simply exit with a status of true or false to indicate whether a matching +PID was found. .IP \fB\-x\fP Scripts too - this causes the program to also return process id's of shells running the named scripts. .IP \fB\-z\fP -Try to detect processes which are stuck in zombie (Z) -status. Usually these processes are skipped as trying to deal with them can cause -pidof or related tools to hang. Note: In the past pidof would ignore processes -in the uninterruptable state (D), unless the \fB-z\fP flag was specified. This is no -longer the case. The \fBpidof\fP program will find and report processes in the D state -whether \fB-z\fP is specified or not. -.IP "-d \fIsep\fP" -Tells \fIpidof\fP to use \fIsep\fP as an output separator if more than one PID -is shown. The default separator is a space. -.IP "-o \fIomitpid\fP" -Tells \fIpidof\fP to omit processes with that process id. The special -pid \fB%PPID\fP can be used to name the parent process of the \fBpidof\fP -program, in other words the calling shell or shell script. +Try to detect processes which are stuck in zombie (Z) status. +Usually these processes are skipped +as trying to deal with them can cause pidof or related tools to hang. +Note: In the past pidof would ignore processes in the uninterruptable state +(D), +unless the \fB\-z\fP flag was specified. +This is no longer the case. +The \fBpidof\fP program will find and report processes in the D state +whether \fB\-z\fP is specified or not. +.IP "\-d \fIsep\fP" +Tells \fIpidof\fP to use \fIsep\fP as an output separator +if more than one PID is shown. +The default separator is a space. +.IP "\-o \fIomitpid\fP" +Tells \fIpidof\fP to omit processes with that process id. +The special pid \fB%PPID\fP can be used to name the parent process of the +\fBpidof\fP program, +in other words the calling shell or shell script. .SH "EXIT STATUS" .TP .B 0 @@ -89,17 +97,22 @@ the program behaves according to the name under which it is called. .PP When \fBpidof\fP is invoked with a full pathname to the program it -should find the pid of, it is reasonably safe. Otherwise it is possible +should find the pid of, +it is reasonably safe. +Otherwise it is possible that it returns PIDs of running programs that happen to have the same name -as the program you're after but are actually other programs. Note -that the executable name of running processes is calculated with +as the program you're after but are actually other programs. +Note that the executable name of running processes is calculated with .BR readlink (2), so symbolic links to executables will also match. .PP -Zombie processes or processes in disk sleep (states Z and D, respectively) -are ignored, as attempts to access the stats of these will sometimes fail. -The \fB\-z\fP flag (see above) tells \fBpidof\fP to try to detect these sleeping and zombie -processes, at the risk of failing or hanging. +Zombie processes or processes in disk sleep +(states Z and D, respectively) +are ignored, +as attempts to access the stats of these will sometimes fail. +The \fB\-z\fP flag (see above) tells \fBpidof\fP to try to detect these +sleeping and zombie processes, +at the risk of failing or hanging. .SH SEE ALSO .BR shutdown (8), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/src/Makefile new/sysvinit-3.13/src/Makefile --- old/sysvinit-3.11/src/Makefile 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/src/Makefile 2025-01-03 22:09:46.000000000 +0100 @@ -40,8 +40,8 @@ ifeq ($(DISTRO),Debian) CPPFLAGS+= -DACCTON_OFF -SBIN += bootlogd -MAN8 += bootlogd.8 +SBIN += sulogin bootlogd +MAN8 += sulogin.8 bootlogd.8 MANDB := endif @@ -65,9 +65,6 @@ MAN1 += mountpoint.1 endif -MANPAGES:=$(MAN1) $(MAN5) $(MAN8) -MANPAGES+=$(subst ../man/,,$(foreach man,$(MANPAGES),$(wildcard ../man/??/$(man)))) - ID = $(shell id -u) BIN_OWNER = root BIN_GROUP = root @@ -80,7 +77,15 @@ INSTALL_DATA = install -m 644 endif INSTALL_DIR = install -m 755 -d -MANDIR = /usr/share/man + +ROOT ?= +usrdir ?= /usr +base_bindir ?= /bin +base_sbindir ?= /sbin +bindir ?= /$(usrdir)/bin +sysconfdir ?= /etc +includedir ?= /$(usrdir)/include +mandir ?= /$(usrdir)/share/man ifeq ($(WITH_SELINUX),yes) SELINUX_DEF = -DWITH_SELINUX @@ -92,15 +97,13 @@ SULOGINLIBS = endif -ROOT ?= $(DESTDIR) - # Additional libs for GNU libc. -ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),) +ifneq ($(wildcard $(ROOT)/$(usrdir)/lib*/libcrypt.*),) SULOGINLIBS += -lcrypt endif # Additional libs for GNU libc / multiarch on Debian based systems. -ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),) +ifneq ($(wildcard $(ROOT)/$(usrdir)/lib/*/libcrypt.*),) ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt) SULOGINLIBS += -lcrypt endif @@ -196,34 +199,48 @@ distclean: clobber install: all - $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/ - $(INSTALL_DIR) $(ROOT)/usr/bin/ + $(INSTALL_DIR) $(ROOT)$(base_bindir)/ $(ROOT)$(base_sbindir)/ + $(INSTALL_DIR) $(ROOT)$(bindir)/ for i in $(BIN); do \ - $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \ + $(INSTALL_EXEC) $$i $(ROOT)$(base_bindir)/ ; \ done for i in $(SBIN); do \ - $(INSTALL_EXEC) $$i $(ROOT)/sbin/ ; \ + $(INSTALL_EXEC) $$i $(ROOT)$(base_sbindir)/ ; \ done for i in $(USRBIN); do \ - $(INSTALL_EXEC) $$i $(ROOT)/usr/bin/ ; \ + $(INSTALL_EXEC) $$i $(ROOT)$(bindir)/ ; \ done - # $(INSTALL_DIR) $(ROOT)/etc/ - $(INSTALL_DIR) $(ROOT)/etc/inittab.d - # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ - ln -sf halt $(ROOT)/sbin/reboot - ln -sf halt $(ROOT)/sbin/poweroff - ln -sf init $(ROOT)/sbin/telinit - ln -sf ../sbin/killall5 $(ROOT)/bin/pidof - if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ - ln -sf last $(ROOT)/usr/bin/lastb; \ + # $(INSTALL_DIR) $(ROOT)/$(sysconfdir)/ + $(INSTALL_DIR) $(ROOT)/$(sysconfdir)/inittab.d + # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/$(sysconfdir)/ + ln -sf halt $(ROOT)$(base_sbindir)/reboot + ln -sf halt $(ROOT)$(base_sbindir)/poweroff + ln -sf init $(ROOT)$(base_sbindir)/telinit + ln -sf $(base_sbindir)/killall5 $(ROOT)$(base_bindir)/pidof + if [ ! -f $(ROOT)$(bindir)/lastb ]; then \ + ln -sf last $(ROOT)$(bindir)/lastb; \ fi - $(INSTALL_DIR) $(ROOT)/usr/include/ - $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ - for man in $(MANPAGES) ; do \ - targetdir=$(ROOT)$(MANDIR)/$$(dirname $$man)/man$${man##*.}; \ - $(INSTALL_DIR) $$targetdir; \ - $(INSTALL_DATA) ../man/$$man $$targetdir/$$(basename $$man); \ - sed -i "1{ $(MANDB); }" $$targetdir/$$(basename $$man); \ + $(INSTALL_DIR) $(ROOT)$(includedir)/ + $(INSTALL_DATA) initreq.h $(ROOT)$(includedir)/ + for lang in '' $(patsubst ../man/po/%.po,%,$(wildcard ../man/po/??.po)); do \ + $(INSTALL_DIR) $(ROOT)$(mandir)/$$lang/man1; \ + $(INSTALL_DIR) $(ROOT)$(mandir)/$$lang/man5; \ + $(INSTALL_DIR) $(ROOT)$(mandir)/$$lang/man8; \ + done + for man in $(MAN1) $(subst ../man/,,$(foreach man,$(MAN1),$(wildcard ../man/??/$(man)))); do \ + install_target=$(ROOT)$(mandir)/$${man%$${man##*/}}man1/$${man##*/} ; \ + $(INSTALL_DATA) ../man/$$man $$install_target ; \ + sed -i "1{ $(MANDB); }" $$install_target ; \ + done + for man in $(MAN5) $(subst ../man/,,$(foreach man,$(MAN5),$(wildcard ../man/??/$(man)))); do \ + install_target=$(ROOT)$(mandir)/$${man%$${man##*/}}man5/$${man##*/} ; \ + $(INSTALL_DATA) ../man/$$man $$install_target ; \ + sed -i "1{ $(MANDB); }" $$install_target ; \ + done + for man in $(MAN8) $(subst ../man/,,$(foreach man,$(MAN8),$(wildcard ../man/??/$(man)))); do \ + install_target=$(ROOT)$(mandir)/$${man%$${man##*/}}man8/$${man##*/} ; \ + $(INSTALL_DATA) ../man/$$man $$install_target ; \ + sed -i "1{ $(MANDB); }" $$install_target ; \ done ifeq ($(ROOT),) # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/src/bootlogd.c new/sysvinit-3.13/src/bootlogd.c --- old/sysvinit-3.11/src/bootlogd.c 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/src/bootlogd.c 2025-01-03 22:09:46.000000000 +0100 @@ -41,11 +41,8 @@ #include <getopt.h> #include <dirent.h> #include <fcntl.h> -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) #include <pty.h> -#endif - -#if defined (__linux__) || defined(__GNU__) #include <sys/sysmacros.h> #endif @@ -417,7 +414,9 @@ char *s; time(&t); s = ctime(&t); - fprintf(fp, "%.24s: ", s); + if (! s) + s = " "; + fprintf(fp, "%.24s: ", s); dosync = 1; first_run = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/src/dowall.c new/sysvinit-3.13/src/dowall.c --- old/sysvinit-3.11/src/dowall.c 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/src/dowall.c 2025-01-03 22:09:46.000000000 +0100 @@ -191,6 +191,8 @@ /* Get the time */ time(&t); date = ctime(&t); + if (! date) + date = " "; for(p = date; *p && *p != '\n'; p++) ; *p = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/src/last.c new/sysvinit-3.13/src/last.c --- old/sysvinit-3.11/src/last.c 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/src/last.c 2025-01-03 22:09:46.000000000 +0100 @@ -278,7 +278,18 @@ char *showdate() { char *s = ctime(&lastdate); - s[16] = 0; + char *p; + + if (s) + { + /* s[16] = 0; */ + /* make sure string ends with a NULL. Do not assume string is 16 characters long. */ + for (p = s; *p && *p != '\n'; p++) + ; + *p = '\0'; + } + else + s = " "; return s; } @@ -371,6 +382,7 @@ char utline[UT_LINESIZE+1]; char domain[256]; char *s, **walk; + char *my_ctime; int mins, hours, days; int r, len; @@ -401,13 +413,16 @@ * Calculate times */ tmp = (time_t)p->ut_time; - strncpy(logintime, ctime(&tmp), sizeof(logintime)); + my_ctime = ctime(&tmp); + if (! my_ctime) + my_ctime = " "; + strncpy(logintime, my_ctime, sizeof(logintime)); logintime[sizeof(logintime)-1] = 0; /* enforce null termination */ if (fulltime) - sprintf(logouttime, "- %s", ctime(&t)); + sprintf(logouttime, "- %s", my_ctime); else { logintime[16] = 0; - sprintf(logouttime, "- %s", ctime(&t) + 11); + sprintf(logouttime, "- %s", my_ctime + 11); logouttime[7] = 0; } secs = t - p->ut_time; @@ -638,7 +653,7 @@ int lastb = 0; /* Is this 'lastb' ? */ int extended = 0; /* Lots of info. */ char *altufile = NULL;/* Alternate wtmp */ - + char *my_ctime; time_t until = 0; /* at what time to stop parsing the file */ progname = mybasename(argv[0]); @@ -959,7 +974,10 @@ down = 0; } } - printf("\n%s begins %s", mybasename(ufile), ctime(&begintime)); + my_ctime = ctime(&begintime); + if (! my_ctime) + my_ctime = " "; + printf("\n%s begins %s", mybasename(ufile), my_ctime); fclose(fp); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/src/logsave.c new/sysvinit-3.13/src/logsave.c --- old/sysvinit-3.11/src/logsave.c 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/src/logsave.c 2025-01-03 22:09:46.000000000 +0100 @@ -257,6 +257,7 @@ { int c, pid, rc; char *outfn, **cpp; + char *ctime_output; int openflags = O_CREAT|O_WRONLY|O_TRUNC; int send_flag = SEND_LOG; int do_stdin; @@ -298,7 +299,10 @@ } send_output("\n", 0, send_flag); t = time(0); - send_output(ctime(&t), 0, send_flag); + ctime_output = ctime(&t); + if (! ctime_output) + ctime_output = " "; + send_output(ctime_output, 0, send_flag); send_output("\n", 0, send_flag); if (do_stdin) @@ -308,7 +312,10 @@ send_output("\n", 0, send_flag); t = time(0); - send_output(ctime(&t), 0, send_flag); + ctime_output = ctime(&t); + if (! ctime_output) + ctime_output = " "; + send_output(ctime_output, 0, send_flag); send_output("----------------\n", 0, send_flag); if (outbuf) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysvinit-3.11/src/shutdown.c new/sysvinit-3.13/src/shutdown.c --- old/sysvinit-3.11/src/shutdown.c 2024-10-21 20:31:27.000000000 +0200 +++ new/sysvinit-3.13/src/shutdown.c 2025-01-03 22:09:46.000000000 +0100 @@ -259,12 +259,15 @@ { FILE *fp; time_t t; + char *ctime_output; time(&t); t += 60 * min; - + ctime_output = ctime(&t); + if (! ctime_output) + ctime_output = "soon"; if ((fp = fopen(NOLOGIN, "w")) != NULL) { - fprintf(fp, "\rThe system is going down on %s\r\n", ctime(&t)); + fprintf(fp, "\rThe system is going down on %s\r\n", ctime_output); if (message[0]) fputs(message, fp); fclose(fp); }
