- Update (fix bug) SMTPEXTFORK code (affects only qmail-ldap port)

- Add JMS's Greet Delay feature on Qmail-LDAP
- Enhace qmail-smtpd logs (spamcontrol-like) on qmail-ldap

PR:		ports/140255
Submitted by:	Patrick Tracanelli <eksffa@freebsdbrasil.com.br>

3 files changed, 29 insertions, 6 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 8500df81e246..b9abb8ffbf16 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-ldap
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index d428fcaebf30..cc08c29a0d23 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -168,7 +168,9 @@ OPTIONS+=	TLS		"SMTP TLS support" on \
 		LDAP_DEBUG	"possibility to log and debug imap/pop" off \
 		SMTPEXTFORK	"Allow qmail-smtpd fork external progs" off \
 		XF_QUITASAP	"Close SMTP session ASAP (SMTPEXTFORK)" off \
-		SENDERCHECK4	"LOOSE checks exclusively for RELAY clients" off
+		SENDERCHECK4	"LOOSE checks exclusively for RELAY clients" off \
+		ENHACELOGS	"Enhace qmail-smtpd logs (spamcontrol-like)" off \
+		GRTDELAY	"Add jms1's Greet Delay feature" off
 
 LDAP_PARAMS=	ALTQUEUE BIGBROTHER BIGTODO BIND_8_COMPAT\
 		CLEARTEXTPASSWD DASH_EXT DATA_COMPRESS\
@@ -470,7 +472,7 @@ PATCHFILES+=	tarpit.patch:tarpit
 . if defined(SLAVE_SPAMCONTROL)
 SMTPEXTFORK_PATCH=	smtpextfork-spamcontrol-2519.patch
 . else
-SMTPEXTFORK_PATCH=	smtpextfork-ldap-${LDAP_PATCH_DATE}_3.patch
+SMTPEXTFORK_PATCH=	smtpextfork-ldap-${LDAP_PATCH_DATE}_4.patch
 . endif
 
 MASTER_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail-smtpextfork/patches/:extfork \
@@ -487,6 +489,21 @@ PATCH_SITE_SUBDIR+=	garga/qmail/:sendercheck4
 PATCHFILES+=	qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch:sendercheck4
 .endif
 
+.if defined(SLAVE_LDAP) && defined(WITH_GRTDELAY)
+PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:grtdelay \
+		${MASTER_SITE_LOCAL:S/$/:grtdelay/}
+PATCH_SITE_SUBDIR+=	garga/qmail/:grtdelay
+PATCHFILES+=	qmail-ldap-${LDAP_PATCH_DATE}-grtdelay.patch:grtdelay
+DOCFILES_WRKDIR_doc+=	README.GREETDELAY
+.endif
+
+.if defined(SLAVE_LDAP) && defined(WITH_ENHACELOGS)
+PATCH_SITES+=	http://www6.freebsdbrasil.com.br/~eksffa/l/dev/qmail/:ldapenhacelog \
+		${MASTER_SITE_LOCAL:S/$/:ldapenhacelog/}
+PATCH_SITE_SUBDIR+=	garga/qmail/:ldapenhacelog
+PATCHFILES+=	enhacelogging-ldap-${LDAP_PATCH_DATE}_4.patch:ldapenhacelog
+.endif
+
 # Some default values, these can be modified by make command line
 .if defined(WITH_BIG_CONCURRENCY_PATCH) && !defined(BARRIER_BIG_CONCURRENCY_PATCH)
 WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT?=	509
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 94449359a469..86b306ff6c59 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -94,9 +94,9 @@ SIZE (qmail/auth.patch.diff-tls) = 2993
 MD5 (qmail/ext_todo-20030105+big-todo.103.patch) = 5878870ef85d6a83ba9465ce94d9cd42
 SHA256 (qmail/ext_todo-20030105+big-todo.103.patch) = 4e44ad403b21f5910b6af11295b82296bc8c0f18bc40dcfecfb95c11e5a296f7
 SIZE (qmail/ext_todo-20030105+big-todo.103.patch) = 2523
-MD5 (qmail/smtpextfork-ldap-20060201_3.patch) = 5dc5f9be5acf3ed87590172ee63a7f24
-SHA256 (qmail/smtpextfork-ldap-20060201_3.patch) = 5aa17d91430ecde3e89d7b842330c3e4860d2c8f2a5cd2e893837c26f6345be4
-SIZE (qmail/smtpextfork-ldap-20060201_3.patch) = 6832
+MD5 (qmail/smtpextfork-ldap-20060201_4.patch) = bfa38f86d1ea648f0059f73dd91e8827
+SHA256 (qmail/smtpextfork-ldap-20060201_4.patch) = ff587d7169f404b4a0d0957f81a6849fd867defee5ac91a52ee958e58034b49f
+SIZE (qmail/smtpextfork-ldap-20060201_4.patch) = 6632
 MD5 (qmail/smtpextfork-spamcontrol-2519.patch) = e5d7e5dc0039bff20a7c3fe6f55f9ca1
 SHA256 (qmail/smtpextfork-spamcontrol-2519.patch) = f45ecbb0949e4def25dc80b0b6c45d5e27df3afdb2ead1e5f0ac48d487af6bf2
 SIZE (qmail/smtpextfork-spamcontrol-2519.patch) = 7611
@@ -106,3 +106,9 @@ SIZE (qmail/README.smtpextfork) = 7690
 MD5 (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 28395f5b6edfff7bb58974cd5b46717a
 SHA256 (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 7656aef1f30f3c6a684e319d2a309d162b2a559eb84b38d21a1e23e88c78995b
 SIZE (qmail/qmail-ldap-1.03_qmail-smtpd_SENDERCHECK4.patch) = 2182
+MD5 (qmail/qmail-ldap-20060201-grtdelay.patch) = 937605e19f022906af5621223e2b1d47
+SHA256 (qmail/qmail-ldap-20060201-grtdelay.patch) = db880469e3d1356252bc8d10251b88cf5cf75a69f18971ffa6e2b85db5a796bc
+SIZE (qmail/qmail-ldap-20060201-grtdelay.patch) = 6051
+MD5 (qmail/enhacelogging-ldap-20060201_4.patch) = 3ad238c62d0864ac72d058c454f207d4
+SHA256 (qmail/enhacelogging-ldap-20060201_4.patch) = 07973f05602a1689e7585a2572c2b523723930214623ef5b922aeeed0bcfc867
+SIZE (qmail/enhacelogging-ldap-20060201_4.patch) = 1205