Adding a small fix0r to -r10 and masking -r9 as it should not be used.

4 files changed, 30 insertions, 4 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 04ae4af2a9ba..5810e4ab2c02 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for net-mail/qmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.19 2003/02/15 19:16:01 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.20 2003/02/17 08:41:57 raker Exp $
 
 *qmail-1.03-r10 (01 Feb 2003)
 
+  17 Feb 2003; Nick Hadaway <raker@gentoo.org> qmail-1.03-r10.ebuild,
+  files/1.03-r10/smtp-auth-close3.patch :
+  Added a patch for a smtp auth and morercpthosts problem.
+
   15 Feb 2003; Nick Hadaway <raker@gentoo.org> qmail-1.03-r10.ebuild :
   Removed ext_todo and added big-todo and the qmailqueue patch.
   Thanks Psi-Jack for doing lotsa testing!
diff --git a/net-mail/qmail/files/1.03-r10/smtp-auth-close3.patch b/net-mail/qmail/files/1.03-r10/smtp-auth-close3.patch
new file mode 100644
index 000000000000..82fda701fd12
--- /dev/null
+++ b/net-mail/qmail/files/1.03-r10/smtp-auth-close3.patch
@@ -0,0 +1,20 @@
+--- qmail-smtpd.c.orig	Sat Jan 18 09:13:50 2003
++++ qmail-smtpd.c	Sat Jan 18 19:51:09 2003
+@@ -459,14 +459,14 @@
+   if (!stralloc_0(&resp)) die_nomem();
+ 
+   if (fd_copy(2,1) == -1) return err_pipe();
+-  close(3);
+   if (pipe(pi) == -1) return err_pipe();
+-  if (pi[0] != 3) return err_pipe();
+   switch(child = fork()) {
+     case -1:
+       return err_fork();
+     case 0:
+       close(pi[1]);
++      close(3);
++      if (0 > dup2(pi[0],3)) _exit(1);
+       sig_pipedefault();
+       execvp(*childargs, childargs);
+       _exit(1);
+
diff --git a/net-mail/qmail/qmail-1.03-r10.ebuild b/net-mail/qmail/qmail-1.03-r10.ebuild
index bc9ca33211ff..ad389ffe0f62 100644
--- a/net-mail/qmail/qmail-1.03-r10.ebuild
+++ b/net-mail/qmail/qmail-1.03-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r10.ebuild,v 1.11 2003/02/15 19:16:01 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r10.ebuild,v 1.12 2003/02/17 08:41:57 raker Exp $
 
 inherit eutils
 
@@ -48,6 +48,8 @@ src_unpack() {
 	cp README.auth base64.c base64.h ${S}
 	cd ${S}
 	epatch ../qmail-smtpd-auth-0.31/auth.patch
+	# Fixes a problem when utilizing "morercpthosts"
+	epatch ${FILESDIR}/${PV}-${PR}/smtp-auth-close3.patch
 
 	# TLS support and an EHLO patch
 	use ssl && bzcat ${FILESDIR}/${PV}-${PR}/tls.patch.bz2 | patch || die
diff --git a/net-mail/qmail/qmail-1.03-r9.ebuild b/net-mail/qmail/qmail-1.03-r9.ebuild
index 2b3a6cf56398..db8a6abf4bfd 100644
--- a/net-mail/qmail/qmail-1.03-r9.ebuild
+++ b/net-mail/qmail/qmail-1.03-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r9.ebuild,v 1.7 2003/02/13 14:37:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r9.ebuild,v 1.8 2003/02/17 08:41:57 raker Exp $
 
 IUSE="ssl ldap"
 
@@ -37,7 +37,7 @@ PROVIDE="virtual/mta
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="-x86 -ppc -sparc "
 
 src_unpack() {