kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 20181028. Changes:

Browse source 
- CERTFILE needs to be set early enough for sslserver. Move it to rc.d.
  UCSPITLS is application-specific and can stay in the CDB.
- Add PYMSGAUTH_TOLERATE_UNCONFIGURED to the CDB.
- Switch qmailpop3d from tcpserver+qmail-popup to sslserver+authup.
  Set UCSPITLS in the CDB to require STLS before USER/PASS.
- Specify a few new required_files.
- Point more precisely at the need to inspect alias/.qmail-*.
This commit is contained in:
schmonz 2018-10-28 15:01:57 +00:00
parent 48a698564b
commit 094f636e77
6 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mail/qmail-run/MESSAGE
View file

@ -1,12 +1,12 @@
===========================================================================
$NetBSD: MESSAGE,v 1.10 2018/10/27 19:16:16 schmonz Exp $
$NetBSD: MESSAGE,v 1.11 2018/10/28 15:01:57 schmonz Exp $
Please read ${PREFIX}/share/doc/qmail-run/README.pkgsrc.
Assuming NetBSD-style mailwrapper(8) and rc(8), to enable qmail for...
Local and outgoing deliveries:
- Check configuration in ${PKG_SYSCONFDIR} (including ~${QMAIL_ALIAS_USER}).
- Check configuration in ${PKG_SYSCONFDIR} (including alias/.qmail-*).
- Replace /etc/mailer.conf with share/examples/qmail-run/mailer.conf.
- Set qmailsend=YES in /etc/rc.conf.

9
mail/qmail-run/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.51 2018/10/27 19:16:16 schmonz Exp $
# $NetBSD: Makefile,v 1.52 2018/10/28 15:01:57 schmonz Exp $
#
DISTNAME= qmail-run-20181027
DISTNAME= qmail-run-20181028
CATEGORIES= mail
MASTER_SITES= # empty
DISTFILES= # empty
@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}
NO_BUILD= yes
NO_CHECKSUM= yes
FILES_SUBST+= QMAIL_ALIAS_USER=${QMAIL_ALIAS_USER:Q}
FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
FILES_SUBST+= QMAIL_SEND_USER=${QMAIL_SEND_USER:Q}
@ -29,7 +28,6 @@ FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
FILES_SUBST+= PKGNAME=${PKGNAME:Q}
FILES_SUBST+= UCSPI_SSL_USER=${UCSPI_SSL_USER:Q}
FILES_SUBST+= UCSPI_SSL_GROUP=${UCSPI_SSL_GROUP:Q}
MESSAGE_SUBST+= QMAIL_ALIAS_USER=${QMAIL_ALIAS_USER:Q}
MESSAGE_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
RCD_SCRIPTS= qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
@ -45,8 +43,7 @@ CONF_FILES+= ${PREFIX}/share/examples/qmail-run/${f} \
.endfor
INSTALLATION_DIRS= bin share/doc/qmail-run share/examples/qmail-run
BUILD_DEFS+= QMAIL_ALIAS_USER QMAIL_DAEMON_USER
BUILD_DEFS+= QMAIL_LOG_USER QMAIL_SEND_USER
BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER QMAIL_SEND_USER
BUILD_DEFS+= QMAIL_QUEUE_EXTRA PKG_SYSCONFBASE
BUILD_DEFS+= UCSPI_SSL_USER UCSPI_SSL_GROUP

9
mail/qmail-run/files/qmailofmipd.sh
View file

@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: qmailofmipd.sh,v 1.11 2018/10/27 19:16:16 schmonz Exp $
# $NetBSD: qmailofmipd.sh,v 1.12 2018/10/28 15:01:57 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:="@SETENV@ SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@)"}
: ${qmailofmipd_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) CERTFILE=@PKG_SYSCONFDIR@/servercert.pem"}
: ${qmailofmipd_tcpflags:="-neV -vRl0"}
: ${qmailofmipd_tcphost:="0.0.0.0"}
: ${qmailofmipd_tcpport:="587"}
@ -31,9 +31,12 @@ if [ -f /etc/rc.subr ]; then
fi
rcvar=${name}
required_files="@PKG_SYSCONFDIR@/control/me"
required_files="@PKG_SYSCONFDIR@/control/concurrencysubmission"
required_files="${required_files} @PKG_SYSCONFDIR@/tcp.ofmip.cdb"
required_files="${required_files} @PKG_SYSCONFDIR@/control/rcpthosts"
required_files="${required_files} @PKG_SYSCONFDIR@/control/smtpcapabilities"
required_files="${required_files} @PKG_SYSCONFDIR@/control/fixsmtpio"
required_files="${required_files} @PKG_SYSCONFDIR@/tcp.ofmip.cdb"
command="${qmailofmipd_tcpserver}"
procname=nb${name}
start_precmd="qmailofmipd_precmd"

