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

Package-Manager: portage-2.1.2-r11

8 files changed, 57 insertions, 135 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/Manifest b/net-mail/fetchmail/Manifest
index 4edeaed684be..432d15b76ba6 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -13,50 +13,45 @@ AUX fetchmail-6.2.5-broken-headers.patch 288 RMD160 1e5237c2cd24223ec4b98b2f67c5
 MD5 cd9176a56e402a922bcf53d3ccf15e11 files/fetchmail-6.2.5-broken-headers.patch 288
 RMD160 1e5237c2cd24223ec4b98b2f67c5780d2026a559 files/fetchmail-6.2.5-broken-headers.patch 288
 SHA256 a72666259b30fed72a5c63519bfa0c888d14570c14c227c2418a2100cf08d326 files/fetchmail-6.2.5-broken-headers.patch 288
-DIST fetchmail-6.3.3.tar.bz2 1197241 RMD160 45af0dd59976779875b683a98b94f68ffed02120 SHA1 f113c4887f67bd21d46294346cb5887516c8ff8e SHA256 bd53e23b0210a831c9ce6765f49904e1d996aaca5d1e95ebacead35a06f3304a
-DIST fetchmail-6.3.4.tar.bz2 1210405 RMD160 06ba93f4fb9aeefecde34117d92fe7f023b77bc4 SHA1 be0cd81f32483ba1d19be7ebe95f698f98eec13c SHA256 a090cfc47949e4ea5eebd46c82e82be35cdc743488e6d7258089591521b5db4f
+AUX fetchmail-6.3.7-poll-again.patch 473 RMD160 daedf8181972b4759870618ea287a0221b309aaf SHA1 2941445e48c1bcb021bd7bec806e0a698840aff1 SHA256 c97a7dc9be48b3e0b8a6e9de329c412990e25677f361c749011b779557c35626
+MD5 89ed33f251feda3430a87165a3ce86c2 files/fetchmail-6.3.7-poll-again.patch 473
+RMD160 daedf8181972b4759870618ea287a0221b309aaf files/fetchmail-6.3.7-poll-again.patch 473
+SHA256 c97a7dc9be48b3e0b8a6e9de329c412990e25677f361c749011b779557c35626 files/fetchmail-6.3.7-poll-again.patch 473
 DIST fetchmail-6.3.6.tar.bz2 1307730 RMD160 455c1413cc5090f834e82be4876b572d4bef35cc SHA1 4c362d8d86c0d4efb191d0faae0b48b54b0887ba SHA256 3c81e7776617b78f18d9cd8b5e5f62944e70f1d7bd47a840fd8d44bcded784ff
 DIST fetchmail-6.3.7.tar.bz2 1315062 RMD160 95b06b5e014c89416269dbc762c8556b20ce74ad SHA1 163634b7b6b491c5f5e84a535f7943ba4d4f0001 SHA256 7957f5eaf4aca6d839ca9869f607b005d09ded884774b8757693410b492ce9f3
-EBUILD fetchmail-6.3.3.ebuild 2388 RMD160 697b897bd5f942e84bebfa105f7a605f6eddf112 SHA1 ed32fbfbe6b4630971417a28cb26047b895186ce SHA256 be7d43a4b5055a3a8ce28ea6abf0fe2cba19564fd0567027b827d23ebee830a6
-MD5 757e9dcdb62a1cebd19956b9778b76d8 fetchmail-6.3.3.ebuild 2388
-RMD160 697b897bd5f942e84bebfa105f7a605f6eddf112 fetchmail-6.3.3.ebuild 2388
-SHA256 be7d43a4b5055a3a8ce28ea6abf0fe2cba19564fd0567027b827d23ebee830a6 fetchmail-6.3.3.ebuild 2388
-EBUILD fetchmail-6.3.4.ebuild 2364 RMD160 6c1fd66e56850dd8c4f743969564873b1117dd4d SHA1 984820e159f79a88fa677ef71ac4f10b13936849 SHA256 b5970667d84f066f7dec1daddff932d3057ca4c8f6d3208085329d2160c20120
-MD5 63ac36c8bbbf37792a361d89c85236d0 fetchmail-6.3.4.ebuild 2364
-RMD160 6c1fd66e56850dd8c4f743969564873b1117dd4d fetchmail-6.3.4.ebuild 2364
-SHA256 b5970667d84f066f7dec1daddff932d3057ca4c8f6d3208085329d2160c20120 fetchmail-6.3.4.ebuild 2364
 EBUILD fetchmail-6.3.6.ebuild 2246 RMD160 92bcec10bd7f0f00bd72d07d12773dbdc42357b8 SHA1 8eec67dbc73be735dd2bd221a56be09bd31dea96 SHA256 0696d1ba94d4c206dbd663b0f685291333998b8d1447531c64c83053499dd68b
 MD5 9308441b39e882f9b6e8315e5cefb315 fetchmail-6.3.6.ebuild 2246
 RMD160 92bcec10bd7f0f00bd72d07d12773dbdc42357b8 fetchmail-6.3.6.ebuild 2246
 SHA256 0696d1ba94d4c206dbd663b0f685291333998b8d1447531c64c83053499dd68b fetchmail-6.3.6.ebuild 2246
