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

[Renato Botelho]

The following reply was made to PR ports/60440; it has been noted by GNATS.

From: Renato Botelho <freebsd at galle.com.br>
To: bug-followup at FreeBSD.org, sysadmin at alexdupre.com
Cc:  
Subject: Re: ports/60440: [New Features] Port: mail/qmail
Date: Tue, 17 May 2005 12:59:25 -0300

 I propose this new patch, based on new port structure and removing this:
 - SMTP_AUTH: you can use slave port mail/qmail-smtp_auth+tls
 - WITHOUT_CONFIG: I changed it to run automatically just where it's needed
 - WITHOUT_RCDLINK: I already added it
 
 Here is the patch
 
 -- qmail.diff starts here --
 ===> Updating from CVS
 M Makefile
 M distinfo
 ===> Generating patch
 ===> Viewing diff with more
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/mail/qmail/Makefile,v
 retrieving revision 1.62
 diff -u -r1.62 Makefile
 --- Makefile	17 May 2005 09:14:29 -0000	1.62
 +++ Makefile	17 May 2005 15:53:20 -0000
 @@ -17,20 +17,32 @@
  
  DIST_SUBDIR=	qmail
  
 -.if defined(SLAVE_LDAP) || defined(SLAVE_SPAMCONTROL)
 -BARRIER_DNS_PATCH=yes
 -BARRIER_BIG_CONCURRENCY_PATCH=yes
 -BARRIER_QMTPC_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
 -.endif
 -
 -.if defined(SLAVE_MYSQL) || defined(SLAVE_SPAMCONTROL)
 -BARRIER_QMAILQUEUE_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_SPAMCONTROL)
 +BARRIER_DNS_PATCH=		yes
 +BARRIER_BIG_CONCURRENCY_PATCH=	yes
 +BARRIER_QMTPC_PATCH=		yes
 +BARRIER_DISCBOUNCES_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
 +.endif
 +
 +.if defined(SLAVE_MYSQL) || \
 +    defined(SLAVE_SPAMCONTROL)
 +BARRIER_QMAILQUEUE_PATCH=	yes
  .endif
  
  .if defined(SLAVE_SPAMCONTROL)
 @@ -116,6 +128,15 @@
  .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 @@
  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)) \
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/mail/qmail/distinfo,v
 retrieving revision 1.26
 diff -u -r1.26 distinfo
 --- distinfo	11 May 2005 13:07:41 -0000	1.26
 +++ distinfo	17 May 2005 15:53:21 -0000
 @@ -28,3 +28,9 @@
  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
 ===> Done
 -- qmail.diff ends here --
 
 Thanks
 -- 
 Renato Botelho <freebsd at galle dot com dot br>
 AIM: RBGargaBR | ICQ: 54596223
 GnuPG Key: http://www.galle.com.br/~renato/pubkey.asc
 
 Put no trust in cryptic comments.