Fix broken logfd handling, thanks to Brian Harring <ferringb@gmail.com> for helping cook up the patch.

Package-Manager: portage-2.1.2_pre2-r5

6 files changed, 148 insertions, 20 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index 405d3250a2cc..c5076eefdb1d 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,14 @@
 # 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.109 2006/10/09 23:05:58 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.110 2006/10/10 09:43:57 robbat2 Exp $
+
+*fetchmail-6.3.5-r1 (10 Oct 2006)
+
+  10 Oct 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/fetchmail-6.3.5-preserve-logging-fd.patch,
+  +fetchmail-6.3.5-r1.ebuild:
+  Fix broken logfd handling, thanks to Brian Harring <ferringb@gmail.com> for
+  helping cook up the patch.
 
 *fetchmail-6.3.5 (09 Oct 2006)
 
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 5f07a8423142..3b7dd988db19 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
 MD5 29d376a1042aeeeba94e911a943d5a7f files/conf.d-fetchmail 347
 RMD160 5a042695f6849653d32b17a6852025d1d695770a files/conf.d-fetchmail 347
@@ -25,16 +22,20 @@ AUX fetchmail-6.2.5-mit-krb5-1.4.patch 406 RMD160 2293f4b3bf2bc7795bc4bcb1d3a0a9
 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
+AUX fetchmail-6.3.5-preserve-logging-fd.patch 607 RMD160 ae951f6937a4834842a6a9f0f5fda104ff716630 SHA1 12b4be63b7ef194dabec8602e09a793eb954de8f SHA256 d46d0d921054bae6023a83f35c7c5fae34930f7687825734643206fbae231dd7
+MD5 aee01e3f01d5d84bfb8d2c564c0a4709 files/fetchmail-6.3.5-preserve-logging-fd.patch 607
+RMD160 ae951f6937a4834842a6a9f0f5fda104ff716630 files/fetchmail-6.3.5-preserve-logging-fd.patch 607
+SHA256 d46d0d921054bae6023a83f35c7c5fae34930f7687825734643206fbae231dd7 files/fetchmail-6.3.5-preserve-logging-fd.patch 607
 AUX patch-6.3.2.1-fix-netrc-SIGSEGV.diff 848 RMD160 756cd361de6ec14ec14ede6fe22ae2fb5398fa86 SHA1 8c8ca445c44dc0da4a7dc765f06d672bafd11909 SHA256 9bb316b8c7d60b00312f7331356985eef46bbbd8fae3c23a4784edc54e248277
 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
-DIST fetchmail-6.2.5.tar.gz 1257376
+DIST fetchmail-6.2.5.tar.gz 1257376 RMD160 e32b91a959d0e80c4bd45a8758811cbe95a98180 SHA1 4656ec4393ccd1c137fe7b331f77cb26b576ac0e SHA256 c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
 DIST fetchmail-6.3.2.tar.bz2 1190838 RMD160 463c77dced9e0d3fe4f4cd951d3c7f7b35d6fe48 SHA1 95bdc22bde0033ccd3c4441353b0bef0e11987eb SHA256 4fbb779c0fddf74af8267a8e8a68bc276c7afc2c854e04b754ca7ebbab2f876e
 DIST fetchmail-6.3.3.tar.bz2 1197241 RMD160 45af0dd59976779875b683a98b94f68ffed02120 SHA256 bd53e23b0210a831c9ce6765f49904e1d996aaca5d1e95ebacead35a06f3304a
 DIST fetchmail-6.3.4.tar.bz2 1210405 RMD160 06ba93f4fb9aeefecde34117d92fe7f023b77bc4 SHA1 be0cd81f32483ba1d19be7ebe95f698f98eec13c SHA256 a090cfc47949e4ea5eebd46c82e82be35cdc743488e6d7258089591521b5db4f
 DIST fetchmail-6.3.5.tar.bz2 1237821 RMD160 3032622b8e3d2171bc7d94357414ccc69bfa9f0d SHA1 e009d904454f7eb0744f3db468bcaf2f8fd2b443 SHA256 0af641629fc1b7ee2561eccd5ecd0efea20fea935656d155886061c530114f2b
-DIST fetchmail-patch-6.2.5.2.gz 2000
+DIST fetchmail-patch-6.2.5.2.gz 2000 RMD160 7738bb8cdf650a95b33575621c7793798d831b0d SHA1 4e4d69e9847213eb594ad931a423a0fad5b2e3f2 SHA256 565d9078d5240e2e1474cd821c3feb5eb3d7018ec435228effa54bc1dce5d4b6
 DIST fetchmailconf-1.43.2.gz 24010
 EBUILD fetchmail-6.2.5.2-r1.ebuild 3041 RMD160 38fcabf1bc6ea4d683d6005705bc2db812448292 SHA1 c4e328d27fe6abccc2fd50b63115d45596e15ea5 SHA256 2f9512956a38c3fa99c77443cb8497456f6a6ad87f4656a4c85cdf9c912cb9dc
 MD5 907934ca41295f8419acd041548f7db8 fetchmail-6.2.5.2-r1.ebuild 3041
