mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-20 20:09:11 +00:00
1, Fix boot/maildir+vida script.
If unmodified to use this script, qmail-smtpd dumps core. And support [start|stop] command. 2, Add SUB_LIST in Makefile. '%%ECHO_CMD%% replaces to echo command in boot/*. 3, Remove duplicated MASTER_QMAIL_SITE in Makefile. 4, Fix Maintainer's mail address. PR: ports/85708 Submitted by: maintainer
This commit is contained in:
parent
19da3c6527
commit
fe377418bb
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=141995
@ -14,7 +14,7 @@ MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE_JP:S/$/:vida/} \
|
||||
http://cr.yp.to/ucspi-tcp/:tcpserver
|
||||
MASTER_SITE_SUBDIR=${PORTNAME}/2100/:vida
|
||||
|
||||
MAINTAINER?= future@future-ta.com
|
||||
MAINTAINER= futurebsd@infoseek.to
|
||||
COMMENT= SMTP_AUTH/APOP support for qmail
|
||||
|
||||
DISTFILES= ${DISTNAME}.tar.gz:vida \
|
||||
@ -65,6 +65,7 @@ PLIST_SUB+= TLS="@comment "
|
||||
|
||||
SUB_FILES+= pkg-message${PKGMESSAGE_SUFFIX} mailer.conf.sample \
|
||||
bootfiles.sed enable-qmail
|
||||
SUB_LIST+= ECHO_CMD=${ECHO_CMD}
|
||||
PKGINSTALL?= ${WRKDIR}/pkg-install
|
||||
PKGMESSAGE?= ${WRKDIR}/pkg-message${PKGMESSAGE_SUFFIX}
|
||||
|
||||
@ -136,7 +137,6 @@ PATCH_SITE_SUBDIR+= lioux/:dns
|
||||
PATCH_DIST_STRIP+= -p1
|
||||
|
||||
.if defined(WITH_QMAILQUEUE_PATCH)
|
||||
PATCH_SITES+= ${MASTER_SITE_QMAIL}
|
||||
PATCHFILES+= qmailqueue-patch
|
||||
.endif
|
||||
.if defined(WITH_BIG_CONCURRENCY_PATCH)
|
||||
@ -163,8 +163,7 @@ PATCH_SITES+= http://www.alexdupre.com/qmail/:doublebounce
|
||||
PATCHFILES+= qmail-discard-double-bounces.patch:doublebounce
|
||||
.endif
|
||||
.if defined(WITH_RELAY_REJECT_PATCH)
|
||||
PATCH_SITES+= ${MASTER_SITE_QMAIL:S/$/:reject/}
|
||||
PATCHFILES+= qmail-smtpd-relay-reject:reject
|
||||
PATCHFILES+= qmail-smtpd-relay-reject
|
||||
.endif
|
||||
.if defined(WITH_RCDLINK)
|
||||
PLIST_SUB+= RCDLINK=""
|
||||
@ -252,7 +251,7 @@ do-install:
|
||||
@if [ -f ${WRKSRC_QMAIL}/${i}.sh ] ; then \
|
||||
${SED} -f ${WRKDIR}/bootfiles.sed ${WRKSRC_QMAIL}/$i.sh > ${WRKDIR}/${i} ; \
|
||||
elif [ -f ${FILESDIR}/${i}.in ] ; then \
|
||||
${SED} -e 's,%%PREFIX%%,${PREFIX},g ; s,%%TCPSERVERDB%%,${TCPSERVER_DB_DIR},g' ${FILESDIR}/$i.in > ${WRKDIR}/${i} ; \
|
||||
${SED} -e 's,%%PREFIX%%,${PREFIX},g ; s,%%TCPSERVERDB%%,${TCPSERVER_DB_DIR},g ; s,%%ECHO_CMD%%,${ECHO_CMD},g' ${FILESDIR}/$i.in > ${WRKDIR}/${i} ; \
|
||||
elif [ -f ${FILESDIR}/${i} ] ; then \
|
||||
${SED} -f ${WRKDIR}/bootfiles.sed ${FILESDIR}/$i > ${WRKDIR}/${i} ; \
|
||||
fi
|
||||
|
@ -4,16 +4,30 @@
|
||||
# Using qmail-local to deliver messages to Maildir format by default
|
||||
# Using tcpserver and checkpassword
|
||||
|
||||
exec env - PATH="%%PREFIX%%/bin:$PATH" \
|
||||
qmail-start ./Maildir/ \
|
||||
splogger qmail &
|
||||
case "$1" in
|
||||
|
||||
exec env - PATH="%%PREFIX%%/bin:$PATH" \
|
||||
tcpserver -vHR -x %%TCPSERVERDB%% -c 40 0 \
|
||||
smtp qmail-smtpup $HOST checkpassword qmail-smtpd 2>&1 | \
|
||||
%%PREFIX%%/bin/splogger smtpd 4 &
|
||||
start)
|
||||
exec env - PATH="%%PREFIX%%/bin:$PATH" \
|
||||
qmail-start ./Maildir/ \
|
||||
splogger qmail &
|
||||
exec env - PATH="%%PREFIX%%/bin:$PATH" \
|
||||
tcpserver -vHR -x %%TCPSERVERDB%% -c 40 0 \
|
||||
smtp qmail-smtpup "$HOST" checkpassword qmail-smtpd 2>&1 | \
|
||||
%%PREFIX%%/bin/splogger smtpd 4 &
|
||||
exec env - PATH="%%PREFIX%%/bin:$PATH" \
|
||||
tcpserver -vHR -x %%TCPSERVERDB%% 0 \
|
||||
pop3 qmail-popup "$HOST" checkpassword qmail-pop3d Maildir 2>&1 | \
|
||||
%%PREFIX%%/bin/splogger pop3d 4 &
|
||||
;;
|
||||
stop)
|
||||
# Stop all qmail process
|
||||
killall qmail-send
|
||||
killall splogger
|
||||
killall tcpserver
|
||||
;;
|
||||
*)
|
||||
%%ECHO_CMD%% "Usage: `basename $0` {start|stop}" >&2
|
||||
exit 64
|
||||
;;
|
||||
esac
|
||||
|
||||
exec env - PATH="%%PREFIX%%/bin:$PATH" \
|
||||
tcpserver -vHR -x %%TCPSERVERDB%% 0 \
|
||||
pop3 qmail-popup $HOST checkpassword qmail-pop3d Maildir 2>&1 | \
|
||||
%%PREFIX%%/bin/splogger pop3d 4 &
|
||||
|
Loading…
Reference in New Issue
Block a user