- Add patch to provide SMTP Authentication on main qmail port.

3 files changed, 130 insertions, 2 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 18e20efe9e1..389d5edc757 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -11,6 +11,7 @@ PORTREVISION?=	4
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	garga@FreeBSD.org
 COMMENT?=	A secure, reliable, efficient, simple, and fast MTA
@@ -57,6 +58,7 @@ BARRIER_RFC2821_PATCH=		yes
     defined(SLAVE_SPAMCONTROL) || \
     defined(SLAVE_TLS)
 BARRIER_SPF_PATCH=		yes
+BARRIER_SMTP_AUTH_PATCH=	yes
 .endif
 
 .if !defined(SLAVE_SMTP_AUTH_TLS)
@@ -104,8 +106,8 @@ PATCH_DIST_STRIP+=	-p1
 PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip/}
 PATCH_SITE_SUBDIR+=	garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,smtp_auth_tls,tls,quota,blockexec,doublebounce,spf,localtime,qmtpc_outgoingip
 
-NO_PACKAGE=	djb's packaging license does not allow non-standard \
-		qmail binary distributions
+NO_PACKAGE=	"djb\'s packaging license does not allow non-standard \
+		qmail binary distributions"
 
 # A normal qmail installation puts everything into /var/qmail/.
 # If you want to install to /usr/local/, then "/usr/local/qmail" is
@@ -113,6 +115,12 @@ NO_PACKAGE=	djb's packaging license does not allow non-standard \
 PREFIX?=		/var/qmail
 QMAIL_VERSION?=		1.03
 
+.if !defined(BARRIER_SMTP_AUTH_PATCH)
+SMTP_AUTH_VERSION=	0.31
+SMTP_AUTH_DIR=		${WRKDIR}/${PORTNAME}-smtpd-auth-${SMTP_AUTH_VERSION}
+
+OPTIONS+=	SMTP_AUTH_PATCH "Provide SMTP Authentication" off
+.endif
 .if !defined(BARRIER_QMAILQUEUE_PATCH)
 OPTIONS+=	QMAILQUEUE_PATCH "run a QMAILQUEUE program" off
 .endif
@@ -346,6 +354,11 @@ PLIST_SUB+=	EXTERNAL_TODO="@comment "
 
 .endif
 
+.if defined(WITH_SMTP_AUTH_PATCH)
+MASTER_SITES+=	http://members.elysium.pl/brush/qmail-smtpd-auth/dist/:smtp_auth
+DISTFILES+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth
+.endif
+
 .if defined(SLAVE_SMTP_AUTH_TLS)
 PATCH_SITES+=	http://www.galle.com.br/~garga/qmail/:smtp_auth_tls
 
@@ -504,6 +517,13 @@ post-extract:
 .endif
 
 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
+.endif
+	@${PATCH} -d ${WRKSRC} < ${SMTP_AUTH_DIR}/auth.patch
+.endif
 .if defined(SLAVE_MYSQL)
 	@${REINPLACE_CMD} 's|/opt/mysql|${LOCALBASE}|' \
 		${WRKSRC}/Makefile
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 6e1e1f383a1..79e66b43e45 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -64,3 +64,6 @@ SIZE (qmail/spamcontrol-2317_tgz.bin) = 120429
 MD5 (qmail/qmail-1.03-tls-20021228.patch) = 0f00f92289c561a8c0053c75e995e823
 SHA256 (qmail/qmail-1.03-tls-20021228.patch) = d41e9b5effc775bcfc5f8c9f781ffa9b7264ec1c3ee13494162b436f66e4190a
 SIZE (qmail/qmail-1.03-tls-20021228.patch) = 42088
