CVS commit: pkgsrc/mail/qmail-run

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct 28 16:38:36 UTC 2018

Modified Files:
        pkgsrc/mail/qmail-run: Makefile
        pkgsrc/mail/qmail-run/files: qmailofmipd.sh qmailpop3d.sh

Log Message:
Point to where servercert.pem actually is. While here, use the regularly
regenerated DH params too. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/qmail-run/files/qmailofmipd.sh
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mail/qmail-run/files/qmailpop3d.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.52 pkgsrc/mail/qmail-run/Makefile:1.53
--- pkgsrc/mail/qmail-run/Makefile:1.52 Sun Oct 28 15:01:57 2018
+++ pkgsrc/mail/qmail-run/Makefile      Sun Oct 28 16:38:36 2018
@@ -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

Index: pkgsrc/mail/qmail-run/files/qmailofmipd.sh
diff -u pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.12 pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.13
--- pkgsrc/mail/qmail-run/files/qmailofmipd.sh:1.12     Sun Oct 28 15:01:57 2018
+++ pkgsrc/mail/qmail-run/files/qmailofmipd.sh  Sun Oct 28 16:38:36 2018
@@ -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"

Index: pkgsrc/mail/qmail-run/files/qmailpop3d.sh
diff -u pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.21 pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.22
--- pkgsrc/mail/qmail-run/files/qmailpop3d.sh:1.21      Sun Oct 28 15:01:57 2018
+++ pkgsrc/mail/qmail-run/files/qmailpop3d.sh   Sun Oct 28 16:38:36 2018
@@ -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"