diff options
| author | schmonz <schmonz@pkgsrc.org> | 2018-10-28 16:38:36 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2018-10-28 16:38:36 +0000 |
| commit | 0db9cad36c33f18125836198b1bff21fff0897ea (patch) | |
| tree | 15abad9cba600c37b0ecfc6b48e808289780621b /mail/qmail-run | |
| parent | 1e82474b42cff22ef7e32324aa9de374a80b5b45 (diff) | |
| download | pkgsrc-0db9cad36c33f18125836198b1bff21fff0897ea.tar.gz | |
Point to where servercert.pem actually is. While here, use the regularly
regenerated DH params too. Bump PKGREVISION.
Diffstat (limited to 'mail/qmail-run')
| -rw-r--r-- | mail/qmail-run/Makefile | 3 | ||||
| -rw-r--r-- | mail/qmail-run/files/qmailofmipd.sh | 10 | ||||
| -rw-r--r-- | mail/qmail-run/files/qmailpop3d.sh | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile index 5ea7a91cc78..af170de388b 100644 --- a/mail/qmail-run/Makefile +++ b/mail/qmail-run/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2018/10/28 15:01:57 schmonz Exp $ +# $NetBSD: Makefile,v 1.53 2018/10/28 16:38:36 schmonz Exp $ # DISTNAME= qmail-run-20181028 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= # empty DISTFILES= # empty diff --git a/mail/qmail-run/files/qmailofmipd.sh b/mail/qmail-run/files/qmailofmipd.sh index a7ae72ad327..e4208fca156 100644 --- a/mail/qmail-run/files/qmailofmipd.sh +++ b/mail/qmail-run/files/qmailofmipd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailofmipd.sh,v 1.12 2018/10/28 15:01:57 schmonz Exp $ +# $NetBSD: qmailofmipd.sh,v 1.13 2018/10/28 16:38:36 schmonz Exp $ # # @PKGNAME@ script to control ofmipd (SMTP submission service). # @@ -11,7 +11,7 @@ name="qmailofmipd" # User-settable rc.conf variables and their default values: -: ${qmailofmipd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) CERTFILE=@PKG_SYSCONFDIR@/servercert.pem"} +: ${qmailofmipd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) DHFILE=@PKG_SYSCONFDIR@/control/dh2048.pem CERTFILE=@PKG_SYSCONFDIR@/control/servercert.pem"} : ${qmailofmipd_tcpflags:="-neV -vRl0"} : ${qmailofmipd_tcphost:="0.0.0.0"} : ${qmailofmipd_tcpport:="587"} @@ -31,8 +31,10 @@ if [ -f /etc/rc.subr ]; then fi rcvar=${name} -required_files="@PKG_SYSCONFDIR@/control/me" -required_files="@PKG_SYSCONFDIR@/control/concurrencysubmission" +required_files="@PKG_SYSCONFDIR@/control/dh2048.pem" +required_files="${required_files} @PKG_SYSCONFDIR@/control/servercert.pem" +required_files="${required_files} @PKG_SYSCONFDIR@/control/me" +required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencysubmission" required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts" required_files="${required_files} @PKG_SYSCONFDIR@/control/smtpcapabilities" required_files="${required_files} @PKG_SYSCONFDIR@/control/fixsmtpio" diff --git a/mail/qmail-run/files/qmailpop3d.sh b/mail/qmail-run/files/qmailpop3d.sh index c9751976a96..e3ae5e76b7d 100644 --- a/mail/qmail-run/files/qmailpop3d.sh +++ b/mail/qmail-run/files/qmailpop3d.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: qmailpop3d.sh,v 1.21 2018/10/28 15:01:57 schmonz Exp $ +# $NetBSD: qmailpop3d.sh,v 1.22 2018/10/28 16:38:36 schmonz Exp $ # # @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs). # @@ -10,7 +10,7 @@ name="qmailpop3d" # User-settable rc.conf variables and their default values: -: ${qmailpop3d_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) CERTFILE=@PKG_SYSCONFDIR@/servercert.pem"} +: ${qmailpop3d_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) DHFILE=@PKG_SYSCONFDIR@/control/dh2048.pem CERTFILE=@PKG_SYSCONFDIR@/control/servercert.pem"} : ${qmailpop3d_tcpflags:="-neV -vRl0"} : ${qmailpop3d_tcphost:="0.0.0.0"} : ${qmailpop3d_tcpport:="110"} @@ -30,7 +30,9 @@ if [ -f /etc/rc.subr ]; then fi rcvar=${name} -required_files="@PKG_SYSCONFDIR@/control/me" +required_files="@PKG_SYSCONFDIR@/control/dh2048.pem" +required_files="${required_files} @PKG_SYSCONFDIR@/control/servercert.pem" +required_files="${required_files} @PKG_SYSCONFDIR@/control/me" required_files="${required_files} @PKG_SYSCONFDIR@/control/concurrencypop3" required_files="${required_files} @PKG_SYSCONFDIR@/control/pop3capabilities" required_files="${required_files} @PKG_SYSCONFDIR@/tcp.pop3.cdb" |