pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/qmail-run Update to 20170720. pkgsrc changes:
details: https://anonhg.NetBSD.org/pkgsrc/rev/407ce66f2f6d
branches: trunk
changeset: 365584:407ce66f2f6d
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Fri Jul 21 04:08:15 2017 +0000
description:
Update to 20170720. pkgsrc changes:
- Remove qmail-qfilter-*-queue shell scripts, which would conflict with
the C programs of the same name included in mail/qmail 1.03nb29 with
the "qmail-rejectutils" option (enabled by default).
- Bump mail/qmail dependency to 1.03nb29.
- Shorten and improve MESSAGE.
diffstat:
mail/qmail-run/MESSAGE | 56 ++++++++++++------------
mail/qmail-run/Makefile | 13 ++---
mail/qmail-run/PLIST | 4 +-
mail/qmail-run/files/qmail-qfilter-queue.sh | 65 -----------------------------
mail/qmail-run/files/qmailofmipd.sh | 4 +-
5 files changed, 35 insertions(+), 107 deletions(-)
diffs (225 lines):
diff -r 1ebbf886b682 -r 407ce66f2f6d mail/qmail-run/MESSAGE
--- a/mail/qmail-run/MESSAGE Fri Jul 21 04:07:17 2017 +0000
+++ b/mail/qmail-run/MESSAGE Fri Jul 21 04:08:15 2017 +0000
@@ -1,43 +1,41 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.6 2017/07/06 15:46:31 schmonz Exp $
+$NetBSD: MESSAGE,v 1.7 2017/07/21 04:08:15 schmonz Exp $
Please read ${PREFIX}/share/doc/qmail-run/README.pkgsrc.
To enable qmail for...
Local and outgoing deliveries:
-- Check the configuration files in ${PKG_SYSCONFDIR}.
-- Modify /etc/mailer.conf (see share/examples/qmail-run/mailer.conf).
-- Set qmailsend=YES in /etc/rc.conf.
+- Check the configuration files in ${PKG_SYSCONFDIR}
+- Replace /etc/mailer.conf with share/examples/qmail-run/mailer.conf
+- In /etc/rc.conf, set
+ qmailsend=YES
+
+Local non-root users to see the queue:
+- Change the mailq entry in /etc/mailer.conf to qmail-qread-client
+- In /etc/rc.conf, set
+ qmailqread=YES
Incoming SMTP deliveries:
-- Set qmailsmtpd=YES in /etc/rc.conf.
+- In /etc/rc.conf, set
+ qmailsmtpd=YES
+ qmailsmtpd_postenv="QMAILQUEUE=${PREFIX}/bin/qmail-qfilter-smtpd-queue RCPTCHECK=${PREFIX}/bin/qmail-rcptcheck"
+
+Filtering incoming SMTP:
+- List qmail-qfilter programs in ${PKG_SYSCONFDIR}/control/smtpfilters
+- List qmail-rcptcheck programs in ${PKG_SYSCONFDIR}/control/rcptchecks
Outgoing submissions with SMTP AUTH over TLS:
-- Set qmailofmipd=YES in /etc/rc.conf, and also qmailofmipd_preofmipd to
- ${PREFIX}/bin/spamdyke --config-file ${PKG_SYSCONFBASE}/spamdyke-ofmipd.conf
-- Copy share/examples/qmail-run/spamdyke-ofmipd.conf to ${PKG_SYSCONFBASE}.
-- Consider that your checkpassword binary may need to be setuid root.
-- Set stunnel=YES in /etc/rc.conf.
-- Incorporate share/examples/qmail-run/stunnel.conf into your stunnel.conf.
-
-POP3 (only for Maildirs):
-- Set qmailpop3d=YES in /etc/rc.conf.
+- Incorporate share/examples/qmail-run/stunnel.conf into your stunnel.conf
+- Consider that your checkpassword binary may need to be setuid root
+- Copy share/examples/qmail-run/spamdyke-ofmipd.conf to ${PKG_SYSCONFBASE}
+- In /etc/rc.conf, set
+ qmailofmipd=YES
+ qmailofmipd_preofmipd="${PREFIX}/bin/spamdyke --config-file ${PKG_SYSCONFBASE}/spamdyke-ofmipd.conf"
+ stunnel=YES
-Local non-root users to see the queue:
-- Set qmailqread=YES in /etc/rc.conf.
-- Change the mailq entry in /etc/mailer.conf to qmail-qread-client.
-
-Filtering incoming messages arriving via SMTP:
-- Set QMAILQUEUE="${PREFIX}/bin/qmail-qfilter-smtpd-queue" in tcp.smtp.
-- Reload the cdb: /etc/rc.d/qmailsmtpd cdb
-- Consult qmail-qfilter(1) and see share/examples/qmail-qfilter.
-- Place executable filters named 'smtpd-*' in ${PKG_SYSCONFDIR}/filters.
-
-Filtering outgoing messages submitted via OFMIP:
-- Set QMAILQUEUE="${PREFIX}/bin/qmail-qfilter-ofmipd-queue" in tcp.ofmip.
-- Reload the cdb: /etc/rc.d/qmailofmipd cdb
-- Consult qmail-qfilter(1) and see share/examples/qmail-qfilter.
-- Place executable filters named 'ofmipd-*' in ${PKG_SYSCONFDIR}/filters.
+Fetching Maildirs via POP3:
+- In /etc/rc.conf, set
+ qmailpop3d=YES
===========================================================================
diff -r 1ebbf886b682 -r 407ce66f2f6d mail/qmail-run/Makefile
--- a/mail/qmail-run/Makefile Fri Jul 21 04:07:17 2017 +0000
+++ b/mail/qmail-run/Makefile Fri Jul 21 04:08:15 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2017/07/06 15:46:31 schmonz Exp $
+# $NetBSD: Makefile,v 1.40 2017/07/21 04:08:15 schmonz Exp $
#
-DISTNAME= qmail-run-20170706
+DISTNAME= qmail-run-20170721
CATEGORIES= mail
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,7 +11,7 @@
LICENSE= 2-clause-bsd
DEPENDS+= mess822-[0-9]*:../../mail/mess822
-DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail
+DEPENDS_QMAIL= qmail>=1.03nb29:../../mail/qmail
DEPENDS+= ${DEPENDS_QMAIL}
DEPENDS+= qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
@@ -47,7 +47,7 @@
.endif
SUBST_CLASSES+= paths
-SUBST_FILES.paths= mailer.conf qmail-procmail qmail-qfilter-queue
+SUBST_FILES.paths= mailer.conf qmail-procmail
SUBST_FILES.paths+= qmail-qread-client spamdyke-ofmipd.conf
SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
@@ -66,7 +66,7 @@
for f in README.pkgsrc mailer.conf spamdyke-ofmipd.conf stunnel.conf; do \
${CP} ${FILESDIR}/$$f ${WRKDIR}/$$f; \
done
- for f in qmail-procmail qmail-qfilter-queue qmail-qread-client; do \
+ for f in qmail-procmail qmail-qread-client; do \
${CP} ${FILESDIR}/$$f.sh ${WRKDIR}/$$f; \
done
@@ -74,9 +74,6 @@
for f in qmail-procmail qmail-qread-client; do \
${INSTALL_SCRIPT} ${WRKDIR}/$$f ${DESTDIR}${PREFIX}/bin; \
done
- for f in qmail-qfilter-ofmipd-queue qmail-qfilter-smtpd-queue; do \
- ${INSTALL_SCRIPT} ${WRKDIR}/qmail-qfilter-queue ${DESTDIR}${PREFIX}/bin/$$f; \
- done
${INSTALL_DATA} ${WRKDIR}/README.pkgsrc \
${DESTDIR}${PREFIX}/share/doc/qmail-run
${INSTALL_DATA} ${WRKDIR}/mailer.conf \
diff -r 1ebbf886b682 -r 407ce66f2f6d mail/qmail-run/PLIST
--- a/mail/qmail-run/PLIST Fri Jul 21 04:07:17 2017 +0000
+++ b/mail/qmail-run/PLIST Fri Jul 21 04:08:15 2017 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.9 2017/07/06 15:46:31 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.10 2017/07/21 04:08:15 schmonz Exp $
bin/qmail-procmail
-bin/qmail-qfilter-ofmipd-queue
-bin/qmail-qfilter-smtpd-queue
bin/qmail-qread-client
share/doc/qmail-run/README.pkgsrc
share/examples/qmail-run/mailer.conf
diff -r 1ebbf886b682 -r 407ce66f2f6d mail/qmail-run/files/qmail-qfilter-queue.sh
--- a/mail/qmail-run/files/qmail-qfilter-queue.sh Fri Jul 21 04:07:17 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-#!@SH@
-#
-# Wrapper for qmail-queue that filters messages before injecting
-# into the queue.
-#
-# Using this wrapper, executable filters:
-# * Must be placed in @PKG_SYSCONFDIR@/filters
-# * Must have filenames matching "ofmipd-*" or "smtpd-*"
-# * Will be executed with no arguments
-# * Will be executed in sort(1) order
-
-CAT=@CAT@
-ECHO=@ECHO@
-PKG_SYSCONFDIR=@PKG_SYSCONFDIR@
-PREFIX=@PREFIX@
-SED=@SED@
-SORT=@SORT@
-
-warn() {
- ${ECHO} >&2 "$@"
-}
-
-choose_glob() {
- local _progname _glob
- _progname="$1"
- case "${_progname}" in
- qmail-qfilter-ofmipd-queue) _glob='ofmipd-*' ;;
- qmail-qfilter-smtpd-queue) _glob='smtpd-*' ;;
- qmail-qfilter-queue) _glob='qfilter-*' ;;
- esac
- ${ECHO} "${_glob}"
-}
-
-choose_filters() {
- local _glob _filters _possible_filters _filter
- _glob="$1"
- _possible_filters=$(${ECHO} ${PKG_SYSCONFDIR}/filters/${_glob} | ${SORT})
- if [ "${_possible_filters}" = "${PKG_SYSCONFDIR}/filters/${_glob}" ]; then
- _filters="${CAT}"
- else
- for _filter in ${_possible_filters}; do
- [ -x "${_filter}" ] && _filters="${_filters} ${_filter}"
- done
- [ -z "${_filters}" ] && _filters="${CAT}"
- fi
- ${ECHO} "${_filters}"
-}
-
-qfilter_args() {
- local _filters
- _filters="$1"
- ${ECHO} ${_filters} | ${SED} -e 's| | -- |g'
-}
-
-main() {
- local _progname _glob _filters _args _cmd
- _progname=$(basename "$0")
- _glob=$(choose_glob "${_progname}")
- _filters=$(choose_filters "${_glob}")
- _args=$(qfilter_args "${_filters}")
- _cmd="${PREFIX}/bin/qmail-qfilter ${_args}"
- exec ${_cmd}
-}
-
-main "$@"
diff -r 1ebbf886b682 -r 407ce66f2f6d mail/qmail-run/files/qmailofmipd.sh
--- a/mail/qmail-run/files/qmailofmipd.sh Fri Jul 21 04:07:17 2017 +0000
+++ b/mail/qmail-run/files/qmailofmipd.sh Fri Jul 21 04:08:15 2017 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: qmailofmipd.sh,v 1.6 2017/06/23 15:49:03 schmonz Exp $
+# $NetBSD: qmailofmipd.sh,v 1.7 2017/07/21 04:08:15 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:=""}
+: ${qmailofmipd_postenv:="QMAILQUEUE=@PREFIX@/bin/qmail-queue"}
: ${qmailofmipd_tcpflags:="-vRl0"}
: ${qmailofmipd_tcphost:="127.0.0.1"}
: ${qmailofmipd_tcpport:="26"}
Home |
Main Index |
Thread Index |
Old Index