add more patches from bug #29485

4 files changed, 35 insertions, 5 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 1833bb2fb2ab..1eea34497100 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,9 @@
 # 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.43 2003/09/24 04:06:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.44 2003/09/24 05:25:35 robbat2 Exp $
+
+  23 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
+  add more patches from bug #29485
 
   23 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
   fix coreutils issue, finalize badrcptto patch.
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index bbdc3efe7d43..64befa6ba82a 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -2,8 +2,8 @@ MD5 f2193d3a327e5328b066c43a85be6b16 qmail-1.03-r11.ebuild 11396
 MD5 9f63e83d10743897e07c25c28a6c57f3 qmail-1.03-r9.ebuild 9963
 MD5 a44e4287eb93476321e39985a7217b65 qmail-1.03-r10.ebuild 11152
 MD5 2e824ec277afa32dfbc8a5b796ecb15d qmail-1.03-r8.ebuild 8115
-MD5 34c7fe6f7eef2b75134b85c32347487a qmail-1.03-r12.ebuild 13580
-MD5 954962b289db93ff4f3b934fe5fdfa9e ChangeLog 10277
+MD5 013922080a4bd155828217928b246698 qmail-1.03-r12.ebuild 13628
+MD5 4edcb7c0745920ceab3e271248d21ecf ChangeLog 10389
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
 MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
 MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r12 b/net-mail/qmail/files/digest-qmail-1.03-r12
index ff1a46d50976..55fccc73fe57 100644
--- a/net-mail/qmail/files/digest-qmail-1.03-r12
+++ b/net-mail/qmail/files/digest-qmail-1.03-r12
@@ -15,3 +15,8 @@ MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
 MD5 83bf5c4a4aade3c6c15faa9665ccfb71 qregex-starttls-2way-auth.patch 63825
 MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
 MD5 fc00be3edc2827f1c93112d7d5147122 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
+MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
+MD5 d7151dcbeb02eea1c24c1dedffe20e0b qmail-1.03-reread-concurrency.2.patch 1129
+MD5 a585997ef2f7755287272d80736d88f9 nullenvsender-recipcount.patch 2141
+MD5 ad597c93426c0938fdb36d853fbcf40d 08-capa.diff 1323
+MD5 0a5d43c817b2eb523616c384dfce561c qmail-pop3d-stat.patch 590
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index 53f6cc12e199..442c5833f35f 100644
--- a/net-mail/qmail/qmail-1.03-r12.ebuild
+++ b/net-mail/qmail/qmail-1.03-r12.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-r12.ebuild,v 1.12 2003/09/24 04:06:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.13 2003/09/24 05:25:35 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -25,7 +25,14 @@ SRC_URI="mirror://qmail/qmail-1.03.tar.gz
 	http://www.ckdhr.com/ckd/qmail-103.patch
 	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth.patch
 	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
-	mirror://gentoo/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2"
+	mirror://gentoo/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
+	http://www.dataloss.nl/software/patches/qmail-popupnofd2close.patch
+	http://js.hu/package/qmail/qmail-1.03-reread-concurrency.2.patch
+	http://www.mcmilk.de/qmail/dl/djb-qmail/patches/08-capa.diff
+	"
+# broken stuffs
+#http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
+#http://www.dataloss.nl/software/patches/qmail-pop3d-stat.patch 
 
 SLOT="0"
 LICENSE="as-is"
@@ -135,6 +142,21 @@ src_unpack() {
 	# patch re-diffed from original at http://sys.pro.br/files/badrcptto-morebadrcptto-accdias.diff.bz2
 	epatch ${DISTDIR}/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
 
+	# TODO TESTING NEEDED
+	EPATCH_SINGLE_MSG="Enable stderr logging from checkpassword programs" \
+	epatch ${DISTDIR}/qmail-popupnofd2close.patch
+	EPATCH_SINGLE_MSG="Allow qmail to re-read concurrency limits on HUP" \
+	epatch ${DISTDIR}/qmail-1.03-reread-concurrency.2.patch
+	EPATCH_SINGLE_MSG="Add support for CAPA in POP3d" \
+	epatch ${DISTDIR}/08-capa.diff
+
+	# TODO REDIFF
+	#EPATCH_SINGLE_MSG="Refuse messages from the null envelope sender if they have more than one envelope recipient" \
+	#epatch ${DISTDIR}/nullenvsender-recipcount.patch
+	# TODO REDIFF
+	#EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
+	#epatch ${DISTDIR}/qmail-pop3d-stat.patch 
+
 	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"