diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-03-29 20:16:24 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-03-30 06:59:45 +0200 |
commit | f1c0c4aac5baeb5f422f8668a863d8f2eeb2edde (patch) | |
tree | 3a805f04fbc68d97504bf07dcffd2799ab44baf1 /source/a | |
parent | d48b3dea7888fc6e194df1ca985338f95530c610 (diff) | |
download | current-f1c0c4aac5baeb5f422f8668a863d8f2eeb2edde.tar.gz current-f1c0c4aac5baeb5f422f8668a863d8f2eeb2edde.tar.xz |
Tue Mar 29 20:16:24 UTC 202220220329201624
a/inih-55-x86_64-1.txz: Upgraded.
a/inotify-tools-3.22.1.0-x86_64-1.txz: Upgraded.
a/sysvinit-3.02-x86_64-1.txz: Upgraded.
a/sysvinit-scripts-15.0-noarch-9.txz: Rebuilt.
rc.M: Fix cosmetic mistake where a couple of paths were relative instead of
absolute. Thanks to babydr.
kde/bluedevil-5.24.4-x86_64-1.txz: Upgraded.
kde/breeze-5.24.4-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.24.4-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.24.4-x86_64-1.txz: Upgraded.
kde/drkonqi-5.24.4-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.24.4-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.24.4-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.24.4-x86_64-1.txz: Upgraded.
kde/kdecoration-5.24.4-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.24.4-x86_64-1.txz: Upgraded.
kde/kgamma5-5.24.4-x86_64-1.txz: Upgraded.
kde/khotkeys-5.24.4-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.24.4-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.24.4-x86_64-1.txz: Upgraded.
kde/kscreen-5.24.4-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.24.4-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.24.4-x86_64-1.txz: Upgraded.
kde/ksystemstats-5.24.4-x86_64-1.txz: Upgraded.
kde/kwallet-pam-5.24.4-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.24.4-x86_64-1.txz: Upgraded.
kde/kwayland-server-5.24.4-x86_64-1.txz: Upgraded.
kde/kwin-5.24.4-x86_64-1.txz: Upgraded.
kde/kwrited-5.24.4-x86_64-1.txz: Upgraded.
kde/layer-shell-qt-5.24.4-x86_64-1.txz: Upgraded.
kde/libkscreen-5.24.4-x86_64-1.txz: Upgraded.
kde/libksysguard-5.24.4-x86_64-1.txz: Upgraded.
kde/milou-5.24.4-x86_64-1.txz: Upgraded.
kde/oxygen-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.24.4-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.24.4-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.24.4-x86_64-1.txz: Upgraded.
kde/powerdevil-5.24.4-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.24.4-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.24.4-x86_64-1.txz: Upgraded.
kde/systemsettings-5.24.4-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.24.4-x86_64-1.txz: Upgraded.
l/expat-2.4.8-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.76.1-x86_64-1.txz: Upgraded.
l/pipewire-0.3.49-x86_64-1.txz: Upgraded.
xap/gparted-1.4.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rwxr-xr-x | source/a/inih/inih.SlackBuild | 2 | ||||
-rwxr-xr-x | source/a/inotify-tools/inotify-tools.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.M | 4 | ||||
-rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 | ||||
-rwxr-xr-x | source/a/sysvinit/sysvinit.SlackBuild | 11 | ||||
-rw-r--r-- | source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff | 258 |
6 files changed, 13 insertions, 266 deletions
diff --git a/source/a/inih/inih.SlackBuild b/source/a/inih/inih.SlackBuild index 12cd64b43..85e808bed 100755 --- a/source/a/inih/inih.SlackBuild +++ b/source/a/inih/inih.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=inih SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | tr -d r) -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/inotify-tools/inotify-tools.SlackBuild b/source/a/inotify-tools/inotify-tools.SlackBuild index df453f6c4..851d0d86f 100755 --- a/source/a/inotify-tools/inotify-tools.SlackBuild +++ b/source/a/inotify-tools/inotify-tools.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=inotify-tools VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index a0d371d17..3df971d5d 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -376,9 +376,9 @@ if [ -x /etc/rc.d/rc.dovecot ]; then fi # Start the mail server. Try the rc.sendmail script first, then try rc.postfix. -if [ -x /etc/rc.d/rc.sendmail -a -x usr/sbin/makemap ]; then +if [ -x /etc/rc.d/rc.sendmail -a -x /usr/sbin/makemap ]; then /etc/rc.d/rc.sendmail start -elif [ -x /etc/rc.d/rc.postfix -a -x usr/sbin/postdrop ]; then +elif [ -x /etc/rc.d/rc.postfix -a -x /usr/sbin/postdrop ]; then /etc/rc.d/rc.postfix start fi diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 3b0f4cd31..090af12e5 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-15.0} ARCH=noarch -BUILD=${BUILD:-8} +BUILD=${BUILD:-9} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild index 26d8ffe28..9f1a0ac3f 100755 --- a/source/a/sysvinit/sysvinit.SlackBuild +++ b/source/a/sysvinit/sysvinit.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -71,7 +71,12 @@ zcat $CWD/sysvinit.always.define.version.diff.gz | patch -p1 --verbose || exit 1 # Use /dev/initctl instead of /run/initctl ; this is a named pipe and probably # should be in /dev anyway, but more importantly, having the upgraded package # expect it in /run breaks shutdown/reboot without manual intervention: -zcat $CWD/sysvinit.use_dev_initctl_not_run_initctl.diff.gz | patch -p1 --verbose || exit 1 +for replace in src/shutdown.c src/Makefile src/initreq.h src/init.c doc/initctl doc/Install man/init.8 man/initctl.5 man/po/* ; do + sed -i "s|run/initctl|dev/initctl|g" $replace +done + +# Since they usually don't update the version here, let's try to make sure: +sed -i "s/define VERSION.*/define VERSION \"$VERSION\"/g" src/init.c mkdir -p $PKG/usr/doc/sysvinit-$VERSION cp -a COPYING* COPYRIGHT* README* \ @@ -111,7 +116,7 @@ mkdir -p $PKG/usr/man/man{1,5,8} for page in last.1 ; do cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz done -for page in inittab.5 initscript.5 ; do +for page in initctl.5 inittab.5 initscript.5 ; do cat $page | gzip -9c > $PKG/usr/man/man5/$page.gz done for page in halt.8 init.8 killall5.8 poweroff.8 reboot.8 runlevel.8 \ diff --git a/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff b/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff deleted file mode 100644 index 47c55cef7..000000000 --- a/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff +++ /dev/null @@ -1,258 +0,0 @@ ---- ./src/shutdown.c.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./src/shutdown.c 2019-06-16 22:04:35.734002893 -0500 -@@ -192,7 +192,7 @@ - - /* - * Open the fifo and write the command. -- * Make sure we don't hang on opening /run/initctl -+ * Make sure we don't hang on opening /dev/initctl - */ - memset(&sa, 0, sizeof(sa)); - sa.sa_handler = alrm_handler; ---- ./src/Makefile.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./src/Makefile 2019-06-16 22:04:35.736002893 -0500 -@@ -231,8 +231,8 @@ - # - # This part is skipped on Debian systems, the - # debian.preinst script takes care of it. -- @if [ ! -p /run/initctl ]; then \ -- echo "Creating /run/initctl"; \ -- rm -f /run/initctl; \ -- mknod -m 600 /run/initctl p; fi -+ @if [ ! -p /dev/initctl ]; then \ -+ echo "Creating /dev/initctl"; \ -+ rm -f /dev/initctl; \ -+ mknod -m 600 /dev/initctl p; fi - endif ---- ./src/initreq.h.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./src/initreq.h 2019-06-16 22:04:35.737002893 -0500 -@@ -1,5 +1,5 @@ - /* -- * initreq.h Interface to talk to init through /run/initctl. -+ * initreq.h Interface to talk to init through /dev/initctl. - * - * Copyright (C) 1995-2004 Miquel van Smoorenburg - * -@@ -26,7 +26,7 @@ - #include <sys/param.h> - - #ifndef INIT_FIFO --#define INIT_FIFO "/run/initctl" -+#define INIT_FIFO "/dev/initctl" - #endif - - #define INIT_MAGIC 0x03091969 ---- ./src/init.c.orig 2019-06-15 12:02:35.000000000 -0500 -+++ ./src/init.c 2019-06-16 22:04:35.742002893 -0500 -@@ -146,7 +146,7 @@ - int maxproclen; /* Maximal length of argv[0] with \0 */ - struct utmp utproto; /* Only used for sizeof(utproto.ut_id) */ - char *console_dev; /* Console device. */ --int pipe_fd = -1; /* /run/initctl */ -+int pipe_fd = -1; /* /dev/initctl */ - int did_boot = 0; /* Did we already do BOOT* stuff? */ - int main(int, char **); - -@@ -2386,13 +2386,13 @@ - int quit = 0; - - /* -- * First, try to create /run/initctl if not present. -+ * First, try to create /dev/initctl if not present. - */ - if (stat(INIT_FIFO, &st2) < 0 && errno == ENOENT) - (void)mkfifo(INIT_FIFO, 0600); - - /* -- * If /run/initctl is open, stat the file to see if it -+ * If /dev/initctl is open, stat the file to see if it - * is still the _same_ inode. - */ - if (pipe_fd >= 0) { -@@ -2406,7 +2406,7 @@ - } - - /* -- * Now finally try to open /run/initctl if pipe_fd is -1 -+ * Now finally try to open /dev/initctl if pipe_fd is -1 - * if it is -2, then we leave it closed - */ - if (pipe_fd == -1) { -@@ -2715,7 +2715,7 @@ - } - if (ISMEMBER(got_signals, SIGUSR1)) { - /* -- * SIGUSR1 means close and reopen /run/initctl -+ * SIGUSR1 means close and reopen /dev/initctl - */ - INITDBG(L_VB, "got SIGUSR1"); - if (pipe_fd) -@@ -2963,7 +2963,7 @@ - strerror(errno)); - - /* Open the fifo and write a command. */ -- /* Make sure we don't hang on opening /run/initctl */ -+ /* Make sure we don't hang on opening /dev/initctl */ - SETSIG(sa, SIGALRM, signal_handler, 0); - alarm(3); - if ((fd = open(INIT_FIFO, O_WRONLY)) >= 0) { ---- ./doc/initctl.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./doc/initctl 2019-06-16 22:04:35.743002893 -0500 -@@ -1,5 +1,5 @@ - This document describes the communiction pipe set up by SysV init --at /run/initctl. This named pipe allows programs with the proper -+at /dev/initctl. This named pipe allows programs with the proper - permissions (typically programs run by root have read+write access to - the pipe) to send signals to the init program (PID 1). - -@@ -58,13 +58,13 @@ - might need to process our request. For example, when setting environment - variables. - --When setting an environment variable through init's /run/initctl pipe, -+When setting an environment variable through init's /dev/initctl pipe, - the data variable should have the format VARIABLE=VALUE. The string - should be terminated with a NULL '\0' character. - - - The following C code example shows how to send a set environment variable --request to the init process using the /run/initctl pipe. This example -+request to the init process using the /dev/initctl pipe. This example - is simplified and skips the error checking. A more comlpete example can be - found in the shutdown.c program's init_setnv() function. - -@@ -86,7 +86,7 @@ - - - --Usually the /run/initctl pipe would only be used by low-level programs to -+Usually the /dev/initctl pipe would only be used by low-level programs to - request a power-related shutdown or change the runlevel, like telinit - would do. Most of the time there is no need to talk to init directly, but - this gives us an extenable approach so init can be taught how to learn ---- ./doc/Install.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./doc/Install 2019-06-16 22:04:35.743002893 -0500 -@@ -66,7 +66,7 @@ - manual page on shutdown to find out more about this. - - Running from a read-only file system (CDROM?): --* All communication to init goes through the FIFO /run/initctl. -+* All communication to init goes through the FIFO /dev/initctl. - There should be no problem using a read-only root file system - If you use a Linux kernel > 1.3.66. Older kernels don't allow - writing to a FIFO on a read-only file system. ---- ./man/init.8.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./man/init.8 2019-06-16 22:04:35.744002893 -0500 -@@ -147,7 +147,7 @@ - the letter \fBF\fP. - .PP - Usage of \fBSIGPWR\fP and \fB/etc/powerstatus\fP is discouraged. Someone --wanting to interact with \fBinit\fP should use the \fB/run/initctl\fP -+wanting to interact with \fBinit\fP should use the \fB/dev/initctl\fP - control channel - see the initctl manual page for more documentation - about this. - .PP -@@ -258,7 +258,7 @@ - immediately exits with a return code of zero. - .PP - .SH INTERFACE --Init listens on a \fIfifo\fP in /dev, \fI/run/initctl\fP, for messages. -+Init listens on a \fIfifo\fP in /dev, \fI/dev/initctl\fP, for messages. - \fBTelinit\fP uses this to communicate with init. 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 -@@ -272,11 +272,11 @@ - .TP 0.5i - .B SIGUSR1 - On receipt of this signals, init closes and re-opens its control fifo, --\fB/run/initctl\fP. Useful for bootscripts when /dev is remounted. -+\fB/dev/initctl\fP. Useful for bootscripts when /dev is remounted. - .TP 0.5i - .B SIGUSR2 - When init receives SIGUSR2, init closes and leaves the control fifo, --\fB/run/initctl\fP, closed. This may be used to make sure init is not -+\fB/dev/initctl\fP, closed. This may be used to make sure init is not - holding open any files. However, it also prevents init from switching - runlevels. Which means commands like shutdown no longer work. - The fifo can be re-opened by sending init the SIGUSR1 signal. -@@ -304,7 +304,7 @@ - /dev/console - /var/run/utmp - /var/log/wtmp --/run/initctl -+/dev/initctl - .fi - .\"}}} - .\"{{{ Warnings ---- ./man/initctl.5.orig 2019-06-15 12:02:34.000000000 -0500 -+++ ./man/initctl.5 2019-06-16 22:05:29.658002895 -0500 -@@ -16,13 +16,13 @@ - .\" - .TH INITCTL 5 "April 13, 2018" "" "Linux System Administrator's Manual" - .SH NAME --initctl \- /run/initctl is a named pipe which passes commands to SysV init. -+initctl \- /dev/initctl is a named pipe which passes commands to SysV init. - .SH SYNOPSIS --/run/initctl -+/dev/initctl - .SH DESCRIPTION - - This document describes the communiction pipe set up by SysV init --at /run/initctl. This named pipe allows programs with the proper -+at /dev/initctl. This named pipe allows programs with the proper - permissions (typically programs run by root have read+write access to - the pipe) to send signals to the init program (PID 1). - -@@ -86,14 +86,14 @@ - might need to process our request. For example, when setting environment - variables. - --When setting an environment variable through init's /run/initctl pipe, -+When setting an environment variable through init's /dev/initctl pipe, - the data variable should have the format VARIABLE=VALUE. The string - should be terminated with a NULL character. - - .SH EXAMPLES - - The following C code example shows how to send a set environment variable --request to the init process using the /run/initctl pipe. This example -+request to the init process using the /dev/initctl pipe. This example - is simplified and skips the error checking. A more comlpete example can be - found in the shutdown.c program's init_setnv() function. - -@@ -117,18 +117,18 @@ - - .sp - .SH NOTES --Usually the /run/initctl pipe would only be used by low-level programs to -+Usually the /dev/initctl pipe would only be used by low-level programs to - request a power-related shutdown or change the runlevel, like telinit - would do. Most of the time there is no need to talk to init directly, but - this gives us an extenable approach so init can be taught how to learn - more commands. - .PP --The commands passed through the /run/initctl pipe must be sent in a specific -+The commands passed through the /dev/initctl pipe must be sent in a specific - binary format and be of a specific length. Larger data structures or ones - not using the proper format will be ignored. Typically, only root has the - ability to write to the initctl pipe for security reasons. - .PP --The /run/initctl pipe can be closed by sending init (PID 1) the SIGUSR2 -+The /dev/initctl pipe can be closed by sending init (PID 1) the SIGUSR2 - signal. This closes the pipe and leaves it closed. This may be useful - for making sure init is not keeping any files open. However, when the - pipe is closed, init no longer receives signals, such as those sent by -@@ -136,11 +136,11 @@ - change its runlevel directly. The pipe may be re-opened by sending init (PID 1) - the SIGUSR1 signal. - .PP --If the /run/initctl pipe is closed then it may still be possible to bring -+If the /dev/initctl pipe is closed then it may still be possible to bring - down the system using the shutdown command's -n flag, but this is not - always clean and not recommended. - .SH FILES --/run/initctl -+/dev/initctl - /sbin/init - .SH AUTHOR - Jesse Smith <jsmith@resonatingmedia.com> |