Patch to fix return paths bug, fixes bug #19372

5 files changed, 132 insertions, 1 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 3c20b4b155b8..c0e131dc3307 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.30 2003/03/31 19:56:18 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.31 2003/04/16 00:52:22 avenj Exp $
+
+*fetchmail-6.2.2-r2 (15 Apr 2003)
+
+  15 Apr 2003; Jon Portnoy <avenj@gentoo.org> fetchmail-6.2.2-r2.ebuild :
+  Patch added to fix a bug with multiple return paths confusing 
+  fetchmail. Fixes bug #19372.
 
 *fetchmail-6.2.2-r1 (24 Mar 2003)
 
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
new file mode 100644
index 000000000000..6f55927a0264
--- /dev/null
+++ b/net-mail/fetchmail/Manifest
@@ -0,0 +1,17 @@
+MD5 3153e54df9fb507dc7ae0bd8be50fb4c ChangeLog 5383
+MD5 90d4a4ecf8b547ecec843fc2ec9c8315 fetchmail-6.2.2.ebuild 1788
+MD5 99d40ddff2edffdce93d5bd7d9bb42ec fetchmail-6.2.2-r1.ebuild 1984
+MD5 d7a2a5454208f393dcfbf0c9ebad98c9 fetchmail-5.9.14.ebuild 1941
+MD5 d6495f128b17c6db763d2643fffd4381 fetchmail-6.2.2-r2.ebuild 1947
+MD5 64bf477646087eebe46e8acd9e3c3dac fetchmail-6.2.1-r1.ebuild 1789
+MD5 f6bb533591550f2f5978892a3e0a6fc6 files/conf.d-fetchmail 359
+MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
+MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2 68
+MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
+MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r1 68
+MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
+MD5 c9baecd4bea485a075f696462c9ab6cc files/fetchmail 581
+MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
+MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
+MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
+MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
diff --git a/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild b/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild
new file mode 100644
index 000000000000..216ba65b7b9d
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.2-r2.ebuild,v 1.1 2003/04/16 00:52:22 avenj Exp $
+
+inherit eutils
+
+DESCRIPTION="Fetchmail is a full-featured remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
+SRC_URI="http://www.catb.org/~esr/fetchmail/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="x86 ~alpha"
+IUSE="ssl nls ipv6"
+
+DEPEND="virtual/glibc
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/fetchmail-6.2.0-gentoo.diff || die
+	epatch ${FILESDIR}/fetchmail-6.2.2-multiple-return-path.diff || die
+}
+
+src_compile() {
+	local myconf
+	use ssl && myconf="${myconf} --with-ssl=/usr"
+	use nls || myconf="${myconf} --disable-nls"
+	use ipv6 && myconf="${myconf} --enable-inet6"
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		${myconf} || die "Configuration failed."
+	emake || 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.2-r2 b/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r2
new file mode 100644
index 000000000000..a1f977811cec
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.2.2-r2
@@ -0,0 +1 @@
+MD5 b3544890a2452b5b04c709c65109c43a fetchmail-6.2.2.tar.gz 1205198
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.2-multiple-return-path.diff b/net-mail/fetchmail/files/fetchmail-6.2.2-multiple-return-path.diff
new file mode 100644
index 000000000000..d3cfc08c6ba8
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.2.2-multiple-return-path.diff
@@ -0,0 +1,27 @@
+--- fetchmail-6.2.2/transact.c.orig	2003-04-14 12:46:42.000000000 +0800
++++ fetchmail-6.2.2/transact.c	2003-04-14 13:04:33.000000000 +0800
+@@ -381,6 +381,7 @@
+     flag		headers_ok, has_nuls;
+     int			olderrs, good_addresses, bad_addresses;
+     int			retain_mail = 0;
++    flag		already_has_return_path = FALSE;
+ 
+     sizeticker = 0;
+     has_nuls = headers_ok = FALSE;
+@@ -676,9 +677,15 @@
+ 	 * not trigger bounces if delivery fails.  What we *do* need to do is
+ 	 * make sure we never try to rewrite such a blank Return-Path.  We
+ 	 * handle this with a check for <> in the rewrite logic above.
++	 *
++	 * Also, if an email has multiple Return-Path: statement, we only
++	 * read the first occurance, as some spam email has more than one
++	 * Return-Path.
++	 *
+ 	 */
+-	if (!strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line)))
++	if ((already_has_return_path==FALSE) && !strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line)))
+ 	{
++	    already_has_return_path = TRUE;
+ 	    strncpy(msgblk.return_path, cp, sizeof(msgblk.return_path));
+ 	    msgblk.return_path[sizeof(msgblk.return_path)-1] = '\0';
+ 	    if (!ctl->mda) {