+MD5 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 6b202f71a99fb41e9e32906017270ba0
+SHA256 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 1b439fa7e128de13fa80b86883f61a39d17b87b7e8916b6a0eab065bbe49b938
+SIZE (qmail/qmail-smtpd-auth-0.31.tar.gz) = 8798
diff --git a/mail/qmail/files/auth.patch.patch b/mail/qmail/files/auth.patch.patch
new file mode 100644
index 00000000000..bc35b45673e
--- /dev/null
+++ b/mail/qmail/files/auth.patch.patch
@@ -0,0 +1,105 @@
+--- auth.patch.orig	Mon Dec 12 09:55:27 2005
++++ auth.patch	Mon Dec 12 09:58:44 2005
+@@ -1,5 +1,5 @@
+-*** Makefile.orig	Mon Jun 15 05:53:16 1998
+---- Makefile	Fri May 10 00:31:38 2002
++*** Makefile.orig	Mon Dec 12 09:37:18 2005
++--- Makefile	Mon Dec 12 09:51:10 2005
+ ***************
+ *** 136,141 ****
+ --- 136,145 ----
+@@ -14,52 +14,50 @@
+   binm1.sh conf-qmail
+   	cat binm1.sh \
+ ***************
+-*** 1536,1547 ****
+-  timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
+-  date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
+-  open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
+-! fs.a auto_qmail.o socket.lib
++*** 1597,1608 ****
++  timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o constmap.o \
++  received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a fd.a wait.a \
++  datetime.a getln.a open.a sig.a case.a env.a stralloc.a alloc.a substdio.a \
++! error.a str.a fs.a auto_qmail.o socket.lib dns.lib
+   	./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
+-  	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
+-  	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
+-  	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
+-! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o  `cat \
+-  	socket.lib`
++  	timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o \
++  	constmap.o received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a \
++  	fd.a wait.a datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
++! 	alloc.a substdio.a error.a fs.a auto_qmail.o \
++  	str.a `cat socket.lib` `cat dns.lib`
+   
+   qmail-smtpd.0: \
+---- 1540,1551 ----
+-  timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
+-  date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
+-  open.a sig.a case.a env.a stralloc.a alloc.a substdio.a error.a str.a \
+-! fs.a auto_qmail.o base64.o socket.lib
++--- 1601,1612 ----
++  timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o constmap.o \
++  received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a fd.a wait.a \
++  datetime.a getln.a open.a sig.a case.a env.a stralloc.a alloc.a substdio.a \
++! error.a str.a fs.a auto_qmail.o base64.o socket.lib dns.lib
+   	./load qmail-smtpd rcpthosts.o commands.o timeoutread.o \
+-  	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
+-  	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
+-  	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
+-! 	alloc.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
+-  	socket.lib`
++  	timeoutwrite.o ip.o ipme.o ipalloc.o strsalloc.o control.o \
++  	constmap.o received.o date822fmt.o now.o qmail.o spf.o dns.o cdb.a \
++  	fd.a wait.a datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
++! 	alloc.a substdio.a error.a fs.a auto_qmail.o base64.o \
++  	str.a `cat socket.lib` `cat dns.lib`
+   
+   qmail-smtpd.0: \
+ ***************
+-*** 1553,1559 ****
++*** 1614,1620 ****
+   substdio.h alloc.h auto_qmail.h control.h received.h constmap.h \
+-  error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
++  error.h ipme.h ip.h ipalloc.h strsalloc.h ip.h gen_alloc.h ip.h qmail.h \
+   substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
+-! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h
++! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h spf.h
+   	./compile qmail-smtpd.c
+   
+   qmail-start: \
+---- 1557,1564 ----
++--- 1618,1625 ----
+   substdio.h alloc.h auto_qmail.h control.h received.h constmap.h \
+-  error.h ipme.h ip.h ipalloc.h ip.h gen_alloc.h ip.h qmail.h \
++  error.h ipme.h ip.h ipalloc.h strsalloc.h ip.h gen_alloc.h ip.h qmail.h \
+   substdio.h str.h fmt.h scan.h byte.h case.h env.h now.h datetime.h \
+-! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h wait.h \
+-! fd.h base64.h
++! exit.h rcpthosts.h timeoutread.h timeoutwrite.h commands.h spf.h \
++! wait.h fd.h base64.h
+   	./compile qmail-smtpd.c
+   
+   qmail-start: \
+-
+-
+ *** TARGETS.orig	Mon Jun 15 05:53:16 1998
+ --- TARGETS	Fri May 10 00:31:38 2002
+ ***************
+@@ -143,11 +141,11 @@
+ *** qmail-smtpd.c.orig	Mon Jun 15 05:53:16 1998
+ --- qmail-smtpd.c	Fri May 10 00:33:35 2002
+ ***************
+-*** 23,29 ****
+---- 23,32 ----
+-  #include "timeoutread.h"
++*** 24,30 ****
++--- 24,33 ----
+   #include "timeoutwrite.h"
+   #include "commands.h"
++  #include "spf.h"
+ + #include "wait.h"
+ + #include "fd.h"
+