Version bump. Add socks USE flag - bug #380405. Allow multiple deamons - bug #380371. Remove unused patches.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

8 files changed, 180 insertions, 74 deletions

diff --git a/net-mail/fetchmail/ChangeLog b/net-mail/fetchmail/ChangeLog
index e29379baba9b..a1fe735adc23 100644
--- a/net-mail/fetchmail/ChangeLog
+++ b/net-mail/fetchmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/fetchmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.216 2011/08/05 07:13:35 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/ChangeLog,v 1.217 2011/08/24 09:15:17 eras Exp $
+
+*fetchmail-6.3.21 (24 Aug 2011)
+
+  24 Aug 2011; Eray Aslan <eras@gentoo.org> +files/fetchmail.initd,
+  -files/MD5_library_pickup.patch, +fetchmail-6.3.21.ebuild,
+  -files/debian-580796.patch, +files/fetchmail.confd:
+  Version bump. Add socks USE flag - bug #380405. Allow multiple deamons - bug
+  #380371. Remove unused patches.
 
   05 Aug 2011; Eray Aslan <eras@gentoo.org> files/fetchmail.new:
   fix deprecated chuid option in init script - bug #377777
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 291f29538624..e3c271899ef5 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX MD5_library_pickup.patch 1124 RMD160 0c28938fe56d9e3032c79aeb3a730147470fe37d SHA1 b3fe036bc019bd0782973e76c0c63fbfd1c87f10 SHA256 25a5600dad73042d3e7212a673898ae153466c82a2fa13c10795dd234d2514b3
 AUX conf.d-fetchmail 347 RMD160 5a042695f6849653d32b17a6852025d1d695770a SHA1 9a0956877f5d8ac3e1c7c949a9921c3f1b1e7307 SHA256 8ba3e51b5a51b42daf8cfa2183c938afb04fd6a9cc941e1adb9faa10aff677bf
-AUX debian-580796.patch 529 RMD160 1b6c6f0e113758bf2fe7fa7b44d1959b410a0a08 SHA1 df8a1160cfde71c17a2ef64fa629fbb65910f2b2 SHA256 723c2fc9630a93367ec253331f4db815a13577b805fdd0a848cfc42d6c91a05a
+AUX fetchmail.confd 410 RMD160 ff677f3525a63d810121e98cc565abc7c5357b25 SHA1 07842218def6ab1e7c7e2c7ca5078f9612405a1a SHA256 4a1958adc59910a0b4e74d25fff2934cf9d3a74014b75e1c0bfbd3b07032e1ab
+AUX fetchmail.initd 992 RMD160 74862f757e49bdd7971f90563515bc38440016fe SHA1 6739cb36cf9c51588047d69425890c5ace34fb11 SHA256 8afe0827ed0803c38bcfa7f7855ec3bfecf4ba9a12e3a10306082fcc45be039a
 AUX fetchmail.new 685 RMD160 356dc7d118a72f0e689dd51ac9317495fd8f2a18 SHA1 4da6d811dfeae4898c988739121e7d60f22dae1c SHA256 7704f4f4cb7110fcb50e2ab9f1bf6c4280d09367bacecd0491fdf548062a4e89
 DIST fetchmail-6.3.20.tar.bz2 1723623 RMD160 1262100c4a74a84e9dd969e4ab4902771752dbe5 SHA1 797b5b0050763ad111c244aba606b2fcb4dfdaad SHA256 22e94f11d885cb9330a197fd80217d44f65e6b087e4d4b4d83e573adfc24aa7b
+DIST fetchmail-6.3.21.tar.bz2 1724445 RMD160 981084b384eb8f6f424af64ceb5922a030271519 SHA1 e32a0d40ec133d651782543ecd7bc9bbee52dff7 SHA256 9b20eededa7d15ab2bde2d4a0c2d169d4882021cd63042ecbed2f13999185502
 EBUILD fetchmail-6.3.20.ebuild 2353 RMD160 6621351ee3790fc4a9a91005e1665830e9d98c2d SHA1 875975400b610fdb5a4688fb3bb2a37e914cbd46 SHA256 c11be2bd92f01a4f65187b4637eb92d536912e93c78b4e512221805418755208
