Apply the .netrc segfault patch. Suggested in bug #124477 by Paul Thompson <thompson at pobox.com>.

(Portage version: 2.1_pre5-r1)

6 files changed, 168 insertions, 3 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 0ce3cd0c0df8..3af24764d703 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.90 2006/02/27 15:10:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.91 2006/03/01 10:40:37 ticho Exp $
+
+*fetchmail-6.3.2-r1 (01 Mar 2006)
+
+  01 Mar 2006; Andrej Kacian <ticho@gentoo.org>
+  +files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff, +fetchmail-6.3.2-r1.ebuild:
+  Apply the .netrc segfault patch. Suggested in bug #124477 by Paul Thompson
+  <thompson at pobox.com>.
 
   27 Feb 2006; Markus Rothe <corsair@gentoo.org> fetchmail-6.3.2.ebuild:
   Stable on ppc64
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 9b7dd8c3c9a9..5cbb03f2f452 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,12 +1,45 @@
 MD5 807dfcf290e4d05355e91ebee931aac2 ChangeLog 13961
+RMD160 7844324669a9ec08520e10ef101d3da666e78bdf ChangeLog 13961
+SHA256 11627ce4ecf1be27c301e2e0e848839f79a5f16255d680f947648543a5509369 ChangeLog 13961
 MD5 04125f54e4be33fd55348f69c38e0942 fetchmail-6.2.5.2-r1.ebuild 3051
+RMD160 fc375fe31f53511a354700edfbd816c6c6723c30 fetchmail-6.2.5.2-r1.ebuild 3051
+SHA256 0742fa2ea2607ef90c5d00fc93ecd1b45bc439ef90578b74c28deb53bed7d594 fetchmail-6.2.5.2-r1.ebuild 3051
+MD5 55e35975c4f8d781375de65fe1463b23 fetchmail-6.3.2-r1.ebuild 2465
+RMD160 ac541e6f0c5c9c90bce911e924328473e898f805 fetchmail-6.3.2-r1.ebuild 2465
+SHA256 ebc33045df9199d96763c4b4c8f94ebfd9356e804d88c0022e473d6a6700be6c fetchmail-6.3.2-r1.ebuild 2465
 MD5 70f003b7815ed70d8d8c34291161bdb5 fetchmail-6.3.2.ebuild 2418
+RMD160 034b9be55110e2be1737838bf7b7330e13ed2c3a fetchmail-6.3.2.ebuild 2418
+SHA256 cdf19f98347ebb7a6020568dcec1516fcaf62b081958466f9501726de1f53ea3 fetchmail-6.3.2.ebuild 2418
 MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
+RMD160 5a042695f6849653d32b17a6852025d1d695770a files/conf.d-fetchmail 347
+SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf files/conf.d-fetchmail 347
 MD5 c74bd41e6321522be59c6c475ce005f3 files/digest-fetchmail-6.2.5.2-r1 204
+RMD160 9ba569e09ec019202d30e68370ea71b9726b088a files/digest-fetchmail-6.2.5.2-r1 204
+SHA256 daaa486d4e911b7d7faccbb85cc6aed32282180a6f352cb6d2e4aa57783d276c files/digest-fetchmail-6.2.5.2-r1 204
 MD5 0447ecc3ec838faaeb51499d794c997e files/digest-fetchmail-6.3.2 69
+RMD160 3b379954f5a6a1cf72425a355de10d609c5ef3ae files/digest-fetchmail-6.3.2 69
+SHA256 cbf4560cc00d950ba3abfd0008ef2594473384a8cc1729aa047087bb7e978e90 files/digest-fetchmail-6.3.2 69
+MD5 8b357a93d8a5b82f52543ce161eaa4ad files/digest-fetchmail-6.3.2-r1 253
+RMD160 dfb77d6510902739dc2898ac4d365ea69080dec0 files/digest-fetchmail-6.3.2-r1 253
+SHA256 fde9cffbefb7724cd36272ac635f96d3c1a525167ebdb4c13ce743086e554c2c files/digest-fetchmail-6.3.2-r1 253
 MD5 44ab8af6373e139c7c4b8b8df77b0658 files/fetchmail 591
+RMD160 a24c5d093db4e8212ec7307dc070dc35a8da144b files/fetchmail 591
+SHA256 0de1c32b1a94755476cd81ba2c846adefb6680414d5e865a85743a1ff091f53f files/fetchmail 591
 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
 MD5 bc67e24e50b2607de8ed8bbfe8c475ea files/fetchmail-6.2.5-gentoo.patch 1878
