Version bump, sec. bug #99865.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 175 insertions, 11 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index bb08ce004944..f65d2b5a5e73 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,14 @@
 # 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.61 2005/07/01 16:38:17 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.62 2005/07/22 08:51:03 ticho Exp $
+
+*fetchmail-6.2.5.2 (22 Jul 2005)
+
+  22 Jul 2005; Andrej Kacian <ticho@gentoo.org>
+  files/fetchmail-6.2.5-broken-headers.patch,
+  +files/fetchmail-6.2.5-gentoo.patch, files/fetchmail-6.2.5-kerberos.patch,
+  +fetchmail-6.2.5.2.ebuild:
+  Version bump, security bug #99865.
 
   01 Jul 2005; Andrej Kacian <ticho@gentoo.org> fetchmail-5.9.14.ebuild,
   fetchmail-6.2.2-r2.ebuild, fetchmail-6.2.3.ebuild, fetchmail-6.2.4.ebuild:
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index bca9b0769301..72021451c685 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -7,10 +7,12 @@ MD5 d01bc5cb58cfda170f585b3e89bef8ed fetchmail-5.9.14.ebuild 1894
 MD5 00c01108df1dd1d60f071b2e1b929253 fetchmail-6.2.2-r2.ebuild 2038
 MD5 243728bcac42ad79161b92714363d75d fetchmail-6.2.3.ebuild 1961
 MD5 44c94474b2d648ebc94ab91cae192e7f fetchmail-6.2.5-r2.ebuild 2722
+MD5 1722ade69cb726afe065056962b1d76c fetchmail-6.2.5.2.ebuild 2814
 MD5 900f6ef3ff4d10ef0668f4d197558e9c fetchmail-6.2.5.ebuild 2609
-MD5 fb51e74fd1ba160931dae8ea40eec4a2 ChangeLog 9765
+MD5 de80918c7041284500e7e012553d17d2 ChangeLog 10037
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 e2e0aea60ed02e6393a387a2288ecb6b fetchmail-6.2.5-r1.ebuild 2734
+MD5 4e030c7ea8258e15f970dfd6a6077461 files/digest-fetchmail-6.2.5.2 137
 MD5 5b0a50b0a0193afbcb7eff9ac3d5fcb7 files/digest-fetchmail-6.2.1-r1 68
 MD5 72af1b79f1e6aab29edbdefdcce8c1c7 files/digest-fetchmail-6.2.2-r2 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5-r1 68
@@ -19,20 +21,21 @@ MD5 83f3d182af36573e8d7264ee440445ee files/digest-fetchmail-5.9.14 68
 MD5 74bad5b4190b32597543a61ed0c7ec7a files/fetchmail-6.2.2-multiple-return-path.diff 1142
 MD5 19b3a189b664bb1fb0a228c1b2bcd5f2 files/fetchmail-6.1.0-gentoo.diff 542
 MD5 1dd80e46bd5b02949ba0686086a37570 files/configure-5.9.14.diff 2046
-MD5 91b291c03a6f375401dc2fee56beeeef files/fetchmail-6.2.5-broken-headers.patch 250
+MD5 cd9176a56e402a922bcf53d3ccf15e11 files/fetchmail-6.2.5-broken-headers.patch 288
 MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
 MD5 c162c209d65c11b6cbdd7c33fd411b90 files/fetchmail-6.2.0-gentoo.diff 1544
+MD5 bc67e24e50b2607de8ed8bbfe8c475ea files/fetchmail-6.2.5-gentoo.patch 1878
 MD5 fa0432a854f2a63b2b6fa0a8e65985f7 files/fetchmail-6.2.5-fetchsizelimit.patch 526
 MD5 44ab8af6373e139c7c4b8b8df77b0658 files/fetchmail 591
 MD5 9fdac9fcc5797bfb643d850abe200105 files/fetchmail-6.2.5-mit-krb5-1.4.patch 406
-MD5 32b3f4317fd807e171da3cd6c27217c2 files/fetchmail-6.2.5-kerberos.patch 1143
+MD5 9e74bd5507acf5a39559d76646bac254 files/fetchmail-6.2.5-kerberos.patch 1175
 MD5 b8f3ceb78e16e9c26c34908229893659 files/digest-fetchmail-6.2.3 68
 MD5 c1c69ebb34b0848d22249ae32b770061 files/digest-fetchmail-6.2.4 68
 MD5 256e473e140583f41c7da6ecd9d815be files/digest-fetchmail-6.2.5 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCxXGUQlM6RnzZP+IRAr++AKCGfKLDRNorJ9Y+WyXe3ZXPhdo/LACfV1WN
-g4RTyah9VSe/KXnJgWcsO1A=
-=5r1v
+iD8DBQFC4LPhQlM6RnzZP+IRAncnAJ9SmYy7i1XqrBME5CWxJGSecH5bHgCdGQtx
+FAhkCS9toBw5e9pLetYd4Nk=
+=1ha0
 -----END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.2.5.2.ebuild b/net-mail/fetchmail/fetchmail-6.2.5.2.ebuild
new file mode 100644
index 000000000000..acb12edc00ff
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.2.5.2.ebuild
@@ -0,0 +1,101 @@
+# 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.ebuild,v 1.1 2005/07/22 08:51:03 ticho Exp $
+
+inherit eutils gnuconfig
+
+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/fetchmail/fetchmail-patch-6.2.5.2.gz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~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? ( virtual/krb5 )
+	krb4? ( app-crypt/kth-krb )
+	sys-devel/gettext
+	elibc_FreeBSD? ( sys-libs/com_err )"
+
+DEPEND="${RDEPEND}
+	sys-devel/autoconf"
+
+S="${WORKDIR}/${PN}-6.2.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	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() {
+	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 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2
new file mode 100644
index 000000000000..0be546c5a44c
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2
@@ -0,0 +1,2 @@
+MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
+MD5 be18f89b94e937a22560aa452e524c4b fetchmail-patch-6.2.5.2.gz 2000
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
index 248630858672..1f1ce04e6fdd 100644
--- a/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-broken-headers.patch
@@ -1,5 +1,5 @@
---- transact.c~	2004-06-01 16:51:33.769501872 +0200
-+++ transact.c	2004-06-01 16:52:18.322728752 +0200
+--- fetchmail-6.2.5.orig/transact.c~	2004-06-01 16:51:33.769501872 +0200
++++ fetchmail-6.2.5/transact.c		2004-06-01 16:52:18.322728752 +0200
 @@ -516,6 +516,7 @@
  		if (linelen != strlen (line))
  		    has_nuls = TRUE;
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-gentoo.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-gentoo.patch
new file mode 100644
index 000000000000..7ca9c42f0c09
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-gentoo.patch
@@ -0,0 +1,50 @@
+diff -ur fetchmail-6.2.5.orig/etrn.c fetchmail-6.2.5/etrn.c
+--- fetchmail-6.2.5.orig/etrn.c	2003-10-15 21:17:36.000000000 +0200
++++ fetchmail-6.2.5/etrn.c	2005-07-22 10:32:35.000000000 +0200
+@@ -124,7 +124,7 @@
+     "ETRN",		/* ESMTP ETRN extension */
+ #if INET6_ENABLE
+     "smtp",		/* standard SMTP port */
+-    "smtps",		/* ssl SMTP port */
++    "ssmtp",		/* ssl SMTP port */
+ #else /* INET6_ENABLE */
+     25,			/* standard SMTP port */
+     465,			/* ssl SMTP port */
+diff -ur fetchmail-6.2.5.orig/imap.c fetchmail-6.2.5/imap.c
+--- fetchmail-6.2.5.orig/imap.c	2003-10-15 21:17:41.000000000 +0200
++++ fetchmail-6.2.5/imap.c	2005-07-22 10:32:18.000000000 +0200
+@@ -1114,7 +1114,7 @@
+ {
+     "IMAP",		/* Internet Message Access Protocol */
+ #if INET6_ENABLE
+-    "imap",
++    "imap2",
+     "imaps",
+ #else /* INET6_ENABLE */
+     143,                /* standard IMAP2bis/IMAP4 port */
+diff -ur fetchmail-6.2.5.orig/pop2.c fetchmail-6.2.5/pop2.c
+--- fetchmail-6.2.5.orig/pop2.c	2003-10-15 21:17:43.000000000 +0200
++++ fetchmail-6.2.5/pop2.c	2005-07-22 10:32:07.000000000 +0200
+@@ -129,8 +129,8 @@
+ {
+     "POP2",				/* Post Office Protocol v2 */
+ #if INET6_ENABLE
+-    "pop2",				/* standard POP2 port */
+-    "pop2",				/* ssl POP2 port */
++    "pop-2",				/* standard POP2 port */
++    "pop-2",				/* ssl POP2 port */
+ #else /* INET6_ENABLE */
+     109,				/* standard POP2 port */
+     109,				/* ssl POP2 port - not */
+diff -ur fetchmail-6.2.5.orig/pop3.c fetchmail-6.2.5/pop3.c
+--- fetchmail-6.2.5.orig/pop3.c	2003-10-15 21:22:31.000000000 +0200
++++ fetchmail-6.2.5/pop3.c	2005-07-22 10:32:50.000000000 +0200
+@@ -1179,7 +1179,7 @@
+ {
+     "POP3",		/* Post Office Protocol v3 */
+ #if INET6_ENABLE
+-    "pop3",		/* standard POP3 port */
++    "pop-3",		/* standard POP3 port */
+     "pop3s",		/* ssl POP3 port */
+ #else /* INET6_ENABLE */
+     110,		/* standard POP3 port */
diff --git a/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch b/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch
index cdba95285b66..3d4e078fdd03 100644
--- a/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch
+++ b/net-mail/fetchmail/files/fetchmail-6.2.5-kerberos.patch
@@ -1,5 +1,5 @@
---- /tmp/configure.in	2004-02-22 10:23:16.711353561 +0000
-+++ configure.in	2004-02-22 10:26:37.916800464 +0000
+--- fetchmail-6.2.5.orig/configure.in	2004-02-22 10:23:16.711353561 +0000
++++ fetchmail-6.2.5/configure.in	2004-02-22 10:26:37.916800464 +0000
 @@ -465,15 +465,13 @@
          else
            AC_MSG_RESULT([found])