aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Narron <richard@aaazen.com>2017-05-03 08:46:01 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-05-03 08:46:01 +0700
commit1926c11d59d144c0ab8133ae3411e6f7712d4ebc (patch)
tree282766a4db44b33a9fb15a6e840cd2fdaba7e167
parentb8a3d224b9fb60f02e780ed7afdc9c6ab2e8d41b (diff)
network/opensmtpd: Misc cleanups.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/opensmtpd/opensmtpd.SlackBuild7
-rw-r--r--network/opensmtpd/rc.opensmtpd3
2 files changed, 6 insertions, 4 deletions
diff --git a/network/opensmtpd/opensmtpd.SlackBuild b/network/opensmtpd/opensmtpd.SlackBuild
index 686547af9710..d864794d4ea5 100644
--- a/network/opensmtpd/opensmtpd.SlackBuild
+++ b/network/opensmtpd/opensmtpd.SlackBuild
@@ -26,7 +26,7 @@
PRGNAM=opensmtpd
VERSION=${VERSION:-6.0.2p1}
EXTRAS=${EXTRAS:-5.7.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -93,7 +93,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -148,10 +148,11 @@ chown root:smtpq $PKG/var/spool/smtpd/offline
chown smtpq:root $PKG/var/spool/smtpd/corrupt $PKG/var/spool/smtpd/incoming \
$PKG/var/spool/smtpd/purge $PKG/var/spool/smtpd/queue \
$PKG/var/spool/smtpd/temporary
+chmod 0711 $PKG/var/spool/smtpd
chmod 0700 $PKG/var/spool/smtpd/corrupt $PKG/var/spool/smtpd/incoming \
$PKG/var/spool/smtpd/queue $PKG/var/spool/smtpd/temporary
chmod 0770 $PKG/var/spool/smtpd/offline
-chmod 0750 $PKG/var/spool/smtpd/purge
+chmod 0700 $PKG/var/spool/smtpd/purge
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/network/opensmtpd/rc.opensmtpd b/network/opensmtpd/rc.opensmtpd
index bd4dc25cda04..b75e3c53e4e4 100644
--- a/network/opensmtpd/rc.opensmtpd
+++ b/network/opensmtpd/rc.opensmtpd
@@ -9,7 +9,8 @@ smtpd_start() {
}
smtpd_stop() {
- smtpctl stop || pkill smtpd
+ echo "Stopping OpenSMTPD"
+ /usr/sbin/smtpctl stop 1>/dev/null 2>/dev/null || /usr/bin/pkill smtpd
}
# Restart smtpd: