- Add maildirquota (Maildir++) support to qmail.

- Add block-executables support to qmail.
- Add discard-double-bounces patch to qmail.

PR:		ports/60440
Submitted by:	ale
Reworked by:	maintainer

2 files changed, 52 insertions, 10 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 15d42e880069..aeaf3629af21 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -17,20 +17,32 @@ COMMENT?=	A secure, reliable, efficient, simple, and fast MTA
 
 DIST_SUBDIR=	qmail
 
-.if defined(SLAVE_LDAP) || defined(SLAVE_SPAMCONTROL)
-BARRIER_DNS_PATCH=yes
-BARRIER_BIG_CONCURRENCY_PATCH=yes
-BARRIER_QMTPC_PATCH=yes
+.if defined(SLAVE_LDAP) || \
+    defined(SLAVE_SPAMCONTROL) || \
+    defined(SLAVE_MYSQL)
+BARRIER_MAILDIRQUOTA_PATCH=	yes
+BARRIER_BLOCKEXEC_PATCH=	yes
 .endif
 
-.if defined(SLAVE_LDAP) || defined(SLAVE_SMTP_AUTH_TLS) || \
-    defined(SLAVE_SPAMCONTROL) || defined(SLAVE_TLS)
-BARRIER_OUTGOINGIP_PATCH=yes
-BARRIER_RFC2821_PATCH=yes
+.if defined(SLAVE_LDAP) || \
+    defined(SLAVE_SPAMCONTROL)
+BARRIER_DNS_PATCH=		yes
+BARRIER_BIG_CONCURRENCY_PATCH=	yes
+BARRIER_QMTPC_PATCH=		yes
+BARRIER_DISCBOUNCES_PATCH=	yes
 .endif
 
-.if defined(SLAVE_MYSQL) || defined(SLAVE_SPAMCONTROL)
-BARRIER_QMAILQUEUE_PATCH=yes
+.if defined(SLAVE_LDAP) || \
+    defined(SLAVE_SMTP_AUTH_TLS) || \
+    defined(SLAVE_SPAMCONTROL) || \
+    defined(SLAVE_TLS)
+BARRIER_OUTGOINGIP_PATCH=	yes
+BARRIER_RFC2821_PATCH=		yes
+.endif
+
+.if defined(SLAVE_MYSQL) || \
+    defined(SLAVE_SPAMCONTROL)
+BARRIER_QMAILQUEUE_PATCH=	yes
 .endif
 
 .if defined(SLAVE_SPAMCONTROL)
@@ -116,6 +128,15 @@ OPTIONS+=	LOCALTIME_PATCH "emit dates in the local timezone" off
 .if !defined(BARRIER_QMTPC_PATCH)
 OPTIONS+=	QMTPC_PATCH "send email using qmtp protocol" off
 .endif
+.if !defined(BARRIER_MAILDIRQUOTA_PATCH)
+OPTIONS+=	MAILDIRQUOTA_PATCH "Maildir++ support" off
+.endif
+.if !defined(BARRIER_BLOCKEXEC_PATCH)
+OPTIONS+=	BLOCKEXEC_PATCH "block many windows viruses/worms" off
+.endif
+.if !defined(BARRIER_DISCBOUNCES_PATCH)
+OPTIONS+=	DISCBOUNCES_PATCH "discard double-bounces" off
+.endif
 .if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS)
 OPTIONS+=	TLS_DEBUG "enable additional debug information" off
 .elif defined(SLAVE_LDAP)
@@ -270,6 +291,21 @@ USE_REINPLACE=	yes
 BROKEN=	"OUTGOINGIP and QMTPC conflicts! Please, make your choice"
 .endif
 
+.if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:quota
+PATCHFILES+=	qmail-maildir++.patch:quota
+.endif
+
+.if defined(WITH_BLOCKEXEC_PATCH) && !defined(BARRIER_BLOCKEXEC_PATCH)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:blockexec
+PATCHFILES+=	qmail-block-executables.patch:blockexec
+.endif
+
+.if defined(WITH_DISCBOUNCES_PATCH) && !defined(BARRIER_DISCBOUNCES_PATCH)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:doublebounce
+PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
+.endif
+
 .if !defined(BARRIER_DNS_PATCH) \
  	||(defined(WITH_QMAILQUEUE_PATCH)     && !defined(BARRIER_QMAILQUEUE_PATCH)) \
 	||(defined(WITH_BIG_TODO_PATCH)       && !defined(BARRIER_BIG_TODO_PATCH)) \
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index e8a9221af477..7dd0954f0e44 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -28,3 +28,9 @@ MD5 (qmail/qmail-date-localtime.patch) = d566e8bd99b33efee0194e855b8d6995
 SIZE (qmail/qmail-date-localtime.patch) = 2603
 MD5 (qmail/qmail-1.03-qmtpc.patch) = 122664c38338e5ec35fcac43f33d6927
 SIZE (qmail/qmail-1.03-qmtpc.patch) = 6197
+MD5 (qmail/qmail-maildir++.patch) = fd92b624ac1129a656eb1e567d1f0409
+SIZE (qmail/qmail-maildir++.patch) = 38088
+MD5 (qmail/qmail-block-executables.patch) = e425b420e5251b4882fc699f7822f7a0
+SIZE (qmail/qmail-block-executables.patch) = 5070
+MD5 (qmail/qmail-discard-double-bounces.patch) = 55d45bb8d2c3822a0e3544058aa5a3a3
+SIZE (qmail/qmail-discard-double-bounces.patch) = 1305