Revision bump. Patch sources to fix #34788.

5 files changed, 134 insertions, 14 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 0236718aac96..21c87fc4e9fb 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,14 @@
 # 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.52 2004/08/07 11:15:46 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.53 2004/09/03 19:56:19 ticho Exp $
+
+*fetchmail-6.2.5-r1 (03 Sep 2004)
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/fetchmail-6.2.5-broken-headers.patch, +fetchmail-6.2.5-r1.ebuild:
+  Apply patch to fetchmail sources to receive mail even if it has broken
+  headers, instead of deleting it, or choking up on it, for POP3 fetching.
+  Patch submitted by John Huttley <john@mwk.co.nz>, closes #34788.
 
   07 Aug 2004; Tom Knight <tomk@gentoo.org>
   +files/fetchmail-6.2.5-fetchsizelimit.patch, fetchmail-6.2.5.ebuild:
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 9f59eec39407..b383eee669da 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,22 +1,25 @@
-MD5 dfd9bda1fd8499be5d1e8847c6c6e477 fetchmail-6.2.1-r1.ebuild 1778
+MD5 694571f918baeac8ed6fa5d25ea7e20e ChangeLog 7945
 MD5 4699605e930914b11ab0b894d5b8c545 fetchmail-6.2.4.ebuild 2143
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 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 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
-MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
+MD5 6992352b928b77ac488fb055bbcfafe7 fetchmail-6.2.5-r1.ebuild 2547
+MD5 5dbdb08954c5b4c91939bd3bd1a3b212 fetchmail-6.2.3.ebuild 1967
+MD5 93696635908b3e9f12e791de449a82c8 fetchmail-6.2.2-r2.ebuild 2043
+MD5 dfd9bda1fd8499be5d1e8847c6c6e477 fetchmail-6.2.1-r1.ebuild 1778
 MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
+MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5 68
+MD5 b8f3ceb78e16e9c26c34908229893659 files/digest-fetchmail-6.2.3 68
+MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
+MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
 MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
 MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
+MD5 91b291c03a6f375401dc2fee56beeeef files/fetchmail-6.2.5-broken-headers.patch 250
+MD5 c1c69ebb34b0848d22249ae32b770061 files/digest-fetchmail-6.2.4 68
+MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
+MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r1 68
 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
-MD5 c1c69ebb34b0848d22249ae32b770061 files/digest-fetchmail-6.2.4 68
-MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5 68
+MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
+MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
diff --git a/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
new file mode 100644
index 000000000000..76d86bf7f15c
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.2.5-r1.ebuild
@@ -0,0 +1,98 @@
+# 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-r1.ebuild,v 1.1 2004/09/03 19:56:19 ticho Exp $
+
+IUSE="ssl nls ipv6 kerberos krb4"
+
+inherit eutils gnuconfig
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64 ~s390 ~ppc64"
+
+DEPEND="virtual/libc
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	nls? ( sys-devel/gettext )
+	kerberos? ( virtual/krb5 )
+	krb4? ( app-crypt/kth-krb )
+	sys-devel/autoconf"
+
+
+src_unpack() {
+	unpack ${A}
+	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
+	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
+	epatch ${FILESDIR}/${P}-broken-headers.patch || die
+}
+
+src_compile() {
+	autoconf
+
+	gnuconfig_update
+
+	local myconf
+
+	use ssl && myconf="${myconf} --with-ssl"
+	use nls || myconf="${myconf} --disable-nls"
+	use ipv6 && myconf="${myconf} --enable-inet6"
+	use kerberos && myconf="${myconf} --with-gssapi --with-kerberos5"
+	use krb4 && myconf="${myconf} --with-kerberos"
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		${myconf} || die "Configuration failed."
+	# wont compile reliably on smp (mkennedy@gentoo.org 2003-11-12)
+	make || die "Compilation failed."
+}
+
+src_install() {
+	einstall || die
+
+	dohtml *.html
+
+	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
+		README.NTLM README.SSL TODO COPYING MANIFEST
+
+	doman ${D}/usr/share/man/*.1
+	rm -f ${D}/usr/share/man/*.1
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/fetchmail
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d-fetchmail fetchmail
+
+	docinto contrib
+	local f
+	for f in contrib/*
+	do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	if ! python -c "import Tkinter" >/dev/null 2>&1
+	then
+		einfo
+		einfo "You will not be able to use fetchmailconf(1), because you"
+		einfo "don't seem to have Python with tkinter support."
+		einfo
+		einfo "If you want to be able to use fetchmailconf(1), do the following:"
+		einfo "  1.  Include 'tcltk' in USE variable in your /etc/make.conf."
+		einfo "  2.  (Re-)merge Python."
+		einfo
+	fi
+
+	einfo "Please see /etc/conf.d/fetchmail if you want to adjust"
+	einfo "the polling delay used by the fetchmail init script."
+}
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r1
new file mode 100644
index 000000000000..11752ef97731
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.2.5-r1
@@ -0,0 +1 @@
+MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
new file mode 100644
index 000000000000..248630858672
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
@@ -0,0 +1,10 @@
+--- transact.c~	2004-06-01 16:51:33.769501872 +0200
++++ transact.c	2004-06-01 16:52:18.322728752 +0200
+@@ -516,6 +516,7 @@
+ 		if (linelen != strlen (line))
+ 		    has_nuls = TRUE;
+ 		free(line);
++		refuse_mail = 0;
+ 		goto process_headers;
+ 	    }
+