Bump to fix segmentation fault (#280760)

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 139 insertions, 5 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 08439dc465ed..6d9715c0f97f 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.165 2009/08/10 22:19:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.166 2009/08/15 11:31:56 tove Exp $
+
+*fetchmail-6.3.11-r1 (15 Aug 2009)
+
+  15 Aug 2009; Torsten Veller <tove@gentoo.org>
+  +files/6.3.11-fix-free-corruption.patch, +fetchmail-6.3.11-r1.ebuild:
+  Bump to fix segmentation fault (#280760)
 
   10 Aug 2009; Markus Meier <maekke@gentoo.org> fetchmail-6.3.11.ebuild:
   amd64 stable, bug #280537
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index f8e9d9a11a9a..40142a4d77f7 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 6.3.11-fix-free-corruption.patch 563 RMD160 5afa1aaca400ae194c79a4d77b76ab60a721c03c SHA1 0a5b87f7e310a1269bc8d0b080f7a98f7d5c46c2 SHA256 3527f203d485c4400823afc8c8c894b40809d62396b3a2925878e4b0f6adae0c
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
 AUX fetchmail 591 RMD160 a24c5d093db4e8212ec7307dc070dc35a8da144b SHA1 fb3413326873829c2a894afa83f2d118b85d3dc7 SHA256 0de1c32b1a94755476cd81ba2c846adefb6680414d5e865a85743a1ff091f53f
 AUX fetchmail-6.2.5-broken-headers.patch 288 RMD160 1e5237c2cd24223ec4b98b2f67c5780d2026a559 SHA1 006d59dc95138a5db241a0536b10978b05227f26 SHA256 a72666259b30fed72a5c63519bfa0c888d14570c14c227c2418a2100cf08d326
@@ -10,16 +11,17 @@ AUX fetchmail.new 686 RMD160 d686776466385ec205dd704dbab999953cb9ee17 SHA1 660e9
 DIST fetchmail-6.3.11.tar.bz2 1608923 RMD160 8d6b0e42b9ead6e836e40e8ae494a6f5b7d3a59b SHA1 e769bcb81b393a55e02ec4bf7e94a52cf0c8ef8f SHA256 ba679cef82b9520bc5dbe9e2e54381e488b5712faf885deb7612393b5ab80c6f
 DIST fetchmail-6.3.8.tar.bz2 1323515 RMD160 34034f9ae9fe44ba35f0a16d3128d4a9b0001df2 SHA1 b8e8c51ed6cf53fc398c821fdb29d166c6713bb0 SHA256 5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b
 DIST fetchmail-6.3.9.tar.bz2 1538134 RMD160 5fcea0ae97ff64633a50e164270ab68435186fbc SHA1 2ed705ffe40afd6d085535cf2af06914507da36a SHA256 3dfd3b04aa552331f91f96bdf5f5afe489c31a600ae7973f5814bde5555813dc
+EBUILD fetchmail-6.3.11-r1.ebuild 2990 RMD160 09410a171470fc0cf4bc1e582ef860ca74189799 SHA1 cf6185b83b7aa437be12ed9d4dafb16e15cf1f3e SHA256 da231df00e01e0cc9505d74a7f8ae89194c99033f6322be4c2572ee46d112a95
 EBUILD fetchmail-6.3.11.ebuild 2923 RMD160 eacd9825ff608128cc77212257e9f7083f65a1c7 SHA1 b64e6170d536774858c1d5d7b7a791550e9d371c SHA256 2587b13e6bef1880ec0770084be64342c9470025a7ed292526ccab2401416a7a
 EBUILD fetchmail-6.3.8-r1.ebuild 2323 RMD160 788471b5d315537e9a7b3ab5bddd761f4d5d6d0f SHA1 0841eeff6b217faa238a46505c1c1af0ba89a1a2 SHA256 dc4af9dfea9d93050e3ccd05a42b59e28deed9c3c2c02e7fe19eef85d8a56d16
 EBUILD fetchmail-6.3.9-r1.ebuild 3045 RMD160 a39708162b1abb660afd84e827ed08073015ecfb SHA1 bf8d2316e1fdf3dcc3ceca4b28e2d90951b1097d SHA256 291f1c2e1b7bf82ba131dbe8018f6ac4da64aad0b88ea862a875cbfcb1c1688a
 EBUILD fetchmail-6.3.9.ebuild 2571 RMD160 78107230834a7369b66c1054daddab293cd6f9a6 SHA1 15e8112ccb36172269985462ad983143ff9045ad SHA256 5308da4442d6b1a6d084c0ebd58ecddc3f0c9d1dd314ecf4a69b37a7a9bcd0a0
-MISC ChangeLog 24197 RMD160 7310678de269519e0dd17a27db14310a1f3d5364 SHA1 b0a4f94f03b4e065d8ba861d7127896a129ef78c SHA256 4883d7e5e9764a95c297eefd2c245b9364ec49dfb4360ac1d2581d37c59d4b83
+MISC ChangeLog 24395 RMD160 e9ecad79f3c1e26359103a7c545090b76c87e0a0 SHA1 ec940d373ec3656a6a83d7cd15739628c69798c9 SHA256 b74f06e57c3547a250ca56e8c0e68c8d4d20156115d3b4f0b4539281b982b8fc
 MISC metadata.xml 237 RMD160 c2a1a048559257005241ad0985c814bd6aab17a7 SHA1 d448f9b9c9f2a92d95efaf4cf9ce3b83b3f9ad3b SHA256 2ff40136507932f8146b07f93d8414eef1cba8bbed94c9eeccf42b6cbbebf7c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqAnRMACgkQkKaRLQcq0GLrNACgmIoPGx6R+e5bRmZ8HV0qkitM
-z9wAoIyL8fPw6kvykw07x5VGuASLhyWx
-=wps4
+iEYEARECAAYFAkqGnLIACgkQV3J2n04Eauw30wCfT6PSnnhR1W9oB5ZotEfI2eqM
+4UEAoKfLzhVJK6KRPn2nYiOcnP4dDjxp
+=8VyU
 -----END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild
new file mode 100644
index 000000000000..a36ae06760dc
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.11-r1.ebuild,v 1.1 2009/08/15 11:31:56 tove Exp $
+
+EAPI=2
+
+inherit multilib python eutils
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://fetchmail.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl nls kerberos krb4 hesiod"
+
+RDEPEND="hesiod? ( net-dns/hesiod )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( app-crypt/mit-krb5 )
+	krb4? ( <app-crypt/mit-krb5-1.7[krb4] )
+	nls? ( virtual/libintl )
+	elibc_FreeBSD? ( sys-libs/com_err )
+	virtual/python"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_prepare() {
+	# this patch fixes bug #34788 (ticho@gentoo.org 2004-09-03)
+	epatch "${FILESDIR}"/${PN}-6.2.5-broken-headers.patch
+
+	epatch "${FILESDIR}"/${PV}-fix-free-corruption.patch
+
+	# dont compile during src_install
+	: > "${S}"/py-compile
+}
+
+src_configure() {
+#	PYTHON=: \
+		econf \
+		--disable-dependency-tracking \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		$(use_with krb4 kerberos) \
+		$(use_with ssl) \
+		$(use_with hesiod) \
+		${myconf} || die "Configuration failed."
+}
+
+src_install() {
+	# dir for pidfile
+	dodir /var/run/${PN} || die "dodir failed"
+	keepdir /var/run/${PN}
+	fowners ${PN}:${PN} /var/run/${PN} || die "fowners failed"
+
+	# fetchmail's homedir (holds fetchmail's .fetchids)
+	dodir /var/lib/${PN} || die "dodir failed"
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN} || die "fowners failed"
+	fperms 700 /var/lib/${PN} || die "fperms failed"
+
+	emake DESTDIR="${D}" install || die
+	python_need_rebuild
+
+	dohtml *.html
+
+	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO || die
+
+	newinitd "${FILESDIR}"/fetchmail.new fetchmail || die
+	newconfd "${FILESDIR}"/conf.d-fetchmail fetchmail || die
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+
+	if ! python -c "import Tkinter" >/dev/null 2>&1
+	then
+		elog
+		elog "You will not be able to use fetchmailconf(1), because you"
+		elog "don't seem to have Python with tkinter support."
+		elog
+		elog "If you want to be able to use fetchmailconf(1), do the following:"
+		elog "  1.  Add 'tk' to the USE variable in /etc/make.conf."
+		elog "  2.  (Re-)merge Python."
+		elog
+	fi
+
+	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+	elog "the polling delay used by the fetchmail init script."
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages
+}
diff --git a/net-mail/fetchmail/files/6.3.11-fix-free-corruption.patch b/net-mail/fetchmail/files/6.3.11-fix-free-corruption.patch
new file mode 100644
index 000000000000..d84d50cc8c94
--- /dev/null
+++ b/net-mail/fetchmail/files/6.3.11-fix-free-corruption.patch
@@ -0,0 +1,15 @@
+--- socket.c
++++ socket.c
+@@ -628,9 +628,10 @@
+ 				report(stdout, GT_("Unknown Issuer CommonName\n"));
+ 		}
+ 		if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) {
+-			if (outlevel >= O_VERBOSE)
++			if (outlevel >= O_VERBOSE) {
+ 				report(stdout, GT_("Server CommonName: %s\n"), (tt = sdump(buf, i)));
+-			xfree(tt);
++				xfree(tt);
++			}
+ 			if ((size_t)i >= sizeof(buf) - 1) {
+ 				/* Possible truncation. In this case, this is a DNS name, so this
+ 				 * is really bad. We do not tolerate this even in the non-strict case. */