Tue Jan 1 21:17:24 UTC 201920190101211724

a/coreutils-8.30-x86_64-4.txz:  Rebuilt.
  Added xterm-new to DIR_COLORS.
a/ed-1.15-x86_64-1.txz:  Upgraded.
a/smartmontools-7.0-x86_64-1.txz:  Upgraded.
a/sysvinit-2.93-x86_64-1.txz:  Upgraded.
ap/diffutils-3.7-x86_64-1.txz:  Upgraded.
ap/mc-4.8.22-x86_64-1.txz:  Upgraded.
l/gexiv2-0.10.10-x86_64-1.txz:  Upgraded.
l/libgphoto2-2.5.22-x86_64-1.txz:  Upgraded.
l/libwpd-0.10.3-x86_64-1.txz:  Upgraded.
x/xterm-341-x86_64-3.txz:  Rebuilt.
  Append new app-defaults for XTerm rather than replacing the upstream file.
  Use 'xterm' rather than 'xterm-new' for termName to avoid surprises, but
  leave the other choice commented out.
  Install XTerm as XTerm.new to avoid wiping out a locally modified file.
  Still not sure we'll be able to stick with this as a default due to Terminus
  possibly not being available on a remote X server. Sure looks nice though.
  Thanks to GazL.

2 files changed, 3 insertions, 26 deletions

diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild
index 92472cb44..6cfe01e97 100755
--- a/source/a/sysvinit/sysvinit.SlackBuild
+++ b/source/a/sysvinit/sysvinit.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sysvinit
-VERSION=${VERSION:-2.90}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.93}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -62,19 +62,12 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# sysvinit-2.90 added an undocumented feature that tries to spawn agetty if
-# it sees console= in the kernel command line. Avoiding the debate about
-# whether this code belongs in init at all, at least such a change # should
-# be documented, and probably made opt-in. This patch disables the new behavior
-# unless "sysvinit_agetty" is also seen in the kernel command line.
-zcat $CWD/sysvinit.no.console.agetty.without.sysvinit_agetty.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1
-
 # Fix paths for /etc/forcefsck and /etc/fastboot:
 zcat $CWD/sysvinit.paths.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || 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
+# 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
 
 mkdir -p $PKG/usr/doc/sysvinit-$VERSION
diff --git a/source/a/sysvinit/sysvinit.no.console.agetty.without.sysvinit_agetty.diff b/source/a/sysvinit/sysvinit.no.console.agetty.without.sysvinit_agetty.diff
deleted file mode 100644
index c81f542bc..000000000
--- a/source/a/sysvinit/sysvinit.no.console.agetty.without.sysvinit_agetty.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/init.c.orig	2018-06-18 18:25:26.000000000 -0500
-+++ ./src/init.c	2018-08-28 23:45:05.134948889 -0500
-@@ -1337,6 +1337,13 @@
- 		return;
- 	}    
- 	if (fgets(buf, sizeof(buf), fp)) {    
-+		/* OK, this is a weird undocumented feature. We'll look for "sysvinit_agetty" in the kernel */
-+		/* command line and if we don't see it, then we'll assume you didn't want this. */
-+		char* t = buf;
-+		if (!(t = strstr(t, "sysvinit_agetty"))) {
-+			fclose(fp);
-+			return;
-+		}
- 		char* p = buf;
- 		while ((p = strstr(p, "console="))) {    
- 			char* e;