summaryrefslogtreecommitdiff
path: root/source/a
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-03-08 19:19:03 +0000
committerEric Hameleers <alien@slackware.com>2021-03-09 08:59:53 +0100
commit0be77b20dad3002d7968cc0a5a8c611d8f9c6315 (patch)
tree8b7950b3b9a70c8a54dd2f7293f973e9fd100c56 /source/a
parent862bf241139111651f1ec68e56951d2c6d033ba2 (diff)
downloadcurrent-0be77b20dad3002d7968cc0a5a8c611d8f9c6315.tar.gz
Mon Mar 8 19:19:03 UTC 202120210308191903
a/lrzip-0.641-x86_64-1.txz: Upgraded. This update fixes the poor compression ratio reported by Toutatis. a/smartmontools-7.2-x86_64-4.txz: Rebuilt. Add support for /etc/default/smartd. Thanks to upnort. a/sysvinit-2.99-x86_64-1.txz: Upgraded. l/iso-codes-4.6.0-noarch-1.txz: Upgraded. n/ca-certificates-20210308-noarch-1.txz: Upgraded. This update provides the latest CA certificates to check for the authenticity of SSL connections. n/fetchmail-6.4.17-x86_64-1.txz: Upgraded. xfce/thunar-4.16.5-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rw-r--r--source/a/smartmontools/doinst.sh1
-rw-r--r--source/a/smartmontools/rc.smartd12
-rw-r--r--source/a/smartmontools/smartd.default4
-rwxr-xr-xsource/a/smartmontools/smartmontools.SlackBuild6
-rwxr-xr-xsource/a/sysvinit/sysvinit.SlackBuild2
-rw-r--r--source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff2
6 files changed, 20 insertions, 7 deletions
diff --git a/source/a/smartmontools/doinst.sh b/source/a/smartmontools/doinst.sh
index b96297f9..94f01fcc 100644
--- a/source/a/smartmontools/doinst.sh
+++ b/source/a/smartmontools/doinst.sh
@@ -23,3 +23,4 @@ preserve_perms() {
preserve_perms etc/rc.d/rc.smartd.new
config etc/smartd.conf.new
+config etc/default/smartd.new
diff --git a/source/a/smartmontools/rc.smartd b/source/a/smartmontools/rc.smartd
index f0ad4f8c..8254b394 100644
--- a/source/a/smartmontools/rc.smartd
+++ b/source/a/smartmontools/rc.smartd
@@ -1,21 +1,27 @@
#!/bin/sh
#
-# /etc/rc.d/rc.smartd
+# /etc/rc.d/rc.smartd
#
# Start/stop/restart the smartd daemon, which monitors the status of
# S.M.A.R.T. compatible hard drives and reports any problems.
#
# By default, smartd will scan for all ATA/SATA and SCSI/SAS hard drives
# and solid-state drives. Settings may be customized in /etc/smartd.conf.
+
+# Import script defaults:
+if [ -r /etc/default/smartd ]; then
+ . /etc/default/smartd
+fi
smart_start() {
if [ -x /usr/sbin/smartd -a -r /etc/smartd.conf ]; then
- echo "Starting smartd: /usr/sbin/smartd -p /run/smartd.pid &"
- /usr/sbin/smartd -p /run/smartd.pid &
+ echo "Starting smartd: /usr/sbin/smartd -p /run/smartd.pid $SMARTD_OPTIONS &"
+ /usr/sbin/smartd -p /run/smartd.pid $SMARTD_OPTIONS &
fi
}
smart_stop() {
+ echo "Stopping smartd."
if [ -r /run/smartd.pid ]; then
kill $(cat /run/smartd.pid)
else
diff --git a/source/a/smartmontools/smartd.default b/source/a/smartmontools/smartd.default
new file mode 100644
index 00000000..f3fc08ec
--- /dev/null
+++ b/source/a/smartmontools/smartd.default
@@ -0,0 +1,4 @@
+# /etc/default/smartd
+
+# Refer to the man page for configuring a separate log file.
+#SMARTD_OPTIONS="-l local3"
diff --git a/source/a/smartmontools/smartmontools.SlackBuild b/source/a/smartmontools/smartmontools.SlackBuild
index 5973a595..600138c0 100755
--- a/source/a/smartmontools/smartmontools.SlackBuild
+++ b/source/a/smartmontools/smartmontools.SlackBuild
@@ -24,7 +24,7 @@ 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}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -83,6 +83,8 @@ 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
+mkdir -p $PKG/etc/default
+cat $CWD/smartd.default > $PKG/etc/default/smartd.new
mv $PKG/etc/smartd.conf $PKG/etc/smartd.conf.new
gzip -9 $PKG/usr/man/man?/*.?
@@ -115,5 +117,5 @@ fi
# Build the package:
cd $PKG
-makepkg -l y -c n $TMP/smartmontools-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/smartmontools-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild
index ce7a6a5d..1f382d2f 100755
--- a/source/a/sysvinit/sysvinit.SlackBuild
+++ b/source/a/sysvinit/sysvinit.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit
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/sysvinit.wrong.version.in.init.c.again.diff b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
index 08557ca3..653aab81 100644
--- a/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
+++ b/source/a/sysvinit/sysvinit.wrong.version.in.init.c.again.diff
@@ -5,7 +5,7 @@
Version information is not placed in the top-level Makefile by default
*/
-#define VERSION "2.94"
-+#define VERSION "2.98"
++#define VERSION "2.99"
/*
* This file is part of the sysvinit suite,
* Copyright (C) 1991-2004 Miquel van Smoorenburg.