Added fetchmail-6.2.5-fetchsizelimit.patch to fix bug #40126

4 files changed, 26 insertions, 4 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index edbc793b8e33..0236718aac96 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.51 2004/07/01 22:31:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.52 2004/08/07 11:15:46 tomk Exp $
+
+  07 Aug 2004; Tom Knight <tomk@gentoo.org>
+  +files/fetchmail-6.2.5-fetchsizelimit.patch, fetchmail-6.2.5.ebuild:
+  Added fetchmail-6.2.5-fetchsizelimit.patch to fix bug #40126
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   fetchmail-5.9.14.ebuild, fetchmail-6.2.1-r1.ebuild,
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 0d2a3425cf4a..9f59eec39407 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -3,8 +3,8 @@ MD5 4699605e930914b11ab0b894d5b8c545 fetchmail-6.2.4.ebuild 2143
 MD5 0e3513a92097cbf36de0d981f0c6489e fetchmail-5.9.14.ebuild 1897
 MD5 93696635908b3e9f12e791de449a82c8 fetchmail-6.2.2-r2.ebuild 2043
 MD5 5dbdb08954c5b4c91939bd3bd1a3b212 fetchmail-6.2.3.ebuild 1967
-MD5 98864d522ebb2dc8d70754ffd1019015 fetchmail-6.2.5.ebuild 2322
-MD5 69b4bd5e971e1ad256f631fddf8c2cbf ChangeLog 7772
+MD5 89480e2c34a777ae517ce30fa25f1002 fetchmail-6.2.5.ebuild 2426
+MD5 694571f918baeac8ed6fa5d25ea7e20e ChangeLog 7945
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
 MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
@@ -14,6 +14,7 @@ MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
 MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
 MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
 MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
+MD5 fa0432a854f2a63b2b6fa0a8e65985f7 files/fetchmail-6.2.5-fetchsizelimit.patch 526
 MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
 MD5 32b3f4317fd807e171da3cd6c27217c2 files/fetchmail-6.2.5-kerberos.patch 1143
 MD5 b8f3ceb78e16e9c26c34908229893659 files/digest-fetchmail-6.2.3 68
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.ebuild
index e71ec97e2a73..217d1f279027 100644
--- a/net-mail/fetchmail/fetchmail-6.2.5.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5.ebuild,v 1.16 2004/07/15 01:47:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5.ebuild,v 1.17 2004/08/07 11:15:46 tomk Exp $
 
 IUSE="ssl nls ipv6 kerberos krb4"
 
@@ -27,6 +27,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-6.2.0-gentoo.diff || die
 	epatch ${FILESDIR}/${P}-kerberos.patch
+	# patch fixes bug #40126 (tomk@gentoo.org 2004-08-07)
+	epatch ${FILESDIR}/${P}-fetchsizelimit.patch || die
 }
 
 src_compile() {
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-fetchsizelimit.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-fetchsizelimit.patch
new file mode 100644
index 000000000000..54f0042d4db4
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-fetchsizelimit.patch
@@ -0,0 +1,15 @@
+--- driver.c	2003-10-16 00:52:31 +0530
++++ driver.c	2003-10-17 11:24:27 +0530
+@@ -429,8 +429,11 @@
+ 	/* for POP3, we can get the size of one mail only! Unfortunately, this
+ 	 * protocol specific test cannot be done elsewhere as the protocol
+ 	 * could be "auto". */
+-	if (ctl->server.protocol == P_POP3)
++	switch (ctl->server.protocol)
++	{
++	    case P_POP3: case P_APOP: case P_RPOP:
+ 	    fetchsizelimit = 1;
++	}
+ 
+ 	/* Time to allocate memory to store the sizes */
+ 	xalloca(msgsizes, int *, sizeof(int) * fetchsizelimit);