-MISC ChangeLog 31057 RMD160 2658ebc8dc72efb5c70b748de1072e633079b8ac SHA1 49b2c1a74d03618b380bb0978d035ad8f3d3de5b SHA256 9e723d8bc41735e58f5a4f52ce7346a6739fae176eea04b9eff6dbe3e8d2d960
-MISC metadata.xml 337 RMD160 eae9cac549cbc847c52c0bc2f49e95bc9daad1a3 SHA1 fafb54bde1a25c573453bb3e6083d840718badb5 SHA256 d7909df61f65b68b111f92105f40bebaf5f5f7314f49be27ab4d05e43cc996a4
+EBUILD fetchmail-6.3.21.ebuild 2290 RMD160 afd9d97e3f5b1f8de8c32e5b6b5a35e713297548 SHA1 32bc6568fd3809d4fb84675dfd23a0b60189e916 SHA256 eba8321341fc272a3ea56ad5e7ff33ff28b5f4cb404fb96e8ee6d6f0581c7966
+MISC ChangeLog 31387 RMD160 9797e83db9467b652850dbe326d22170e4c01d46 SHA1 1fb75be37655593e14edf03bf2884d71142fda90 SHA256 67c23df732982475ae9d3e4299b272d4574f7e47f531575b67766304a1632fce
+MISC metadata.xml 400 RMD160 5c52a6f03b82ae8546323884f788246fa4fdac71 SHA1 997df4c3c3b912534351b199ac3697ac71e76156 SHA256 83d55d3024d64b0e99ba051275b4173c0094135216d68b41d555c8ff424aab13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOO5glAAoJEHfx8XVYajsf9ocP/RoscvVAi0Yz/yknPvzTxQYU
-wrQ0z34PsPFo0LwrhlxX9iu1gbjKk1iB63njhGp92SNk5cfNK2kkVDyIIl/eL0gy
-IrdpVpa+H1HwAfrfDEhwSF7Lb0m28M8r1ged9z0lm8zib+Yy8Npb1VJLJdq4m45p
-cHClLGTiVfdqb6gwEQeMXQEb36onf1FEESXj2Hbf+KFOdsm5a30db9jCJZlrNKoF
-bkmhqTSqfMAskFFiLFXXSDuLDb9MyeGYUu8N3ND0L0G/bqIbDvNaUy6V+mUS5Tai
-K9on2aMagI2Ow/KyH8vNUDzI9ECPqqkqy4kH6JW9Ojo9bE4wG0EXN7UJDX2R9zT5
-8ABHgehPnR/MwLj6nyjBo0smQ35j9AkiLN/hYv+HTV6GNGRKqtg9sFuyuutrDp6s
-KC/lWt3OMvhWMU/oAeIfzYmAF+8Jfx/VzZbmvm9ijJwm3FyIxM7Q7v1YvyccTU8+
-Q9jeX5iIFBPBiiJ5uaavRmxl6wR9Bk4qB3EWA8kChY55R0mrHxwu7sOuu9CG1lhB
-catCI0OuaCiEw+yUKiIDQi57RDWxOg/SzLYXEC+2QUnlYJ4Y7mBtCnxoOP2hZrT0
-hpoFnpaYvjjk06iqqai4Nv2w8SMl228LDvg9GxVnZaE2EYDzk7qfY67Zvy66hQCy
-nSoN48jGv5njBcLYp6Nd
-=/1aV
+iQIcBAEBCAAGBQJOVMEyAAoJEHfx8XVYajsfg+QP/ie9yQJplI3JEEcKIZjJ6JsL
+UI/Vmo0HM6PdEdc+ATLYec+Y9PvU3n63AQVU1gBuxgX91cMJPrlIU2EWtQt9EwJy
+Dt2bcZOtDMWO0UDafUugFR8NA1UwXibGwONmcE17kmLLDE6cJUSEzLkj99ICmxk1
+oFDLFI6NOk8FzyO1OwfplZkjWxyhZxq1cg29L4I4iXQAPT40mY4sFSkfTpVSSS7f
+KJtAVYi6hbalWuAtLHY3ICu08BSQR050tWE8tq4jozw0A0fmK0ycZPKF2mwFS6Gn
+EjhNSCFBFf2gPD2PfO51TPnThmvzBvlgRP/+BSPJ0cnhTmx5Yd5HN+Cdo9Rz4+95
+v9qNyl+dQ3NUwDVnaYJvzBeg/bfRYnAnAey3mtKoK0UgIgVNkLK+JXEHok/GKuwQ
+J5VjbjxuRGs0LPMi0PTrO7XwFU3SVOG89KDZH/2RDJvzXD12hk56Dh5QgSrKxIZu
+M0dYOk4ab6a5x1jldyzr+ooBM/XBPRnbJPrdbHCd7fqnfUAy8Rr06MnCV5ifykis
+znsq0WEtFGu4YJFRBIpPoD72ThvvOxZ2t745SuMMPOq3qOIHqQj5cTGYnaluAwc6
+vWznn+92tHWDI5k1CUeB+MuMVcfTutlsYCt1CGQk94LFXK525nu9T3lzPU+V7Eit
+V4c07cZrbn1nWuYUhMR5
+=03ji
 -----END PGP SIGNATURE-----
