diff options
Diffstat (limited to 'source/a')
-rw-r--r-- | source/a/coreutils/DIR_COLORS | 1 | ||||
-rwxr-xr-x | source/a/coreutils/coreutils.SlackBuild | 2 | ||||
-rwxr-xr-x | source/a/ed/ed.SlackBuild | 2 | ||||
-rwxr-xr-x | source/a/smartmontools/smartmontools.SlackBuild | 7 | ||||
-rwxr-xr-x | source/a/sysvinit/sysvinit.SlackBuild | 13 | ||||
-rw-r--r-- | source/a/sysvinit/sysvinit.no.console.agetty.without.sysvinit_agetty.diff | 16 |
6 files changed, 10 insertions, 31 deletions
diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS index 29660a87..17120ec6 100644 --- a/source/a/coreutils/DIR_COLORS +++ b/source/a/coreutils/DIR_COLORS @@ -59,6 +59,7 @@ TERM xterm-256color TERM xterm-88color TERM xterm-color TERM xterm-debian +TERM xterm-new # Below are the color init strings for the basic file types. A color init # string consists of one or more of the following numeric codes: diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index eb28f571..3af777a6 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=coreutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/a/ed/ed.SlackBuild b/source/a/ed/ed.SlackBuild index 7249fed5..9b967771 100755 --- a/source/a/ed/ed.SlackBuild +++ b/source/a/ed/ed.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ed VERSION=${VERSION:-$(echo $PKGNAM-*.tar.lz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/smartmontools/smartmontools.SlackBuild b/source/a/smartmontools/smartmontools.SlackBuild index 72593d71..17d1c48e 100755 --- a/source/a/smartmontools/smartmontools.SlackBuild +++ b/source/a/smartmontools/smartmontools.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=smartmontools -VERSION=${VERSION:-$(echo smartmontools-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo smartmontools-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -58,7 +58,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf smartmontools-$VERSION -tar xvf $CWD/smartmontools-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/smartmontools-$VERSION.tar.?z || exit 1 cd smartmontools-$VERSION || exit 1 chown -R root:root . @@ -77,6 +77,7 @@ make install DESTDIR=$PKG || exit 1 rm -rf $PKG/etc/rc.d/* # Install the Slackware smartd init script: +mkdir -p $PKG/etc/rc.d cp -a $CWD/rc.smartd $PKG/etc/rc.d/rc.smartd.new chown root:root $PKG/etc/rc.d/rc.smartd.new chmod 644 $PKG/etc/rc.d/rc.smartd.new diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild index 92472cb4..6cfe01e9 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 c81f542b..00000000 --- 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; |