aboutsummaryrefslogtreecommitdiff
path: root/mail/qmail
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2007-02-05 23:32:02 +0000
committerRenato Botelho <garga@FreeBSD.org>2007-02-05 23:32:02 +0000
commit885cd2500c6e783710baeb06d007494646c4eda3 (patch)
treea3a59d49daea03f0102e352d97f30c393ade87ba /mail/qmail
parent463e6c5244a9561822938657196f018370a842ff (diff)
downloadports-885cd2500c6e783710baeb06d007494646c4eda3.tar.gz
ports-885cd2500c6e783710baeb06d007494646c4eda3.zip
Notes
Diffstat (limited to 'mail/qmail')
-rw-r--r--mail/qmail/Makefile30
-rw-r--r--mail/qmail/distinfo6
2 files changed, 28 insertions, 8 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index e55b21cbd456..002ff322bdd5 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -176,7 +176,8 @@ OPTIONS+= RELAYMAILFROM "Open relay based on mailfrom" off \
REQBRACKETS "Require brackets in <addresses>" on \
VERP "VERP addresses for recipients" on \
MOREIPME "Add control files (more|not)ipme" off \
- BIGTODO "Bruce Guenter's BigToDo patch" off
+ BIGTODO "Bruce Guenter's BigToDo patch" off \
+ SMTPEXTFORK "Allow qmail-smtpd fork external progs" off
.endif
.if !defined(SLAVE_LDAP)
OPTIONS+= RCDLINK "create rc.d/qmail.sh" on
@@ -456,6 +457,13 @@ PATCH_SITES+= http://www.palomine.net/qmail/:tarpit
PATCHFILES+= tarpit.patch:tarpit
.endif
+.if defined(WITH_SMTPEXTFORK) && defined(SLAVE_SPAMCONTROL)
+MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:extfork/}
+MASTER_SITE_SUBDIR+= garga/qmail/:extfork
+DISTFILES+= smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch:extfork \
+ README.smtpextfork:extfork
+.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
@@ -562,17 +570,20 @@ post-patch:
. for option in ${SELECTED_OPTIONS}
@${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol
. endfor
- @cd ${WRKSRC} && ./install_spamcontrol.sh && \
- ${PATCH} < ${FILESDIR}/extra-patch-spamcontrol-qmail-smtpd.c
-.if defined(WITH_SPF_PATCH) && defined(SPF_SPAMCONTROL_PATCH)
+ @cd ${WRKSRC} && ./install_spamcontrol.sh
+ @${PATCH} -d ${WRKSRC} < ${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)
+. if defined(WITH_EXTTODO_PATCH) && defined(EXTTODO_PATCH)
@${PATCH} -p1 -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${EXTTODO_PATCH}
+. endif
. endif
-.endif
-.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
+. if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)
@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/outgoingip.patch-spamcontrol
-.endif
+. endif
+. if defined(WITH_SMTPEXTFORK)
+ @${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/smtpextfork-spamcontrol-${SPAMCONTROL_VERSION}.patch
+. endif
.elif defined(SLAVE_TLS)
@${HEAD} -105 ${DISTDIR}/${DIST_SUBDIR}/qmail-1.03-tls-${TLS_PATCH_DATE}-renato.patch > \
${WRKDIR}/TLS.readme
@@ -668,6 +679,9 @@ do-install:
${INSTALL_DATA} ${${sub}}/${doc} ${DOCSDIR}
. endfor
. endfor
+. if defined(SLAVE_SPAMCONTROL) && defined(WITH_SMTPEXTFORK)
+ ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/README.smtpextfork ${DOCSDIR}
+. endif
. if defined(PACKAGE_BUILDING)
@${ECHO_CMD} "FreeBSD Binary package qmail installation" \
> ${DOCSDIR}/SYSDEPS
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 93e38a519afd..a207bf25ce1c 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -94,3 +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-spamcontrol-2417.patch) = 54e4d8686a621166b006765c83c14cb0
+SHA256 (qmail/smtpextfork-spamcontrol-2417.patch) = 422b8b37c6e447f1a9ae1ffec8d00aee98bceafa963927c6331480ad90e99563
+SIZE (qmail/smtpextfork-spamcontrol-2417.patch) = 6865
+MD5 (qmail/README.smtpextfork) = e783965f5a7510c38b30f0ba3cda1e11
+SHA256 (qmail/README.smtpextfork) = c43122d27d4e20dd955c30ca402903d2e9a6a1820c3cf11902e2477316abdcbb
+SIZE (qmail/README.smtpextfork) = 7618