diff --git a/net-mail/fetchmail/fetchmail-6.3.21.ebuild b/net-mail/fetchmail/fetchmail-6.3.21.ebuild
new file mode 100644
index 000000000000..c222b7bd7cdf
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.3.21.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/fetchmail-6.3.21.ebuild,v 1.1 2011/08/24 09:15:17 eras Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="tk? 2"
+PYTHON_USE_WITH_OPT="tk"
+PYTHON_USE_WITH="tk"
+
+inherit 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 hesiod tk socks"
+
+RDEPEND="hesiod? ( net-dns/hesiod )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 )
+	nls? ( virtual/libintl )
+	elibc_FreeBSD? ( sys-libs/e2fsprogs-libs )
+	socks? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if use tk; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# dont compile during src_install
+	: > "${S}"/py-compile
+}
+
+src_configure() {
+	if use tk ; then
+		export PYTHON=$(PYTHON -a )
+	else
+		export PYTHON=:
+	fi
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl) \
+		$(use kerberos && echo "--with-ssl" ) \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		$(use_with hesiod) \
+		$(use_with socks)
+}
+
+src_install() {
+	# fetchmail's homedir (holds fetchmail's .fetchids)
+	keepdir /var/lib/${PN} || die
+	fowners ${PN}:${PN} /var/lib/${PN} || die
+	fperms 700 /var/lib/${PN} || die
+
+	emake DESTDIR="${D}" install || die
+
+	dohtml *.html
+
+	dodoc FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO || die
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail || die
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail || die
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	use tk && python_mod_optimize fetchmailconf.py
+
+	elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+	elog "the polling delay used by the fetchmail init script."
+}
+
+pkg_postrm() {
+	use tk && python_mod_cleanup fetchmailconf.py
+}
diff --git a/net-mail/fetchmail/files/MD5_library_pickup.patch b/net-mail/fetchmail/files/MD5_library_pickup.patch
deleted file mode 100644
index 575572c68c1e..000000000000
--- a/net-mail/fetchmail/files/MD5_library_pickup.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Matthias Andree <matthias.andree@gmx.de>
-Date: Mon, 17 May 2010 21:10:16 +0200
-Subject: [PATCH] Fix MD5* library pickup.
-
-Avoid picking up libmd5, which fails if libwww is installed because libmd5
-uses "long" rather than fixed-width types. This fails on non-32-bit machines.
-
-Only probe libmd if md5.h is found.
-
-To fix Gentoo Bug #319283, reported by Karl Hakimian.
----
- NEWS         |    4 ++++
- configure.ac |   12 +++++++++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-index 2ff315f..943eb3e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -171,9 +171,15 @@ dnl 		[LIBS="$LIBS -lintl"])
- 
- AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat])
- 
--AC_SEARCH_LIBS(MD5Init, [md5 md], [],
--	      [AC_LIBSOURCE(md5c.c)
--               EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"])
-+have_md5=no
-+if test "$ac_cv_header_md5_h" != no ; then
-+    AC_SEARCH_LIBS(MD5Init, [md], [have_md5=yes])
-+fi
-+
-+if test "$have_md5" != yes ; then
-+    AC_LIBSOURCE(md5c.c)
-+    EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"
-+fi
- 
- AC_CHECK_FUNC(getopt_long, [],
-               [AC_LIBSOURCES([getopt.c, getopt1.c])
--- 
-1.6.1
-
diff --git a/net-mail/fetchmail/files/debian-580796.patch b/net-mail/fetchmail/files/debian-580796.patch
deleted file mode 100644
index 0bd65b1ca026..000000000000
--- a/net-mail/fetchmail/files/debian-580796.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/socket.c b/socket.c
-index a3adfd8..2ebdfc6 100644
---- a/socket.c
-+++ b/socket.c
-@@ -1009,8 +1009,8 @@ int SSLOpen(int sock, char *mycert, char *mykey, const char *myproto, int certck
- 		}
- 	}
- 
--	if (!certck && (SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK
--|| !_verify_ok)) {
-+	if (!certck && !fingerprint &&
-+		(SSL_get_verify_result(_ssl_context[sock]) != X509_V_OK || !_verify_ok)) {
- 		report(stderr, GT_("Warning: the connection is insecure, continuing anyways. (Better use --sslcertck!)\n"));
- 	}
- 
diff --git a/net-mail/fetchmail/files/fetchmail.confd b/net-mail/fetchmail/files/fetchmail.confd
new file mode 100644
index 000000000000..b7be8e32b8cc
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail.confd
@@ -0,0 +1,10 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/fetchmail/files/fetchmail.confd,v 1.1 2011/08/24 09:15:18 eras Exp $
+
+# Polling frequency in seconds
+# (fetchmail will daemonize and check for new mail at this interval)
+polling_period="60"
+
+# Directory where the pid file is kept
+pid_dir="/var/run/fetchmail"
diff --git a/net-mail/fetchmail/files/fetchmail.initd b/net-mail/fetchmail/files/fetchmail.initd
new file mode 100644
index 000000000000..889bcb61bb7d
--- /dev/null
+++ b/net-mail/fetchmail/files/fetchmail.initd
@@ -0,0 +1,44 @@
+#!/sbin/runscript
+
+piddir=${pid_dir:-/var/run/fetchmail}
+pid_file=${piddir}/${RC_SVCNAME}.pid
+rcfile=/etc/${RC_SVCNAME}rc
+
+depend() {
+	need net
+	use mta
+}
+
+checkconfig() {
+	if [ ! -f ${rcfile} ]; then
+		eerror "Configuration file ${rcfile} not found"
+		return 1
+	fi
+	local fetchmail_instance
+	fetchmail_instance=${RC_SVCNAME##*.}
+	if [ -n "${fetchmail_instance}" -a "${RC_SVCNAME}" != "fetchmail" ]; then
+		fidfile=/var/lib/fetchmail/.fetchids.${RC_SVCNAME}
+	else
+		fidfile=/var/lib/fetchmail/.fetchids
+	fi
+	if [ ! -d ${piddir} ]; then
+		checkpath -q -d -o fetchmail:fetchmail -m 0755 ${piddir} || return 1
+	fi
+}
+
+start() {
+        checkconfig || return 1
+	ebegin "Starting ${RC_SVCNAME}"
+	start-stop-daemon --start --pidfile ${pid_file} \
+		--user fetchmail --exec /usr/bin/fetchmail \
+		-- -d ${polling_period} -f ${rcfile} \
+		--pidfile ${pid_file} -i ${fidfile}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --quiet --pidfile ${pid_file}
+	eend ${?}
+}
+
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index a652eb292576..d0a743178b8a 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/metadata.xml
@@ -4,6 +4,7 @@
   <herd>net-mail</herd>
   <use>
     <flag name="hesiod">Enable support for hesiod</flag>
-    <flag name="tk">Adds support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
+    <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
+    <flag name="socks">Enable support for socks proxy</flag>
   </use>
 </pkgmetadata>