diff options
| author | garga <garga@FreeBSD.org> | 2005-08-29 18:15:18 +0800 |
|---|---|---|
| committer | garga <garga@FreeBSD.org> | 2005-08-29 18:15:18 +0800 |
| commit | 151278cf6b3c61d4b57ea9017767a0f886e6f818 (patch) | |
| tree | 01191072d749965751f502aee8bf1645ff1cd2f3 /mail | |
| parent | 9dc7f24225798b09b68a17efc972754ed36a8e4e (diff) | |
| download | freebsd-ports-gnome-151278cf6b3c61d4b57ea9017767a0f886e6f818.tar.gz freebsd-ports-gnome-151278cf6b3c61d4b57ea9017767a0f886e6f818.tar.zst freebsd-ports-gnome-151278cf6b3c61d4b57ea9017767a0f886e6f818.zip | |
- Add a changed version of starttls-smtp-auth patch that applies cleanly
if outgoing-ip patch is applied.
Submitted by: Wouter de Geus <benv@junerules.com>
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail/Makefile | 21 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 2 |
2 files changed, 19 insertions, 4 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 3cfd675fdb6c..b1fc903ed17e 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -37,10 +37,15 @@ BARRIER_LOCALTIME_PATCH= yes .endif .if defined(SLAVE_LDAP) || \ - defined(SLAVE_SMTP_AUTH_TLS) || \ defined(SLAVE_SPAMCONTROL) || \ defined(SLAVE_TLS) BARRIER_OUTGOINGIP_PATCH= yes +.endif + +.if defined(SLAVE_LDAP) || \ + defined(SLAVE_SMTP_AUTH_TLS) || \ + defined(SLAVE_SPAMCONTROL) || \ + defined(SLAVE_TLS) BARRIER_RFC2821_PATCH= yes .endif @@ -84,9 +89,6 @@ PATCH_DIST_STRIP+= -p1 .elif defined(SLAVE_MYSQL) PATCH_SITES+= http://iain.cx/unix/qmail/download/:mysql PATCHFILES+= qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql -.elif defined(SLAVE_SMTP_AUTH_TLS) -PATCH_SITES+= http://www.galle.com.br/~garga/qmail/:smtp_auth_tls -PATCHFILES+= qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls .elif defined(SLAVE_TLS) PATCH_SITES+= http://inoa.net/qmail-tls/:tls PATCHFILES+= qmail-1.03-tls-${TLS_PATCH_DATE}.patch:tls @@ -340,6 +342,17 @@ PLIST_SUB+= EXTERNAL_TODO="@comment " BROKEN= "OUTGOINGIP and QMTPC conflicts! Please, make your choice" .endif +.if defined(SLAVE_SMTP_AUTH_TLS) +PATCH_SITES+= http://www.galle.com.br/~garga/qmail/:smtp_auth_tls + +.if defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH) +PATCHFILES+= qmail-1.03-starttls-smtp-auth_outgoingip.patch:smtp_auth_tls +.else +PATCHFILES+= qmail-1.03-starttls-smtp-auth.patch:smtp_auth_tls +.endif + +.endif + .if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH) PATCH_SITES+= http://www.alexdupre.com/qmail/:quota PATCHFILES+= qmail-maildir++.patch:quota diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index 23909865df5a..0924e80b9b36 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -4,6 +4,8 @@ MD5 (qmail/qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16 SIZE (qmail/qmail-103.patch) = 2104 MD5 (qmail/qmail-1.03-starttls-smtp-auth.patch) = f42d6f2e58b7031ceb491820e85ddd16 SIZE (qmail/qmail-1.03-starttls-smtp-auth.patch) = 41786 +MD5 (qmail/qmail-1.03-starttls-smtp-auth_outgoingip.patch) = 24f0665e22ad68c8034e26f631803f1f +SIZE (qmail/qmail-1.03-starttls-smtp-auth_outgoingip.patch) = 41910 MD5 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 077254d5034ee966ab5dd111f05ebbf1 SIZE (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 267930 MD5 (qmail/qmail-mysql-1.1.11.patch) = 3cb291ae92fd1cbab5f5ff9c6e84f2b6 |