- Add SPF patch on qmail-tls slaveport [1]

- Indent if's and for's on qmail's Makefils

Thanks to:	Manuel Mausz <manuel@mausz.at> [1]

2 files changed, 80 insertions, 64 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 4b8478943b38..c25013eceb6b 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -28,6 +28,7 @@ BARRIER_MAILDIRQUOTA_PATCH=	yes
 BARRIER_BLOCKEXEC_PATCH=	yes
 BARRIER_QMAILQUEUE_PATCH=	yes
 BARRIER_SMTP_AUTH_PATCH=	yes
+BARRIER_SPF_PATCH=		yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -48,13 +49,6 @@ BARRIER_OUTGOINGIP_PATCH=	yes
 BARRIER_RFC2821_PATCH=		yes
 .endif
 
-.if defined(SLAVE_LDAP) || \
-    defined(SLAVE_MYSQL) || \
-    defined(SLAVE_SPAMCONTROL) || \
-    defined(SLAVE_TLS)
-BARRIER_SPF_PATCH=		yes
-.endif
-
 .if !defined(BARRIER_DNS_PATCH)
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
@@ -316,29 +310,29 @@ NO_MTREE=	yes
 
 .if defined(SLAVE_TLS)
 CFLAGS+=	-I${OPENSSLBASE}/include -L${OPENSSLBASE}/lib -DTLS
-.if defined(WITH_TLS_DEBUG)
+. if defined(WITH_TLS_DEBUG)
 CFLAGS+=	-DDEBUG
-.endif
+. endif
 .endif
 
 .if defined(SLAVE_LDAP)
 
-.if !defined(WITHOUT_TLS)
+. if !defined(WITHOUT_TLS)
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
-.endif
+. endif
 
-.for param in ${LDAP_PARAMS}
-.if defined(WITH_${param})
+. for param in ${LDAP_PARAMS}
+.  if defined(WITH_${param})
 LDAPFLAGS+=	-D${param}
-.endif
-.endfor
+.  endif
+. endfor
 
-.if defined(WITH_EXTERNAL_TODO)
+. if defined(WITH_EXTERNAL_TODO)
 PLIST_SUB+=	EXTERNAL_TODO=""
-.else
+. else
 PLIST_SUB+=	EXTERNAL_TODO="@comment "
-.endif
+. endif
 
 .endif
 
@@ -366,8 +360,18 @@ PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
 .endif
 
 .if defined(WITH_SPF_PATCH) && !defined(BARRIER_SPF_PATCH)
+. if defined(SLAVE_TLS)
+MASTER_SITES+=	http://manuel.mausz.at/patches/qmail/:spf_tls
+.  if defined(WITH_SMTP_AUTH_PATCH)
+SPF_TLS_PATCH=	qmail-spf-rc5.patch-auth-tls
+.  else
+SPF_TLS_PATCH=	qmail-spf-rc5.patch-tls
+.  endif
+DISTFILES+=	${SPF_TLS_PATCH}:spf_tls
+. else
 PATCH_SITES+=	http://www.saout.de/misc/spf/:spf
 PATCHFILES+=	qmail-spf-rc5.patch:spf
+. endif
 .endif
 
 .if !defined(BARRIER_DNS_PATCH) \
@@ -417,59 +421,60 @@ RCDLINK=	\#
 
 # Fill SELECTED_OPTIONS with options to write conf-spamcontrol
 .if defined(SLAVE_SPAMCONTROL)
-.if defined(WITH_RELAYMAILFROM)
+. if defined(WITH_RELAYMAILFROM)
 SELECTED_OPTIONS+=	relaymailfrom=yes
-.else
+. else
 SELECTED_OPTIONS+=	relaymailfrom=no
-.endif
+. endif
 
-.if defined(WITH_QUITASAP)
+. if defined(WITH_QUITASAP)
 SELECTED_OPTIONS+=	quitasap=yes