15
mail/qmail-run/files/qmailpop3d.sh
View file

@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: qmailpop3d.sh,v 1.20 2018/10/24 15:46:54 schmonz Exp $
# $NetBSD: qmailpop3d.sh,v 1.21 2018/10/28 15:01:57 schmonz Exp $
#
# @PKGNAME@ script to control qmail-pop3d (POP3 server for Maildirs).
#
@ -10,13 +10,13 @@
name="qmailpop3d"
# User-settable rc.conf variables and their default values:
: ${qmailpop3d_postenv:=""}
: ${qmailpop3d_tcpflags:="-vRHl0"}
: ${qmailpop3d_tcphost:="0"}
: ${qmailpop3d_postenv:="SSL_UID=$(@ID@ -u @UCSPI_SSL_USER@) SSL_GID=$(@ID@ -g @UCSPI_SSL_GROUP@) CERTFILE=@PKG_SYSCONFDIR@/servercert.pem"}
: ${qmailpop3d_tcpflags:="-neV -vRl0"}
: ${qmailpop3d_tcphost:="0.0.0.0"}
: ${qmailpop3d_tcpport:="110"}
: ${qmailpop3d_datalimit:="180000000"}
: ${qmailpop3d_pretcpserver:=""}
: ${qmailpop3d_tcpserver:="@PREFIX@/bin/tcpserver"}
: ${qmailpop3d_tcpserver:="@PREFIX@/bin/sslserver"}
: ${qmailpop3d_prepop3d:=""}
: ${qmailpop3d_pop3dcmd:="@PREFIX@/bin/qmail-pop3d"}
: ${qmailpop3d_checkpassword:="@PREFIX@/bin/nbcheckpassword"}
@ -32,6 +32,7 @@ fi
rcvar=${name}
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"
command="${qmailpop3d_tcpserver}"
procname=nb${name}
@ -56,8 +57,8 @@ qmailpop3d_precmd()
@PREFIX@/bin/argv0 ${qmailpop3d_tcpserver} ${procname}
${qmailpop3d_tcpflags} -x @PKG_SYSCONFDIR@/tcp.pop3.cdb
-c `@HEAD@ -1 @PKG_SYSCONFDIR@/control/concurrencypop3`
${qmailpop3d_tcphost} ${qmailpop3d_tcpport} @PREFIX@/bin/qmail-popup
`@HEAD@ -1 @PKG_SYSCONFDIR@/control/me`
${qmailpop3d_tcphost} ${qmailpop3d_tcpport}
@PREFIX@/bin/authup pop3
${qmailpop3d_checkpassword} @PREFIX@/bin/checknotroot
${qmailpop3d_prepop3d} ${qmailpop3d_pop3dcmd} ${qmailpop3d_maildirname}
2>&1 |

3
mail/qmail-run/files/tcp.ofmip
View file

@ -1,2 +1 @@
127.:allow,RELAYCLIENT=""
:allow,QMAILQUEUE="@PREFIX@/bin/qmail-qfilter-ofmipd-queue",UCSPITLS="!",CERTFILE="@PKG_SYSCONFDIR@/control/servercert.pem"
:allow,QMAILQUEUE="@PREFIX@/bin/qmail-qfilter-ofmipd-queue",UCSPITLS="!",PYMSGAUTH_TOLERATE_UNCONFIGURED="1"

2
mail/qmail-run/files/tcp.pop3
View file

@ -1 +1 @@
:allow
:allow,UCSPITLS="!"