@@ -56,21 +57,25 @@ EBUILD fetchmail-6.3.4.ebuild 2419 RMD160 3bb17199cf5ecda9c4cce7a8788d7269a43b6d
 MD5 e5ec25c3d726599e8219e182deb92055 fetchmail-6.3.4.ebuild 2419
 RMD160 3bb17199cf5ecda9c4cce7a8788d7269a43b6d0b fetchmail-6.3.4.ebuild 2419
 SHA256 17ceba17dc04d1e6ed81d67cfe3c67a3e9d709aeefbde205c106b6c11b211187 fetchmail-6.3.4.ebuild 2419
+EBUILD fetchmail-6.3.5-r1.ebuild 2512 RMD160 4da3a701f1c74b8e2e42f4ba1341b62a6e930acf SHA1 6fb606f4964e3f90dd4dffa9e690c1ac97383a1b SHA256 2811f0a04a9935df836032785e45dab949a70e7c8653a7caf5ea31ac71436de5
+MD5 5b2e028fb6bdbd037264ce2833c1ea8c fetchmail-6.3.5-r1.ebuild 2512
+RMD160 4da3a701f1c74b8e2e42f4ba1341b62a6e930acf fetchmail-6.3.5-r1.ebuild 2512
+SHA256 2811f0a04a9935df836032785e45dab949a70e7c8653a7caf5ea31ac71436de5 fetchmail-6.3.5-r1.ebuild 2512
 EBUILD fetchmail-6.3.5.ebuild 2427 RMD160 040cfd67ecc2bd3be596783306175a084aab3eb2 SHA1 0acb49d37afbe41435d05526781f35c0bf9c2e66 SHA256 3e9599bbc0e665fda0a0cea78b80a1621d6605f98b8f4a33e3ec777798f0f82e
 MD5 d46e0a7e2b9875180387ed076ac9e34c fetchmail-6.3.5.ebuild 2427
 RMD160 040cfd67ecc2bd3be596783306175a084aab3eb2 fetchmail-6.3.5.ebuild 2427
 SHA256 3e9599bbc0e665fda0a0cea78b80a1621d6605f98b8f4a33e3ec777798f0f82e fetchmail-6.3.5.ebuild 2427
-MISC ChangeLog 16305 RMD160 0808b62433122dd24444c4eeb9dfde35ac723178 SHA1 a272eeec122efa7c8a847f196094948d959f9178 SHA256 e694125baab7b48aa6817a2ff5a0ce7cf6acf1803272ef645bed3aa2d19fe663
-MD5 111102a98f4df6f5da8b14ad82ef19ff ChangeLog 16305
-RMD160 0808b62433122dd24444c4eeb9dfde35ac723178 ChangeLog 16305
-SHA256 e694125baab7b48aa6817a2ff5a0ce7cf6acf1803272ef645bed3aa2d19fe663 ChangeLog 16305
+MISC ChangeLog 16585 RMD160 03c3492adb15f5598fc2412edb2ff1571911df6d SHA1 4444a8eff2e4ecb425b72dc8a6863174fc0ce894 SHA256 130bbd0f7bc0c3625c8408a6e3f6f5531bd0347c5281b9146bdc93ce75b2410e
+MD5 d12f68e8a60f6e39be6371ee0eaf165a ChangeLog 16585
+RMD160 03c3492adb15f5598fc2412edb2ff1571911df6d ChangeLog 16585
+SHA256 130bbd0f7bc0c3625c8408a6e3f6f5531bd0347c5281b9146bdc93ce75b2410e ChangeLog 16585
 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 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 7b104cea0d2a69916eb674f79e576311 files/digest-fetchmail-6.2.5.2-r1 570
+RMD160 c83a097f10e4a936bd054135e6db04807b57ab04 files/digest-fetchmail-6.2.5.2-r1 570
+SHA256 a5b497c69e3430be275a010aa0b32e5c67433630141dcdca54fe9acd52d1d291 files/digest-fetchmail-6.2.5.2-r1 570
 MD5 8b357a93d8a5b82f52543ce161eaa4ad files/digest-fetchmail-6.3.2 253
 RMD160 dfb77d6510902739dc2898ac4d365ea69080dec0 files/digest-fetchmail-6.3.2 253
 SHA256 fde9cffbefb7724cd36272ac635f96d3c1a525167ebdb4c13ce743086e554c2c files/digest-fetchmail-6.3.2 253