-.else
+. else
 SELECTED_OPTIONS+=	quitasap=no
-.endif
+. endif
 
-.if !defined(WITHOUT_REQBRACKETS)
+. if !defined(WITHOUT_REQBRACKETS)
 SELECTED_OPTIONS+=	reqbrackets=yes
-.else
+. else
 SELECTED_OPTIONS+=	reqbrackets=no
-.endif
+. endif
 
-.if !defined(WITHOUT_VERP)
+. if !defined(WITHOUT_VERP)
 SELECTED_OPTIONS+=	verp=yes
-.else
+. else
 SELECTED_OPTIONS+=	verp=no
-.endif
+. endif
 
-.if defined(WITH_RECIPIENTS550)
+. if defined(WITH_RECIPIENTS550)
 SELECTED_OPTIONS+=	recipients550=yes
-.else
+. else
 SELECTED_OPTIONS+=	recipients550=no
-.endif
+. endif
 
-.if defined(WITH_LOCALMFREQAUTH)
+. if defined(WITH_LOCALMFREQAUTH)
 SELECTED_OPTIONS+=	localmfreqauth=yes
-.else
+. else
 SELECTED_OPTIONS+=	localmfreqauth=no
-.endif
+. endif
 
-.if defined(WITH_AUTHCRAM)
+. if defined(WITH_AUTHCRAM)
 SELECTED_OPTIONS+=	cram_md5=yes
-.else
+. else
 SELECTED_OPTIONS+=	cram_md5=no
-.endif
+. endif
 
-.if defined(WITH_MOREIPME)
+. if defined(WITH_MOREIPME)
 SELECTED_OPTIONS+=	moreipme=yes
-.else
+. else
 SELECTED_OPTIONS+=	moreipme=no
-.endif
+. endif
 
-.if defined(WITH_BIGTODO)
+. if defined(WITH_BIGTODO)
 SELECTED_OPTIONS+=	bigtodo=yes
-.else
+. else
 SELECTED_OPTIONS+=	bigtodo=no
-.endif
+. endif
+
 .endif
 
 pre-everything::
@@ -504,13 +509,18 @@ post-extract:
 post-patch:
 .if defined(WITH_SMTP_AUTH_PATCH)
 	@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
-. if defined(WITH_SPF_PATCH)
-	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch
-. elif defined(SLAVE_TLS)
+. if defined(SLAVE_TLS)
 	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch-tls
+. elif defined(WITH_SPF_PATCH)
+	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch
 . endif
 	@${PATCH} -d ${WRKSRC} < ${SMTP_AUTH_DIR}/auth.patch
+. if defined(WITH_SPF_PATCH) && defined(SLAVE_TLS)
+	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
+. endif
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/qmail-smtpd-auth-close3.patch
+.elif defined(SLAVE_TLS) && defined(WITH_SPF_PATCH)
+	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
 .endif
 .if defined(SLAVE_MYSQL)
 	@${REINPLACE_CMD} 's|/opt/mysql|${LOCALBASE}|' \
@@ -519,9 +529,9 @@ post-patch:
 	@${ECHO_CMD} ${WRKDIR} > ${WRKSRC}/conf-qmail
 	@${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \
 		> ${WRKSRC}/conf-spamcontrol
-.for option in ${SELECTED_OPTIONS}
+. for option in ${SELECTED_OPTIONS}
 	@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
-.endfor
+. endfor
 	@cd ${WRKSRC} && ./install_spamcontrol.sh
 .elif defined(SLAVE_TLS)
 	@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/qmail-1.03-tls-${TLS_PATCH_DATE}-renato.patch > \
@@ -534,30 +544,30 @@ post-patch:
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} "s|^#SHADOWLIBS=-lcrypt$$|SHADOWLIBS=-lcrypt|" \
 		${WRKSRC}/Makefile
