From 4902427f2d4c924bb05bd676a240403d4ae35303 Mon Sep 17 00:00:00 2001 From: Richard Narron Date: Thu, 6 Apr 2023 22:10:53 +0100 Subject: network/opensmtpd: Fix pkill, add testconf, to rc init file. Signed-off-by: bedlam Signed-off-by: Willy Sudiarto Raharjo --- network/opensmtpd/opensmtpd.SlackBuild | 2 +- network/opensmtpd/rc.opensmtpd | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild index e97260abd7..87ba8c4ef2 100644 --- a/network/opensmtpd/opensmtpd.SlackBuild +++ b/network/opensmtpd/opensmtpd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=opensmtpd VERSION=${VERSION:-6.8.0p2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/network/opensmtpd/rc.opensmtpd b/network/opensmtpd/rc.opensmtpd index b75e3c53e4..f3154061c5 100644 --- a/network/opensmtpd/rc.opensmtpd +++ b/network/opensmtpd/rc.opensmtpd @@ -10,7 +10,7 @@ smtpd_start() { smtpd_stop() { echo "Stopping OpenSMTPD" - /usr/sbin/smtpctl stop 1>/dev/null 2>/dev/null || /usr/bin/pkill smtpd + /usr/bin/pkill -f /usr/sbin/smtpd } # Restart smtpd: @@ -20,6 +20,12 @@ smtpd_restart() { smtpd_start } +# Test the smtpd configuration: +smtpd_testconf() { + echo "testing OpenSMTPD configuration: /usr/sbin/smtpd -n" + /usr/sbin/smtpd -n +} + case "$1" in 'start') smtpd_start @@ -30,6 +36,9 @@ case "$1" in 'restart') smtpd_restart ;; +'testconf') + smtpd_testconf + ;; *) - echo "usage $0 start|stop|restart" + echo "usage $0 start|stop|restart|testconf" esac -- cgit v1.2.3