@@ -86,10 +91,6 @@ SHA256 802c1c7160ad0e517ec6c2a97576bf0a5fbb655c2e9ad93e3c58282e572f6d06 files/di
 MD5 3a69f5849eec7af43964eefc7bf554bd files/digest-fetchmail-6.3.5 253
 RMD160 1567096097cbd52422780323d59ec1de9fe36681 files/digest-fetchmail-6.3.5 253
 SHA256 1ace676e9d003d0aa0cfb440bb0c5283fb6d8e036b9f201ec6346215313c0621 files/digest-fetchmail-6.3.5 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFKtyx10xuJSrg3/sRAm0LAJsELEGXyfJj4nNesz3WdgubjePaKACfWm0x
-R1tcXiruPShGhHElpnTmVJw=
-=DY3R
------END PGP SIGNATURE-----
+MD5 3a69f5849eec7af43964eefc7bf554bd files/digest-fetchmail-6.3.5-r1 253
+RMD160 1567096097cbd52422780323d59ec1de9fe36681 files/digest-fetchmail-6.3.5-r1 253
+SHA256 1ace676e9d003d0aa0cfb440bb0c5283fb6d8e036b9f201ec6346215313c0621 files/digest-fetchmail-6.3.5-r1 253
diff --git a/net-mail/fetchmail/fetchmail-6.3.5-r1.ebuild b/net-mail/fetchmail/fetchmail-6.3.5-r1.ebuild
new file mode 100644
index 000000000000..c5e4f02d57b8
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.3.5-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.5-r1.ebuild,v 1.1 2006/10/10 09:43:57 robbat2 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://download2.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
+~x86-fbsd"
+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
+
+	# fix log weirdness
+	epatch ${FILESDIR}/${PN}-6.3.5-preserve-logging-fd.patch
+
+	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)
+	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/files/digest-fetchmail-6.2.5.2-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2-r1
index 1cda9121229e..6795154f1b89 100644
--- a/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2-r1
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.2.5.2-r1
@@ -1,3 +1,7 @@
 MD5 9956b30139edaa4f5f77c4d0dbd80225 fetchmail-6.2.5.tar.gz 1257376
+RMD160 e32b91a959d0e80c4bd45a8758811cbe95a98180 fetchmail-6.2.5.tar.gz 1257376
+SHA256 c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac fetchmail-6.2.5.tar.gz 1257376
 MD5 be18f89b94e937a22560aa452e524c4b fetchmail-patch-6.2.5.2.gz 2000
+RMD160 7738bb8cdf650a95b33575621c7793798d831b0d fetchmail-patch-6.2.5.2.gz 2000
+SHA256 565d9078d5240e2e1474cd821c3feb5eb3d7018ec435228effa54bc1dce5d4b6 fetchmail-patch-6.2.5.2.gz 2000
 MD5 804bcae14431941c8b2c5e8f0011da7b fetchmailconf-1.43.2.gz 24010
diff --git a/net-mail/fetchmail/files/digest-fetchmail-6.3.5-r1 b/net-mail/fetchmail/files/digest-fetchmail-6.3.5-r1
new file mode 100644
index 000000000000..25509b9e4b71
--- /dev/null
+++ b/net-mail/fetchmail/files/digest-fetchmail-6.3.5-r1
@@ -0,0 +1,3 @@
+MD5 e8dc5cd8e80677bb60e397d6171d12ec fetchmail-6.3.5.tar.bz2 1237821
+RMD160 3032622b8e3d2171bc7d94357414ccc69bfa9f0d fetchmail-6.3.5.tar.bz2 1237821
+SHA256 0af641629fc1b7ee2561eccd5ecd0efea20fea935656d155886061c530114f2b fetchmail-6.3.5.tar.bz2 1237821
diff --git a/net-mail/fetchmail/files/fetchmail-6.3.5-preserve-logging-fd.patch b/net-mail/fetchmail/files/fetchmail-6.3.5-preserve-logging-fd.patch
new file mode 100644
index 000000000000..faafcb7f3598
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail-6.3.5-preserve-logging-fd.patch
@@ -0,0 +1,17 @@
+Don't close the logfile if you succeed in opening it.
+
+Signed-off-by: Brian Harring <ferringb@gmail.com>
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- fetchmail-6.3.5-old/daemon.c	2006-08-07 02:22:40.000000000 -0700
++++ fetchmail-6.3.5/daemon.c	2006-10-10 00:54:04.000000000 -0700
+@@ -218,8 +218,7 @@
+       if ((logfd = open(logfile, O_CREAT|O_WRONLY|O_APPEND, 0666)) < 0) {	/* stdout */
+ 	  report(stderr, "cannot open %s: %s\n", logfile, strerror(errno));
+ 	  return PS_IOERR;
+-      } else
+-	  logfd = 0;	/* use /dev/null */
++      }
+   } else
+       logfd = 0;    /* this is /dev/null */
+