From 198edb5c7edf461f676a6dd841c371c9595ec691 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 Mar 2020 21:40:00 +0100
Subject: [PATCH] sqmail: service tweaks.

Add service tags to all loggers.
Listen on :0 instead of :: to force dual-stack.
Make run scripts conf_files, as they are meant to be adapted to your needs.
---
 srcpkgs/sqmail/files/qmail-send/log/run    | 2 +-
 srcpkgs/sqmail/files/qmail-smtpd/log/run   | 2 +-
 srcpkgs/sqmail/files/qmail-smtpd/run       | 4 ++--
 srcpkgs/sqmail/files/qmail-smtpsd/log/run  | 2 +-
 srcpkgs/sqmail/files/qmail-smtpsd/run      | 2 +-
 srcpkgs/sqmail/files/qmail-smtpsub/log/run | 2 +-
 srcpkgs/sqmail/files/qmail-smtpsub/run     | 2 +-
 srcpkgs/sqmail/template                    | 3 ++-
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/sqmail/files/qmail-send/log/run b/srcpkgs/sqmail/files/qmail-send/log/run
index 029152819b0..dfe9ca0c0e9 100755
--- a/srcpkgs/sqmail/files/qmail-send/log/run
+++ b/srcpkgs/sqmail/files/qmail-send/log/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec vlogger -p mail.notice
+exec vlogger -p mail.notice -t qmail-send
diff --git a/srcpkgs/sqmail/files/qmail-smtpd/log/run b/srcpkgs/sqmail/files/qmail-smtpd/log/run
index 029152819b0..e8b65cb0b35 100755
--- a/srcpkgs/sqmail/files/qmail-smtpd/log/run
+++ b/srcpkgs/sqmail/files/qmail-smtpd/log/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec vlogger -p mail.notice
+exec vlogger -p mail.notice -t qmail-smtpd
diff --git a/srcpkgs/sqmail/files/qmail-smtpd/run b/srcpkgs/sqmail/files/qmail-smtpd/run
index a4f8da65e85..1c230ac0852 100755
--- a/srcpkgs/sqmail/files/qmail-smtpd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpd/run
@@ -9,13 +9,13 @@ if [ -f /var/qmail/ssl/ssl.env ]; then
 	exec env PATH="/var/qmail/bin:$PATH" \
 	     sslserver -seVn -Rp -l $HOSTNAME \
 	     -Xx /var/qmail/control/rules.smtpd.cdb \
-	     -u $QMAILU -g $QMAILG :: 25 \
+	     -u $QMAILU -g $QMAILG :0 25 \
 	     qmail-smtpd 2>&1
 else
 	exec env PATH="/var/qmail/bin:$PATH" \
 	     tcpserver -p -v \
 	     -Xx /var/qmail/control/rules.smtpd.cdb \
-	     -u $QMAILU -g $QMAILG :: 25 \
+	     -u $QMAILU -g $QMAILG :0 25 \
 	     qmail-smtpd 2>&1
 fi
 
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/log/run b/srcpkgs/sqmail/files/qmail-smtpsd/log/run
index 029152819b0..933100cc3f7 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsd/log/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsd/log/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec vlogger -p mail.notice
+exec vlogger -p mail.notice -t qmail-smtpsd
diff --git a/srcpkgs/sqmail/files/qmail-smtpsd/run b/srcpkgs/sqmail/files/qmail-smtpsd/run
index 02d77018df4..d4169d97c46 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsd/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsd/run
@@ -7,6 +7,6 @@ export SMTPAUTH="!"
 exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \
      sslserver -seV -Rp -l $HOSTNAME \
      -Xx /var/qmail/control/rules.smtpd.cdb \
-     -u $QMAILU -g $QMAILG :: 465 \
+     -u $QMAILU -g $QMAILG :0 465 \
      qmail-smtpd qmail-authuser true 2>&1
 
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/log/run b/srcpkgs/sqmail/files/qmail-smtpsub/log/run
index 029152819b0..c7918d4ee26 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsub/log/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsub/log/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec vlogger -p mail.notice
+exec vlogger -p mail.notice -t qmail-smtpsub
diff --git a/srcpkgs/sqmail/files/qmail-smtpsub/run b/srcpkgs/sqmail/files/qmail-smtpsub/run
index 4a75b012163..26120d3b5a7 100755
--- a/srcpkgs/sqmail/files/qmail-smtpsub/run
+++ b/srcpkgs/sqmail/files/qmail-smtpsub/run
@@ -7,5 +7,5 @@ export UCSPITLS="!"
 . /var/qmail/ssl/ssl.env
 exec env PATH="/var/qmail/bin:/usr/local/bin:$PATH" \
      sslserver -seVn -Rp -l $HOSTNAME \
-     -u $QMAILU -g $QMAILG :: 587 \
+     -u $QMAILU -g $QMAILG :0 587 \
      qmail-smtpd qmail-authuser true 2>&1
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 4f442ca4d5d..89df2e7039a 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
 # Template file for 'sqmail'
 pkgname=sqmail
 version=4.0.03
-revision=1
+revision=2
 create_wrksrc=yes
 build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
 makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
@@ -15,6 +15,7 @@ checksum=fec96b51aee3506b6c068b0040304eb530f6926f719d9b917f07fac53f5e12bc
 nocross="custom build system"
 provides="smtp-server-0_1"
 replaces="smtp-server>=0"
+conf_files="/etc/sv/*/run /etc/sv/*/log/run"
 
 system_groups="_nofiles:798 _sqmail:799"