From 5316677351c072f12d2f1749d8d284c7aaf35c78 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 28 Jul 2006 10:50:40 +0000
Subject: [PATCH] Add SPF checker to qmail-spamcontrol port

---
 mail/qmail/Makefile | 31 ++++++++++++++++++++++---------
 mail/qmail/distinfo |  3 +++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index db5db33cffd2..640cc34b422f 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -24,6 +24,7 @@ CONFLICTS=	qmail-vida-[0-9]*
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_MYSQL)
 BARRIER_MAILDIRQUOTA_PATCH=	yes
+BARRIER_SPF_PATCH=		yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -32,7 +33,6 @@ 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)
@@ -350,14 +350,21 @@ 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/programming/patches/qmail/:spf_tls
-.  if defined(WITH_SMTP_AUTH_PATCH)
+. if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
+.  if defined(SLAVE_SPAMCONTROL)
+SPF_SPAMCONTROL_PATCH=	qmail-spf-rc5.patch-spamcontrol
+MASTER_SITES+=		${MASTER_SITE_LOCAL:S/$/:spf_spamcontrol/}
+MASTER_SITE_SUBDIR+=	garga/qmail/:spf_spamcontrol
+DISTFILES+=		${SPF_SPAMCONTROL_PATCH}:spf_spamcontrol
+.  elif defined(WITH_SMTP_AUTH_PATCH)
 SPF_TLS_PATCH=	qmail-spf-rc5.patch-auth-tls
+MASTER_SITES+=	http://manuel.mausz.at/programming/patches/qmail/:spf_tls
+DISTFILES+=	${SPF_TLS_PATCH}:spf_tls
 .  else
 SPF_TLS_PATCH=	qmail-spf-rc5.patch-tls
-.  endif
+MASTER_SITES+=	http://manuel.mausz.at/programming/patches/qmail/:spf_tls
 DISTFILES+=	${SPF_TLS_PATCH}:spf_tls
+.  endif
 . else
 PATCH_SITES+=	http://www.saout.de/misc/spf/:spf
 PATCHFILES+=	qmail-spf-rc5.patch:spf
@@ -369,7 +376,7 @@ PLIST_SUB+=		EXTTODO=""
 DOCFILES_WRKSRC+=	EXTTODO
 
 . if defined(WITH_SPF_PATCH) && !defined(BARRIER_SPF_PATCH)
-.  if defined(SLAVE_TLS)
+.  if defined(SLAVE_TLS) || defined(SLAVE_SPAMCONTROL)
 MASTER_SITES+=	${MASTER_SITE_LOCAL:S/$/:exttodo/}
 MASTER_SITE_SUBDIR+=	garga/qmail/:exttodo
 EXTTODO_PATCH=	ext_todo-20030105_spf.patch
@@ -505,7 +512,7 @@ post-extract:
 .endif
 
 post-patch:
-.if defined(WITH_SMTP_AUTH_PATCH)
+.if defined(WITH_SMTP_AUTH_PATCH) && !defined(BARRIER_SMTP_AUTH_PATCH)
 	@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
 . if defined(SLAVE_TLS)
 	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch-tls
@@ -513,14 +520,14 @@ post-patch:
 	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch
 . endif
 	@${PATCH} -d ${WRKSRC} < ${SMTP_AUTH_DIR}/auth.patch
-. if defined(SLAVE_TLS) && defined(WITH_SPF_PATCH)
+. if defined(SLAVE_TLS) && defined(WITH_SPF_PATCH) && defined(SPF_TLS_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
 .  if defined(WITH_EXTTODO_PATCH) && defined(EXTTODO_PATCH)
 	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
 .  endif
 . endif
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/qmail-smtpd-auth-close3.patch
-.elif defined(SLAVE_TLS) && defined(WITH_SPF_PATCH)
+.elif defined(SLAVE_TLS) && defined(WITH_SPF_PATCH) && defined(SPF_TLS_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
 . if defined(WITH_EXTTODO_PATCH) && defined(EXTTODO_PATCH)
 	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
@@ -538,6 +545,12 @@ post-patch:
 . endfor
 	@cd ${WRKSRC} && ./install_spamcontrol.sh && \
 		${PATCH} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c
+.if defined(WITH_SPF_PATCH) && defined(SPF_SPAMCONTROL_PATCH)
+	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_SPAMCONTROL_PATCH}
+. if defined(WITH_EXTTODO_PATCH) && defined(EXTTODO_PATCH)
+	@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
+. endif
+.endif
 .elif defined(SLAVE_TLS)
 	@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/qmail-1.03-tls-${TLS_PATCH_DATE}-renato.patch > \
 		${WRKDIR}/TLS.readme
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index f29ba89f9c67..298bcd9f1d90 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -79,3 +79,6 @@ SIZE (qmail/ext_todo-20030105_spf.patch) = 33781
 MD5 (qmail/ext_todo-20030105_mysql.patch) = ecddff9ba6d725ec3be61843bc8007a7
 SHA256 (qmail/ext_todo-20030105_mysql.patch) = 3fc65b91faaaae147dbf6264f9381664819ef2f236532764309d174f29919ff1
 SIZE (qmail/ext_todo-20030105_mysql.patch) = 33797
+MD5 (qmail/qmail-spf-rc5.patch-spamcontrol) = 9fe79d3420c9ad75f7ec224e04933bf5
+SHA256 (qmail/qmail-spf-rc5.patch-spamcontrol) = 4c49eb9bb137fb6c07ef9a38773fc6d122a087b120f663c0fc9dc4910875e527
+SIZE (qmail/qmail-spf-rc5.patch-spamcontrol) = 64100