Date: Sun, 4 Sep 2005 19:38:12 +0900 (JST) From: FURUTATE Mikihiko <futurebsd@infoseek.to> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85708: [PATCH] mail/qmail-vida Message-ID: <200509041038.j84AcCjP000681@fenrir.future-ta.jp> Resent-Message-ID: <200509041040.j84AeDZr095608@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85708 >Category: ports >Synopsis: [PATCH] mail/qmail-vida >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Sep 04 10:40:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: FURUTATE Mikihiko >Release: FreeBSD 5.4-RELEASE-p6 i386 >Organization: >Environment: System: FreeBSD fenrir.future-ta.jp 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Sun Sep 4 13:18:53 JST 2005 root@fenrir.future-ta.jp:/usr/obj/usr/src/sys/FENRIR i386 >Description: 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. >How-To-Repeat: >Fix: diff -ruN qmail-vida.orig/Makefile qmail-vida/Makefile --- qmail-vida.orig/Makefile Sun Sep 4 18:38:49 2005 +++ qmail-vida/Makefile Sun Sep 4 18:14:15 2005 @@ -14,7 +14,7 @@ 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 @@ 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_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 @@ 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 @@ @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 diff -ruN qmail-vida.orig/files/maildir+vida.in qmail-vida/files/maildir+vida.in --- qmail-vida.orig/files/maildir+vida.in Sun Sep 4 18:38:49 2005 +++ qmail-vida/files/maildir+vida.in Sun Sep 4 18:13:27 2005 @@ -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 & >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509041038.j84AcCjP000681>