ports/60440: [New Features] Port: mail/qmail

Sat Dec 20 21:42:04 UTC 2003

>Number:         60440
>Category:       ports
>Synopsis:       [New Features] Port: mail/qmail
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 20 13:40:07 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Tue Dec 16 03:14:53 CET 2003 alex at armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
Add maildirquota (Maildir++) support to qmail.
Useful with other softwares that use Maildir++ extension
like vpopmail, sqwebmail, courier-imap.
Supersedes PR 55036.

Add SMTP AUTH support to qmail.
Should I explain the meaning? :-)

Add block-executables support to qmail.
Useful to block many windows viruses/worms.

Add discard-double-bounces patch to qmail.
Useful since many spammers send mail to non-existent addresses
from non-existent addresses.

Add WITHOUT_CONFIG knob to bypass the post-install setup.
Useful when upgrading an existing qmail installation.

Add WITHOUT_RCDLINK know to bypass the rc.d/qmail.sh link creation.
Useful if you start qmail via supervise scripts.
	
>How-To-Repeat:
	
>Fix:

--- qmail.diff begins here ---
diff -ruN qmail.orig/Makefile qmail/Makefile
--- qmail.orig/Makefile	Sat Dec 20 21:44:38 2003
+++ qmail/Makefile	Sat Dec 20 22:13:28 2003
@@ -34,6 +34,26 @@
 PATCHFILES+=	sendmail-flagf.patch:sendmail_flagf
 .endif # MAIN_QMAIL_PORT_SENDMAIL_F_PATCH_BARRIER
 
+.if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_MAILDIRQUOTA_PATCH_BARRIER)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:quota
+PATCHFILES+=	qmail-maildir++.patch:quota
+.endif # MAIN_QMAIL_PORT_MAILDIRQUOTA_PATCH_BARRIER
+
+.if defined(WITH_SMTPAUTH_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_SMTPAUTH_PATCH_BARRIER)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:smtpauth
+PATCHFILES+=	qmail-smtp-auth.patch:smtpauth
+.endif # MAIN_QMAIL_PORT_SMTPAUTH_PATCH_BARRIER
+
+.if defined(WITH_BLOCKEXECUTABLES_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_BLOCKEXECUTABLES_PATCH_BARRIER)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:blockexec
+PATCHFILES+=	qmail-block-executables.patch:blockexec
+.endif # MAIN_QMAIL_PORT_BLOCKEXECUTABLES_PATCH_BARRIER
+
+.if defined(WITH_DISCARDDOUBLEBOUNCES_PATCH) && !defined(MAIN_QMAIL_PORT_WITH_DISCARDDOUBLEBOUNCES_PATCH_BARRIER)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:doublebounce
+PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
+.endif # MAIN_QMAIL_PORT_DISCARDDOUBLEBOUNCES_PATCH_BARRIER
+
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:local,dns,ldap,mysql,tls/}
 PATCH_SITE_SUBDIR+=	lioux/:local,dns,ldap,mysql,tls
 
@@ -129,7 +149,7 @@
 MAINTAINER=	lioux at FreeBSD.org
 COMMENT?=	A secure, reliable, efficient, simple, and fast MTA
 
-NO_PACKAGE=	djb\'s packaging license does not allow non-standard\
+NO_PACKAGE=	djb's packaging license does not allow non-standard\
 		qmail binary distributions
 
 # A normal qmail installation puts everything into /var/qmail/.
@@ -190,7 +210,8 @@
 		${WRKSRC}/PIC.local2ext ${WRKSRC}/PIC.local2local \
 		${WRKSRC}/PIC.local2rem ${WRKSRC}/PIC.local2virt \
 		${WRKSRC}/PIC.nullclient ${WRKSRC}/PIC.relaybad \
