Apply patch from upstream to fix bug #163782. Removed obsolete ebuilds.

(Portage version: 2.1.2-r11)

7 files changed, 38 insertions, 111 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index c4975cdeae81..dc100de20597 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.127 2007/02/18 21:55:04 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.128 2007/03/07 06:14:18 ticho Exp $
+
+*fetchmail-6.3.7-r1 (07 Mar 2007)
+
+  07 Mar 2007; Andrej Kacian <ticho@gentoo.org>
+  +files/fetchmail-6.3.7-poll-again.patch, -fetchmail-6.3.3.ebuild,
+  -fetchmail-6.3.4.ebuild, +fetchmail-6.3.7-r1.ebuild:
+  Apply patch from upstream to fix bug #163782. Removed obsolete ebuilds.
 
   18 Feb 2007; Marien Zwart <marienz@gentoo.org> Manifest:
   Fix broken Manifest. Thanks to drphibes on irc for reporting.
diff --git a/net-mail/fetchmail/fetchmail-6.3.3.ebuild b/net-mail/fetchmail/fetchmail-6.3.3.ebuild
deleted file mode 100644
index a1f3dbddc772..000000000000
--- a/net-mail/fetchmail/fetchmail-6.3.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.3.ebuild,v 1.5 2007/01/18 00:51:39 ticho Exp $
-
-inherit eutils
-
-FCONF_P="fetchmailconf-1.43.2"
-
-DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
-HOMEPAGE="http://fetchmail.berlios.de"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl nls ipv6 kerberos krb4 hesiod"
-
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	kerberos? ( app-crypt/mit-krb5 )
-	nls? ( sys-devel/gettext )
-	elibc_FreeBSD? ( sys-libs/com_err )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd \${S} failed"
-
-	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch ${FILESDIR}/${PN}-6.2.5-broken-headers.patch || die
-
-	autoconf
-}
-
-src_compile() {
-	econf  --disable-dependency-tracking \
-		--enable-RPA \
-		--enable-NTLM \
-		--enable-SDPS \
-		$(use_enable nls) \
-		$(use_enable ipv6 inet6) \
-		$(use_with kerberos gssapi) $(use_with kerberos kerberos5) \
-		$(use_with krb4 kerberos) \
-		$(use_with ssl) \
-		$(use_with hesiod) \
-		${myconf} || die "Configuration failed."
-	# wont compile reliably on smp (mkennedy@gentoo.org 2003-11-12)
-	emake || die "Compilation failed."
-}
-
-src_install() {
-	einstall || die
-
-	dohtml *.html
-
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING
-
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
-
-	newinitd ${FILESDIR}/fetchmail fetchmail
-	newconfd ${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.  Add 'tk' to the USE variable in /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/fetchmail-6.3.4.ebuild b/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild
index 8b96be7a9a0c..1001e41bd61c 100644
--- a/net-mail/fetchmail/fetchmail-6.3.4.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.4.ebuild,v 1.15 2007/01/08 22:30:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.7-r1.ebuild,v 1.1 2007/03/07 06:14:18 ticho Exp $
 
 inherit eutils
 
@@ -12,25 +12,29 @@ SRC_URI="http://download2.berlios.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="mips s390 sh"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ssl nls ipv6 kerberos krb4 hesiod"
 
-DDEPEND="hesiod? ( net-dns/hesiod )
+DEPEND="hesiod? ( net-dns/hesiod )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	kerberos? ( app-crypt/mit-krb5 )
 	nls? ( sys-devel/gettext )
 	elibc_FreeBSD? ( sys-libs/com_err )"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
-	cd ${S} || die "cd \${S} failed"
+	unpack ${A}
+	cd "${S}"
 
 	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
-	epatch ${FILESDIR}/${PN}-6.2.5-broken-headers.patch || die
+	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
+
+	# Poll again without SSL on error after USER command (bug #163782).
+	epatch "${FILESDIR}"/${P}-poll-again.patch
 }
 
 src_compile() {
-	econf  --disable-dependency-tracking \
+	econf \
+		--disable-dependency-tracking \
 		--enable-RPA \
 		--enable-NTLM \
 		--enable-SDPS \
@@ -46,16 +50,11 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	emake DESTDIR="${D}" install || die
 
 	dohtml *.html
 
-	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README \
-		README.NTLM README.SSL TODO COPYING
-
-	# Put installed manpages to correct place
-	doman ${D}/usr/share/man/*.1
-	rm -f ${D}/usr/share/man/*.1
+	dodoc FAQ FEATURES ABOUT-NLS NEWS NOTES README README.NTLM README.SSL TODO
 
 	newinitd ${FILESDIR}/fetchmail fetchmail
 	newconfd ${FILESDIR}/conf.d-fetchmail fetchmail
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.3.3 b/net-mail/fetchmail/files/digest-fetchmail-6.3.3
deleted file mode 100644
index c794525de0b5..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.3.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d6f6ecd02fa5c92b84d44fe031067938 fetchmail-6.3.3.tar.bz2 1197241
-RMD160 45af0dd59976779875b683a98b94f68ffed02120 fetchmail-6.3.3.tar.bz2 1197241
-SHA256 bd53e23b0210a831c9ce6765f49904e1d996aaca5d1e95ebacead35a06f3304a fetchmail-6.3.3.tar.bz2 1197241
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.3.4 b/net-mail/fetchmail/files/digest-fetchmail-6.3.4
deleted file mode 100644
index 5627a44929c0..000000000000
--- a/net-mail/fetchmail/files/digest-fetchmail-6.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 35ded0414fcff79b492d6ade2ce48911 fetchmail-6.3.4.tar.bz2 1210405
-RMD160 06ba93f4fb9aeefecde34117d92fe7f023b77bc4 fetchmail-6.3.4.tar.bz2 1210405
-SHA256 a090cfc47949e4ea5eebd46c82e82be35cdc743488e6d7258089591521b5db4f fetchmail-6.3.4.tar.bz2 1210405
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.3.7-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.3.7-r1
new file mode 100644
index 000000000000..7503a236c11c
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.3.7-r1
@@ -0,0 +1,3 @@
+MD5 9ef60ab06661108c3c6605aad97e8325 fetchmail-6.3.7.tar.bz2 1315062
+RMD160 95b06b5e014c89416269dbc762c8556b20ce74ad fetchmail-6.3.7.tar.bz2 1315062
+SHA256 7957f5eaf4aca6d839ca9869f607b005d09ded884774b8757693410b492ce9f3 fetchmail-6.3.7.tar.bz2 1315062
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.7-poll-again.patch b/net-mail/fetchmail/files/fetchmail-6.3.7-poll-again.patch
new file mode 100644
index 000000000000..e3a2f67c7705
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.3.7-poll-again.patch
@@ -0,0 +1,14 @@
+Index: pop3.c
+===================================================================
+--- pop3.c	(revision 5042)
++++ pop3.c	(working copy)
+@@ -686,7 +686,8 @@
+ #ifdef SSL_ENABLE
+     /* this is for servers which claim to support TLS, but actually
+      * don't! */
+-    if (connection_may_have_tls_errors && ok == PS_SOCKET)
++    if (connection_may_have_tls_errors
++		    && (ok == PS_SOCKET || ok == PS_PROTOCOL))
+     {
+ 	xfree(ctl->sslproto);
+ 	ctl->sslproto = xstrdup("");