Mon Jun 17 03:26:28 UTC 201920190617032628

Sorry, no new kernel today. ;-)
a/shadow-4.7-x86_64-1.txz:  Upgraded.
a/sysvinit-2.95-x86_64-1.txz:  Upgraded.
l/gmm-5.3-noarch-1.txz:  Upgraded.
l/gobject-introspection-1.60.2-x86_64-1.txz:  Upgraded.
l/libarchive-3.4.0-x86_64-1.txz:  Upgraded.
l/libbluray-1.1.2-x86_64-1.txz:  Upgraded.
l/libical-3.0.5-x86_64-1.txz:  Upgraded.
l/python-certifi-2019.6.16-x86_64-1.txz:  Upgraded.
n/mutt-1.12.1-x86_64-1.txz:  Upgraded.
x/libevdev-1.7.0-x86_64-1.txz:  Upgraded.

3 files changed, 38 insertions, 25 deletions

diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild
index 4e8d90d5..1c041ca6 100755
--- a/source/a/sysvinit/sysvinit.SlackBuild
+++ b/source/a/sysvinit/sysvinit.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sysvinit
-VERSION=${VERSION:-2.94}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -68,6 +68,9 @@ zcat $CWD/sysvinit.paths.diff.gz | patch -p1 -E --verbose --backup --suffix=.ori
 # Fix failure to show program version:
 zcat $CWD/sysvinit.always.define.version.diff.gz | patch -p1 --verbose || exit 1
 
+# This seems to be a recurring theme:
+zcat $CWD/sysvinit.wrong.version.in.init.c.again.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:
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
index 7b4ce971..47c55cef 100644
--- a/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff
+++ b/source/a/sysvinit/sysvinit.use_dev_initctl_not_run_initctl.diff
@@ -1,5 +1,5 @@
---- ./src/shutdown.c.orig	2019-02-24 17:26:33.000000000 -0600
-+++ ./src/shutdown.c	2019-03-01 14:09:18.632719995 -0600
+--- ./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 @@
  
          /*
@@ -9,8 +9,8 @@
  	 */
  	memset(&sa, 0, sizeof(sa));
  	sa.sa_handler = alrm_handler;
---- ./src/Makefile.orig	2019-02-24 17:26:33.000000000 -0600
-+++ ./src/Makefile	2019-03-01 14:09:18.624719996 -0600
+--- ./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
@@ -24,8 +24,8 @@
 +		 rm -f /dev/initctl; \
 +		 mknod -m 600 /dev/initctl p; fi
  endif
---- ./src/initreq.h.orig	2019-02-24 17:26:33.000000000 -0600
-+++ ./src/initreq.h	2019-03-01 14:09:18.630719995 -0600
+--- ./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.
@@ -42,8 +42,8 @@
  #endif
  
  #define INIT_MAGIC 0x03091969
---- ./src/init.c.orig	2019-02-24 17:26:33.000000000 -0600
-+++ ./src/init.c	2019-03-01 14:09:18.629719995 -0600
+--- ./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) */
@@ -53,7 +53,7 @@
  int did_boot = 0;		/* Did we already do BOOT* stuff? */
  int main(int, char **);
  
-@@ -2382,13 +2382,13 @@
+@@ -2386,13 +2386,13 @@
    int			quit = 0;
  
    /*
@@ -69,7 +69,7 @@
     *	is still the _same_ inode.
     */
    if (pipe_fd >= 0) {
-@@ -2402,7 +2402,7 @@
+@@ -2406,7 +2406,7 @@
    }
  
    /*
@@ -78,7 +78,7 @@
     *    if it is -2, then we leave it closed
     */
    if (pipe_fd == -1) {
-@@ -2711,7 +2711,7 @@
+@@ -2715,7 +2715,7 @@
    }
    if (ISMEMBER(got_signals, SIGUSR1)) {
  	/*
@@ -87,7 +87,7 @@
  	 */
  	INITDBG(L_VB, "got SIGUSR1");
  	if (pipe_fd)
-@@ -2959,7 +2959,7 @@
+@@ -2963,7 +2963,7 @@
  			strerror(errno));
  
  	/* Open the fifo and write a command. */
@@ -96,8 +96,8 @@
  	SETSIG(sa, SIGALRM, signal_handler, 0);
  	alarm(3);
  	if ((fd = open(INIT_FIFO, O_WRONLY)) >= 0) {
---- ./doc/initctl.orig	2019-02-24 17:26:33.000000000 -0600
-+++ ./doc/initctl	2019-03-01 14:09:18.614719997 -0600
+--- ./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
@@ -130,8 +130,8 @@
  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-02-24 17:26:33.000000000 -0600
-+++ ./doc/Install	2019-03-01 14:09:18.612719997 -0600
+--- ./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.
  
@@ -141,8 +141,8 @@
    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-02-24 17:26:33.000000000 -0600
-+++ ./man/init.8	2019-03-01 14:11:06.713711051 -0600
+--- ./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
@@ -184,8 +184,8 @@
  .fi
  .\"}}}
  .\"{{{  Warnings
---- ./man/initctl.5.orig	2019-02-24 17:26:33.000000000 -0600
-+++ ./man/initctl.5	2019-03-01 14:09:18.622719996 -0600
+--- ./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"
@@ -220,9 +220,9 @@
  is simplified and skips the error checking. A more comlpete example can be
  found in the shutdown.c program's init_setnv() function.
  
-@@ -118,18 +118,18 @@
+@@ -117,18 +117,18 @@
+ 
  .sp
- .RE
  .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
@@ -242,7 +242,7 @@
  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
-@@ -137,12 +137,12 @@
+@@ -136,11 +136,11 @@
  change its runlevel directly. The pipe may be re-opened by sending init (PID 1)
  the SIGUSR1 signal.
  .PP
@@ -250,7 +250,6 @@
 +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.
- .RE
  .SH FILES
 -/run/initctl
 +/dev/initctl
diff --git a/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
new file mode 100644
index 00000000..65dc02d0
--- /dev/null
+++ b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
@@ -0,0 +1,11 @@
+--- ./src/init.c.orig	2019-06-16 22:06:19.677002897 -0500
++++ ./src/init.c	2019-06-16 22:07:43.515002900 -0500
+@@ -12,7 +12,7 @@
+ /*
+ Version information is not placed in the top-level Makefile by default
+ */
+-#define VERSION "2.94"
++#define VERSION "2.95"
+ /*
+  *		This file is part of the sysvinit suite,
+  *		Copyright (C) 1991-2004 Miquel van Smoorenburg.