+EBUILD fetchmail-6.3.7-r1.ebuild 2367 RMD160 d6b07247111bc28fd6bf4d5861c96a6a2ea888a0 SHA1 5fc065ea230b296a0d91556f5cda3d42a53e248f SHA256 de403aeec887c9748246db1df5d7782bc46412615521bf79225b81bb9ffc86c6
+MD5 22dd0c62afa85a0c69d5638ad72fa9da fetchmail-6.3.7-r1.ebuild 2367
+RMD160 d6b07247111bc28fd6bf4d5861c96a6a2ea888a0 fetchmail-6.3.7-r1.ebuild 2367
+SHA256 de403aeec887c9748246db1df5d7782bc46412615521bf79225b81bb9ffc86c6 fetchmail-6.3.7-r1.ebuild 2367
 EBUILD fetchmail-6.3.7.ebuild 2257 RMD160 7e48247f3b47581824cb7d95f1f51798f6522556 SHA1 59cd542a79bb88ef7c4b5cb25ba044222f7f4126 SHA256 9a94601fad1aca074582f3bd53df21b634910872514e4b52c0cbd15af5b271b8
 MD5 94b19c6f080e954385545bce9b30a9df fetchmail-6.3.7.ebuild 2257
 RMD160 7e48247f3b47581824cb7d95f1f51798f6522556 fetchmail-6.3.7.ebuild 2257
 SHA256 9a94601fad1aca074582f3bd53df21b634910872514e4b52c0cbd15af5b271b8 fetchmail-6.3.7.ebuild 2257
-MISC ChangeLog 19486 RMD160 3c2f45569069e708b36250cba603c1d5a5948a53 SHA1 60cb785dc8d6157ca0dda0e5d8a3874bc30f04d4 SHA256 cd4d2a52b73dbdf9386e15c1c3ae8e864ea2b02e34c3ec709aa92fa5cd3eb9de
-MD5 3f6c765dabcc924d2c8e37102453ad9c ChangeLog 19486
-RMD160 3c2f45569069e708b36250cba603c1d5a5948a53 ChangeLog 19486
-SHA256 cd4d2a52b73dbdf9386e15c1c3ae8e864ea2b02e34c3ec709aa92fa5cd3eb9de ChangeLog 19486
+MISC ChangeLog 19765 RMD160 a9dd632cb34fe877c770aa1998b34e95c24ab4da SHA1 acec0c3fade3fa5e55067f5e7602cd4442412722 SHA256 7b6e29a3a6d59018e897c18e9ac36006e82e97345920ae77945bf843198f2beb
+MD5 4cf59f075df5682417c432740dd26a02 ChangeLog 19765
+RMD160 a9dd632cb34fe877c770aa1998b34e95c24ab4da ChangeLog 19765
+SHA256 7b6e29a3a6d59018e897c18e9ac36006e82e97345920ae77945bf843198f2beb ChangeLog 19765
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 72b5a859ce4066b3808224321960e71d files/digest-fetchmail-6.3.3 253
-RMD160 1b42b1d3a5597f1afc6704841e9391bd1e9375f3 files/digest-fetchmail-6.3.3 253
-SHA256 26b778415d5ee5230fc9fe12df0c0ad0f23b450f4eef689536b9f74cdbe79c3d files/digest-fetchmail-6.3.3 253
-MD5 b6867165c6f5b6af75f8af8bf1938879 files/digest-fetchmail-6.3.4 253
-RMD160 918aa6b28dfcb88201ac9720df5ae808f8019f18 files/digest-fetchmail-6.3.4 253
-SHA256 802c1c7160ad0e517ec6c2a97576bf0a5fbb655c2e9ad93e3c58282e572f6d06 files/digest-fetchmail-6.3.4 253
 MD5 0844339dc3bca7f106bc0983d36f77c8 files/digest-fetchmail-6.3.6 253
 RMD160 08ed02761e8ce87ea5f114e25bb7040f7598ac3c files/digest-fetchmail-6.3.6 253
 SHA256 4b4288e416271a2b485863e7482d68de5c2158f2cadb5bddb4a41dd405dbdabc files/digest-fetchmail-6.3.6 253
 MD5 49ec04ed63490f23dd68b3696457f9fd files/digest-fetchmail-6.3.7 253
 RMD160 dbca0f362b14c0aa4aa4cade7eb46cfc08339aec files/digest-fetchmail-6.3.7 253
 SHA256 a8abb287803d26983abe8ce158a63f2b0d5373d44e4480583700adb85321e190 files/digest-fetchmail-6.3.7 253
+MD5 49ec04ed63490f23dd68b3696457f9fd files/digest-fetchmail-6.3.7-r1 253
+RMD160 dbca0f362b14c0aa4aa4cade7eb46cfc08339aec files/digest-fetchmail-6.3.7-r1 253
+SHA256 a8abb287803d26983abe8ce158a63f2b0d5373d44e4480583700adb85321e190 files/digest-fetchmail-6.3.7-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF2MtYUElL7eJpfEQRAgs5AJ9WrVXZ93ExW8I4DUd0yS4vD6/vYgCgnR4r
-wKIG9ihHvmRTCf0KgBOsRv0=
-=tGM+
+iD8DBQFF7lhDQlM6RnzZP+IRAhuNAKCtS/6CMw7joV7sVNCMexFKbDd2cwCdF29O
+FAQXkWLf0lE4Hn2BpRAgfzU=
+=3m3f
 -----END PGP SIGNATURE-----
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("");