-.if !defined(WITHOUT_TLS)
+. if !defined(WITHOUT_TLS)
 	@${REINPLACE_CMD} "s|^#TLS=|TLS=|; \
 			   s|^#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
 			   s|^#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
 			   s|^#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
 		${WRKSRC}/Makefile
-.endif
-.if defined(WITH_DATA_COMPRESS) || defined (WITH_QMQP_COMPRESS)
+. endif
+. if defined(WITH_DATA_COMPRESS) || defined (WITH_QMQP_COMPRESS)
 	@${REINPLACE_CMD} "s|^#ZLIB=-lz$$|ZLIB=-lz|" \
 		${WRKSRC}/Makefile
-.endif
-.if !defined(WITHOUT_AUTOMAILDIRMAKE)
+. endif
+. if !defined(WITHOUT_AUTOMAILDIRMAKE)
 	@${REINPLACE_CMD} "s|^#MDIRMAKE=|MDIRMAKE=|" ${WRKSRC}/Makefile
-.endif
-.if !defined(WITHOUT_AUTOHOMEDIRMAKE)
+. endif
+. if !defined(WITHOUT_AUTOHOMEDIRMAKE)
 	@${REINPLACE_CMD} "s|^#HDIRMAKE=|HDIRMAKE=|" ${WRKSRC}/Makefile
-.endif
-.if defined(WITH_LDAP_DEBUG)
+. endif
+. if defined(WITH_LDAP_DEBUG)
 	@${REINPLACE_CMD} "s|^#DEBUG=|DEBUG=|" ${WRKSRC}/Makefile
-.endif
-.if defined(LDAPFLAGS)
+. endif
+. if defined(LDAPFLAGS)
 	@${REINPLACE_CMD} "s|^#LDAPFLAGS=.*$$|LDAPFLAGS=${LDAPFLAGS}|" \
 		${WRKSRC}/Makefile
-.endif
+. endif
 .endif
 	@${REINPLACE_CMD} 's!/var/qmail!${PREFIX}!; \
 			   s!/usr/local/!${LOCALBASE}/!' \
@@ -600,9 +610,9 @@ do-install:
 .endfor
 .for i in 1 5 7 8
 	@${MKDIR} ${PREFIX}/man/man$i
-.for j in ${MAN${i}}
+. for j in ${MAN${i}}
 	${INSTALL_MAN} ${WRKSRC}/$j ${PREFIX}/man/man${i}
-.endfor
+. endfor
 .endfor
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 01fc6750a374..75510eaedc78 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -43,6 +43,12 @@ SIZE (qmail/qmail-discard-double-bounces.patch) = 1305
 MD5 (qmail/qmail-spf-rc5.patch) = 434bd84b87e2027cfa643673c498bd6f
 SHA256 (qmail/qmail-spf-rc5.patch) = 8ad251d779125e11422ae9bcbf619b0ba002c0893dd8c8fe55a34a8b5fc42640
 SIZE (qmail/qmail-spf-rc5.patch) = 63582
+MD5 (qmail/qmail-spf-rc5.patch-tls) = db126b4ac29ad83c1c219e5323cef452
+SHA256 (qmail/qmail-spf-rc5.patch-tls) = c884665ff0bc5a5272efe3e09aed71e648a79d0279bc708d5a9df25c5758804f
+SIZE (qmail/qmail-spf-rc5.patch-tls) = 63617
+MD5 (qmail/qmail-spf-rc5.patch-auth-tls) = 262e381adc967df0a8ab4f15f2f6fe8f
+SHA256 (qmail/qmail-spf-rc5.patch-auth-tls) = 16fe99894938c30ed1928a61dabf0a598ef7e08a766a76cf084fe658d6d50092
+SIZE (qmail/qmail-spf-rc5.patch-auth-tls) = 63752
 MD5 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 077254d5034ee966ab5dd111f05ebbf1
 SHA256 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 89016748995546eb2a88f6fa8746d9ca3a15a491885fb1cda800dd6a4f75f5c3
 SIZE (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 267930