-		${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local
+		${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local \
+		${WRKSRC}/README.auth
 
 # More files normally installed with from hier.c
 BOOTFILES=	${WRKSRC}/home ${WRKSRC}/home+df ${WRKSRC}/proc \
@@ -225,6 +246,23 @@
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may use the following build options:"
 	@${ECHO_MSG} ""
+.if !defined(MAIN_QMAIL_PORT_WITH_MAILDIRQUOTA_PATCH_BARRIER)
+	@${ECHO_MSG} "WITH_MAILDIRQUOTA_PATCH=yes	enable patch to qmail to support"
+	@${ECHO_MSG} "				maildirquota (Maildir++)"
+.endif # MAIN_QMAIL_PORT_WITH_MAILDIRQUOTA_PATCH_BARRIER
+.if !defined(MAIN_QMAIL_PORT_WITH_SMTPAUTH_PATCH_BARRIER)
+	@${ECHO_MSG} "WITH_SMTPAUTH_PATCH=yes		enable patch to qmail to support"
+	@${ECHO_MSG} "				SMTP Authentication"
+.endif # MAIN_QMAIL_PORT_WITH_SMTPAUTH_PATCH_BARRIER
+.if !defined(MAIN_QMAIL_PORT_WITH_BLOCKEXECUTABLES_PATCH_BARRIER)
+	@${ECHO_MSG} "WITH_BLOCKEXECUTABLES_PATCH=yes	enable patch to qmail to block"
+	@${ECHO_MSG} "				emails with executable attachments"
+.endif # MAIN_QMAIL_PORT_WITH_BLOCKEXECUTABLES_PATCH_BARRIER
+.if !defined(MAIN_QMAIL_PORT_WITH_DISCARDDOUBLEBOUNCES_PATCH_BARRIER)
+	@${ECHO_MSG} "WITH_DISCARDDOUBLEBOUNCES_PATCH=yes"
+	@${ECHO_MSG} "				enable patch to qmail to discard"
+	@${ECHO_MSG} "				bounced (double) bounces"
+.endif # MAIN_QMAIL_PORT_WITH_DISCARDDOUBLEBOUNCES_PATCH_BARRIER
 .if !defined(MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER)
 	@${ECHO_MSG} "WITH_QMAILQUEUE_PATCH=yes	enable patch to qmail to run a QMAILQUEUE"
 	@${ECHO_MSG} "				program instead of bin/qmail-queue"
@@ -236,7 +274,9 @@
 	@${ECHO_MSG} "WITH_BIG_CONCURRENCY_PATCH=yes	enable patch to qmail to"
 	@${ECHO_MSG} "				use a concurrency greater than 240"
 	@${ECHO_MSG} "WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT=NUMBER"
+.if defined(WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT)
 	@${ECHO_MSG} "				(default NUMBER=${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT})"
+.endif # WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT
 	@${ECHO_MSG} "				set this to a value reasonable for"
 	@${ECHO_MSG} "				your system if you use the patch"
 .endif # MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER
@@ -322,9 +362,13 @@
 .endfor
 	@# This is not part of qmail proper, hence the 2nd class citizenship
 	${INSTALL_SCRIPT} ${FILESDIR}/mkaliasdir ${PREFIX}/${DOCDIR}
+.if !defined(WITHOUT_CONFIG)
 	@cd ${PREFIX}/configure ; ./config
+.endif
+.if !defined(WITHOUT_RCDLINK)
 	@${MKDIR} ${LOCALBASE}/etc/rc.d
 	@${LN} -sf ${PREFIX}/rc ${LOCALBASE}/etc/rc.d/qmail.sh
+.endif
 	@${ECHO}
 	@${SED} s!/var/qmail!${PREFIX}!g ${PKGMESSAGE} | ${FMT}
 
diff -ruN qmail.orig/distinfo qmail/distinfo
--- qmail.orig/distinfo	Sat Dec 20 21:44:38 2003
+++ qmail/distinfo	Sat Dec 20 22:06:07 2003
@@ -1,5 +1,9 @@
 MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
 MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
+MD5 (qmail-maildir++.patch) = fd92b624ac1129a656eb1e567d1f0409
+MD5 (qmail-smtp-auth.patch) = e19874eac17d4af2176dc18eacec3c68
+MD5 (qmail-block-executables.patch) = e425b420e5251b4882fc699f7822f7a0
+MD5 (qmail-discard-double-bounces.patch) = 55d45bb8d2c3822a0e3544058aa5a3a3
 MD5 (qmail-ldap-1.03-20020901.patch.gz) = 48d2761e9ae44bb4d2812a19634f1a5b
 MD5 (qmail-mysql-1.1.8.patch) = 0860a5b5cd5b6f99bf005e845b2e0764
 MD5 (tls.patch) = 57447ec135ddb32ada13a56b70ccf6d4
diff -ruN qmail.orig/pkg-plist qmail/pkg-plist
--- qmail.orig/pkg-plist	Sat Dec 20 21:44:38 2003
+++ qmail/pkg-plist	Sat Dec 20 21:44:56 2003
@@ -10,6 +10,7 @@
 %%PORTDOCS%%%%DOCDIR%%/INSTALL.vsm
 %%PORTDOCS%%%%DOCDIR%%/TEST.deliver
 %%PORTDOCS%%%%DOCDIR%%/TEST.receive
+%%PORTDOCS%%%%DOCDIR%%/README.auth
 %%PORTDOCS%%%%DOCDIR%%/REMOVE.sendmail
 %%PORTDOCS%%%%DOCDIR%%/REMOVE.binmail
 %%PORTDOCS%%%%DOCDIR%%/PIC.local2alias
--- qmail.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