+RMD160 2ecfdea7a96694c3cae756e745537ef888e1ab0a files/fetchmail-6.2.5-gentoo.patch 1878
+SHA256 c64b3bc9b5a6982cee7b66f5a2940ee93fd3e9355f7051e58700e01d1c720295 files/fetchmail-6.2.5-gentoo.patch 1878
 MD5 9e74bd5507acf5a39559d76646bac254 files/fetchmail-6.2.5-kerberos.patch 1175
+RMD160 02a0d8829c1295e2d0a9c6e5fd518ba7cdf004e8 files/fetchmail-6.2.5-kerberos.patch 1175
+SHA256 050b320fb4d732c60d0a67a65aca0545007bd6152c6e19f691a08a4ce7dabef9 files/fetchmail-6.2.5-kerberos.patch 1175
 MD5 9fdac9fcc5797bfb643d850abe200105 files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
+RMD160 2293f4b3bf2bc7795bc4bcb1d3a0a928bdd507ac files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
+SHA256 ea822e17caf47dcbfc6f22d998717d0a01b9256037966221482397a752ac602b files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
+MD5 3798cd4bb01cafa1025206f91653e542 files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff 848
+RMD160 756cd361de6ec14ec14ede6fe22ae2fb5398fa86 files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff 848
+SHA256 9bb316b8c7d60b00312f7331356985eef46bbbd8fae3c23a4784edc54e248277 files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff 848
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
+SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild
index bf37b88d2025..46cd73d972b9 100644
--- a/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.2-r1.ebuild,v 1.10 2005/10/30 05:46:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild,v 1.11 2006/03/01 10:40:37 ticho Exp $
 
 inherit eutils gnuconfig
 
diff --git a/net-mail/fetchmail/fetchmail-6.3.2-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.2-r1.ebuild
new file mode 100644
index 000000000000..c103fb9a12a6
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.3.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.2-r1.ebuild,v 1.1 2006/03/01 10:40:37 ticho Exp $
+
+inherit eutils gnuconfig
+
+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 ~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
+
+	# this patch fixes bug #124477 - this will be fixed in 6.3.3
+	# - ticho 2006-03-01
+	epatch ${FILESDIR}/patch-${PV}.1-fix-netrc-SIGSEGV.diff || die
+
+	autoconf
+	gnuconfig_update
+}
+
+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)
+	make || 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.  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.3.2-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.3.2-r1
new file mode 100644
index 000000000000..880f6b317e45
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.3.2-r1
@@ -0,0 +1,3 @@
+MD5 a532134a5e3b35b4f8b78a8184439837 fetchmail-6.3.2.tar.bz2 1190838
+RMD160 463c77dced9e0d3fe4f4cd951d3c7f7b35d6fe48 fetchmail-6.3.2.tar.bz2 1190838
+SHA256 4fbb779c0fddf74af8267a8e8a68bc276c7afc2c854e04b754ca7ebbab2f876e fetchmail-6.3.2.tar.bz2 1190838
diff --git a/net-mail/fetchmail/files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff b/net-mail/fetchmail/files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff
new file mode 100644
index 000000000000..2b6d112b2dde
--- /dev/null
+++ b/net-mail/fetchmail/files/patch-6.3.2.1-fix-netrc-SIGSEGV.diff
@@ -0,0 +1,27 @@
+Craig Leres identified a problem that makes fetchmail 6.3.2 (only this
+version) crash if the .netrc file does not contain a password for a
+particular account.
+
+This patch is mostly Craig Leres' work has been committed to the
+SVN repository and should be applied to fetchmail 6.3.2 on all sites
+that plan to use netrc files:
+
+Index: netrc.c
+===================================================================
+--- netrc.c	(Revision 4683)
++++ netrc.c	(Revision 4684)
+@@ -314,8 +314,10 @@
+ free_netrc(netrc_entry *a) {
+     while(a) {
+ 	netrc_entry *n = a->next;
+-	memset(a->password, 0x55, strlen(a->password));
+-	xfree(a->password);
++	if (a->password != NULL) {
++		memset(a->password, 0x55, strlen(a->password));
++		free(a->password);
++	}
+ 	xfree(a->login);
+ 	xfree(a->host);
+ 	xfree(a);
+
+Sorry for the inconvenience.  -- Matthias Andree, 2006-01-30