Update fetchmailconf script due to security bug #110366.

Package-Manager: portage-2.0.53_rc5

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index c6c353a20df03ea87735562fe70695e0e8ae171c..facbdc9dabe8e82d2f88d9dbee9b47369e8a971d 100644 (file)
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.73 2005/08/13 17:21:50 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.74 2005/10/25 05:40:32 ticho Exp $
+
+*fetchmail-6.2.5.2-r1 (25 Oct 2005)
+
+  25 Oct 2005; Andrej Kacian <ticho@gentoo.org>
+  +fetchmail-6.2.5.2-r1.ebuild:
+  Update fetchmailconf script due to security bug #110366.
 
   13 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> fetchmail-6.2.5.2.ebuild:
   Stable on mips.

diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index e0d3322df80801bf4e84d1b12d688431689c4571..500e3c1fa1ac413d5099b7e4db401f329fc15437 100644 (file)
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 17b5e3cf3637a964aafdd9c9a3841534 ChangeLog 11260
+MD5 640bd8b551b0b4af93725e632a05f42a ChangeLog 11435
 MD5 d01bc5cb58cfda170f585b3e89bef8ed fetchmail-5.9.14.ebuild 1894
 MD5 faaffbf24a8f1845717127119690cbc9 fetchmail-6.2.1-r1.ebuild 1773
 MD5 00c01108df1dd1d60f071b2e1b929253 fetchmail-6.2.2-r2.ebuild 2038
@@ -9,9 +9,9 @@ MD5 243728bcac42ad79161b92714363d75d fetchmail-6.2.3.ebuild 1961
 MD5 fad43483dd30edcc1e3d5da45141a535 fetchmail-6.2.4.ebuild 2138
 MD5 e2e0aea60ed02e6393a387a2288ecb6b fetchmail-6.2.5-r1.ebuild 2734
 MD5 20841a593098014840ac383e73ef3aa8 fetchmail-6.2.5-r2.ebuild 2699
+MD5 54dc4396e3d71dc1c3bb04f3ffc0bc17 fetchmail-6.2.5.2-r1.ebuild 3059
 MD5 5321e0e013f45f2fcdf97cb2d7926ad0 fetchmail-6.2.5.2.ebuild 2790
 MD5 900f6ef3ff4d10ef0668f4d197558e9c fetchmail-6.2.5.ebuild 2609
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
 MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
 MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
@@ -23,6 +23,7 @@ MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r1 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r2 68
 MD5 4e030c7ea8258e15f970dfd6a6077461 files/digest-fetchmail-6.2.5.2 137
+MD5 c74bd41e6321522be59c6c475ce005f3 files/digest-fetchmail-6.2.5.2-r1 204
 MD5 44ab8af6373e139c7c4b8b8df77b0658 files/fetchmail 591
 MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
 MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
@@ -32,10 +33,11 @@ MD5 fa0432a854f2a63b2b6fa0a8e65985f7 files/fetchmail-6.2.5-fetchsizelimit.patch
 MD5 bc67e24e50b2607de8ed8bbfe8c475ea files/fetchmail-6.2.5-gentoo.patch 1878
 MD5 9e74bd5507acf5a39559d76646bac254 files/fetchmail-6.2.5-kerberos.patch 1175
 MD5 9fdac9fcc5797bfb643d850abe200105 files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC/ixPEZCkKN40op4RArIOAKDFlwDjsWgJorrLcjkX09JbXe4Q5ACfY/T+
-BMH19X1m2km8hjkCoeElhY8=
-=6CJ2
+iD4DBQFDXcVeQlM6RnzZP+IRAq8XAKDDJ2dlhiQiVR5tPXv6n9wbb/B9oQCYgE1d
+UTafbLTcAsBFoD2Bj+bLLQ==
+=Rxqk
 -----END PGP SIGNATURE-----

diff --git a/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild
new file mode 100644 (file)
index 0000000..1c11eb0
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.2.5.2-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 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.1 2005/10/25 05:40:32 ticho Exp $
+
+inherit eutils gnuconfig
+
+FCONF_P="fetchmailconf-1.43.2"
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="http://www.catb.org/~esr/fetchmail/"
+SRC_URI="http://www.catb.org/~esr/${PN}/${PN}-6.2.5.tar.gz
+               http://download.berlios.de/${PN}/${PN}-patch-${PV}.gz
+               http://download.berlios.de/${PN}/${FCONF_P}.gz"
+
+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 )
+       sys-devel/gettext
+       elibc_FreeBSD? ( sys-libs/com_err )"
+
+DEPEND="${RDEPEND}
+       sys-devel/autoconf"
+
+S="${WORKDIR}/${PN}-6.2.5"
+
+src_unpack() {
+       unpack ${A} || die "unpack failed"
+       cd ${S} || die "cd \${S} failed"
+
+       epatch ${WORKDIR}/${PN}-patch-${PV} || die "epatch to ${PV} failed"
+
+       epatch ${FILESDIR}/${PN}-6.2.5-gentoo.patch || die
+       epatch ${FILESDIR}/${PN}-6.2.5-kerberos.patch || die
+       # 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 #97263 (ticho@gentoo.org 2005-06-01)
+       if has_version '>=app-crypt/mit-krb5-1.4' ; then
+               epatch ${FILESDIR}/${PN}-6.2.5-mit-krb5-1.4.patch || die
+       fi
+
+       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() {
+       # update fetchmailconf (security bug #110366)
+       mv -f "../fetchmailconf-1.43.2" "fetchmailconf" || \
+               die "couldn't update fetchmailconf"
+
+       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
+
+       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.2.5.2-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2-r1
new file mode 100644 (file)
index 0000000..1cda912
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2-r1
@@ -0,0 +1,3 @@
+MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
+MD5 be18f89b94e937a22560aa452e524c4b fetchmail-patch-6.2.5.2.gz 2000
+MD5 804bcae14431941c8b2c5e8f0011da7b fetchmailconf-1.43.2.gz 24010